Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(mcp): bound label deletion by an overall deadline

Tind1044e53a478
diff --git a/apps/api/src/mcp/tools.ts b/apps/api/src/mcp/tools.ts
index b28cfd747..811d370a6 100644
--- a/apps/api/src/mcp/tools.ts
+++ b/apps/api/src/mcp/tools.ts
@@ -44,7 +44,9 @@ class ApiClient {
const res = await fetch(url, {
...init,
headers,
- signal: AbortSignal.timeout(10_000),
+ signal: init?.signal
+ ? AbortSignal.any([init.signal, AbortSignal.timeout(10_000)])
+ : AbortSignal.timeout(10_000),
});
const text = await res.text();
diff --git a/packages/mcp/src/tools/register.test.ts b/packages/mcp/src/tools/register.test.ts
index 99332565b..9da972677 100644
--- a/packages/mcp/src/tools/register.test.ts
+++ b/packages/mcp/src/tools/register.test.ts
@@ -376,6 +376,7 @@ describe("registerTools", () => {
const result = await tools.get("delete_label")?.handler({ id: "label-1" });
expect(client.json).toHaveBeenCalledExactlyOnceWith("/api/label/label-1", {
method: "DELETE",
+ signal: expect.any(AbortSignal),
});
expect(result?.isError).toBe(false);
});
@@ -398,9 +399,46 @@ describe("registerTools", () => {
expect(client.json).toHaveBeenCalledTimes(2);
expect(client.json).toHaveBeenNthCalledWith(2, "/api/label/label-1", {
method: "DELETE",
+ signal: expect.any(AbortSignal),
});
});
+ it("returns saved progress when the overall deletion deadline expires", async () => {
+ const { server, tools } = createServerMock();
+ const controller = new AbortController();
+ const timeout = vi
+ .spyOn(AbortSignal, "timeout")
+ .mockReturnValue(controller.signal);
+ const progress = { id: "large", pendingDeletion: true };
+ const client = {
+ json: vi
+ .fn()
+ .mockResolvedValueOnce(progress)
+ .mockImplementationOnce(async () => {
+ controller.abort();
+ throw new DOMException("Timed out", "TimeoutError");
+ }),
+ };
+ try {
+ registerTools(server as never, { client: client as never });
+ const result = await tools.get("delete_label")?.handler({ id: "large" });
+ expect(timeout).toHaveBeenCalledWith(10_000);
+ expect(result?.isError).toBe(false);
+ expect(client.json).toHaveBeenCalledTimes(2);
+ expect(client.json).toHaveBeenLastCalledWith("/api/label/large", {
+ method: "DELETE",
+ signal: controller.signal,
+ });
+ expect(result?.content).toEqual([
+ expect.objectContaining({
+ text: expect.stringContaining('"pendingDeletion": true'),
+ }),
+ ]);
+ } finally {
+ timeout.mockRestore();
+ }
+ });
+
it("returns resumable progress when a cascade exceeds one tool call", async () => {
const { server, tools } = createServerMock();
const client = {
diff --git a/packages/mcp/src/tools/register.ts b/packages/mcp/src/tools/register.ts
index ab30bcfe2..9401c3ef9 100644
--- a/packages/mcp/src/tools/register.ts
+++ b/packages/mcp/src/tools/register.ts
@@ -630,12 +630,19 @@ export function registerTools(
async (args) =>
run(async () => {
let result: unknown;
+ const signal = AbortSignal.timeout(10_000);
// Bound work per tool call. The API persists the continuation boundary.
for (let page = 0; page < 100; page++) {
- result = await client.json(
- `/api/label/${encodeURIComponent(args.id)}`,
- { method: "DELETE" },
- );
+ if (page > 0 && signal.aborted) break;
+ try {
+ result = await client.json(
+ `/api/label/${encodeURIComponent(args.id)}`,
+ { method: "DELETE", signal },
+ );
+ } catch (error) {
+ if (signal.aborted && result) break;
+ throw error;
+ }
if (
!result ||
typeof result !== "object" ||