@tencent-ai/agent-sdk 0.1.23 → 0.1.24

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-ai/codebuddy-code",
-  "version": "2.33.1",
+  "version": "2.34.0",
   "description": "Use CodeBuddy, Tencent's AI assistant, right from your terminal. CodeBuddy can understand your codebase, edit files, run terminal commands, and handle entire workflows for you.",
   "main": "lib/node/index.js",
   "typings": "lib/node/index.d.ts",

package/cli/product.cloudhosted.json

@@ -316,6 +316,6 @@
     "BillingNotice": false,
     "CustomModelsJSON": true
   },
-  "commit": "3a923a3cfa1de1152d7594c0ad7e9b132030f47c",
-  "date": "2026-01-14T07:17:51.414Z"
+  "commit": "03dfa8482bf24abc92075fd676c34bd515b80024",
+  "date": "2026-01-14T15:40:57.998Z"
 }

package/cli/product.internal.json

@@ -318,6 +318,6 @@
     "BillingNotice": false,
     "CustomModelsJSON": true
   },
-  "commit": "3a923a3cfa1de1152d7594c0ad7e9b132030f47c",
-  "date": "2026-01-14T07:17:48.723Z"
+  "commit": "03dfa8482bf24abc92075fd676c34bd515b80024",
+  "date": "2026-01-14T15:40:55.276Z"
 }

package/cli/product.ioa.json

@@ -525,6 +525,6 @@
     "BillingNotice": false,
     "CustomModelsJSON": true
   },
-  "commit": "3a923a3cfa1de1152d7594c0ad7e9b132030f47c",
-  "date": "2026-01-14T07:17:50.051Z"
+  "commit": "03dfa8482bf24abc92075fd676c34bd515b80024",
+  "date": "2026-01-14T15:40:56.605Z"
 }

package/cli/product.json

@@ -1017,6 +1017,6 @@
       "description": "tool-lsp-description"
     }
   ],
-  "commit": "3a923a3cfa1de1152d7594c0ad7e9b132030f47c",
-  "date": "2026-01-14T07:17:47.335Z"
+  "commit": "03dfa8482bf24abc92075fd676c34bd515b80024",
+  "date": "2026-01-14T15:40:53.946Z"
 }

package/cli/product.selfhosted.json

@@ -198,6 +198,6 @@
     "BillingNotice": false,
     "CustomModelsJSON": true
   },
-  "commit": "3a923a3cfa1de1152d7594c0ad7e9b132030f47c",
-  "date": "2026-01-14T07:17:52.733Z"
+  "commit": "03dfa8482bf24abc92075fd676c34bd515b80024",
+  "date": "2026-01-14T15:40:59.310Z"
 }

package/lib/index.d.ts

@@ -18,6 +18,8 @@
 export { query } from './query';
 export { Query } from './query';
 export { createSession as unstable_v2_createSession, resumeSession as unstable_v2_resumeSession, prompt as unstable_v2_prompt, } from './session';
+export { createSdkMcpServer, tool } from './mcp';
+export type { SdkMcpServerOptions, SdkMcpServerResult, SdkMcpToolDefinition, AnyZodRawShape, InferShape, ToolHandler, } from './mcp';
 export { HOOK_EVENTS, EXIT_REASONS } from './types';
 export { AbortError } from './errors';
 export type { Options, SessionOptions } from './types';
@@ -27,7 +29,7 @@ export type { Message, SystemMessage, UserMessage, AssistantMessage, PartialAssi
 export type { SlashCommand, ModelInfo, AccountInfo, McpServerStatus, } from './types';
 export type { OutputFormat, JsonSchemaOutputFormat } from './types';
 export type { RawMessageStreamEvent } from './types';
-export type { McpServerConfig, McpStdioServerConfig, McpSSEServerConfig, McpHttpServerConfig, } from './types';
+export type { McpServerConfig, McpStdioServerConfig, McpSSEServerConfig, McpHttpServerConfig, McpSdkServerConfig, } from './types';
 export type { AgentDefinition } from './types';
 export type { AskUserQuestionOption, AskUserQuestionQuestion, AskUserQuestionInput, ToolInputMap, KnownToolName, } from './types';
 export type { SandboxSettings } from './types';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EACH,aAAa,IAAI,yBAAyB,EAC1C,aAAa,IAAI,yBAAyB,EAC1C,MAAM,IAAI,kBAAkB,GAC/B,MAAM,WAAW,CAAC;AAInB,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAIpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAKtC,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGvD,YAAY,EACR,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,iBAAiB,GACpB,MAAM,SAAS,CAAC;AAGjB,YAAY,EACR,SAAS,EACT,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,0BAA0B,GAC7B,MAAM,SAAS,CAAC;AAGjB,YAAY,EACR,OAAO,EACP,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,aAAa,EACb,mBAAmB,EACnB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AAGjB,YAAY,EACR,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,GAClB,MAAM,SAAS,CAAC;AAGjB,YAAY,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAGpE,YAAY,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAGrD,YAAY,EACR,eAAe,EACf,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,GACtB,MAAM,SAAS,CAAC;AAGjB,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAG/C,YAAY,EACR,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,YAAY,EACZ,aAAa,GAChB,MAAM,SAAS,CAAC;AAGjB,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAG/C,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EACH,aAAa,IAAI,yBAAyB,EAC1C,aAAa,IAAI,yBAAyB,EAC1C,MAAM,IAAI,kBAAkB,GAC/B,MAAM,WAAW,CAAC;AAInB,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACjD,YAAY,EACR,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,EACd,UAAU,EACV,WAAW,GACd,MAAM,OAAO,CAAC;AAIf,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAIpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAKtC,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGvD,YAAY,EACR,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,iBAAiB,GACpB,MAAM,SAAS,CAAC;AAGjB,YAAY,EACR,SAAS,EACT,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,0BAA0B,GAC7B,MAAM,SAAS,CAAC;AAGjB,YAAY,EACR,OAAO,EACP,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,aAAa,EACb,mBAAmB,EACnB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AAGjB,YAAY,EACR,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,GAClB,MAAM,SAAS,CAAC;AAGjB,YAAY,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAGpE,YAAY,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAGrD,YAAY,EACR,eAAe,EACf,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,GACrB,MAAM,SAAS,CAAC;AAGjB,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAG/C,YAAY,EACR,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,YAAY,EACZ,aAAa,GAChB,MAAM,SAAS,CAAC;AAGjB,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAG/C,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC"}

package/lib/index.js

@@ -17,7 +17,7 @@
  * ```
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbortError = exports.EXIT_REASONS = exports.HOOK_EVENTS = exports.unstable_v2_resumeSession = exports.unstable_v2_createSession = exports.Query = exports.query = void 0;
+exports.AbortError = exports.EXIT_REASONS = exports.HOOK_EVENTS = exports.tool = exports.createSdkMcpServer = exports.unstable_v2_resumeSession = exports.unstable_v2_createSession = exports.Query = exports.query = void 0;
 // ============= Main API =============
 var query_1 = require("./query");
 Object.defineProperty(exports, "query", { enumerable: true, get: function () { return query_1.query; } });
@@ -28,6 +28,10 @@ var session_1 = require("./session");
 Object.defineProperty(exports, "unstable_v2_createSession", { enumerable: true, get: function () { return session_1.createSession; } });
 Object.defineProperty(exports, "unstable_v2_resumeSession", { enumerable: true, get: function () { return session_1.resumeSession; } });
 Object.defineProperty(exports, "unstable_v2_prompt", { enumerable: true, get: function () { return session_1.prompt; } });
+// ============= MCP Server API =============
+var mcp_1 = require("./mcp");
+Object.defineProperty(exports, "createSdkMcpServer", { enumerable: true, get: function () { return mcp_1.createSdkMcpServer; } });
+Object.defineProperty(exports, "tool", { enumerable: true, get: function () { return mcp_1.tool; } });
 // ============= Constants =============
 var types_1 = require("./types");
 Object.defineProperty(exports, "HOOK_EVENTS", { enumerable: true, get: function () { return types_1.HOOK_EVENTS; } });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH,uCAAuC;AAEvC,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd,oBAAoB;AACpB,qCAImB;AAHf,oHAAA,aAAa,OAA6B;AAC1C,oHAAA,aAAa,OAA6B;AAC1C,6GAAA,MAAM,OAAsB;AAGhC,wCAAwC;AAExC,iCAAoD;AAA3C,oGAAA,WAAW,OAAA;AAAE,qGAAA,YAAY,OAAA;AAElC,qCAAqC;AAErC,mCAAsC;AAA7B,oGAAA,UAAU,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH,uCAAuC;AAEvC,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd,oBAAoB;AACpB,qCAImB;AAHf,oHAAA,aAAa,OAA6B;AAC1C,oHAAA,aAAa,OAA6B;AAC1C,6GAAA,MAAM,OAAsB;AAGhC,6CAA6C;AAE7C,6BAAiD;AAAxC,yGAAA,kBAAkB,OAAA;AAAE,2FAAA,IAAI,OAAA;AAUjC,wCAAwC;AAExC,iCAAoD;AAA3C,oGAAA,WAAW,OAAA;AAAE,qGAAA,YAAY,OAAA;AAElC,qCAAqC;AAErC,mCAAsC;AAA7B,oGAAA,UAAU,OAAA"}

package/lib/mcp/create-sdk-mcp-server.d.ts

@@ -0,0 +1,159 @@
+/**
+ * createSdkMcpServer - Create an SDK MCP Server
+ *
+ * This function creates an MCP server that can be integrated into the SDK
+ * and used with the CLI via the control protocol.
+ */
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { ZodRawShape } from 'zod';
+type ZodRawShapeV4 = {
+    [k: string]: any;
+};
+export type AnyZodRawShape = ZodRawShape | ZodRawShapeV4;
+/**
+ * Infer the output type from a Zod raw shape.
+ * Works with both Zod 3 and Zod 4 schemas.
+ */
+export type InferShape<T extends AnyZodRawShape> = {
+    [K in keyof T]: T[K] extends {
+        _output: infer O;
+    } ? O : never;
+} & {};
+/**
+ * Tool handler function type.
+ * This is a simplified version that works with our InferShape type.
+ */
+export type ToolHandler<Schema extends AnyZodRawShape> = (args: InferShape<Schema>, extra: unknown) => CallToolResult | Promise<CallToolResult>;
+/**
+ * Tool definition for SDK MCP Server.
+ * Contains a handler function, so not serializable.
+ * Supports both Zod 3 and Zod 4 schemas.
+ */
+export interface SdkMcpToolDefinition<Schema extends AnyZodRawShape = AnyZodRawShape> {
+    /** Tool name */
+    name: string;
+    /** Tool description */
+    description: string;
+    /** Input schema as Zod shape */
+    inputSchema: Schema;
+    /** Handler function */
+    handler: ToolHandler<Schema>;
+}
+/**
+ * Options for creating an SDK MCP Server.
+ */
+export interface SdkMcpServerOptions {
+    /** Server name (must be unique within the session) */
+    name: string;
+    /** Server version (defaults to "1.0.0") */
+    version?: string;
+    /** Tool definitions to register */
+    tools?: Array<SdkMcpToolDefinition<any>>;
+}
+/**
+ * Result type for createSdkMcpServer.
+ */
+export interface SdkMcpServerResult {
+    /** Type discriminator - always "sdk" for SDK MCP servers */
+    type: 'sdk';
+    /** Server name */
+    name: string;
+    /** The MCP server instance */
+    instance: McpServer;
+}
+/**
+ * Helper function to define an MCP tool with type-safe schema and handler.
+ *
+ * This function provides a convenient way to create tool definitions that can be
+ * passed to createSdkMcpServer(). It ensures type safety between the input schema
+ * and the handler function parameters.
+ *
+ * @param name - The name of the tool (should be unique within the server)
+ * @param description - A description of what the tool does
+ * @param inputSchema - A Zod shape defining the input parameters
+ * @param handler - The function that executes when the tool is called
+ * @returns A tool definition object
+ *
+ * @example
+ * ```typescript
+ * import { tool, createSdkMcpServer } from '@tencent-ai/genie-agent-sdk';
+ * import { z } from 'zod';
+ *
+ * const weatherTool = tool(
+ *   'get_weather',
+ *   'Get current weather for a location',
+ *   {
+ *     location: z.string().describe('City name or coordinates'),
+ *     units: z.enum(['celsius', 'fahrenheit']).optional().describe('Temperature units')
+ *   },
+ *   async ({ location, units }) => {
+ *     const weather = await fetchWeather(location, units);
+ *     return {
+ *       content: [
+ *         { type: 'text', text: `Weather in ${location}: ${weather.temperature}°` }
+ *       ]
+ *     };
+ *   }
+ * );
+ *
+ * const server = createSdkMcpServer({
+ *   name: 'weather-server',
+ *   tools: [weatherTool]
+ * });
+ * ```
+ */
+export declare function tool<Schema extends AnyZodRawShape>(name: string, description: string, inputSchema: Schema, handler: ToolHandler<Schema>): SdkMcpToolDefinition<Schema>;
+/**
+ * Create an SDK MCP Server.
+ *
+ * This function creates an MCP server that can be passed to the query() function
+ * via the mcpServers option. The server runs within the SDK process and
+ * communicates with the CLI via the control protocol.
+ *
+ * @param options - Server configuration options
+ * @returns SDK MCP server result that can be passed to query()
+ *
+ * @example
+ * ```typescript
+ * import { createSdkMcpServer, tool, query } from '@tencent-ai/genie-agent-sdk';
+ * import { z } from 'zod';
+ *
+ * // Define tools using the tool() helper
+ * const weatherTool = tool(
+ *   'get_weather',
+ *   'Get weather for a location',
+ *   {
+ *     location: z.string().describe('The location to get weather for'),
+ *     units: z.enum(['celsius', 'fahrenheit']).optional()
+ *   },
+ *   async ({ location, units }) => {
+ *     return {
+ *       content: [
+ *         { type: 'text', text: `Weather for ${location}: Sunny, 72°` }
+ *       ]
+ *     };
+ *   }
+ * );
+ *
+ * // Create server with tools
+ * const myServer = createSdkMcpServer({
+ *   name: 'my-custom-server',
+ *   version: '1.0.0',
+ *   tools: [weatherTool]
+ * });
+ *
+ * // Use in query
+ * const result = query({
+ *   prompt: "What's the weather in Tokyo?",
+ *   options: {
+ *     mcpServers: {
+ *       'my-custom-server': myServer
+ *     }
+ *   }
+ * });
+ * ```
+ */
+export declare function createSdkMcpServer(options: SdkMcpServerOptions): SdkMcpServerResult;
+export {};
+//# sourceMappingURL=create-sdk-mcp-server.d.ts.map

package/lib/mcp/create-sdk-mcp-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-sdk-mcp-server.d.ts","sourceRoot":"","sources":["../../src/mcp/create-sdk-mcp-server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAIvC,KAAK,aAAa,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAC1C,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,aAAa,CAAC;AAEzD;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,cAAc,IAAI;KAC9C,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,OAAO,EAAE,MAAM,CAAC,CAAA;KAAE,GAAG,CAAC,GAAG,KAAK;CAChE,GAAG,EAAE,CAAC;AAEP;;;GAGG;AACH,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,cAAc,IACjD,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,KAAK,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE3F;;;;GAIG;AACH,MAAM,WAAW,oBAAoB,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc;IAChF,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,uBAAuB;IACvB,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mCAAmC;IAEnC,KAAK,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,4DAA4D;IAC5D,IAAI,EAAE,KAAK,CAAC;IACZ,kBAAkB;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,8BAA8B;IAC9B,QAAQ,EAAE,SAAS,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,IAAI,CAAC,MAAM,SAAS,cAAc,EAC9C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAC7B,oBAAoB,CAAC,MAAM,CAAC,CAO9B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,CAuCnF"}

package/lib/mcp/create-sdk-mcp-server.js

@@ -0,0 +1,143 @@
+"use strict";
+/**
+ * createSdkMcpServer - Create an SDK MCP Server
+ *
+ * This function creates an MCP server that can be integrated into the SDK
+ * and used with the CLI via the control protocol.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tool = tool;
+exports.createSdkMcpServer = createSdkMcpServer;
+const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
+/**
+ * Helper function to define an MCP tool with type-safe schema and handler.
+ *
+ * This function provides a convenient way to create tool definitions that can be
+ * passed to createSdkMcpServer(). It ensures type safety between the input schema
+ * and the handler function parameters.
+ *
+ * @param name - The name of the tool (should be unique within the server)
+ * @param description - A description of what the tool does
+ * @param inputSchema - A Zod shape defining the input parameters
+ * @param handler - The function that executes when the tool is called
+ * @returns A tool definition object
+ *
+ * @example
+ * ```typescript
+ * import { tool, createSdkMcpServer } from '@tencent-ai/genie-agent-sdk';
+ * import { z } from 'zod';
+ *
+ * const weatherTool = tool(
+ *   'get_weather',
+ *   'Get current weather for a location',
+ *   {
+ *     location: z.string().describe('City name or coordinates'),
+ *     units: z.enum(['celsius', 'fahrenheit']).optional().describe('Temperature units')
+ *   },
+ *   async ({ location, units }) => {
+ *     const weather = await fetchWeather(location, units);
+ *     return {
+ *       content: [
+ *         { type: 'text', text: `Weather in ${location}: ${weather.temperature}°` }
+ *       ]
+ *     };
+ *   }
+ * );
+ *
+ * const server = createSdkMcpServer({
+ *   name: 'weather-server',
+ *   tools: [weatherTool]
+ * });
+ * ```
+ */
+function tool(name, description, inputSchema, handler) {
+    return {
+        name,
+        description,
+        inputSchema,
+        handler,
+    };
+}
+/**
+ * Create an SDK MCP Server.
+ *
+ * This function creates an MCP server that can be passed to the query() function
+ * via the mcpServers option. The server runs within the SDK process and
+ * communicates with the CLI via the control protocol.
+ *
+ * @param options - Server configuration options
+ * @returns SDK MCP server result that can be passed to query()
+ *
+ * @example
+ * ```typescript
+ * import { createSdkMcpServer, tool, query } from '@tencent-ai/genie-agent-sdk';
+ * import { z } from 'zod';
+ *
+ * // Define tools using the tool() helper
+ * const weatherTool = tool(
+ *   'get_weather',
+ *   'Get weather for a location',
+ *   {
+ *     location: z.string().describe('The location to get weather for'),
+ *     units: z.enum(['celsius', 'fahrenheit']).optional()
+ *   },
+ *   async ({ location, units }) => {
+ *     return {
+ *       content: [
+ *         { type: 'text', text: `Weather for ${location}: Sunny, 72°` }
+ *       ]
+ *     };
+ *   }
+ * );
+ *
+ * // Create server with tools
+ * const myServer = createSdkMcpServer({
+ *   name: 'my-custom-server',
+ *   version: '1.0.0',
+ *   tools: [weatherTool]
+ * });
+ *
+ * // Use in query
+ * const result = query({
+ *   prompt: "What's the weather in Tokyo?",
+ *   options: {
+ *     mcpServers: {
+ *       'my-custom-server': myServer
+ *     }
+ *   }
+ * });
+ * ```
+ */
+function createSdkMcpServer(options) {
+    var _a;
+    // Create MCP server instance
+    const server = new mcp_js_1.McpServer({
+        name: options.name,
+        version: (_a = options.version) !== null && _a !== void 0 ? _a : '1.0.0',
+    }, {
+        capabilities: {
+            tools: options.tools ? {} : undefined,
+        },
+    });
+    // Register tools
+    if (options.tools) {
+        for (const toolDef of options.tools) {
+            // Type assertion is needed because:
+            // 1. MCP SDK's ToolCallback uses z.objectOutputType<Args, ZodTypeAny> for args inference
+            // 2. We use InferShape<Schema> which is structurally equivalent but TypeScript cannot verify
+            // 3. The 'extra' parameter type differs (RequestHandlerExtra vs unknown)
+            // At runtime, both produce the same shape, so this is safe.
+            server.registerTool(toolDef.name, {
+                description: toolDef.description,
+                inputSchema: toolDef.inputSchema,
+            }, toolDef.handler);
+        }
+    }
+    // Return server info
+    return {
+        type: 'sdk',
+        name: options.name,
+        instance: server,
+    };
+}
+//# sourceMappingURL=create-sdk-mcp-server.js.map

package/lib/mcp/create-sdk-mcp-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-sdk-mcp-server.js","sourceRoot":"","sources":["../../src/mcp/create-sdk-mcp-server.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA4GH,oBAYC;AAoDD,gDAuCC;AAjND,oEAAoE;AAiEpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,SAAgB,IAAI,CAChB,IAAY,EACZ,WAAmB,EACnB,WAAmB,EACnB,OAA4B;IAE5B,OAAO;QACH,IAAI;QACJ,WAAW;QACX,WAAW;QACX,OAAO;KACV,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,SAAgB,kBAAkB,CAAC,OAA4B;;IAC3D,6BAA6B;IAC7B,MAAM,MAAM,GAAG,IAAI,kBAAS,CACxB;QACI,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO;KACtC,EACD;QACI,YAAY,EAAE;YACV,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;SACxC;KACJ,CACJ,CAAC;IAEF,iBAAiB;IACjB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClC,oCAAoC;YACpC,yFAAyF;YACzF,6FAA6F;YAC7F,yEAAyE;YACzE,4DAA4D;YAC5D,MAAM,CAAC,YAAY,CACf,OAAO,CAAC,IAAI,EACZ;gBACI,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,WAAW,EAAE,OAAO,CAAC,WAAW;aACnC,EACD,OAAO,CAAC,OAAO,CAClB,CAAC;QACN,CAAC;IACL,CAAC;IAED,qBAAqB;IACrB,OAAO;QACH,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,MAAM;KACnB,CAAC;AACN,CAAC"}

package/lib/mcp/index.d.ts

@@ -0,0 +1,11 @@
+/**
+ * MCP (Model Context Protocol) Integration
+ *
+ * This module provides utilities for creating and managing SDK MCP servers
+ * that can be integrated with the CLI via the control protocol.
+ */
+export { createSdkMcpServer, tool } from './create-sdk-mcp-server';
+export type { SdkMcpServerOptions, SdkMcpServerResult, SdkMcpToolDefinition, AnyZodRawShape, InferShape, ToolHandler, } from './create-sdk-mcp-server';
+export { SdkControlServerTransport } from './sdk-control-server-transport';
+export type { SendMcpMessageCallback } from './sdk-control-server-transport';
+//# sourceMappingURL=index.d.ts.map

package/lib/mcp/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACR,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,EACd,UAAU,EACV,WAAW,GACd,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,YAAY,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC"}

package/lib/mcp/index.js

@@ -0,0 +1,15 @@
+"use strict";
+/**
+ * MCP (Model Context Protocol) Integration
+ *
+ * This module provides utilities for creating and managing SDK MCP servers
+ * that can be integrated with the CLI via the control protocol.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SdkControlServerTransport = exports.tool = exports.createSdkMcpServer = void 0;
+var create_sdk_mcp_server_1 = require("./create-sdk-mcp-server");
+Object.defineProperty(exports, "createSdkMcpServer", { enumerable: true, get: function () { return create_sdk_mcp_server_1.createSdkMcpServer; } });
+Object.defineProperty(exports, "tool", { enumerable: true, get: function () { return create_sdk_mcp_server_1.tool; } });
+var sdk_control_server_transport_1 = require("./sdk-control-server-transport");
+Object.defineProperty(exports, "SdkControlServerTransport", { enumerable: true, get: function () { return sdk_control_server_transport_1.SdkControlServerTransport; } });
+//# sourceMappingURL=index.js.map

package/lib/mcp/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iEAAmE;AAA1D,2HAAA,kBAAkB,OAAA;AAAE,6GAAA,IAAI,OAAA;AAUjC,+EAA2E;AAAlE,yIAAA,yBAAyB,OAAA"}

package/lib/mcp/sdk-control-server-transport.d.ts

@@ -0,0 +1,60 @@
+/**
+ * SDK Control Server Transport
+ *
+ * Custom transport implementation that bridges SDK MCP servers to CLI process.
+ * This transport forwards MCP messages through the control protocol.
+ */
+import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { JSONRPCMessage as McpJSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+export type { McpJSONRPCMessage };
+/**
+ * Callback function type for sending MCP messages to CLI.
+ */
+export type SendMcpMessageCallback = (message: McpJSONRPCMessage) => void;
+/**
+ * SdkControlServerTransport - bridges MCP servers to CLI via control messages.
+ *
+ * This transport implements the MCP Transport interface and forwards all
+ * messages through a callback function that wraps them in control_request
+ * messages for the CLI.
+ */
+export declare class SdkControlServerTransport implements Transport {
+    private sendMcpMessage;
+    private isClosed;
+    onclose?: () => void;
+    onerror?: (error: Error) => void;
+    onmessage?: (message: McpJSONRPCMessage) => void;
+    /**
+     * Create a new SDK Control Server Transport.
+     *
+     * @param sendMcpMessage - Callback function to forward MCP messages to CLI
+     */
+    constructor(sendMcpMessage: SendMcpMessageCallback);
+    /**
+     * Start the transport.
+     * No-op since connection is already established via stdio.
+     */
+    start(): Promise<void>;
+    /**
+     * Send a message to the CLI via control_request.
+     *
+     * @param message - The JSON-RPC message to send
+     */
+    send(message: McpJSONRPCMessage): Promise<void>;
+    /**
+     * Close the transport.
+     */
+    close(): Promise<void>;
+    /**
+     * Check if the transport is closed.
+     */
+    get closed(): boolean;
+    /**
+     * Handle incoming message from CLI.
+     * This method should be called when the CLI sends a message to this server.
+     *
+     * @param message - The JSON-RPC message from CLI
+     */
+    handleIncomingMessage(message: McpJSONRPCMessage): void;
+}
+//# sourceMappingURL=sdk-control-server-transport.d.ts.map

package/lib/mcp/sdk-control-server-transport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sdk-control-server-transport.d.ts","sourceRoot":"","sources":["../../src/mcp/sdk-control-server-transport.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAG9F,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;AAE1E;;;;;;GAMG;AACH,qBAAa,yBAA0B,YAAW,SAAS;IACvD,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAEjD;;;;OAIG;gBACS,cAAc,EAAE,sBAAsB;IAIlD;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;;OAIG;IACG,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5B;;OAEG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;CAM1D"}

package/lib/mcp/sdk-control-server-transport.js

@@ -0,0 +1,78 @@
+"use strict";
+/**
+ * SDK Control Server Transport
+ *
+ * Custom transport implementation that bridges SDK MCP servers to CLI process.
+ * This transport forwards MCP messages through the control protocol.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SdkControlServerTransport = void 0;
+/**
+ * SdkControlServerTransport - bridges MCP servers to CLI via control messages.
+ *
+ * This transport implements the MCP Transport interface and forwards all
+ * messages through a callback function that wraps them in control_request
+ * messages for the CLI.
+ */
+class SdkControlServerTransport {
+    /**
+     * Create a new SDK Control Server Transport.
+     *
+     * @param sendMcpMessage - Callback function to forward MCP messages to CLI
+     */
+    constructor(sendMcpMessage) {
+        this.isClosed = false;
+        this.sendMcpMessage = sendMcpMessage;
+    }
+    /**
+     * Start the transport.
+     * No-op since connection is already established via stdio.
+     */
+    async start() {
+        // No-op: connection is already established via stdio
+    }
+    /**
+     * Send a message to the CLI via control_request.
+     *
+     * @param message - The JSON-RPC message to send
+     */
+    async send(message) {
+        if (this.isClosed) {
+            throw new Error('Transport is closed');
+        }
+        // Forward message to CLI via control_request
+        this.sendMcpMessage(message);
+    }
+    /**
+     * Close the transport.
+     */
+    async close() {
+        var _a;
+        if (this.isClosed) {
+            return;
+        }
+        this.isClosed = true;
+        (_a = this.onclose) === null || _a === void 0 ? void 0 : _a.call(this);
+    }
+    /**
+     * Check if the transport is closed.
+     */
+    get closed() {
+        return this.isClosed;
+    }
+    /**
+     * Handle incoming message from CLI.
+     * This method should be called when the CLI sends a message to this server.
+     *
+     * @param message - The JSON-RPC message from CLI
+     */
+    handleIncomingMessage(message) {
+        var _a;
+        if (this.isClosed) {
+            return;
+        }
+        (_a = this.onmessage) === null || _a === void 0 ? void 0 : _a.call(this, message);
+    }
+}
+exports.SdkControlServerTransport = SdkControlServerTransport;
+//# sourceMappingURL=sdk-control-server-transport.js.map

package/lib/mcp/sdk-control-server-transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sdk-control-server-transport.js","sourceRoot":"","sources":["../../src/mcp/sdk-control-server-transport.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAaH;;;;;;GAMG;AACH,MAAa,yBAAyB;IASlC;;;;OAIG;IACH,YAAY,cAAsC;QAZ1C,aAAQ,GAAG,KAAK,CAAC;QAarB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACP,qDAAqD;IACzD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,OAA0B;QACjC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,CAAC;QACD,6CAA6C;QAC7C,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;;QACP,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,MAAA,IAAI,CAAC,OAAO,oDAAI,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,OAA0B;;QAC5C,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QACD,MAAA,IAAI,CAAC,SAAS,qDAAG,OAAO,CAAC,CAAC;IAC9B,CAAC;CACJ;AArED,8DAqEC"}

package/lib/query.d.ts

@@ -20,6 +20,10 @@ export declare class Query implements AsyncGenerator<Message, void> {
     private abortController;
     private hookCallbacks;
     private iterator;
+    private sdkMcpTransports;
+    private sdkMcpServerInstances;
+    private pendingMcpResponses;
+    private sdkMcpServerNames;
     constructor(prompt: string | AsyncIterable<UserMessage>, options?: Options | undefined);
     [Symbol.asyncIterator](): AsyncGenerator<Message, void>;
     next(): Promise<IteratorResult<Message, void>>;
@@ -43,5 +47,30 @@ export declare class Query implements AsyncGenerator<Message, void> {
     private registeredHooks?;
     private registerHooks;
     private buildHooksConfig;
+    /**
+     * Extract SDK MCP servers from the mcpServers config.
+     * SDK servers are identified by having type: 'sdk'.
+     */
+    private extractMcpServers;
+    /**
+     * Connect an SDK MCP server.
+     */
+    private connectSdkMcpServer;
+    /**
+     * Send an MCP message from server to CLI.
+     */
+    private sendMcpServerMessageToCli;
+    /**
+     * Handle MCP message control request from CLI.
+     */
+    private handleMcpMessageRequest;
+    /**
+     * Handle MCP request and wait for response from MCP server.
+     */
+    private handleMcpControlRequest;
+    /**
+     * Cleanup all resources.
+     */
+    private cleanup;
 }
 //# sourceMappingURL=query.d.ts.map