@google-cloud/storage-mcp 0.3.2 → 0.4.0

package/dist/bundle.js

@@ -4725,6 +4725,7 @@ var require_pattern = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var code_1 = require_code2();
+    var util_1 = require_util();
     var codegen_1 = require_codegen();
     var error2 = {
       message: ({ schemaCode }) => (0, codegen_1.str)`must match pattern "${schemaCode}"`,
@@ -4737,10 +4738,18 @@ var require_pattern = __commonJS({
       $data: true,
       error: error2,
       code(cxt) {
-        const { data, $data, schema, schemaCode, it } = cxt;
+        const { gen, data, $data, schema, schemaCode, it } = cxt;
         const u = it.opts.unicodeRegExp ? "u" : "";
-        const regExp = $data ? (0, codegen_1._)`(new RegExp(${schemaCode}, ${u}))` : (0, code_1.usePattern)(cxt, schema);
-        cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+        if ($data) {
+          const { regExp } = it.opts.code;
+          const regExpCode = regExp.code === "new RegExp" ? (0, codegen_1._)`new RegExp` : (0, util_1.useFunc)(gen, regExp);
+          const valid = gen.let("valid");
+          gen.try(() => gen.assign(valid, (0, codegen_1._)`${regExpCode}(${schemaCode}, ${u}).test(${data})`), () => gen.assign(valid, false));
+          cxt.fail$data((0, codegen_1._)`!${valid}`);
+        } else {
+          const regExp = (0, code_1.usePattern)(cxt, schema);
+          cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+        }
       }
     };
     exports.default = def;
@@ -10614,6 +10623,7 @@ var require_pattern2 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var code_1 = require_code4();
+    var util_1 = require_util2();
     var codegen_1 = require_codegen2();
     var error2 = {
       message: ({ schemaCode }) => (0, codegen_1.str)`must match pattern "${schemaCode}"`,
@@ -10626,10 +10636,18 @@ var require_pattern2 = __commonJS({
       $data: true,
       error: error2,
       code(cxt) {
-        const { data, $data, schema, schemaCode, it } = cxt;
+        const { gen, data, $data, schema, schemaCode, it } = cxt;
         const u = it.opts.unicodeRegExp ? "u" : "";
-        const regExp = $data ? (0, codegen_1._)`(new RegExp(${schemaCode}, ${u}))` : (0, code_1.usePattern)(cxt, schema);
-        cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+        if ($data) {
+          const { regExp } = it.opts.code;
+          const regExpCode = regExp.code === "new RegExp" ? (0, codegen_1._)`new RegExp` : (0, util_1.useFunc)(gen, regExp);
+          const valid = gen.let("valid");
+          gen.try(() => gen.assign(valid, (0, codegen_1._)`${regExpCode}(${schemaCode}, ${u}).test(${data})`), () => gen.assign(valid, false));
+          cxt.fail$data((0, codegen_1._)`!${valid}`);
+        } else {
+          const regExp = (0, code_1.usePattern)(cxt, schema);
+          cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+        }
       }
     };
     exports.default = def;
@@ -12462,12 +12480,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs3, exportName) {
+    function addFormats(ajv, list, fs4, exportName) {
       var _a2;
       var _b2;
       (_a2 = (_b2 = ajv.opts.code).formats) !== null && _a2 !== void 0 ? _a2 : _b2.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs3[f]);
+        ajv.addFormat(f, fs4[f]);
     }
     module.exports = exports = formatsPlugin;
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -20520,13 +20538,12 @@ async function safeParseAsync2(schema, data) {
   return result;
 }
 function getObjectShape(schema) {
-  var _a2, _b2;
   if (!schema)
     return void 0;
   let rawShape;
   if (isZ4Schema(schema)) {
     const v4Schema = schema;
-    rawShape = (_b2 = (_a2 = v4Schema._zod) === null || _a2 === void 0 ? void 0 : _a2.def) === null || _b2 === void 0 ? void 0 : _b2.shape;
+    rawShape = v4Schema._zod?.def?.shape;
   } else {
     const v3Schema = schema;
     rawShape = v3Schema.shape;
@@ -20536,14 +20553,13 @@ function getObjectShape(schema) {
   if (typeof rawShape === "function") {
     try {
       return rawShape();
-    } catch (_c2) {
+    } catch {
       return void 0;
     }
   }
   return rawShape;
 }
 function normalizeObjectSchema(schema) {
-  var _a2;
   if (!schema)
     return void 0;
   if (typeof schema === "object") {
@@ -20558,7 +20574,7 @@ function normalizeObjectSchema(schema) {
   }
   if (isZ4Schema(schema)) {
     const v4Schema = schema;
-    const def = (_a2 = v4Schema._zod) === null || _a2 === void 0 ? void 0 : _a2.def;
+    const def = v4Schema._zod?.def;
     if (def && (def.type === "object" || def.shape !== void 0)) {
       return schema;
     }
@@ -20583,38 +20599,30 @@ function getParseErrorMessage(error2) {
     }
     try {
       return JSON.stringify(error2);
-    } catch (_a2) {
+    } catch {
       return String(error2);
     }
   }
   return String(error2);
 }
 function getSchemaDescription(schema) {
-  var _a2, _b2, _c2, _d;
-  if (isZ4Schema(schema)) {
-    const v4Schema = schema;
-    return (_b2 = (_a2 = v4Schema._zod) === null || _a2 === void 0 ? void 0 : _a2.def) === null || _b2 === void 0 ? void 0 : _b2.description;
-  }
-  const v3Schema = schema;
-  return (_c2 = schema.description) !== null && _c2 !== void 0 ? _c2 : (_d = v3Schema._def) === null || _d === void 0 ? void 0 : _d.description;
+  return schema.description;
 }
 function isSchemaOptional(schema) {
-  var _a2, _b2, _c2;
   if (isZ4Schema(schema)) {
     const v4Schema = schema;
-    return ((_b2 = (_a2 = v4Schema._zod) === null || _a2 === void 0 ? void 0 : _a2.def) === null || _b2 === void 0 ? void 0 : _b2.type) === "optional";
+    return v4Schema._zod?.def?.type === "optional";
   }
   const v3Schema = schema;
   if (typeof schema.isOptional === "function") {
     return schema.isOptional();
   }
-  return ((_c2 = v3Schema._def) === null || _c2 === void 0 ? void 0 : _c2.typeName) === "ZodOptional";
+  return v3Schema._def?.typeName === "ZodOptional";
 }
 function getLiteralValue(schema) {
-  var _a2;
   if (isZ4Schema(schema)) {
     const v4Schema = schema;
-    const def2 = (_a2 = v4Schema._zod) === null || _a2 === void 0 ? void 0 : _a2.def;
+    const def2 = v4Schema._zod?.def;
     if (def2) {
       if (def2.value !== void 0)
         return def2.value;
@@ -21352,7 +21360,10 @@ var TaskCreationParamsSchema = looseObject({
    */
   pollInterval: number2().optional()
 });
-var RelatedTaskMetadataSchema = looseObject({
+var TaskMetadataSchema = object2({
+  ttl: number2().optional()
+});
+var RelatedTaskMetadataSchema = object2({
   taskId: string2()
 });
 var RequestMetaSchema = looseObject({
@@ -21365,48 +21376,45 @@ var RequestMetaSchema = looseObject({
    */
   [RELATED_TASK_META_KEY]: RelatedTaskMetadataSchema.optional()
 });
-var BaseRequestParamsSchema = looseObject({
-  /**
-   * If specified, the caller is requesting that the receiver create a task to represent the request.
-   * Task creation parameters are now at the top level instead of in _meta.
-   */
-  task: TaskCreationParamsSchema.optional(),
+var BaseRequestParamsSchema = object2({
   /**
    * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
    */
   _meta: RequestMetaSchema.optional()
 });
+var TaskAugmentedRequestParamsSchema = BaseRequestParamsSchema.extend({
+  /**
+   * If specified, the caller is requesting task-augmented execution for this request.
+   * The request will return a CreateTaskResult immediately, and the actual result can be
+   * retrieved later via tasks/result.
+   *
+   * Task augmentation is subject to capability negotiation - receivers MUST declare support
+   * for task augmentation of specific request types in their capabilities.
+   */
+  task: TaskMetadataSchema.optional()
+});
+var isTaskAugmentedRequestParams = (value) => TaskAugmentedRequestParamsSchema.safeParse(value).success;
 var RequestSchema = object2({
   method: string2(),
-  params: BaseRequestParamsSchema.optional()
+  params: BaseRequestParamsSchema.loose().optional()
 });
-var NotificationsParamsSchema = looseObject({
+var NotificationsParamsSchema = object2({
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
-  _meta: object2({
-    /**
-     * If specified, this notification is related to the provided task.
-     */
-    [RELATED_TASK_META_KEY]: optional(RelatedTaskMetadataSchema)
-  }).passthrough().optional()
+  _meta: RequestMetaSchema.optional()
 });
 var NotificationSchema = object2({
   method: string2(),
-  params: NotificationsParamsSchema.optional()
+  params: NotificationsParamsSchema.loose().optional()
 });
 var ResultSchema = looseObject({
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
-  _meta: looseObject({
-    /**
-     * If specified, this result is related to the provided task.
-     */
-    [RELATED_TASK_META_KEY]: RelatedTaskMetadataSchema.optional()
-  }).optional()
+  _meta: RequestMetaSchema.optional()
 });
 var RequestIdSchema = union([string2(), number2().int()]);
 var JSONRPCRequestSchema = object2({
@@ -21420,12 +21428,12 @@ var JSONRPCNotificationSchema = object2({
   ...NotificationSchema.shape
 }).strict();
 var isJSONRPCNotification = (value) => JSONRPCNotificationSchema.safeParse(value).success;
-var JSONRPCResponseSchema = object2({
+var JSONRPCResultResponseSchema = object2({
   jsonrpc: literal(JSONRPC_VERSION),
   id: RequestIdSchema,
   result: ResultSchema
 }).strict();
-var isJSONRPCResponse = (value) => JSONRPCResponseSchema.safeParse(value).success;
+var isJSONRPCResultResponse = (value) => JSONRPCResultResponseSchema.safeParse(value).success;
 var ErrorCode;
 (function(ErrorCode2) {
   ErrorCode2[ErrorCode2["ConnectionClosed"] = -32e3] = "ConnectionClosed";
@@ -21437,9 +21445,9 @@ var ErrorCode;
   ErrorCode2[ErrorCode2["InternalError"] = -32603] = "InternalError";
   ErrorCode2[ErrorCode2["UrlElicitationRequired"] = -32042] = "UrlElicitationRequired";
 })(ErrorCode || (ErrorCode = {}));
-var JSONRPCErrorSchema = object2({
+var JSONRPCErrorResponseSchema = object2({
   jsonrpc: literal(JSONRPC_VERSION),
-  id: RequestIdSchema,
+  id: RequestIdSchema.optional(),
   error: object2({
     /**
      * The error type that occurred.
@@ -21452,11 +21460,17 @@ var JSONRPCErrorSchema = object2({
     /**
      * Additional information about the error. The value of this member is defined by the sender (e.g. detailed error information, nested errors etc.).
      */
-    data: optional(unknown())
+    data: unknown().optional()
   })
 }).strict();
-var isJSONRPCError = (value) => JSONRPCErrorSchema.safeParse(value).success;
-var JSONRPCMessageSchema = union([JSONRPCRequestSchema, JSONRPCNotificationSchema, JSONRPCResponseSchema, JSONRPCErrorSchema]);
+var isJSONRPCErrorResponse = (value) => JSONRPCErrorResponseSchema.safeParse(value).success;
+var JSONRPCMessageSchema = union([
+  JSONRPCRequestSchema,
+  JSONRPCNotificationSchema,
+  JSONRPCResultResponseSchema,
+  JSONRPCErrorResponseSchema
+]);
+var JSONRPCResponseSchema = union([JSONRPCResultResponseSchema, JSONRPCErrorResponseSchema]);
 var EmptyResultSchema = ResultSchema.strict();
 var CancelledNotificationParamsSchema = NotificationsParamsSchema.extend({
   /**
@@ -21464,7 +21478,7 @@ var CancelledNotificationParamsSchema = NotificationsParamsSchema.extend({
    *
    * This MUST correspond to the ID of a request previously issued in the same direction.
    */
-  requestId: RequestIdSchema,
+  requestId: RequestIdSchema.optional(),
   /**
    * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
    */
@@ -21489,7 +21503,15 @@ var IconSchema = object2({
    *
    * If not provided, the client should assume that the icon can be used at any size.
    */
-  sizes: array(string2()).optional()
+  sizes: array(string2()).optional(),
+  /**
+   * Optional specifier for the theme this icon is designed for. `light` indicates
+   * the icon is designed to be used with a light background, and `dark` indicates
+   * the icon is designed to be used with a dark background.
+   *
+   * If not provided, the client should assume the icon can be used with any theme.
+   */
+  theme: _enum(["light", "dark"]).optional()
 });
 var IconsSchema = object2({
   /**
@@ -21525,7 +21547,15 @@ var ImplementationSchema = BaseMetadataSchema.extend({
   /**
    * An optional URL of the website for this implementation.
    */
-  websiteUrl: string2().optional()
+  websiteUrl: string2().optional(),
+  /**
+   * An optional human-readable description of what this implementation does.
+   *
+   * This can be used by clients or servers to provide context about their purpose
+   * and capabilities. For example, a server might describe the types of resources
+   * or tools it provides, while a client might describe its intended use case.
+   */
+  description: string2().optional()
 });
 var FormElicitationCapabilitySchema = intersection(object2({
   applyDefaults: boolean2().optional()
@@ -21541,54 +21571,54 @@ var ElicitationCapabilitySchema = preprocess((value) => {
   form: FormElicitationCapabilitySchema.optional(),
   url: AssertObjectSchema.optional()
 }), record(string2(), unknown()).optional()));
-var ClientTasksCapabilitySchema = object2({
+var ClientTasksCapabilitySchema = looseObject({
   /**
    * Present if the client supports listing tasks.
    */
-  list: optional(object2({}).passthrough()),
+  list: AssertObjectSchema.optional(),
   /**
    * Present if the client supports cancelling tasks.
    */
-  cancel: optional(object2({}).passthrough()),
+  cancel: AssertObjectSchema.optional(),
   /**
    * Capabilities for task creation on specific request types.
    */
-  requests: optional(object2({
+  requests: looseObject({
     /**
      * Task support for sampling requests.
      */
-    sampling: optional(object2({
-      createMessage: optional(object2({}).passthrough())
-    }).passthrough()),
+    sampling: looseObject({
+      createMessage: AssertObjectSchema.optional()
+    }).optional(),
     /**
      * Task support for elicitation requests.
      */
-    elicitation: optional(object2({
-      create: optional(object2({}).passthrough())
-    }).passthrough())
-  }).passthrough())
-}).passthrough();
-var ServerTasksCapabilitySchema = object2({
+    elicitation: looseObject({
+      create: AssertObjectSchema.optional()
+    }).optional()
+  }).optional()
+});
+var ServerTasksCapabilitySchema = looseObject({
   /**
    * Present if the server supports listing tasks.
    */
-  list: optional(object2({}).passthrough()),
+  list: AssertObjectSchema.optional(),
   /**
    * Present if the server supports cancelling tasks.
    */
-  cancel: optional(object2({}).passthrough()),
+  cancel: AssertObjectSchema.optional(),
   /**
    * Capabilities for task creation on specific request types.
    */
-  requests: optional(object2({
+  requests: looseObject({
     /**
      * Task support for tool requests.
      */
-    tools: optional(object2({
-      call: optional(object2({}).passthrough())
-    }).passthrough())
-  }).passthrough())
-}).passthrough();
+    tools: looseObject({
+      call: AssertObjectSchema.optional()
+    }).optional()
+  }).optional()
+});
 var ClientCapabilitiesSchema = object2({
   /**
    * Experimental, non-standard capabilities that the client supports.
@@ -21624,7 +21654,7 @@ var ClientCapabilitiesSchema = object2({
   /**
    * Present if the client supports task creation.
    */
-  tasks: optional(ClientTasksCapabilitySchema)
+  tasks: ClientTasksCapabilitySchema.optional()
 });
 var InitializeRequestParamsSchema = BaseRequestParamsSchema.extend({
   /**
@@ -21654,12 +21684,12 @@ var ServerCapabilitiesSchema = object2({
   /**
    * Present if the server offers any prompt templates.
    */
-  prompts: optional(object2({
+  prompts: object2({
     /**
      * Whether this server supports issuing notifications for changes to the prompt list.
      */
-    listChanged: optional(boolean2())
-  })),
+    listChanged: boolean2().optional()
+  }).optional(),
   /**
    * Present if the server offers any resources to read.
    */
@@ -21685,8 +21715,8 @@ var ServerCapabilitiesSchema = object2({
   /**
    * Present if the server supports task creation.
    */
-  tasks: optional(ServerTasksCapabilitySchema)
-}).passthrough();
+  tasks: ServerTasksCapabilitySchema.optional()
+});
 var InitializeResultSchema = ResultSchema.extend({
   /**
    * The version of the Model Context Protocol that the server wants to use. This may not match the version that the client requested. If the client cannot support this version, it MUST disconnect.
@@ -21702,10 +21732,12 @@ var InitializeResultSchema = ResultSchema.extend({
   instructions: string2().optional()
 });
 var InitializedNotificationSchema = NotificationSchema.extend({
-  method: literal("notifications/initialized")
+  method: literal("notifications/initialized"),
+  params: NotificationsParamsSchema.optional()
 });
 var PingRequestSchema = RequestSchema.extend({
-  method: literal("ping")
+  method: literal("ping"),
+  params: BaseRequestParamsSchema.optional()
 });
 var ProgressSchema = object2({
   /**
@@ -21748,11 +21780,12 @@ var PaginatedResultSchema = ResultSchema.extend({
    * An opaque token representing the pagination position after the last returned result.
    * If present, there may be more results available.
    */
-  nextCursor: optional(CursorSchema)
+  nextCursor: CursorSchema.optional()
 });
+var TaskStatusSchema = _enum(["working", "input_required", "completed", "failed", "cancelled"]);
 var TaskSchema = object2({
   taskId: string2(),
-  status: _enum(["working", "input_required", "completed", "failed", "cancelled"]),
+  status: TaskStatusSchema,
   /**
    * Time in milliseconds to keep task results available after completion.
    * If null, the task has unlimited lifetime until manually cleaned up.
@@ -21793,6 +21826,7 @@ var GetTaskPayloadRequestSchema = RequestSchema.extend({
     taskId: string2()
   })
 });
+var GetTaskPayloadResultSchema = ResultSchema.loose();
 var ListTasksRequestSchema = PaginatedRequestSchema.extend({
   method: literal("tasks/list")
 });
@@ -21831,7 +21865,7 @@ var Base64Schema = string2().refine((val) => {
   try {
     atob(val);
     return true;
-  } catch (_a2) {
+  } catch {
     return false;
   }
 }, { message: "Invalid Base64 string" });
@@ -21841,11 +21875,12 @@ var BlobResourceContentsSchema = ResourceContentsSchema.extend({
    */
   blob: Base64Schema
 });
+var RoleSchema = _enum(["user", "assistant"]);
 var AnnotationsSchema = object2({
   /**
    * Intended audience(s) for the resource.
    */
-  audience: array(_enum(["user", "assistant"])).optional(),
+  audience: array(RoleSchema).optional(),
   /**
    * Importance hint for the resource, from 0 (least) to 1 (most).
    */
@@ -21938,7 +21973,8 @@ var ReadResourceResultSchema = ResultSchema.extend({
   contents: array(union([TextResourceContentsSchema, BlobResourceContentsSchema]))
 });
 var ResourceListChangedNotificationSchema = NotificationSchema.extend({
-  method: literal("notifications/resources/list_changed")
+  method: literal("notifications/resources/list_changed"),
+  params: NotificationsParamsSchema.optional()
 });
 var SubscribeRequestParamsSchema = ResourceRequestParamsSchema;
 var SubscribeRequestSchema = RequestSchema.extend({
@@ -22083,13 +22119,13 @@ var ToolUseContentSchema = object2({
    * Arguments to pass to the tool.
    * Must conform to the tool's inputSchema.
    */
-  input: object2({}).passthrough(),
+  input: record(string2(), unknown()),
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
-  _meta: optional(object2({}).passthrough())
-}).passthrough();
+  _meta: record(string2(), unknown()).optional()
+});
 var EmbeddedResourceSchema = object2({
   type: literal("resource"),
   resource: union([TextResourceContentsSchema, BlobResourceContentsSchema]),
@@ -22114,18 +22150,19 @@ var ContentBlockSchema = union([
   EmbeddedResourceSchema
 ]);
 var PromptMessageSchema = object2({
-  role: _enum(["user", "assistant"]),
+  role: RoleSchema,
   content: ContentBlockSchema
 });
 var GetPromptResultSchema = ResultSchema.extend({
   /**
    * An optional description for the prompt.
    */
-  description: optional(string2()),
+  description: string2().optional(),
   messages: array(PromptMessageSchema)
 });
 var PromptListChangedNotificationSchema = NotificationSchema.extend({
-  method: literal("notifications/prompts/list_changed")
+  method: literal("notifications/prompts/list_changed"),
+  params: NotificationsParamsSchema.optional()
 });
 var ToolAnnotationsSchema = object2({
   /**
@@ -22206,11 +22243,11 @@ var ToolSchema = object2({
   /**
    * Optional additional tool information.
    */
-  annotations: optional(ToolAnnotationsSchema),
+  annotations: ToolAnnotationsSchema.optional(),
   /**
    * Execution-related properties for this tool.
    */
-  execution: optional(ToolExecutionSchema),
+  execution: ToolExecutionSchema.optional(),
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
@@ -22251,12 +22288,12 @@ var CallToolResultSchema = ResultSchema.extend({
    * server does not support tool calls, or any other exceptional conditions,
    * should be reported as an MCP error response.
    */
-  isError: optional(boolean2())
+  isError: boolean2().optional()
 });
 var CompatibilityCallToolResultSchema = CallToolResultSchema.or(ResultSchema.extend({
   toolResult: unknown()
 }));
-var CallToolRequestParamsSchema = BaseRequestParamsSchema.extend({
+var CallToolRequestParamsSchema = TaskAugmentedRequestParamsSchema.extend({
   /**
    * The name of the tool to call.
    */
@@ -22264,14 +22301,35 @@ var CallToolRequestParamsSchema = BaseRequestParamsSchema.extend({
   /**
    * Arguments to pass to the tool.
    */
-  arguments: optional(record(string2(), unknown()))
+  arguments: record(string2(), unknown()).optional()
 });
 var CallToolRequestSchema = RequestSchema.extend({
   method: literal("tools/call"),
   params: CallToolRequestParamsSchema
 });
 var ToolListChangedNotificationSchema = NotificationSchema.extend({
-  method: literal("notifications/tools/list_changed")
+  method: literal("notifications/tools/list_changed"),
+  params: NotificationsParamsSchema.optional()
+});
+var ListChangedOptionsBaseSchema = object2({
+  /**
+   * If true, the list will be refreshed automatically when a list changed notification is received.
+   * The callback will be called with the updated list.
+   *
+   * If false, the callback will be called with null items, allowing manual refresh.
+   *
+   * @default true
+   */
+  autoRefresh: boolean2().default(true),
+  /**
+   * Debounce time in milliseconds for list changed notification processing.
+   *
+   * Multiple notifications received within this timeframe will only trigger one refresh.
+   * Set to 0 to disable debouncing.
+   *
+   * @default 300
+   */
+  debounceMs: number2().int().nonnegative().default(300)
 });
 var LoggingLevelSchema = _enum(["debug", "info", "notice", "warning", "error", "critical", "alert", "emergency"]);
 var SetLevelRequestParamsSchema = BaseRequestParamsSchema.extend({
@@ -22312,19 +22370,19 @@ var ModelPreferencesSchema = object2({
   /**
    * Optional hints to use for model selection.
    */
-  hints: optional(array(ModelHintSchema)),
+  hints: array(ModelHintSchema).optional(),
   /**
    * How much to prioritize cost when selecting a model.
    */
-  costPriority: optional(number2().min(0).max(1)),
+  costPriority: number2().min(0).max(1).optional(),
   /**
    * How much to prioritize sampling speed (latency) when selecting a model.
    */
-  speedPriority: optional(number2().min(0).max(1)),
+  speedPriority: number2().min(0).max(1).optional(),
   /**
    * How much to prioritize intelligence and capabilities when selecting a model.
    */
-  intelligencePriority: optional(number2().min(0).max(1))
+  intelligencePriority: number2().min(0).max(1).optional()
 });
 var ToolChoiceSchema = object2({
   /**
@@ -22333,20 +22391,20 @@ var ToolChoiceSchema = object2({
    * - "required": Model MUST use at least one tool before completing
    * - "none": Model MUST NOT use any tools
    */
-  mode: optional(_enum(["auto", "required", "none"]))
+  mode: _enum(["auto", "required", "none"]).optional()
 });
 var ToolResultContentSchema = object2({
   type: literal("tool_result"),
   toolUseId: string2().describe("The unique identifier for the corresponding tool call."),
   content: array(ContentBlockSchema).default([]),
-  structuredContent: object2({}).passthrough().optional(),
-  isError: optional(boolean2()),
+  structuredContent: object2({}).loose().optional(),
+  isError: boolean2().optional(),
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
-  _meta: optional(object2({}).passthrough())
-}).passthrough();
+  _meta: record(string2(), unknown()).optional()
+});
 var SamplingContentSchema = discriminatedUnion("type", [TextContentSchema, ImageContentSchema, AudioContentSchema]);
 var SamplingMessageContentBlockSchema = discriminatedUnion("type", [
   TextContentSchema,
@@ -22356,15 +22414,15 @@ var SamplingMessageContentBlockSchema = discriminatedUnion("type", [
   ToolResultContentSchema
 ]);
 var SamplingMessageSchema = object2({
-  role: _enum(["user", "assistant"]),
+  role: RoleSchema,
   content: union([SamplingMessageContentBlockSchema, array(SamplingMessageContentBlockSchema)]),
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
-  _meta: optional(object2({}).passthrough())
-}).passthrough();
-var CreateMessageRequestParamsSchema = BaseRequestParamsSchema.extend({
+  _meta: record(string2(), unknown()).optional()
+});
+var CreateMessageRequestParamsSchema = TaskAugmentedRequestParamsSchema.extend({
   messages: array(SamplingMessageSchema),
   /**
    * The server's preferences for which model to select. The client MAY modify or omit this request.
@@ -22398,13 +22456,13 @@ var CreateMessageRequestParamsSchema = BaseRequestParamsSchema.extend({
    * Tools that the model may use during generation.
    * The client MUST return an error if this field is provided but ClientCapabilities.sampling.tools is not declared.
    */
-  tools: optional(array(ToolSchema)),
+  tools: array(ToolSchema).optional(),
   /**
    * Controls how the model uses tools.
    * The client MUST return an error if this field is provided but ClientCapabilities.sampling.tools is not declared.
    * Default is `{ mode: "auto" }`.
    */
-  toolChoice: optional(ToolChoiceSchema)
+  toolChoice: ToolChoiceSchema.optional()
 });
 var CreateMessageRequestSchema = RequestSchema.extend({
   method: literal("sampling/createMessage"),
@@ -22426,7 +22484,7 @@ var CreateMessageResultSchema = ResultSchema.extend({
    * This field is an open string to allow for provider-specific stop reasons.
    */
   stopReason: optional(_enum(["endTurn", "stopSequence", "maxTokens"]).or(string2())),
-  role: _enum(["user", "assistant"]),
+  role: RoleSchema,
   /**
    * Response content. Single content block (text, image, or audio).
    */
@@ -22449,7 +22507,7 @@ var CreateMessageResultWithToolsSchema = ResultSchema.extend({
    * This field is an open string to allow for provider-specific stop reasons.
    */
   stopReason: optional(_enum(["endTurn", "stopSequence", "maxTokens", "toolUse"]).or(string2())),
-  role: _enum(["user", "assistant"]),
+  role: RoleSchema,
   /**
    * Response content. May be a single block or array. May include ToolUseContent if stopReason is "toolUse".
    */
@@ -22533,7 +22591,7 @@ var TitledMultiSelectEnumSchemaSchema = object2({
 var MultiSelectEnumSchemaSchema = union([UntitledMultiSelectEnumSchemaSchema, TitledMultiSelectEnumSchemaSchema]);
 var EnumSchemaSchema = union([LegacyTitledEnumSchemaSchema, SingleSelectEnumSchemaSchema, MultiSelectEnumSchemaSchema]);
 var PrimitiveSchemaDefinitionSchema = union([EnumSchemaSchema, BooleanSchemaSchema, StringSchemaSchema, NumberSchemaSchema]);
-var ElicitRequestFormParamsSchema = BaseRequestParamsSchema.extend({
+var ElicitRequestFormParamsSchema = TaskAugmentedRequestParamsSchema.extend({
   /**
    * The elicitation mode.
    *
@@ -22554,7 +22612,7 @@ var ElicitRequestFormParamsSchema = BaseRequestParamsSchema.extend({
     required: array(string2()).optional()
   })
 });
-var ElicitRequestURLParamsSchema = BaseRequestParamsSchema.extend({
+var ElicitRequestURLParamsSchema = TaskAugmentedRequestParamsSchema.extend({
   /**
    * The elicitation mode.
    */
@@ -22688,13 +22746,15 @@ var RootSchema = object2({
   _meta: record(string2(), unknown()).optional()
 });
 var ListRootsRequestSchema = RequestSchema.extend({
-  method: literal("roots/list")
+  method: literal("roots/list"),
+  params: BaseRequestParamsSchema.optional()
 });
 var ListRootsResultSchema = ResultSchema.extend({
   roots: array(RootSchema)
 });
 var RootsListChangedNotificationSchema = NotificationSchema.extend({
-  method: literal("notifications/roots/list_changed")
+  method: literal("notifications/roots/list_changed"),
+  params: NotificationsParamsSchema.optional()
 });
 var ClientRequestSchema = union([
   PingRequestSchema,
@@ -22712,7 +22772,8 @@ var ClientRequestSchema = union([
   ListToolsRequestSchema,
   GetTaskRequestSchema,
   GetTaskPayloadRequestSchema,
-  ListTasksRequestSchema
+  ListTasksRequestSchema,
+  CancelTaskRequestSchema
 ]);
 var ClientNotificationSchema = union([
   CancelledNotificationSchema,
@@ -22738,7 +22799,8 @@ var ServerRequestSchema = union([
   ListRootsRequestSchema,
   GetTaskRequestSchema,
   GetTaskPayloadRequestSchema,
-  ListTasksRequestSchema
+  ListTasksRequestSchema,
+  CancelTaskRequestSchema
 ]);
 var ServerNotificationSchema = union([
   CancelledNotificationSchema,
@@ -22793,8 +22855,7 @@ var UrlElicitationRequiredError = class extends McpError {
     });
   }
   get elicitations() {
-    var _a2, _b2;
-    return (_b2 = (_a2 = this.data) === null || _a2 === void 0 ? void 0 : _a2.elicitations) !== null && _b2 !== void 0 ? _b2 : [];
+    return this.data?.elicitations ?? [];
   }
 };
 
@@ -24098,21 +24159,20 @@ function mapMiniTarget(t) {
   return "draft-7";
 }
 function toJsonSchemaCompat(schema, opts) {
-  var _a2, _b2, _c2;
   if (isZ4Schema(schema)) {
     return toJSONSchema(schema, {
-      target: mapMiniTarget(opts === null || opts === void 0 ? void 0 : opts.target),
-      io: (_a2 = opts === null || opts === void 0 ? void 0 : opts.pipeStrategy) !== null && _a2 !== void 0 ? _a2 : "input"
+      target: mapMiniTarget(opts?.target),
+      io: opts?.pipeStrategy ?? "input"
     });
   }
   return zodToJsonSchema(schema, {
-    strictUnions: (_b2 = opts === null || opts === void 0 ? void 0 : opts.strictUnions) !== null && _b2 !== void 0 ? _b2 : true,
-    pipeStrategy: (_c2 = opts === null || opts === void 0 ? void 0 : opts.pipeStrategy) !== null && _c2 !== void 0 ? _c2 : "input"
+    strictUnions: opts?.strictUnions ?? true,
+    pipeStrategy: opts?.pipeStrategy ?? "input"
   });
 }
 function getMethodLiteral(schema) {
   const shape = getObjectShape(schema);
-  const methodSchema = shape === null || shape === void 0 ? void 0 : shape.method;
+  const methodSchema = shape?.method;
   if (!methodSchema) {
     throw new Error("Schema is missing a method literal");
   }
@@ -24156,8 +24216,8 @@ var Protocol = class {
       // Automatic pong by default.
       (_request) => ({})
     );
-    this._taskStore = _options === null || _options === void 0 ? void 0 : _options.taskStore;
-    this._taskMessageQueue = _options === null || _options === void 0 ? void 0 : _options.taskMessageQueue;
+    this._taskStore = _options?.taskStore;
+    this._taskMessageQueue = _options?.taskMessageQueue;
     if (this._taskStore) {
       this.setRequestHandler(GetTaskRequestSchema, async (request, extra) => {
         const task = await this._taskStore.getTask(request.params.taskId, extra.sessionId);
@@ -24170,7 +24230,6 @@ var Protocol = class {
       });
       this.setRequestHandler(GetTaskPayloadRequestSchema, async (request, extra) => {
         const handleTaskResult = async () => {
-          var _a2;
           const taskId = request.params.taskId;
           if (this._taskMessageQueue) {
             let queuedMessage;
@@ -24194,7 +24253,7 @@ var Protocol = class {
                 }
                 continue;
               }
-              await ((_a2 = this._transport) === null || _a2 === void 0 ? void 0 : _a2.send(queuedMessage.message, { relatedRequestId: extra.requestId }));
+              await this._transport?.send(queuedMessage.message, { relatedRequestId: extra.requestId });
             }
           }
           const task = await this._taskStore.getTask(taskId, extra.sessionId);
@@ -24223,9 +24282,8 @@ var Protocol = class {
         return await handleTaskResult();
       });
       this.setRequestHandler(ListTasksRequestSchema, async (request, extra) => {
-        var _a2;
         try {
-          const { tasks, nextCursor } = await this._taskStore.listTasks((_a2 = request.params) === null || _a2 === void 0 ? void 0 : _a2.cursor, extra.sessionId);
+          const { tasks, nextCursor } = await this._taskStore.listTasks(request.params?.cursor, extra.sessionId);
           return {
             tasks,
             nextCursor,
@@ -24264,8 +24322,11 @@ var Protocol = class {
     }
   }
   async _oncancel(notification) {
+    if (!notification.params.requestId) {
+      return;
+    }
     const controller = this._requestHandlerAbortControllers.get(notification.params.requestId);
-    controller === null || controller === void 0 ? void 0 : controller.abort(notification.params.reason);
+    controller?.abort(notification.params.reason);
   }
   _setupTimeout(messageId, timeout, maxTotalTimeout, onTimeout, resetTimeoutOnProgress = false) {
     this._timeoutInfo.set(messageId, {
@@ -24306,22 +24367,24 @@ var Protocol = class {
    * The Protocol object assumes ownership of the Transport, replacing any callbacks that have already been set, and expects that it is the only user of the Transport instance going forward.
    */
   async connect(transport) {
-    var _a2, _b2, _c2;
+    if (this._transport) {
+      throw new Error("Already connected to a transport. Call close() before connecting to a new transport, or use a separate Protocol instance per connection.");
+    }
     this._transport = transport;
-    const _onclose = (_a2 = this.transport) === null || _a2 === void 0 ? void 0 : _a2.onclose;
+    const _onclose = this.transport?.onclose;
     this._transport.onclose = () => {
-      _onclose === null || _onclose === void 0 ? void 0 : _onclose();
+      _onclose?.();
       this._onclose();
     };
-    const _onerror = (_b2 = this.transport) === null || _b2 === void 0 ? void 0 : _b2.onerror;
+    const _onerror = this.transport?.onerror;
     this._transport.onerror = (error2) => {
-      _onerror === null || _onerror === void 0 ? void 0 : _onerror(error2);
+      _onerror?.(error2);
       this._onerror(error2);
     };
-    const _onmessage = (_c2 = this._transport) === null || _c2 === void 0 ? void 0 : _c2.onmessage;
+    const _onmessage = this._transport?.onmessage;
     this._transport.onmessage = (message, extra) => {
-      _onmessage === null || _onmessage === void 0 ? void 0 : _onmessage(message, extra);
-      if (isJSONRPCResponse(message) || isJSONRPCError(message)) {
+      _onmessage?.(message, extra);
+      if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(message)) {
         this._onresponse(message);
       } else if (isJSONRPCRequest(message)) {
         this._onrequest(message, extra);
@@ -24334,36 +24397,36 @@ var Protocol = class {
     await this._transport.start();
   }
   _onclose() {
-    var _a2;
     const responseHandlers = this._responseHandlers;
     this._responseHandlers = /* @__PURE__ */ new Map();
     this._progressHandlers.clear();
     this._taskProgressTokens.clear();
     this._pendingDebouncedNotifications.clear();
+    for (const controller of this._requestHandlerAbortControllers.values()) {
+      controller.abort();
+    }
+    this._requestHandlerAbortControllers.clear();
     const error2 = McpError.fromError(ErrorCode.ConnectionClosed, "Connection closed");
     this._transport = void 0;
-    (_a2 = this.onclose) === null || _a2 === void 0 ? void 0 : _a2.call(this);
+    this.onclose?.();
     for (const handler of responseHandlers.values()) {
       handler(error2);
     }
   }
   _onerror(error2) {
-    var _a2;
-    (_a2 = this.onerror) === null || _a2 === void 0 ? void 0 : _a2.call(this, error2);
+    this.onerror?.(error2);
   }
   _onnotification(notification) {
-    var _a2;
-    const handler = (_a2 = this._notificationHandlers.get(notification.method)) !== null && _a2 !== void 0 ? _a2 : this.fallbackNotificationHandler;
+    const handler = this._notificationHandlers.get(notification.method) ?? this.fallbackNotificationHandler;
     if (handler === void 0) {
       return;
     }
     Promise.resolve().then(() => handler(notification)).catch((error2) => this._onerror(new Error(`Uncaught error in notification handler: ${error2}`)));
   }
   _onrequest(request, extra) {
-    var _a2, _b2, _c2, _d, _e, _f;
-    const handler = (_a2 = this._requestHandlers.get(request.method)) !== null && _a2 !== void 0 ? _a2 : this.fallbackRequestHandler;
+    const handler = this._requestHandlers.get(request.method) ?? this.fallbackRequestHandler;
     const capturedTransport = this._transport;
-    const relatedTaskId = (_d = (_c2 = (_b2 = request.params) === null || _b2 === void 0 ? void 0 : _b2._meta) === null || _c2 === void 0 ? void 0 : _c2[RELATED_TASK_META_KEY]) === null || _d === void 0 ? void 0 : _d.taskId;
+    const relatedTaskId = request.params?._meta?.[RELATED_TASK_META_KEY]?.taskId;
     if (handler === void 0) {
       const errorResponse = {
         jsonrpc: "2.0",
@@ -24378,21 +24441,23 @@ var Protocol = class {
           type: "error",
           message: errorResponse,
           timestamp: Date.now()
-        }, capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.sessionId).catch((error2) => this._onerror(new Error(`Failed to enqueue error response: ${error2}`)));
+        }, capturedTransport?.sessionId).catch((error2) => this._onerror(new Error(`Failed to enqueue error response: ${error2}`)));
       } else {
-        capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.send(errorResponse).catch((error2) => this._onerror(new Error(`Failed to send an error response: ${error2}`)));
+        capturedTransport?.send(errorResponse).catch((error2) => this._onerror(new Error(`Failed to send an error response: ${error2}`)));
       }
       return;
     }
     const abortController = new AbortController();
     this._requestHandlerAbortControllers.set(request.id, abortController);
-    const taskCreationParams = (_e = request.params) === null || _e === void 0 ? void 0 : _e.task;
-    const taskStore = this._taskStore ? this.requestTaskStore(request, capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.sessionId) : void 0;
+    const taskCreationParams = isTaskAugmentedRequestParams(request.params) ? request.params.task : void 0;
+    const taskStore = this._taskStore ? this.requestTaskStore(request, capturedTransport?.sessionId) : void 0;
     const fullExtra = {
       signal: abortController.signal,
-      sessionId: capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.sessionId,
-      _meta: (_f = request.params) === null || _f === void 0 ? void 0 : _f._meta,
+      sessionId: capturedTransport?.sessionId,
+      _meta: request.params?._meta,
       sendNotification: async (notification) => {
+        if (abortController.signal.aborted)
+          return;
         const notificationOptions = { relatedRequestId: request.id };
         if (relatedTaskId) {
           notificationOptions.relatedTask = { taskId: relatedTaskId };
@@ -24400,25 +24465,27 @@ var Protocol = class {
         await this.notification(notification, notificationOptions);
       },
       sendRequest: async (r, resultSchema, options) => {
-        var _a3, _b3;
+        if (abortController.signal.aborted) {
+          throw new McpError(ErrorCode.ConnectionClosed, "Request was cancelled");
+        }
         const requestOptions = { ...options, relatedRequestId: request.id };
         if (relatedTaskId && !requestOptions.relatedTask) {
           requestOptions.relatedTask = { taskId: relatedTaskId };
         }
-        const effectiveTaskId = (_b3 = (_a3 = requestOptions.relatedTask) === null || _a3 === void 0 ? void 0 : _a3.taskId) !== null && _b3 !== void 0 ? _b3 : relatedTaskId;
+        const effectiveTaskId = requestOptions.relatedTask?.taskId ?? relatedTaskId;
         if (effectiveTaskId && taskStore) {
           await taskStore.updateTaskStatus(effectiveTaskId, "input_required");
         }
         return await this.request(r, resultSchema, requestOptions);
       },
-      authInfo: extra === null || extra === void 0 ? void 0 : extra.authInfo,
+      authInfo: extra?.authInfo,
       requestId: request.id,
-      requestInfo: extra === null || extra === void 0 ? void 0 : extra.requestInfo,
+      requestInfo: extra?.requestInfo,
       taskId: relatedTaskId,
       taskStore,
-      taskRequestedTtl: taskCreationParams === null || taskCreationParams === void 0 ? void 0 : taskCreationParams.ttl,
-      closeSSEStream: extra === null || extra === void 0 ? void 0 : extra.closeSSEStream,
-      closeStandaloneSSEStream: extra === null || extra === void 0 ? void 0 : extra.closeStandaloneSSEStream
+      taskRequestedTtl: taskCreationParams?.ttl,
+      closeSSEStream: extra?.closeSSEStream,
+      closeStandaloneSSEStream: extra?.closeStandaloneSSEStream
     };
     Promise.resolve().then(() => {
       if (taskCreationParams) {
@@ -24438,12 +24505,11 @@ var Protocol = class {
           type: "response",
           message: response,
           timestamp: Date.now()
-        }, capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.sessionId);
+        }, capturedTransport?.sessionId);
       } else {
-        await (capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.send(response));
+        await capturedTransport?.send(response);
       }
     }, async (error2) => {
-      var _a3;
       if (abortController.signal.aborted) {
         return;
       }
@@ -24452,7 +24518,7 @@ var Protocol = class {
         id: request.id,
         error: {
           code: Number.isSafeInteger(error2["code"]) ? error2["code"] : ErrorCode.InternalError,
-          message: (_a3 = error2.message) !== null && _a3 !== void 0 ? _a3 : "Internal error",
+          message: error2.message ?? "Internal error",
           ...error2["data"] !== void 0 && { data: error2["data"] }
         }
       };
@@ -24461,9 +24527,9 @@ var Protocol = class {
           type: "error",
           message: errorResponse,
           timestamp: Date.now()
-        }, capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.sessionId);
+        }, capturedTransport?.sessionId);
       } else {
-        await (capturedTransport === null || capturedTransport === void 0 ? void 0 : capturedTransport.send(errorResponse));
+        await capturedTransport?.send(errorResponse);
       }
     }).catch((error2) => this._onerror(new Error(`Failed to send response: ${error2}`))).finally(() => {
       this._requestHandlerAbortControllers.delete(request.id);
@@ -24497,7 +24563,7 @@ var Protocol = class {
     const resolver = this._requestResolvers.get(messageId);
     if (resolver) {
       this._requestResolvers.delete(messageId);
-      if (isJSONRPCResponse(response)) {
+      if (isJSONRPCResultResponse(response)) {
         resolver(response);
       } else {
         const error2 = new McpError(response.error.code, response.error.message, response.error.data);
@@ -24513,7 +24579,7 @@ var Protocol = class {
     this._responseHandlers.delete(messageId);
     this._cleanupTimeout(messageId);
     let isTaskResponse = false;
-    if (isJSONRPCResponse(response) && response.result && typeof response.result === "object") {
+    if (isJSONRPCResultResponse(response) && response.result && typeof response.result === "object") {
       const result = response.result;
       if (result.task && typeof result.task === "object") {
         const task = result.task;
@@ -24526,7 +24592,7 @@ var Protocol = class {
     if (!isTaskResponse) {
       this._progressHandlers.delete(messageId);
     }
-    if (isJSONRPCResponse(response)) {
+    if (isJSONRPCResultResponse(response)) {
       handler(response);
     } else {
       const error2 = McpError.fromError(response.error.code, response.error.message, response.error.data);
@@ -24540,8 +24606,7 @@ var Protocol = class {
    * Closes the connection.
    */
   async close() {
-    var _a2;
-    await ((_a2 = this._transport) === null || _a2 === void 0 ? void 0 : _a2.close());
+    await this._transport?.close();
   }
   /**
    * Sends a request and returns an AsyncGenerator that yields response messages.
@@ -24571,8 +24636,7 @@ var Protocol = class {
    * @experimental Use `client.experimental.tasks.requestStream()` to access this method.
    */
   async *requestStream(request, resultSchema, options) {
-    var _a2, _b2, _c2, _d;
-    const { task } = options !== null && options !== void 0 ? options : {};
+    const { task } = options ?? {};
     if (!task) {
       try {
         const result = await this.request(request, resultSchema, options);
@@ -24619,9 +24683,9 @@ var Protocol = class {
           yield { type: "result", result };
           return;
         }
-        const pollInterval = (_c2 = (_a2 = task2.pollInterval) !== null && _a2 !== void 0 ? _a2 : (_b2 = this._options) === null || _b2 === void 0 ? void 0 : _b2.defaultTaskPollInterval) !== null && _c2 !== void 0 ? _c2 : 1e3;
+        const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
         await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
-        (_d = options === null || options === void 0 ? void 0 : options.signal) === null || _d === void 0 ? void 0 : _d.throwIfAborted();
+        options?.signal?.throwIfAborted();
       }
     } catch (error2) {
       yield {
@@ -24636,9 +24700,8 @@ var Protocol = class {
    * Do not use this method to emit notifications! Use notification() instead.
    */
   request(request, resultSchema, options) {
-    const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options !== null && options !== void 0 ? options : {};
+    const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
     return new Promise((resolve5, reject) => {
-      var _a2, _b2, _c2, _d, _e, _f, _g;
       const earlyReject = (error2) => {
         reject(error2);
       };
@@ -24646,7 +24709,7 @@ var Protocol = class {
         earlyReject(new Error("Not connected"));
         return;
       }
-      if (((_a2 = this._options) === null || _a2 === void 0 ? void 0 : _a2.enforceStrictCapabilities) === true) {
+      if (this._options?.enforceStrictCapabilities === true) {
         try {
           this.assertCapabilityForMethod(request.method);
           if (task) {
@@ -24657,19 +24720,19 @@ var Protocol = class {
           return;
         }
       }
-      (_b2 = options === null || options === void 0 ? void 0 : options.signal) === null || _b2 === void 0 ? void 0 : _b2.throwIfAborted();
+      options?.signal?.throwIfAborted();
       const messageId = this._requestMessageId++;
       const jsonrpcRequest = {
         ...request,
         jsonrpc: "2.0",
         id: messageId
       };
-      if (options === null || options === void 0 ? void 0 : options.onprogress) {
+      if (options?.onprogress) {
         this._progressHandlers.set(messageId, options.onprogress);
         jsonrpcRequest.params = {
           ...request.params,
           _meta: {
-            ...((_c2 = request.params) === null || _c2 === void 0 ? void 0 : _c2._meta) || {},
+            ...request.params?._meta || {},
             progressToken: messageId
           }
         };
@@ -24684,17 +24747,16 @@ var Protocol = class {
         jsonrpcRequest.params = {
           ...jsonrpcRequest.params,
           _meta: {
-            ...((_d = jsonrpcRequest.params) === null || _d === void 0 ? void 0 : _d._meta) || {},
+            ...jsonrpcRequest.params?._meta || {},
             [RELATED_TASK_META_KEY]: relatedTask
           }
         };
       }
       const cancel = (reason) => {
-        var _a3;
         this._responseHandlers.delete(messageId);
         this._progressHandlers.delete(messageId);
         this._cleanupTimeout(messageId);
-        (_a3 = this._transport) === null || _a3 === void 0 ? void 0 : _a3.send({
+        this._transport?.send({
           jsonrpc: "2.0",
           method: "notifications/cancelled",
           params: {
@@ -24706,8 +24768,7 @@ var Protocol = class {
         reject(error2);
       };
       this._responseHandlers.set(messageId, (response) => {
-        var _a3;
-        if ((_a3 = options === null || options === void 0 ? void 0 : options.signal) === null || _a3 === void 0 ? void 0 : _a3.aborted) {
+        if (options?.signal?.aborted) {
           return;
         }
         if (response instanceof Error) {
@@ -24724,14 +24785,13 @@ var Protocol = class {
           reject(error2);
         }
       });
-      (_e = options === null || options === void 0 ? void 0 : options.signal) === null || _e === void 0 ? void 0 : _e.addEventListener("abort", () => {
-        var _a3;
-        cancel((_a3 = options === null || options === void 0 ? void 0 : options.signal) === null || _a3 === void 0 ? void 0 : _a3.reason);
+      options?.signal?.addEventListener("abort", () => {
+        cancel(options?.signal?.reason);
       });
-      const timeout = (_f = options === null || options === void 0 ? void 0 : options.timeout) !== null && _f !== void 0 ? _f : DEFAULT_REQUEST_TIMEOUT_MSEC;
+      const timeout = options?.timeout ?? DEFAULT_REQUEST_TIMEOUT_MSEC;
       const timeoutHandler = () => cancel(McpError.fromError(ErrorCode.RequestTimeout, "Request timed out", { timeout }));
-      this._setupTimeout(messageId, timeout, options === null || options === void 0 ? void 0 : options.maxTotalTimeout, timeoutHandler, (_g = options === null || options === void 0 ? void 0 : options.resetTimeoutOnProgress) !== null && _g !== void 0 ? _g : false);
-      const relatedTaskId = relatedTask === null || relatedTask === void 0 ? void 0 : relatedTask.taskId;
+      this._setupTimeout(messageId, timeout, options?.maxTotalTimeout, timeoutHandler, options?.resetTimeoutOnProgress ?? false);
+      const relatedTaskId = relatedTask?.taskId;
       if (relatedTaskId) {
         const responseResolver = (response) => {
           const handler = this._responseHandlers.get(messageId);
@@ -24794,12 +24854,11 @@ var Protocol = class {
    * Emits a notification, which is a one-way message that does not expect a response.
    */
   async notification(notification, options) {
-    var _a2, _b2, _c2, _d, _e;
     if (!this._transport) {
       throw new Error("Not connected");
     }
     this.assertNotificationCapability(notification.method);
-    const relatedTaskId = (_a2 = options === null || options === void 0 ? void 0 : options.relatedTask) === null || _a2 === void 0 ? void 0 : _a2.taskId;
+    const relatedTaskId = options?.relatedTask?.taskId;
     if (relatedTaskId) {
       const jsonrpcNotification2 = {
         ...notification,
@@ -24807,7 +24866,7 @@ var Protocol = class {
         params: {
           ...notification.params,
           _meta: {
-            ...((_b2 = notification.params) === null || _b2 === void 0 ? void 0 : _b2._meta) || {},
+            ...notification.params?._meta || {},
             [RELATED_TASK_META_KEY]: options.relatedTask
           }
         }
@@ -24819,15 +24878,14 @@ var Protocol = class {
       });
       return;
     }
-    const debouncedMethods = (_d = (_c2 = this._options) === null || _c2 === void 0 ? void 0 : _c2.debouncedNotificationMethods) !== null && _d !== void 0 ? _d : [];
-    const canDebounce = debouncedMethods.includes(notification.method) && !notification.params && !(options === null || options === void 0 ? void 0 : options.relatedRequestId) && !(options === null || options === void 0 ? void 0 : options.relatedTask);
+    const debouncedMethods = this._options?.debouncedNotificationMethods ?? [];
+    const canDebounce = debouncedMethods.includes(notification.method) && !notification.params && !options?.relatedRequestId && !options?.relatedTask;
     if (canDebounce) {
       if (this._pendingDebouncedNotifications.has(notification.method)) {
         return;
       }
       this._pendingDebouncedNotifications.add(notification.method);
       Promise.resolve().then(() => {
-        var _a3, _b3;
         this._pendingDebouncedNotifications.delete(notification.method);
         if (!this._transport) {
           return;
@@ -24836,19 +24894,19 @@ var Protocol = class {
           ...notification,
           jsonrpc: "2.0"
         };
-        if (options === null || options === void 0 ? void 0 : options.relatedTask) {
+        if (options?.relatedTask) {
           jsonrpcNotification2 = {
             ...jsonrpcNotification2,
             params: {
               ...jsonrpcNotification2.params,
               _meta: {
-                ...((_a3 = jsonrpcNotification2.params) === null || _a3 === void 0 ? void 0 : _a3._meta) || {},
+                ...jsonrpcNotification2.params?._meta || {},
                 [RELATED_TASK_META_KEY]: options.relatedTask
               }
             }
           };
         }
-        (_b3 = this._transport) === null || _b3 === void 0 ? void 0 : _b3.send(jsonrpcNotification2, options).catch((error2) => this._onerror(error2));
+        this._transport?.send(jsonrpcNotification2, options).catch((error2) => this._onerror(error2));
       });
       return;
     }
@@ -24856,13 +24914,13 @@ var Protocol = class {
       ...notification,
       jsonrpc: "2.0"
     };
-    if (options === null || options === void 0 ? void 0 : options.relatedTask) {
+    if (options?.relatedTask) {
       jsonrpcNotification = {
         ...jsonrpcNotification,
         params: {
           ...jsonrpcNotification.params,
           _meta: {
-            ...((_e = jsonrpcNotification.params) === null || _e === void 0 ? void 0 : _e._meta) || {},
+            ...jsonrpcNotification.params?._meta || {},
             [RELATED_TASK_META_KEY]: options.relatedTask
           }
         }
@@ -24938,11 +24996,10 @@ var Protocol = class {
    * simply propagates the error.
    */
   async _enqueueTaskMessage(taskId, message, sessionId) {
-    var _a2;
     if (!this._taskStore || !this._taskMessageQueue) {
       throw new Error("Cannot enqueue task message: taskStore and taskMessageQueue are not configured");
     }
-    const maxQueueSize = (_a2 = this._options) === null || _a2 === void 0 ? void 0 : _a2.maxTaskQueueSize;
+    const maxQueueSize = this._options?.maxTaskQueueSize;
     await this._taskMessageQueue.enqueue(taskId, message, sessionId, maxQueueSize);
   }
   /**
@@ -24975,14 +25032,13 @@ var Protocol = class {
    * @returns Promise that resolves when an update occurs or rejects if aborted
    */
   async _waitForTaskUpdate(taskId, signal) {
-    var _a2, _b2, _c2;
-    let interval = (_b2 = (_a2 = this._options) === null || _a2 === void 0 ? void 0 : _a2.defaultTaskPollInterval) !== null && _b2 !== void 0 ? _b2 : 1e3;
+    let interval = this._options?.defaultTaskPollInterval ?? 1e3;
     try {
-      const task = await ((_c2 = this._taskStore) === null || _c2 === void 0 ? void 0 : _c2.getTask(taskId));
-      if (task === null || task === void 0 ? void 0 : task.pollInterval) {
+      const task = await this._taskStore?.getTask(taskId);
+      if (task?.pollInterval) {
         interval = task.pollInterval;
       }
-    } catch (_d) {
+    } catch {
     }
     return new Promise((resolve5, reject) => {
       if (signal.aborted) {
@@ -25086,7 +25142,7 @@ function mergeCapabilities(base, additional) {
 var import_ajv = __toESM(require_ajv(), 1);
 var import_ajv_formats = __toESM(require_dist(), 1);
 function createDefaultAjvInstance() {
-  const ajv = new import_ajv.Ajv({
+  const ajv = new import_ajv.default({
     strict: false,
     validateFormats: true,
     validateSchema: false,
@@ -25118,7 +25174,7 @@ var AjvJsonSchemaValidator = class {
    * ```
    */
   constructor(ajv) {
-    this._ajv = ajv !== null && ajv !== void 0 ? ajv : createDefaultAjvInstance();
+    this._ajv = ajv ?? createDefaultAjvInstance();
   }
   /**
    * Create a validator for the given JSON Schema
@@ -25130,8 +25186,7 @@ var AjvJsonSchemaValidator = class {
    * @returns A validator function that validates input data
    */
   getValidator(schema) {
-    var _a2;
-    const ajvValidator = "$id" in schema && typeof schema.$id === "string" ? (_a2 = this._ajv.getSchema(schema.$id)) !== null && _a2 !== void 0 ? _a2 : this._ajv.compile(schema) : this._ajv.compile(schema);
+    const ajvValidator = "$id" in schema && typeof schema.$id === "string" ? this._ajv.getSchema(schema.$id) ?? this._ajv.compile(schema) : this._ajv.compile(schema);
     return (input) => {
       const valid = ajvValidator(input);
       if (valid) {
@@ -25225,13 +25280,12 @@ var ExperimentalServerTasks = class {
 
 // ../../node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
 function assertToolsCallTaskCapability(requests, method, entityName) {
-  var _a2;
   if (!requests) {
     throw new Error(`${entityName} does not support task creation (required for ${method})`);
   }
   switch (method) {
     case "tools/call":
-      if (!((_a2 = requests.tools) === null || _a2 === void 0 ? void 0 : _a2.call)) {
+      if (!requests.tools?.call) {
         throw new Error(`${entityName} does not support task creation for tools/call (required for ${method})`);
       }
       break;
@@ -25240,18 +25294,17 @@ function assertToolsCallTaskCapability(requests, method, entityName) {
   }
 }
 function assertClientRequestTaskCapability(requests, method, entityName) {
-  var _a2, _b2;
   if (!requests) {
     throw new Error(`${entityName} does not support task creation (required for ${method})`);
   }
   switch (method) {
     case "sampling/createMessage":
-      if (!((_a2 = requests.sampling) === null || _a2 === void 0 ? void 0 : _a2.createMessage)) {
+      if (!requests.sampling?.createMessage) {
         throw new Error(`${entityName} does not support task creation for sampling/createMessage (required for ${method})`);
       }
       break;
     case "elicitation/create":
-      if (!((_b2 = requests.elicitation) === null || _b2 === void 0 ? void 0 : _b2.create)) {
+      if (!requests.elicitation?.create) {
         throw new Error(`${entityName} does not support task creation for elicitation/create (required for ${method})`);
       }
       break;
@@ -25266,7 +25319,6 @@ var Server = class extends Protocol {
    * Initializes this server with the given name and version information.
    */
   constructor(_serverInfo, options) {
-    var _a2, _b2;
     super(options);
     this._serverInfo = _serverInfo;
     this._loggingLevels = /* @__PURE__ */ new Map();
@@ -25275,18 +25327,14 @@ var Server = class extends Protocol {
       const currentLevel = this._loggingLevels.get(sessionId);
       return currentLevel ? this.LOG_LEVEL_SEVERITY.get(level) < this.LOG_LEVEL_SEVERITY.get(currentLevel) : false;
     };
-    this._capabilities = (_a2 = options === null || options === void 0 ? void 0 : options.capabilities) !== null && _a2 !== void 0 ? _a2 : {};
-    this._instructions = options === null || options === void 0 ? void 0 : options.instructions;
-    this._jsonSchemaValidator = (_b2 = options === null || options === void 0 ? void 0 : options.jsonSchemaValidator) !== null && _b2 !== void 0 ? _b2 : new AjvJsonSchemaValidator();
+    this._capabilities = options?.capabilities ?? {};
+    this._instructions = options?.instructions;
+    this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
     this.setRequestHandler(InitializeRequestSchema, (request) => this._oninitialize(request));
-    this.setNotificationHandler(InitializedNotificationSchema, () => {
-      var _a3;
-      return (_a3 = this.oninitialized) === null || _a3 === void 0 ? void 0 : _a3.call(this);
-    });
+    this.setNotificationHandler(InitializedNotificationSchema, () => this.oninitialized?.());
     if (this._capabilities.logging) {
       this.setRequestHandler(SetLevelRequestSchema, async (request, extra) => {
-        var _a3;
-        const transportSessionId = extra.sessionId || ((_a3 = extra.requestInfo) === null || _a3 === void 0 ? void 0 : _a3.headers["mcp-session-id"]) || void 0;
+        const transportSessionId = extra.sessionId || extra.requestInfo?.headers["mcp-session-id"] || void 0;
         const { level } = request.params;
         const parseResult = LoggingLevelSchema.safeParse(level);
         if (parseResult.success) {
@@ -25326,21 +25374,20 @@ var Server = class extends Protocol {
    * Override request handler registration to enforce server-side validation for tools/call.
    */
   setRequestHandler(requestSchema, handler) {
-    var _a2, _b2, _c2;
     const shape = getObjectShape(requestSchema);
-    const methodSchema = shape === null || shape === void 0 ? void 0 : shape.method;
+    const methodSchema = shape?.method;
     if (!methodSchema) {
       throw new Error("Schema is missing a method literal");
     }
     let methodValue;
     if (isZ4Schema(methodSchema)) {
       const v4Schema = methodSchema;
-      const v4Def = (_a2 = v4Schema._zod) === null || _a2 === void 0 ? void 0 : _a2.def;
-      methodValue = (_b2 = v4Def === null || v4Def === void 0 ? void 0 : v4Def.value) !== null && _b2 !== void 0 ? _b2 : v4Schema.value;
+      const v4Def = v4Schema._zod?.def;
+      methodValue = v4Def?.value ?? v4Schema.value;
     } else {
       const v3Schema = methodSchema;
       const legacyDef = v3Schema._def;
-      methodValue = (_c2 = legacyDef === null || legacyDef === void 0 ? void 0 : legacyDef.value) !== null && _c2 !== void 0 ? _c2 : v3Schema.value;
+      methodValue = legacyDef?.value ?? v3Schema.value;
     }
     if (typeof methodValue !== "string") {
       throw new Error("Schema method literal must be a string");
@@ -25375,20 +25422,19 @@ var Server = class extends Protocol {
     return super.setRequestHandler(requestSchema, handler);
   }
   assertCapabilityForMethod(method) {
-    var _a2, _b2, _c2;
     switch (method) {
       case "sampling/createMessage":
-        if (!((_a2 = this._clientCapabilities) === null || _a2 === void 0 ? void 0 : _a2.sampling)) {
+        if (!this._clientCapabilities?.sampling) {
           throw new Error(`Client does not support sampling (required for ${method})`);
         }
         break;
       case "elicitation/create":
-        if (!((_b2 = this._clientCapabilities) === null || _b2 === void 0 ? void 0 : _b2.elicitation)) {
+        if (!this._clientCapabilities?.elicitation) {
           throw new Error(`Client does not support elicitation (required for ${method})`);
         }
         break;
       case "roots/list":
-        if (!((_c2 = this._clientCapabilities) === null || _c2 === void 0 ? void 0 : _c2.roots)) {
+        if (!this._clientCapabilities?.roots) {
           throw new Error(`Client does not support listing roots (required for ${method})`);
         }
         break;
@@ -25397,7 +25443,6 @@ var Server = class extends Protocol {
     }
   }
   assertNotificationCapability(method) {
-    var _a2, _b2;
     switch (method) {
       case "notifications/message":
         if (!this._capabilities.logging) {
@@ -25421,7 +25466,7 @@ var Server = class extends Protocol {
         }
         break;
       case "notifications/elicitation/complete":
-        if (!((_b2 = (_a2 = this._clientCapabilities) === null || _a2 === void 0 ? void 0 : _a2.elicitation) === null || _b2 === void 0 ? void 0 : _b2.url)) {
+        if (!this._clientCapabilities?.elicitation?.url) {
           throw new Error(`Client does not support URL elicitation (required for ${method})`);
         }
         break;
@@ -25479,15 +25524,13 @@ var Server = class extends Protocol {
     }
   }
   assertTaskCapability(method) {
-    var _a2, _b2;
-    assertClientRequestTaskCapability((_b2 = (_a2 = this._clientCapabilities) === null || _a2 === void 0 ? void 0 : _a2.tasks) === null || _b2 === void 0 ? void 0 : _b2.requests, method, "Client");
+    assertClientRequestTaskCapability(this._clientCapabilities?.tasks?.requests, method, "Client");
   }
   assertTaskHandlerCapability(method) {
-    var _a2;
     if (!this._capabilities) {
       return;
     }
-    assertToolsCallTaskCapability((_a2 = this._capabilities.tasks) === null || _a2 === void 0 ? void 0 : _a2.requests, method, "Server");
+    assertToolsCallTaskCapability(this._capabilities.tasks?.requests, method, "Server");
   }
   async _oninitialize(request) {
     const requestedVersion = request.params.protocolVersion;
@@ -25521,9 +25564,8 @@ var Server = class extends Protocol {
   }
   // Implementation
   async createMessage(params, options) {
-    var _a2, _b2;
     if (params.tools || params.toolChoice) {
-      if (!((_b2 = (_a2 = this._clientCapabilities) === null || _a2 === void 0 ? void 0 : _a2.sampling) === null || _b2 === void 0 ? void 0 : _b2.tools)) {
+      if (!this._clientCapabilities?.sampling?.tools) {
         throw new Error("Client does not support sampling tools capability.");
       }
     }
@@ -25563,18 +25605,17 @@ var Server = class extends Protocol {
    * @returns The result of the elicitation request.
    */
   async elicitInput(params, options) {
-    var _a2, _b2, _c2, _d, _e;
-    const mode = (_a2 = params.mode) !== null && _a2 !== void 0 ? _a2 : "form";
+    const mode = params.mode ?? "form";
     switch (mode) {
       case "url": {
-        if (!((_c2 = (_b2 = this._clientCapabilities) === null || _b2 === void 0 ? void 0 : _b2.elicitation) === null || _c2 === void 0 ? void 0 : _c2.url)) {
+        if (!this._clientCapabilities?.elicitation?.url) {
           throw new Error("Client does not support url elicitation.");
         }
         const urlParams = params;
         return this.request({ method: "elicitation/create", params: urlParams }, ElicitResultSchema, options);
       }
       case "form": {
-        if (!((_e = (_d = this._clientCapabilities) === null || _d === void 0 ? void 0 : _d.elicitation) === null || _e === void 0 ? void 0 : _e.form)) {
+        if (!this._clientCapabilities?.elicitation?.form) {
           throw new Error("Client does not support form elicitation.");
         }
         const formParams = params.mode === "form" ? params : { ...params, mode: "form" };
@@ -25606,8 +25647,7 @@ var Server = class extends Protocol {
    * @returns A function that emits the completion notification when awaited.
    */
   createElicitationCompletionNotifier(elicitationId, options) {
-    var _a2, _b2;
-    if (!((_b2 = (_a2 = this._clientCapabilities) === null || _a2 === void 0 ? void 0 : _a2.elicitation) === null || _b2 === void 0 ? void 0 : _b2.url)) {
+    if (!this._clientCapabilities?.elicitation?.url) {
       throw new Error("Client does not support URL elicitation (required for notifications/elicitation/complete)");
     }
     return () => this.notification({
@@ -25660,7 +25700,7 @@ function isCompletable(schema) {
 }
 function getCompleter(schema) {
   const meta = schema[COMPLETABLE_SYMBOL];
-  return meta === null || meta === void 0 ? void 0 : meta.complete;
+  return meta?.complete;
 }
 var McpZodTypeKind;
 (function(McpZodTypeKind2) {
@@ -25823,7 +25863,6 @@ var McpServer = class {
       })
     }));
     this.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
-      var _a2;
       try {
         const tool = this._registeredTools[request.params.name];
         if (!tool) {
@@ -25833,7 +25872,7 @@ var McpServer = class {
           throw new McpError(ErrorCode.InvalidParams, `Tool ${request.params.name} disabled`);
         }
         const isTaskRequest = !!request.params.task;
-        const taskSupport = (_a2 = tool.execution) === null || _a2 === void 0 ? void 0 : _a2.taskSupport;
+        const taskSupport = tool.execution?.taskSupport;
         const isTaskHandler = "createTask" in tool.handler;
         if ((taskSupport === "required" || taskSupport === "optional") && !isTaskHandler) {
           throw new McpError(ErrorCode.InternalError, `Tool ${request.params.name} has taskSupport '${taskSupport}' but was not registered with registerToolTask`);
@@ -25887,7 +25926,7 @@ var McpServer = class {
       return void 0;
     }
     const inputObj = normalizeObjectSchema(tool.inputSchema);
-    const schemaToParse = inputObj !== null && inputObj !== void 0 ? inputObj : tool.inputSchema;
+    const schemaToParse = inputObj ?? tool.inputSchema;
     const parseResult = await safeParseAsync2(schemaToParse, args);
     if (!parseResult.success) {
       const error2 = "error" in parseResult ? parseResult.error : "Unknown error";
@@ -25951,7 +25990,6 @@ var McpServer = class {
    * Handles automatic task polling for tools with taskSupport 'optional'.
    */
   async handleAutomaticTaskPolling(tool, request, extra) {
-    var _a2;
     if (!extra.taskStore) {
       throw new Error("No task store provided for task-capable tool.");
     }
@@ -25964,7 +26002,7 @@ var McpServer = class {
     );
     const taskId = createTaskResult.task.taskId;
     let task = createTaskResult.task;
-    const pollInterval = (_a2 = task.pollInterval) !== null && _a2 !== void 0 ? _a2 : 5e3;
+    const pollInterval = task.pollInterval ?? 5e3;
     while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
       await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
       const updatedTask = await extra.taskStore.getTask(taskId);
@@ -26009,7 +26047,7 @@ var McpServer = class {
       return EMPTY_COMPLETION_RESULT;
     }
     const promptShape = getObjectShape(prompt.argsSchema);
-    const field = promptShape === null || promptShape === void 0 ? void 0 : promptShape[request.params.argument.name];
+    const field = promptShape?.[request.params.argument.name];
     if (!isCompletable(field)) {
       return EMPTY_COMPLETION_RESULT;
     }
@@ -26094,7 +26132,6 @@ var McpServer = class {
       }
       throw new McpError(ErrorCode.InvalidParams, `Resource ${uri} not found`);
     });
-    this.setCompletionRequestHandler();
     this._resourceHandlersInitialized = true;
   }
   setPromptRequestHandlers() {
@@ -26142,7 +26179,6 @@ var McpServer = class {
         return await Promise.resolve(cb(extra));
       }
     });
-    this.setCompletionRequestHandler();
     this._promptHandlersInitialized = true;
   }
   resource(name, uriOrTemplate, ...rest) {
@@ -26250,6 +26286,11 @@ var McpServer = class {
       }
     };
     this._registeredResourceTemplates[name] = registeredResourceTemplate;
+    const variableNames = template.uriTemplate.variableNames;
+    const hasCompleter = Array.isArray(variableNames) && variableNames.some((v) => !!template.completeCallback(v));
+    if (hasCompleter) {
+      this.setCompletionRequestHandler();
+    }
     return registeredResourceTemplate;
   }
   _createRegisteredPrompt(name, title, description, argsSchema, callback) {
@@ -26282,14 +26323,23 @@ var McpServer = class {
       }
     };
     this._registeredPrompts[name] = registeredPrompt;
+    if (argsSchema) {
+      const hasCompletable = Object.values(argsSchema).some((field) => {
+        const inner = field instanceof ZodOptional ? field._def?.innerType : field;
+        return isCompletable(inner);
+      });
+      if (hasCompletable) {
+        this.setCompletionRequestHandler();
+      }
+    }
     return registeredPrompt;
   }
-  _createRegisteredTool(name, title, description, inputSchema25, outputSchema, annotations, execution, _meta, handler) {
+  _createRegisteredTool(name, title, description, inputSchema26, outputSchema, annotations, execution, _meta, handler) {
     validateAndWarnToolName(name);
     const registeredTool = {
       title,
       description,
-      inputSchema: getZodSchemaObject(inputSchema25),
+      inputSchema: getZodSchemaObject(inputSchema26),
       outputSchema: getZodSchemaObject(outputSchema),
       annotations,
       execution,
@@ -26314,6 +26364,8 @@ var McpServer = class {
           registeredTool.description = updates.description;
         if (typeof updates.paramsSchema !== "undefined")
           registeredTool.inputSchema = objectFromShape(updates.paramsSchema);
+        if (typeof updates.outputSchema !== "undefined")
+          registeredTool.outputSchema = objectFromShape(updates.outputSchema);
         if (typeof updates.callback !== "undefined")
           registeredTool.handler = updates.callback;
         if (typeof updates.annotations !== "undefined")
@@ -26338,7 +26390,7 @@ var McpServer = class {
       throw new Error(`Tool ${name} is already registered`);
     }
     let description;
-    let inputSchema25;
+    let inputSchema26;
     let outputSchema;
     let annotations;
     if (typeof rest[0] === "string") {
@@ -26347,7 +26399,7 @@ var McpServer = class {
     if (rest.length > 1) {
       const firstArg = rest[0];
       if (isZodRawShapeCompat(firstArg)) {
-        inputSchema25 = rest.shift();
+        inputSchema26 = rest.shift();
         if (rest.length > 1 && typeof rest[0] === "object" && rest[0] !== null && !isZodRawShapeCompat(rest[0])) {
           annotations = rest.shift();
         }
@@ -26356,7 +26408,7 @@ var McpServer = class {
       }
     }
     const callback = rest[0];
-    return this._createRegisteredTool(name, void 0, description, inputSchema25, outputSchema, annotations, { taskSupport: "forbidden" }, void 0, callback);
+    return this._createRegisteredTool(name, void 0, description, inputSchema26, outputSchema, annotations, { taskSupport: "forbidden" }, void 0, callback);
   }
   /**
    * Registers a tool with a config object and callback.
@@ -26365,8 +26417,8 @@ var McpServer = class {
     if (this._registeredTools[name]) {
       throw new Error(`Tool ${name} is already registered`);
     }
-    const { title, description, inputSchema: inputSchema25, outputSchema, annotations, _meta } = config2;
-    return this._createRegisteredTool(name, title, description, inputSchema25, outputSchema, annotations, { taskSupport: "forbidden" }, _meta, cb);
+    const { title, description, inputSchema: inputSchema26, outputSchema, annotations, _meta } = config2;
+    return this._createRegisteredTool(name, title, description, inputSchema26, outputSchema, annotations, { taskSupport: "forbidden" }, _meta, cb);
   }
   prompt(name, ...rest) {
     if (this._registeredPrompts[name]) {
@@ -26488,7 +26540,7 @@ function promptArgumentsFromSchema(schema) {
 }
 function getMethodValue(schema) {
   const shape = getObjectShape(schema);
-  const methodSchema = shape === null || shape === void 0 ? void 0 : shape.method;
+  const methodSchema = shape?.method;
   if (!methodSchema) {
     throw new Error("Schema is missing a method literal");
   }
@@ -27393,8 +27445,71 @@ var registerDownloadObjectTool = (server) => {
   );
 };
 
-// src/tools/objects/list_objects.ts
+// src/tools/objects/download_object_safe.ts
+import fs from "fs";
 var inputSchema13 = {
+  bucket_name: external_exports.string().describe("The name of the GCS bucket."),
+  object_name: external_exports.string().describe("The name of the object to download."),
+  file_path: external_exports.string().describe("The local path to save the downloaded file to.")
+};
+async function downloadObjectSafe(params) {
+  try {
+    if (fs.existsSync(params.file_path)) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify({
+              success: false,
+              error: `File already exists at path: ${params.file_path}`,
+              error_type: "AlreadyExists"
+            })
+          }
+        ]
+      };
+    }
+    const storage = apiClientFactory.getStorageClient();
+    await storage.bucket(params.bucket_name).file(params.object_name).download({ destination: params.file_path });
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({
+            success: true,
+            message: `Object ${params.object_name} from bucket ${params.bucket_name} downloaded to ${params.file_path}.`
+          })
+        }
+      ]
+    };
+  } catch (e) {
+    const error2 = e;
+    logger.error(error2.message);
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({
+            success: false,
+            error: error2.message
+          })
+        }
+      ]
+    };
+  }
+}
+var registerDownloadObjectSafeTool = (server) => {
+  server.registerTool(
+    "download_object_safe",
+    {
+      description: "Downloads an object from GCS to a local file. Fails if the destination file already exists.",
+      inputSchema: inputSchema13
+    },
+    downloadObjectSafe
+  );
+};
+
+// src/tools/objects/list_objects.ts
+var inputSchema14 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   prefix: external_exports.string().optional().describe("Filters results to objects whose names begin with this prefix."),
   delimiter: external_exports.string().optional().describe(
@@ -27471,14 +27586,14 @@ var registerListObjectsTool = (server) => {
     "list_objects",
     {
       description: "Lists the names of objects in a Google Cloud Storage (GCS) bucket. Supports filtering by prefix, directory-like listing with a delimiter, pagination, and listing object versions.",
-      inputSchema: inputSchema13
+      inputSchema: inputSchema14
     },
     listObjects
   );
 };
 
 // src/tools/objects/move_object.ts
-var inputSchema14 = {
+var inputSchema15 = {
   source_bucket_name: external_exports.string().describe("The name of the source GCS bucket."),
   source_object_name: external_exports.string().describe("The name of the source object."),
   destination_bucket_name: external_exports.string().describe("The name of the destination GCS bucket."),
@@ -27532,7 +27647,7 @@ var registerMoveObjectTool = (server) => {
     "move_object",
     {
       description: "Moves an object from one bucket to another or renames it within the same bucket by copying and deleting the original.",
-      inputSchema: inputSchema14
+      inputSchema: inputSchema15
     },
     moveObject
   );
@@ -27675,7 +27790,7 @@ function detectBufferType(buffer, contentType, fileName) {
 
 // src/tools/objects/read_object_content.ts
 var { decode } = iconv;
-var inputSchema15 = {
+var inputSchema16 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   object_name: external_exports.string().describe("The name of the object.")
 };
@@ -27810,14 +27925,14 @@ var registerReadObjectContentTool = (server) => {
     "read_object_content",
     {
       description: "Reads the content of a specific object.",
-      inputSchema: inputSchema15
+      inputSchema: inputSchema16
     },
     readObjectContent
   );
 };
 
 // src/tools/objects/read_object_metadata.ts
-var inputSchema16 = {
+var inputSchema17 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   object_name: external_exports.string().describe("The name of the object.")
 };
@@ -27874,14 +27989,14 @@ var registerReadObjectMetadataTool = (server) => {
     "read_object_metadata",
     {
       description: "Reads metadata for a specific object.",
-      inputSchema: inputSchema16
+      inputSchema: inputSchema17
     },
     readObjectMetadata
   );
 };
 
 // src/tools/objects/update_object_metadata.ts
-var inputSchema17 = {
+var inputSchema18 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   object_name: external_exports.string().describe("The name of the object to update."),
   metadata: external_exports.record(external_exports.string()).describe("A dictionary of metadata to set on the object.")
@@ -27935,16 +28050,16 @@ var registerUpdateObjectMetadataTool = (server) => {
     "update_object_metadata",
     {
       description: "Updates the metadata of an existing object.",
-      inputSchema: inputSchema17
+      inputSchema: inputSchema18
     },
     updateObjectMetadata
   );
 };
 
 // src/tools/objects/upload_object.ts
-import * as fs from "fs";
+import * as fs2 from "fs";
 import * as path2 from "path";
-var inputSchema18 = {
+var inputSchema19 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   file_path: external_exports.string().describe("The local path of the file to upload."),
   object_name: external_exports.string().optional().describe(
@@ -27955,7 +28070,7 @@ var inputSchema18 = {
 async function uploadObject(params) {
   try {
     logger.info(`Uploading file: ${params.file_path} to bucket: ${params.bucket_name}`);
-    if (!fs.existsSync(params.file_path)) {
+    if (!fs2.existsSync(params.file_path)) {
       return {
         content: [
           {
@@ -28017,15 +28132,15 @@ var registerUploadObjectTool = (server) => {
     "upload_object",
     {
       description: "Uploads a file to a GCS bucket.",
-      inputSchema: inputSchema18
+      inputSchema: inputSchema19
     },
     uploadObject
   );
 };
 
 // src/tools/objects/upload_object_safe.ts
-import * as fs2 from "fs";
-var inputSchema19 = {
+import * as fs3 from "fs";
+var inputSchema20 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   file_path: external_exports.string().describe("The local path of the file to upload."),
   object_name: external_exports.string().optional().describe(
@@ -28036,7 +28151,7 @@ var inputSchema19 = {
 async function uploadObjectSafe(params) {
   try {
     logger.info(`Uploading safe file: ${params.file_path} to bucket: ${params.bucket_name}`);
-    if (!fs2.existsSync(params.file_path)) {
+    if (!fs3.existsSync(params.file_path)) {
       const errorMsg = `File not found at path: ${params.file_path}`;
       logger.error(errorMsg);
       return {
@@ -28059,7 +28174,7 @@ async function uploadObjectSafe(params) {
     }
     const file = bucket.file(objectName, { generation: 0 });
     const contentType = params.content_type || getContentType(params.file_path);
-    await file.save(fs2.readFileSync(params.file_path), {
+    await file.save(fs3.readFileSync(params.file_path), {
       contentType
     });
     const [metadata] = await file.getMetadata();
@@ -28104,14 +28219,14 @@ var registerUploadObjectSafeTool = (server) => {
     "upload_object_safe",
     {
       description: "Uploads a file to a GCS bucket. Fails if the object already exists.",
-      inputSchema: inputSchema19
+      inputSchema: inputSchema20
     },
     uploadObjectSafe
   );
 };
 
 // src/tools/objects/write_object.ts
-var inputSchema20 = {
+var inputSchema21 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   object_name: external_exports.string().describe("The name of the object to write."),
   content: external_exports.string().describe("The content to write to the object, encoded in base64."),
@@ -28183,14 +28298,14 @@ var registerWriteObjectTool = (server) => {
     "write_object",
     {
       description: "Writes a new object to the bucket.",
-      inputSchema: inputSchema20
+      inputSchema: inputSchema21
     },
     writeObject
   );
 };
 
 // src/tools/objects/write_object_safe.ts
-var inputSchema21 = {
+var inputSchema22 = {
   bucket_name: external_exports.string().describe("The name of the GCS bucket."),
   object_name: external_exports.string().describe("The name of the object to write."),
   content: external_exports.string().describe("The content to write to the object, encoded in base64."),
@@ -28269,7 +28384,7 @@ var registerWriteObjectSafeTool = (server) => {
     "write_object_safe",
     {
       description: "Writes a new object to the bucket. Fails if the object already exists.",
-      inputSchema: inputSchema21
+      inputSchema: inputSchema22
     },
     writeObjectSafe
   );
@@ -28277,7 +28392,7 @@ var registerWriteObjectSafeTool = (server) => {
 
 // src/tools/insights/get_metadata_table_schema.ts
 var serviceName = "storageinsights.googleapis.com";
-var inputSchema22 = {
+var inputSchema23 = {
   datasetConfigName: external_exports.string().describe("The name of the dataset configuration."),
   datasetConfigLocation: external_exports.string().describe("The location of the dataset configuration."),
   projectId: external_exports.string().optional().describe("The project ID to check Storage Insights availability for.")
@@ -28511,14 +28626,14 @@ var registerGetMetadataTableSchemaTool = (server) => {
     "get_metadata_table_schema",
     {
       description: "Checks if GCS insights service is enabled and returns the BigQuery table schema for a given insights dataset configuration in JSON format. Also returns hints for each column in the table",
-      inputSchema: inputSchema22
+      inputSchema: inputSchema23
     },
     getMetadataTableSchema
   );
 };
 
 // src/tools/insights/execute_insights_query.ts
-var inputSchema23 = {
+var inputSchema24 = {
   config: external_exports.string().describe(
     "The JSON object of the BigQuery table schema for a given insights dataset configuration."
   ),
@@ -28630,7 +28745,7 @@ var registerExecuteInsightsQueryTool = (server) => {
     "execute_insights_query",
     {
       description: "Executes a BigQuery SQL query against an insights dataset and returns the result.",
-      inputSchema: inputSchema23
+      inputSchema: inputSchema24
     },
     executeInsightsQuery
   );
@@ -28638,7 +28753,7 @@ var registerExecuteInsightsQueryTool = (server) => {
 
 // src/tools/insights/list_insights_configs.ts
 var serviceName2 = "storageinsights.googleapis.com";
-var inputSchema24 = {
+var inputSchema25 = {
   projectId: external_exports.string().optional().describe("The project ID to list Storage Insights dataset configurations for.")
 };
 async function listInsightsConfigs(params) {
@@ -28703,7 +28818,7 @@ var registerListInsightsConfigsTool = (server) => {
     "list_insights_configs",
     {
       description: "Lists the names of all Storage Insights dataset configurations for a given project.",
-      inputSchema: inputSchema24
+      inputSchema: inputSchema25
     },
     listInsightsConfigs
   );
@@ -28720,7 +28835,7 @@ var commonSafeTools = [
   registerListObjectsTool,
   registerReadObjectContentTool,
   registerReadObjectMetadataTool,
-  registerDownloadObjectTool,
+  registerDownloadObjectSafeTool,
   registerDeleteObjectTool,
   registerGetMetadataTableSchemaTool,
   registerExecuteInsightsQueryTool,
@@ -28740,7 +28855,8 @@ var otherDestructiveTools = [
   registerDeleteBucketTool,
   registerUpdateBucketLabelsTool,
   registerMoveObjectTool,
-  registerUpdateObjectMetadataTool
+  registerUpdateObjectMetadataTool,
+  registerDownloadObjectTool
 ];
 
 // ../../node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
@@ -28786,8 +28902,7 @@ var StdioServerTransport = class {
       this.processReadBuffer();
     };
     this._onerror = (error2) => {
-      var _a2;
-      (_a2 = this.onerror) === null || _a2 === void 0 ? void 0 : _a2.call(this, error2);
+      this.onerror?.(error2);
     };
   }
   /**
@@ -28802,21 +28917,19 @@ var StdioServerTransport = class {
     this._stdin.on("error", this._onerror);
   }
   processReadBuffer() {
-    var _a2, _b2;
     while (true) {
       try {
         const message = this._readBuffer.readMessage();
         if (message === null) {
           break;
         }
-        (_a2 = this.onmessage) === null || _a2 === void 0 ? void 0 : _a2.call(this, message);
+        this.onmessage?.(message);
       } catch (error2) {
-        (_b2 = this.onerror) === null || _b2 === void 0 ? void 0 : _b2.call(this, error2);
+        this.onerror?.(error2);
       }
     }
   }
   async close() {
-    var _a2;
     this._stdin.off("data", this._ondata);
     this._stdin.off("error", this._onerror);
     const remainingDataListeners = this._stdin.listenerCount("data");
@@ -28824,7 +28937,7 @@ var StdioServerTransport = class {
       this._stdin.pause();
     }
     this._readBuffer.clear();
-    (_a2 = this.onclose) === null || _a2 === void 0 ? void 0 : _a2.call(this);
+    this.onclose?.();
   }
   send(message) {
     return new Promise((resolve5) => {
@@ -28841,7 +28954,7 @@ var StdioServerTransport = class {
 // package.json
 var package_default = {
   name: "@google-cloud/storage-mcp",
-  version: "0.3.2",
+  version: "0.4.0",
   type: "module",
   main: "dist/bundle.js",
   bin: {
@@ -28891,7 +29004,7 @@ var package_default = {
     eslint: "^9.32.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-license-header": "^0.8.0",
+    "eslint-plugin-license-header": "^0.9.0",
     "eslint-plugin-prettier": "^5.5.4",
     prettier: "^3.6.2",
     turbo: "latest",
@@ -28902,13 +29015,13 @@ var package_default = {
   dependencies: {
     "@google-cloud/bigquery": "^8.0.0",
     "@google-cloud/service-usage": "^4.2.0",
-    "@google-cloud/storage": "^7.17.1",
+    "@google-cloud/storage": "^7.19.0",
     "@google-cloud/storageinsights": "^2.2.0",
-    "@modelcontextprotocol/sdk": "^1.24.0",
+    "@modelcontextprotocol/sdk": "^1.26.0",
     "@types/yargs": "^17.0.33",
     chardet: "^2.1.0",
     "google-auth-library": "^9.11.0",
-    googleapis: "^169.0.0",
+    googleapis: "^171.0.0",
     "iconv-lite": "^0.7.0",
     "mime-types": "^2.1.35",
     yargs: "^18.0.0",
@@ -34283,10 +34396,10 @@ For example, you can use the tools to:
 ## GCS Reference Documentation
 
 If additional context or information is needed on GCS, reference documentation can be found at https://cloud.google.com/storage/docs.`;
-var initializeGeminiCLI = async (local = false, enableDestructiveTools = false, fs3 = { mkdir, writeFile: writeFile2 }) => {
+var initializeGeminiCLI = async (local = false, enableDestructiveTools = false, fs4 = { mkdir, writeFile: writeFile2 }) => {
   try {
     const extensionDir = join2(os.homedir(), ".gemini", "extensions", "storage-mcp");
-    await fs3.mkdir(extensionDir, { recursive: true });
+    await fs4.mkdir(extensionDir, { recursive: true });
     const extensionFile = join2(extensionDir, "gemini-extension.json");
     const commandArgs = local ? ["-y", "storage-mcp"] : ["-y", "@google-cloud/storage-mcp"];
     if (enableDestructiveTools) {
@@ -34304,10 +34417,10 @@ var initializeGeminiCLI = async (local = false, enableDestructiveTools = false,
         }
       }
     };
-    await fs3.writeFile(extensionFile, JSON.stringify(extensionJson, null, 2));
+    await fs4.writeFile(extensionFile, JSON.stringify(extensionJson, null, 2));
     console.log(`Created: ${extensionFile}`);
     const geminiMdDestPath = join2(extensionDir, "GEMINI.md");
-    await fs3.writeFile(geminiMdDestPath, geminiMdContent);
+    await fs4.writeFile(geminiMdDestPath, geminiMdContent);
     console.log(`Created: ${geminiMdDestPath}`);
     console.log(`\u{1F331} storage-mcp Gemini CLI extension initialized.`);
   } catch (err) {