toolcraft 0.0.50 → 0.0.52

package/node_modules/tiny-mcp-client/dist/internal.js

@@ -71,7 +71,8 @@ export class McpClient {
             await onToolsChanged();
         });
         messageLayer.onNotification("notifications/resources/list_changed", async () => {
-            if (onResourcesChanged === undefined) {
+            if (onResourcesChanged === undefined
+                || this.currentServerCapabilities?.resources?.listChanged !== true) {
                 return;
             }
             await onResourcesChanged();
@@ -90,7 +91,8 @@ export class McpClient {
             await onResourceUpdated(uri);
         });
         messageLayer.onNotification("notifications/prompts/list_changed", async () => {
-            if (onPromptsChanged === undefined) {
+            if (onPromptsChanged === undefined
+                || this.currentServerCapabilities?.prompts?.listChanged !== true) {
                 return;
             }
             await onPromptsChanged();
@@ -325,7 +327,11 @@ export class McpClient {
             throw new Error("Server does not support resources");
         }
         const requestParams = params.cursor === undefined ? undefined : { cursor: params.cursor };
-        return (await messageLayer.sendRequest("resources/list", requestParams));
+        const result = await messageLayer.sendRequest("resources/list", requestParams);
+        if (!isResourcesListResult(result)) {
+            throw new McpError(ERROR_INVALID_REQUEST, "Invalid resources/list result");
+        }
+        return result;
     }
     async listResourceTemplates(params = {}) {
         const messageLayer = this.getMessageLayerOrThrow();
@@ -334,7 +340,11 @@ export class McpClient {
             throw new Error("Server does not support resources");
         }
         const requestParams = params.cursor === undefined ? undefined : { cursor: params.cursor };
-        return (await messageLayer.sendRequest("resources/templates/list", requestParams));
+        const result = await messageLayer.sendRequest("resources/templates/list", requestParams);
+        if (!isResourceTemplatesListResult(result)) {
+            throw new McpError(ERROR_INVALID_REQUEST, "Invalid resources/templates/list result");
+        }
+        return result;
     }
     async readResource(params) {
         const messageLayer = this.getMessageLayerOrThrow();
@@ -342,7 +352,11 @@ export class McpClient {
         if (serverCapabilities.resources === undefined) {
             throw new Error("Server does not support resources");
         }
-        return (await messageLayer.sendRequest("resources/read", params));
+        const result = await messageLayer.sendRequest("resources/read", params);
+        if (!isReadResourceResult(result)) {
+            throw new McpError(ERROR_INVALID_REQUEST, "Invalid resources/read result");
+        }
+        return result;
     }
     async subscribe(uri) {
         const messageLayer = this.getMessageLayerOrThrow();
@@ -377,7 +391,11 @@ export class McpClient {
         if (serverCapabilities.prompts === undefined) {
             throw new Error("Server does not support prompts");
         }
-        return (await messageLayer.sendRequest("prompts/get", params));
+        const result = await messageLayer.sendRequest("prompts/get", params);
+        if (!isGetPromptResult(result)) {
+            throw new McpError(ERROR_INVALID_REQUEST, "Invalid prompts/get result");
+        }
+        return result;
     }
     async complete(params) {
         const messageLayer = this.getMessageLayerOrThrow();
@@ -385,7 +403,11 @@ export class McpClient {
         if (serverCapabilities.completions === undefined) {
             throw new Error("Server does not support completions");
         }
-        return (await messageLayer.sendRequest("completion/complete", params));
+        const result = await messageLayer.sendRequest("completion/complete", params);
+        if (!isCompleteResult(result)) {
+            throw new McpError(ERROR_INVALID_REQUEST, "Invalid completion/complete result");
+        }
+        return result;
     }
     async setLogLevel(level) {
         const messageLayer = this.getMessageLayerOrThrow();
@@ -2434,6 +2456,72 @@ function isToolsListResult(value) {
         && Array.isArray(value.tools)
         && (value.nextCursor === undefined || typeof value.nextCursor === "string");
 }
+function isResourcesListResult(value) {
+    return isObjectRecord(value)
+        && Array.isArray(value.resources)
+        && value.resources.every(isResource)
+        && (value.nextCursor === undefined || typeof value.nextCursor === "string");
+}
+function isResourceTemplatesListResult(value) {
+    return isObjectRecord(value)
+        && Array.isArray(value.resourceTemplates)
+        && value.resourceTemplates.every(isResourceTemplate)
+        && (value.nextCursor === undefined || typeof value.nextCursor === "string");
+}
+function isReadResourceResult(value) {
+    return isObjectRecord(value)
+        && Array.isArray(value.contents)
+        && value.contents.every(isResourceContents);
+}
+function isGetPromptResult(value) {
+    return isObjectRecord(value)
+        && (value.description === undefined || typeof value.description === "string")
+        && Array.isArray(value.messages)
+        && value.messages.every(isPromptMessage);
+}
+function isCompleteResult(value) {
+    return isObjectRecord(value)
+        && isObjectRecord(value.completion)
+        && Array.isArray(value.completion.values)
+        && value.completion.values.every((candidate) => typeof candidate === "string")
+        && (value.completion.hasMore === undefined || typeof value.completion.hasMore === "boolean")
+        && (value.completion.total === undefined || typeof value.completion.total === "number");
+}
+function isResource(value) {
+    return isObjectRecord(value)
+        && typeof value.uri === "string"
+        && typeof value.name === "string"
+        && (value.description === undefined || typeof value.description === "string")
+        && (value.mimeType === undefined || typeof value.mimeType === "string")
+        && (value.size === undefined || typeof value.size === "number");
+}
+function isResourceTemplate(value) {
+    return isObjectRecord(value)
+        && typeof value.uriTemplate === "string"
+        && typeof value.name === "string"
+        && (value.description === undefined || typeof value.description === "string")
+        && (value.mimeType === undefined || typeof value.mimeType === "string");
+}
+function isResourceContents(value) {
+    if (!isObjectRecord(value) || typeof value.uri !== "string") {
+        return false;
+    }
+    if (value.mimeType !== undefined && typeof value.mimeType !== "string") {
+        return false;
+    }
+    const hasText = value.text !== undefined;
+    const hasBlob = value.blob !== undefined;
+    if (!hasText && !hasBlob) {
+        return false;
+    }
+    return (!hasText || typeof value.text === "string")
+        && (!hasBlob || typeof value.blob === "string");
+}
+function isPromptMessage(value) {
+    return isObjectRecord(value)
+        && (value.role === "user" || value.role === "assistant")
+        && isContentItem(value.content);
+}
 function isContentItem(value) {
     if (!isObjectRecord(value)) {
         return false;
@@ -2447,9 +2535,7 @@ function isContentItem(value) {
     if (value.type !== "resource" || !isObjectRecord(value.resource)) {
         return false;
     }
-    return typeof value.resource.uri === "string"
-        && (value.resource.mimeType === undefined || typeof value.resource.mimeType === "string")
-        && (typeof value.resource.text === "string" || typeof value.resource.blob === "string");
+    return isResourceContents(value.resource);
 }
 function hasOwn(value, property) {
     return Object.prototype.hasOwnProperty.call(value, property);

package/node_modules/tiny-mcp-client/package.json

@@ -13,9 +13,6 @@
     "url": "git+https://github.com/poe-platform/poe-code.git",
     "directory": "packages/tiny-mcp-client"
   },
-  "dependencies": {
-    "mcp-oauth": "*"
-  },
   "devDependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
     "tiny-stdio-mcp-server": "*"

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

@@ -213,7 +213,10 @@ export class McpClient {
       await onToolsChanged();
     });
     messageLayer.onNotification("notifications/resources/list_changed", async () => {
-      if (onResourcesChanged === undefined) {
+      if (
+        onResourcesChanged === undefined
+        || this.currentServerCapabilities?.resources?.listChanged !== true
+      ) {
         return;
       }
 
@@ -236,7 +239,10 @@ export class McpClient {
       await onResourceUpdated(uri);
     });
     messageLayer.onNotification("notifications/prompts/list_changed", async () => {
-      if (onPromptsChanged === undefined) {
+      if (
+        onPromptsChanged === undefined
+        || this.currentServerCapabilities?.prompts?.listChanged !== true
+      ) {
         return;
       }
 
@@ -521,10 +527,12 @@ export class McpClient {
     }
 
     const requestParams = params.cursor === undefined ? undefined : { cursor: params.cursor };
-    return (await messageLayer.sendRequest("resources/list", requestParams)) as {
-      resources: Resource[];
-      nextCursor?: string;
-    };
+    const result = await messageLayer.sendRequest("resources/list", requestParams);
+    if (!isResourcesListResult(result)) {
+      throw new McpError(ERROR_INVALID_REQUEST, "Invalid resources/list result");
+    }
+
+    return result;
   }
 
   async listResourceTemplates(
@@ -537,10 +545,12 @@ export class McpClient {
     }
 
     const requestParams = params.cursor === undefined ? undefined : { cursor: params.cursor };
-    return (await messageLayer.sendRequest("resources/templates/list", requestParams)) as {
-      resourceTemplates: ResourceTemplate[];
-      nextCursor?: string;
-    };
+    const result = await messageLayer.sendRequest("resources/templates/list", requestParams);
+    if (!isResourceTemplatesListResult(result)) {
+      throw new McpError(ERROR_INVALID_REQUEST, "Invalid resources/templates/list result");
+    }
+
+    return result;
   }
 
   async readResource(params: ReadResourceParams): Promise<{ contents: ResourceContents[] }> {
@@ -550,9 +560,12 @@ export class McpClient {
       throw new Error("Server does not support resources");
     }
 
-    return (await messageLayer.sendRequest("resources/read", params)) as {
-      contents: ResourceContents[];
-    };
+    const result = await messageLayer.sendRequest("resources/read", params);
+    if (!isReadResourceResult(result)) {
+      throw new McpError(ERROR_INVALID_REQUEST, "Invalid resources/read result");
+    }
+
+    return result;
   }
 
   async subscribe(uri: string): Promise<void> {
@@ -598,7 +611,12 @@ export class McpClient {
       throw new Error("Server does not support prompts");
     }
 
-    return (await messageLayer.sendRequest("prompts/get", params)) as GetPromptResult;
+    const result = await messageLayer.sendRequest("prompts/get", params);
+    if (!isGetPromptResult(result)) {
+      throw new McpError(ERROR_INVALID_REQUEST, "Invalid prompts/get result");
+    }
+
+    return result;
   }
 
   async complete(params: CompleteParams): Promise<CompleteResult> {
@@ -608,7 +626,12 @@ export class McpClient {
       throw new Error("Server does not support completions");
     }
 
-    return (await messageLayer.sendRequest("completion/complete", params)) as CompleteResult;
+    const result = await messageLayer.sendRequest("completion/complete", params);
+    if (!isCompleteResult(result)) {
+      throw new McpError(ERROR_INVALID_REQUEST, "Invalid completion/complete result");
+    }
+
+    return result;
   }
 
   async setLogLevel(level: LogLevel): Promise<void> {
@@ -3597,6 +3620,87 @@ function isToolsListResult(value: unknown): value is { tools: Tool[]; nextCursor
     && (value.nextCursor === undefined || typeof value.nextCursor === "string");
 }
 
+function isResourcesListResult(value: unknown): value is { resources: Resource[]; nextCursor?: string } {
+  return isObjectRecord(value)
+    && Array.isArray(value.resources)
+    && value.resources.every(isResource)
+    && (value.nextCursor === undefined || typeof value.nextCursor === "string");
+}
+
+function isResourceTemplatesListResult(
+  value: unknown
+): value is { resourceTemplates: ResourceTemplate[]; nextCursor?: string } {
+  return isObjectRecord(value)
+    && Array.isArray(value.resourceTemplates)
+    && value.resourceTemplates.every(isResourceTemplate)
+    && (value.nextCursor === undefined || typeof value.nextCursor === "string");
+}
+
+function isReadResourceResult(value: unknown): value is { contents: ResourceContents[] } {
+  return isObjectRecord(value)
+    && Array.isArray(value.contents)
+    && value.contents.every(isResourceContents);
+}
+
+function isGetPromptResult(value: unknown): value is GetPromptResult {
+  return isObjectRecord(value)
+    && (value.description === undefined || typeof value.description === "string")
+    && Array.isArray(value.messages)
+    && value.messages.every(isPromptMessage);
+}
+
+function isCompleteResult(value: unknown): value is CompleteResult {
+  return isObjectRecord(value)
+    && isObjectRecord(value.completion)
+    && Array.isArray(value.completion.values)
+    && value.completion.values.every((candidate) => typeof candidate === "string")
+    && (value.completion.hasMore === undefined || typeof value.completion.hasMore === "boolean")
+    && (value.completion.total === undefined || typeof value.completion.total === "number");
+}
+
+function isResource(value: unknown): value is Resource {
+  return isObjectRecord(value)
+    && typeof value.uri === "string"
+    && typeof value.name === "string"
+    && (value.description === undefined || typeof value.description === "string")
+    && (value.mimeType === undefined || typeof value.mimeType === "string")
+    && (value.size === undefined || typeof value.size === "number");
+}
+
+function isResourceTemplate(value: unknown): value is ResourceTemplate {
+  return isObjectRecord(value)
+    && typeof value.uriTemplate === "string"
+    && typeof value.name === "string"
+    && (value.description === undefined || typeof value.description === "string")
+    && (value.mimeType === undefined || typeof value.mimeType === "string");
+}
+
+function isResourceContents(value: unknown): value is ResourceContents {
+  if (!isObjectRecord(value) || typeof value.uri !== "string") {
+    return false;
+  }
+
+  if (value.mimeType !== undefined && typeof value.mimeType !== "string") {
+    return false;
+  }
+
+  const hasText = value.text !== undefined;
+  const hasBlob = value.blob !== undefined;
+
+  if (!hasText && !hasBlob) {
+    return false;
+  }
+
+  return (!hasText || typeof value.text === "string")
+    && (!hasBlob || typeof value.blob === "string");
+}
+
+function isPromptMessage(value: unknown): value is PromptMessage {
+  return isObjectRecord(value)
+    && (value.role === "user" || value.role === "assistant")
+    && isContentItem(value.content);
+}
+
 function isContentItem(value: unknown): value is ContentItem {
   if (!isObjectRecord(value)) {
     return false;
@@ -3614,9 +3718,7 @@ function isContentItem(value: unknown): value is ContentItem {
     return false;
   }
 
-  return typeof value.resource.uri === "string"
-    && (value.resource.mimeType === undefined || typeof value.resource.mimeType === "string")
-    && (typeof value.resource.text === "string" || typeof value.resource.blob === "string");
+  return isResourceContents(value.resource);
 }
 
 function hasOwn(

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

@@ -3870,7 +3870,7 @@ describe("McpClient connect", () => {
         id: initializeRequest.id,
         result: {
           protocolVersion: "2025-03-26",
-          capabilities: {},
+          capabilities: { resources: { listChanged: true } },
           serverInfo: {
             name: "server",
             version: "1.0.0",
@@ -3900,6 +3900,40 @@ describe("McpClient connect", () => {
     await client.close();
   });
 
+  it("ignores resources/list_changed when server did not advertise listChanged", async () => {
+    const onResourcesChanged = vi.fn();
+    const { client, readable, iterator, connectPromise } = await startClientHandshake(
+      {
+        protocolVersion: "2025-03-26",
+        capabilities: { resources: {} },
+        serverInfo: { name: "server", version: "1.0.0" },
+      },
+      {
+        clientInfo: {
+          name: "tiny-mcp-client",
+          version: "0.1.0",
+        },
+        onResourcesChanged,
+      }
+    );
+    await connectPromise;
+    await iterator.next();
+
+    readable.write(
+      `${JSON.stringify({
+        jsonrpc: "2.0",
+        method: "notifications/resources/list_changed",
+      })}\n`
+    );
+    await new Promise<void>((resolve) => {
+      setImmediate(resolve);
+    });
+
+    expect(onResourcesChanged).toHaveBeenCalledTimes(0);
+
+    await client.close();
+  });
+
   it("calls onPromptsChanged when server sends prompts/list_changed notification", async () => {
     const readable = new PassThrough();
     const writable = new PassThrough();
@@ -3942,7 +3976,7 @@ describe("McpClient connect", () => {
         id: initializeRequest.id,
         result: {
           protocolVersion: "2025-03-26",
-          capabilities: {},
+          capabilities: { prompts: { listChanged: true } },
           serverInfo: {
             name: "server",
             version: "1.0.0",
@@ -3972,6 +4006,40 @@ describe("McpClient connect", () => {
     await client.close();
   });
 
+  it("ignores prompts/list_changed when server did not advertise listChanged", async () => {
+    const onPromptsChanged = vi.fn();
+    const { client, readable, iterator, connectPromise } = await startClientHandshake(
+      {
+        protocolVersion: "2025-03-26",
+        capabilities: { prompts: {} },
+        serverInfo: { name: "server", version: "1.0.0" },
+      },
+      {
+        clientInfo: {
+          name: "tiny-mcp-client",
+          version: "0.1.0",
+        },
+        onPromptsChanged,
+      }
+    );
+    await connectPromise;
+    await iterator.next();
+
+    readable.write(
+      `${JSON.stringify({
+        jsonrpc: "2.0",
+        method: "notifications/prompts/list_changed",
+      })}\n`
+    );
+    await new Promise<void>((resolve) => {
+      setImmediate(resolve);
+    });
+
+    expect(onPromptsChanged).toHaveBeenCalledTimes(0);
+
+    await client.close();
+  });
+
   it("calls onResourceUpdated with uri when server sends resources/updated notification", async () => {
     const readable = new PassThrough();
     const writable = new PassThrough();
@@ -5685,6 +5753,36 @@ describe("McpClient listResources", () => {
       nextCursor: "4",
     });
   });
+
+  it("rejects invalid resource descriptors returned from resources/list", async () => {
+    const { client, readable, iterator, connectPromise } = await startClientHandshake({
+      protocolVersion: "2025-03-26",
+      capabilities: { resources: {} },
+      serverInfo: { name: "server", version: "1.0.0" },
+    });
+    await connectPromise;
+    await iterator.next();
+
+    const requestPromise = client.listResources();
+    const requestLine = await iterator.next();
+    if (requestLine.done) {
+      throw new Error("Expected resources/list request line to be written");
+    }
+    const request = JSON.parse(requestLine.value) as { id: number };
+    readable.write(
+      `${JSON.stringify({
+        jsonrpc: "2.0",
+        id: request.id,
+        result: {
+          resources: [{ uri: 42, name: null }],
+          nextCursor: 7,
+        },
+      })}\n`
+    );
+
+    await expect(requestPromise).rejects.toThrow("Invalid resources/list result");
+    await client.close();
+  });
 });
 
 describe("McpClient listResourceTemplates", () => {
@@ -5774,6 +5872,36 @@ describe("McpClient listResourceTemplates", () => {
       resourceTemplates: expectedResourceTemplates,
     });
   });
+
+  it("rejects invalid resource templates returned from resources/templates/list", async () => {
+    const { client, readable, iterator, connectPromise } = await startClientHandshake({
+      protocolVersion: "2025-03-26",
+      capabilities: { resources: {} },
+      serverInfo: { name: "server", version: "1.0.0" },
+    });
+    await connectPromise;
+    await iterator.next();
+
+    const requestPromise = client.listResourceTemplates();
+    const requestLine = await iterator.next();
+    if (requestLine.done) {
+      throw new Error("Expected resources/templates/list request line to be written");
+    }
+    const request = JSON.parse(requestLine.value) as { id: number };
+    readable.write(
+      `${JSON.stringify({
+        jsonrpc: "2.0",
+        id: request.id,
+        result: {
+          resourceTemplates: [{ uriTemplate: 123, name: false, mimeType: 42 }],
+          nextCursor: 7,
+        },
+      })}\n`
+    );
+
+    await expect(requestPromise).rejects.toThrow("Invalid resources/templates/list result");
+    await client.close();
+  });
 });
 
 describe("McpClient listPrompts", () => {
@@ -6188,6 +6316,40 @@ describe("McpClient getPrompt", () => {
       new Set(["user", "assistant"])
     );
   });
+
+  it("rejects invalid prompt messages returned from prompts/get", async () => {
+    const { client, readable, iterator, connectPromise } = await startClientHandshake({
+      protocolVersion: "2025-03-26",
+      capabilities: { prompts: {} },
+      serverInfo: { name: "server", version: "1.0.0" },
+    });
+    await connectPromise;
+    await iterator.next();
+
+    const requestPromise = client.getPrompt({ name: "broken" });
+    const requestLine = await iterator.next();
+    if (requestLine.done) {
+      throw new Error("Expected prompts/get request line to be written");
+    }
+    const request = JSON.parse(requestLine.value) as { id: number };
+    readable.write(
+      `${JSON.stringify({
+        jsonrpc: "2.0",
+        id: request.id,
+        result: {
+          messages: [
+            {
+              role: "system",
+              content: { type: "text", text: 123 },
+            },
+          ],
+        },
+      })}\n`
+    );
+
+    await expect(requestPromise).rejects.toThrow("Invalid prompts/get result");
+    await client.close();
+  });
 });
 
 describe("McpClient complete", () => {
@@ -6482,6 +6644,44 @@ describe("McpClient complete", () => {
 
     await expect(completePromise).resolves.toEqual(expectedResult);
   });
+
+  it("rejects invalid completion values returned from completion/complete", async () => {
+    const { client, readable, iterator, connectPromise } = await startClientHandshake({
+      protocolVersion: "2025-03-26",
+      capabilities: { completions: {} },
+      serverInfo: { name: "server", version: "1.0.0" },
+    });
+    await connectPromise;
+    await iterator.next();
+
+    const requestPromise = client.complete({
+      ref: {
+        type: "ref/prompt",
+        name: "code_review",
+      },
+      argument: {
+        name: "language",
+        value: "p",
+      },
+    });
+    const requestLine = await iterator.next();
+    if (requestLine.done) {
+      throw new Error("Expected completion/complete request line to be written");
+    }
+    const request = JSON.parse(requestLine.value) as { id: number };
+    readable.write(
+      `${JSON.stringify({
+        jsonrpc: "2.0",
+        id: request.id,
+        result: {
+          completion: { values: "not-an-array" },
+        },
+      })}\n`
+    );
+
+    await expect(requestPromise).rejects.toThrow("Invalid completion/complete result");
+    await client.close();
+  });
 });
 
 describe("McpClient readResource", () => {
@@ -6575,6 +6775,35 @@ describe("McpClient readResource", () => {
     });
   });
 
+  it("rejects invalid content returned from resources/read", async () => {
+    const { client, readable, iterator, connectPromise } = await startClientHandshake({
+      protocolVersion: "2025-03-26",
+      capabilities: { resources: {} },
+      serverInfo: { name: "server", version: "1.0.0" },
+    });
+    await connectPromise;
+    await iterator.next();
+
+    const requestPromise = client.readResource({ uri: "memo://bad" });
+    const requestLine = await iterator.next();
+    if (requestLine.done) {
+      throw new Error("Expected resources/read request line to be written");
+    }
+    const request = JSON.parse(requestLine.value) as { id: number };
+    readable.write(
+      `${JSON.stringify({
+        jsonrpc: "2.0",
+        id: request.id,
+        result: {
+          contents: [{ uri: "memo://bad", mimeType: 123, text: 456 }],
+        },
+      })}\n`
+    );
+
+    await expect(requestPromise).rejects.toThrow("Invalid resources/read result");
+    await client.close();
+  });
+
   it("sends resources/read with uri and returns binary resource contents", async () => {
     const readable = new PassThrough();
     const writable = new PassThrough();

package/node_modules/toolcraft-design/package.json

@@ -20,7 +20,6 @@
     "dist"
   ],
   "dependencies": {
-    "@poe-code/frontmatter": "*",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",
     "sisteransi": "^1.0.5"