ToolCallContent -> ToolUseContent

Author: ochafik

src/examples/backfill/backfillSampling.ts

@@ -44,7 +44,7 @@ import {
   CallToolRequestSchema,
   isJSONRPCNotification,
   Tool,
-  ToolCallContent,
+  ToolUseContent,
   LoggingMessageNotification,
   JSONRPCNotification,
   AssistantMessageContent,
@@ -193,7 +193,7 @@ function contentToMcp(content: ContentBlock): CreateMessageResult['content'] {
                 id: content.id,
                 name: content.name,
                 input: content.input,
-            } as ToolCallContent;
+            } as ToolUseContent;
         default:
             throw new Error(`[contentToMcp] Unsupported content type: ${(content as any).type}`);
     }

src/examples/server/adventureGame.ts

@@ -34,7 +34,7 @@ import { resolve, relative } from "node:path";
 import type {
   SamplingMessage,
   Tool,
-  ToolCallContent,
+  ToolUseContent,
   CreateMessageResult,
   CreateMessageRequest,
   ToolResultContent, 

src/examples/server/simpleLocalResearcher.ts

@@ -39,7 +39,7 @@ import { resolve, relative } from "node:path";
 import type {
   SamplingMessage,
   Tool,
-  ToolCallContent,
+  ToolUseContent,
   CreateMessageResult,
   CreateMessageRequest,
   ToolResultContent, 

src/examples/server/toolLoop.ts

@@ -9,7 +9,7 @@ import { RequestHandlerExtra } from "../../shared/protocol.js";
 import type {
   SamplingMessage,
   Tool,
-  ToolCallContent,
+  ToolUseContent,
   CreateMessageResult,
   CreateMessageRequest,
   RequestId,
@@ -103,7 +103,7 @@ export async function runToolLoop(
     if (response.stopReason === "toolUse") {
       const contentArray = Array.isArray(response.content) ? response.content : [response.content];
       const toolCalls = contentArray.filter(
-        (content): content is ToolCallContent => content.type === "tool_use"
+        (content): content is ToolUseContent => content.type === "tool_use"
       );
 
       await options.server.sendLoggingMessage({

src/examples/server/toolRegistry.ts

@@ -3,7 +3,7 @@ import { RequestHandlerExtra } from "../../shared/protocol.js";
 import { z } from "zod";
 import type {
   Tool,
-  ToolCallContent,
+  ToolUseContent,
   ToolResultContent, 
   ServerRequest,
   ServerNotification,
@@ -40,7 +40,7 @@ export class ToolRegistry {
     }
   }
 
-  async callTools(toolCalls: ToolCallContent[], extra: RequestHandlerExtra<ServerRequest, ServerNotification>): Promise<ToolResultContent[]> {
+  async callTools(toolCalls: ToolUseContent[], extra: RequestHandlerExtra<ServerRequest, ServerNotification>): Promise<ToolResultContent[]> {
       return Promise.all(toolCalls.map(async ({ name, id, input }) => {
           const tool = this.toolDefinitions[name];
           if (!tool) {

src/types.test.ts

@@ -6,7 +6,7 @@ import {
     PromptMessageSchema,
     CallToolResultSchema,
     CompleteRequestSchema,
-    ToolCallContentSchema,
+    ToolUseContentSchema,
     ToolResultContentSchema,
     ToolChoiceSchema,
     UserMessageSchema,
@@ -322,7 +322,7 @@ describe('Types', () => {
     });
 
     describe("SEP-1577: Sampling with Tools", () => {
-        describe("ToolCallContent", () => {
+        describe("ToolUseContent", () => {
             test("should validate a tool call content", () => {
                 const toolCall = {
                     type: "tool_use",
@@ -331,7 +331,7 @@ describe('Types', () => {
                     input: { city: "San Francisco", units: "celsius" }
                 };
 
-                const result = ToolCallContentSchema.safeParse(toolCall);
+                const result = ToolUseContentSchema.safeParse(toolCall);
                 expect(result.success).toBe(true);
                 if (result.success) {
                     expect(result.data.type).toBe("tool_use");
@@ -350,7 +350,7 @@ describe('Types', () => {
                     _meta: { custom: "data" }
                 };
 
-                const result = ToolCallContentSchema.safeParse(toolCall);
+                const result = ToolUseContentSchema.safeParse(toolCall);
                 expect(result.success).toBe(true);
                 if (result.success) {
                     expect(result.data._meta).toEqual({ custom: "data" });
@@ -364,7 +364,7 @@ describe('Types', () => {
                     // missing id and input
                 };
 
-                const result = ToolCallContentSchema.safeParse(invalidToolCall);
+                const result = ToolUseContentSchema.safeParse(invalidToolCall);
                 expect(result.success).toBe(false);
             });
         });

src/types.ts

@@ -821,7 +821,7 @@ export const AudioContentSchema = z.object({
  * A tool call request from an assistant (LLM).
  * Represents the assistant's request to use a tool.
  */
-export const ToolCallContentSchema = z
+export const ToolUseContentSchema = z
   .object({
     type: z.literal("tool_use"),
     /**
@@ -1195,7 +1195,7 @@ export const ToolChoiceSchema = z
 
 /**
  * The result of a tool execution, provided by the user (server).
- * Represents the outcome of invoking a tool requested via ToolCallContent.
+ * Represents the outcome of invoking a tool requested via ToolUseContent.
  */
 export const ToolResultContentSchema = z
     .object({
@@ -1239,7 +1239,7 @@ export const AssistantMessageContentSchema = z.discriminatedUnion("type", [
   TextContentSchema,
   ImageContentSchema,
   AudioContentSchema,
-  ToolCallContentSchema,
+  ToolUseContentSchema,
 ]);
 
 /**
@@ -1340,7 +1340,7 @@ export const CreateMessageResultSchema = ResultSchema.extend({
      */
     role: z.literal("assistant"),
     /**
-     * Response content. May be ToolCallContent if stopReason is "toolUse".
+     * Response content. May be ToolUseContent if stopReason is "toolUse".
      */
     content: z.union([AssistantMessageContentSchema, z.array(AssistantMessageContentSchema)]),
 });
@@ -1770,7 +1770,7 @@ export type GetPromptRequest = Infer<typeof GetPromptRequestSchema>;
 export type TextContent = Infer<typeof TextContentSchema>;
 export type ImageContent = Infer<typeof ImageContentSchema>;
 export type AudioContent = Infer<typeof AudioContentSchema>;
-export type ToolCallContent = Infer<typeof ToolCallContentSchema>;
+export type ToolUseContent = Infer<typeof ToolUseContentSchema>;
 export type ToolResultContent = Infer<typeof ToolResultContentSchema>;
 export type EmbeddedResource = Infer<typeof EmbeddedResourceSchema>;
 export type ResourceLink = Infer<typeof ResourceLinkSchema>;