toolcraft 0.0.25 → 0.0.26

package/node_modules/tiny-mcp-client/src/internal.ts

@@ -478,6 +478,9 @@ export class McpClient {
       const abortPromise = new Promise<CallToolResult>((_, reject) => {
         const rejectWithAbortReason = () => {
           sendCancellationNotification();
+          if (requestId !== undefined) {
+            messageLayer.cancelRequest(requestId, signal.reason);
+          }
           reject(signal.reason);
         };
 
@@ -2350,11 +2353,16 @@ export class StdioTransport implements McpTransport {
 
     this.readable = child.stdout;
     this.writable = child.stdin;
+    const stderrDecoder = new TextDecoder();
     child.stderr.on("data", (chunk: unknown) => {
-      this.stderrOutput += chunkToString(chunk);
-      if (this.stderrOutput.length > StdioTransport.STDERR_MAX_LENGTH) {
-        this.stderrOutput = this.stderrOutput.slice(-StdioTransport.STDERR_MAX_LENGTH);
-      }
+      const decoded =
+        chunk instanceof Uint8Array
+          ? stderrDecoder.decode(chunk, { stream: true })
+          : `${stderrDecoder.decode()}${String(chunk)}`;
+      this.appendStderrOutput(decoded);
+    });
+    child.stderr.once("end", () => {
+      this.appendStderrOutput(stderrDecoder.decode());
     });
     this.closed = new Promise((resolve) => {
       let settled = false;
@@ -2405,6 +2413,17 @@ export class StdioTransport implements McpTransport {
     return this.stderrOutput;
   }
 
+  private appendStderrOutput(chunk: string): void {
+    if (chunk.length === 0) {
+      return;
+    }
+
+    this.stderrOutput += chunk;
+    if (this.stderrOutput.length > StdioTransport.STDERR_MAX_LENGTH) {
+      this.stderrOutput = this.stderrOutput.slice(-StdioTransport.STDERR_MAX_LENGTH);
+    }
+  }
+
   dispose(reason = new Error("Stdio transport disposed")): void {
     void reason;
 
@@ -2965,18 +2984,6 @@ export function serializeJsonRpcMessage(message: JsonRpcMessage): string {
   return `${JSON.stringify(message)}\n`;
 }
 
-function chunkToString(chunk: unknown): string {
-  if (typeof chunk === "string") {
-    return chunk;
-  }
-
-  if (chunk instanceof Uint8Array) {
-    return Buffer.from(chunk).toString("utf8");
-  }
-
-  return String(chunk);
-}
-
 function normalizeLine(line: string): string {
   return line.endsWith("\r") ? line.slice(0, -1) : line;
 }
@@ -3266,6 +3273,18 @@ export class JsonRpcMessageLayer {
     });
   }
 
+  cancelRequest(requestId: RequestId, reason: unknown): boolean {
+    const pending = this.pendingRequests.get(requestId);
+    if (pending === undefined) {
+      return false;
+    }
+
+    this.pendingRequests.delete(requestId);
+    clearTimeout(pending.timeout);
+    pending.reject(reason);
+    return true;
+  }
+
   dispose(reason = new Error("JSON-RPC message layer disposed")): void {
     if (this.disposedError !== undefined) {
       return;

package/node_modules/tiny-mcp-client/src/transports.test.ts

@@ -1471,6 +1471,40 @@ describe("JsonRpcMessageLayer sendRequest", () => {
       vi.useRealTimers();
     }
   });
+
+  it("clears pending request state and timeout when a request is cancelled", async () => {
+    vi.useFakeTimers();
+    try {
+      const input = new PassThrough();
+      const output = new PassThrough();
+      trackForCleanup(input, output);
+      const layer = new JsonRpcMessageLayer(input, output, 25);
+      const onTimeout = vi.fn();
+      const pendingCount = () =>
+        (
+          layer as unknown as {
+            pendingRequests: Map<unknown, unknown>;
+          }
+        ).pendingRequests.size;
+
+      const responsePromise = layer.sendRequest("slow/method", undefined, {
+        onTimeout,
+      });
+      expect(pendingCount()).toBe(1);
+
+      expect(layer.cancelRequest(1, "user cancelled")).toBe(true);
+
+      await expect(responsePromise).rejects.toBe("user cancelled");
+      expect(pendingCount()).toBe(0);
+
+      await vi.advanceTimersByTimeAsync(25);
+
+      expect(onTimeout).not.toHaveBeenCalled();
+      expect(layer.cancelRequest(1, "already gone")).toBe(false);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
 });
 
 describe("JsonRpcMessageLayer UTF-8 input", () => {
@@ -2643,6 +2677,22 @@ describe("StdioTransport stderr capture", () => {
     expect(transport.getStderrOutput()).toBe("first second");
   });
 
+  it("preserves UTF-8 characters split across stderr chunks", () => {
+    const child = createMockChildProcess();
+    const spawn = vi.fn<StdioSpawn>(() => child);
+
+    const transport = new StdioTransport({
+      command: "node",
+      spawn,
+    });
+
+    const encoded = Buffer.from("é", "utf8");
+    child.stderr.write(encoded.subarray(0, 1));
+    child.stderr.write(encoded.subarray(1));
+
+    expect(transport.getStderrOutput()).toBe("é");
+  });
+
   it("caps stderr at 64KB keeping the tail", () => {
     const child = createMockChildProcess();
     const spawn = vi.fn<StdioSpawn>(() => child);
@@ -7123,6 +7173,21 @@ describe("McpClient callTool", () => {
       throw new Error("Expected initialized notification line to be written");
     }
 
+    const activeMessageLayer = (
+      client as unknown as {
+        messageLayer: JsonRpcMessageLayer | null;
+      }
+    ).messageLayer;
+    if (activeMessageLayer === null) {
+      throw new Error("Expected message layer to exist after connect");
+    }
+    const pendingCount = () =>
+      (
+        activeMessageLayer as unknown as {
+          pendingRequests: Map<unknown, unknown>;
+        }
+      ).pendingRequests.size;
+
     const abortController = new AbortController();
     const callToolPromise = client.callTool(
       {
@@ -7142,6 +7207,8 @@ describe("McpClient callTool", () => {
     const callToolRequest = JSON.parse(callToolLineResult.value) as {
       id: number;
     };
+    expect(pendingCount()).toBe(1);
+
     abortController.abort("user cancelled");
 
     const cancelledLineResult = await iterator.next();
@@ -7158,6 +7225,7 @@ describe("McpClient callTool", () => {
     });
 
     await callToolRejection;
+    expect(pendingCount()).toBe(0);
     await client.close();
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@clack/core": "^1.0.0",
     "@clack/prompts": "^1.0.0",
-    "toolcraft-schema": "0.0.25",
+    "toolcraft-schema": "0.0.26",
     "commander": "^14.0.3",
     "jose": "^6.1.2",
     "jsonc-parser": "^3.3.1",