@kyo-so/cli 0.15.1 → 0.15.2

package/dist/bin/kyoso.js

@@ -183964,7 +183964,7 @@ var JUDGE_MAX_OUTPUT_TOKENS = 4096;
 var RAW_OUTPUT_MAX_CHARS = 16384;
 var TRACE_DIR = ".kyoso/traces";
 var KYOSO_CHILD_AGENT = "KYOSO_CHILD_AGENT";
-var KYOSO_VERSION = "0.15.1";
+var KYOSO_VERSION = "0.15.2";
 
 // src/utils/pathContainment.ts
 import { resolve, sep as sep2 } from "node:path";
@@ -184269,7 +184269,7 @@ var defaultConfig = {
       enabled: true,
       type: "acp",
       command: "npx",
-      args: ["-y", "@agentclientprotocol/codex-acp@1.1.5"],
+      args: ["-y", "@agentclientprotocol/codex-acp@1.1.7"],
       role: "implementation_reviewer",
       timeoutMs: DEFAULT_AGENT_TIMEOUT_MS,
       allowProjectProvider: [],
@@ -184294,7 +184294,7 @@ var defaultConfig = {
       enabled: true,
       type: "acp",
       command: "npx",
-      args: ["-y", "@agentclientprotocol/claude-agent-acp@0.60.0"],
+      args: ["-y", "@agentclientprotocol/claude-agent-acp@0.61.0"],
       role: "architecture_security_reviewer",
       timeoutMs: DEFAULT_AGENT_TIMEOUT_MS,
       env: {
@@ -187156,9 +187156,9 @@ var PLUGIN_RUNTIME_COMPATIBILITY_SCHEMA_VERSION = 2;
 var MINIMUM_SUPPORTED_CODEX_VERSION = "0.144.0-alpha.4";
 var PLUGIN_RUNTIME_EXPECTED_CONTRACT = {
   distribution: {
-    pluginVersion: "0.7.5",
+    pluginVersion: "0.7.6",
     mcpCommand: "npx",
-    mcpPackagePin: "@kyo-so/cli@0.15.0",
+    mcpPackagePin: "@kyo-so/cli@0.15.1",
     mcpExecutable: "kyoso"
   },
   marketplace: {
@@ -191322,6 +191322,9 @@ var zToolCallUpdate = object({
   title: defaultOnError(string2().nullish(), () => {
     return;
   }),
+  name: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
   content: defaultOnError(vecSkipError(zToolCallContent).nullish(), () => {
     return;
   }),
@@ -192433,6 +192436,9 @@ var zContentChunk = object({
 var zToolCall = object({
   toolCallId: zToolCallId,
   title: string2(),
+  name: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
   kind: defaultOnError(zToolKind.optional(), () => {
     return;
   }),
@@ -193356,37 +193362,71 @@ var zCancelRequestNotification = object({
   })
 });
 
-// node_modules/@agentclientprotocol/sdk/dist/schema/guards.gen.js
-var zGuardCreateElicitationRequestForm = zElicitationFormMode.and(object({ mode: literal("form") })).and(object({ message: string2() }));
-var zGuardCreateElicitationRequestUrl = zElicitationUrlMode.and(object({ mode: literal("url") })).and(object({ message: string2() }));
-var zGuardCreateElicitationRequestCustom = union([zElicitationSessionScope, zElicitationRequestScope]).and(object({ message: string2() }));
-var zGuardElicitationPropertySchemaString = zStringPropertySchema.and(object({ type: literal("string") }));
-var zGuardElicitationPropertySchemaNumber = zNumberPropertySchema.and(object({ type: literal("number") }));
-var zGuardElicitationPropertySchemaInteger = zIntegerPropertySchema.and(object({ type: literal("integer") }));
-var zGuardElicitationPropertySchemaBoolean = zBooleanPropertySchema.and(object({ type: literal("boolean") }));
-var zGuardElicitationPropertySchemaArray = zMultiSelectPropertySchema.and(object({ type: literal("array") }));
-var zGuardMultiSelectItemsString = zStringMultiSelectItems.and(object({ type: literal("string") }));
-var zGuardCreateElicitationResponseAccept = zElicitationAcceptAction.and(object({ action: literal("accept") }));
-var zGuardCreateElicitationResponseDecline = object({
-  action: literal("decline")
-});
-var zGuardCreateElicitationResponseCancel = object({
-  action: literal("cancel")
-});
 // node_modules/@agentclientprotocol/sdk/dist/jsonrpc.js
 var CANCEL_REQUEST_METHOD = "$/cancel_request";
+function isRequestMessage(value) {
+  return isJsonRpcEnvelope(value) && "id" in value && typeof value["method"] === "string" && isJsonRpcId(value["id"]);
+}
+function isResponseMessage(value) {
+  if (!isJsonRpcEnvelope(value) || "method" in value) {
+    return false;
+  }
+  if (!("id" in value) || !isJsonRpcId(value["id"])) {
+    return false;
+  }
+  const hasResult = Object.hasOwn(value, "result");
+  const hasError = Object.hasOwn(value, "error");
+  if (hasResult === hasError) {
+    return false;
+  }
+  return !hasError || isErrorResponse(value["error"]);
+}
+function isNotificationMessage(value) {
+  return isJsonRpcEnvelope(value) && !("id" in value) && typeof value["method"] === "string";
+}
 function isRecord11(value) {
   return typeof value === "object" && value !== null;
 }
+function isJsonRpcEnvelope(value) {
+  return isRecord11(value) && value["jsonrpc"] === "2.0";
+}
 function isJsonRpcId(value) {
   return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
+function isResponseShapedMessage(value) {
+  return isRecord11(value) && !("method" in value) && (("id" in value) || ("result" in value) || ("error" in value));
+}
+function isResponseBatch(batch) {
+  let hasValidCall = false;
+  let hasValidResponse = false;
+  let hasCallShape = false;
+  let hasResponseShape = false;
+  for (const entry of batch) {
+    hasValidCall ||= isRequestMessage(entry) || isNotificationMessage(entry);
+    hasValidResponse ||= isResponseMessage(entry);
+    if (!isRecord11(entry)) {
+      continue;
+    }
+    hasCallShape ||= "method" in entry;
+    hasResponseShape ||= "result" in entry || "error" in entry;
+  }
+  if (hasValidCall) {
+    return false;
+  }
+  if (hasValidResponse) {
+    return true;
+  }
+  return hasResponseShape && !hasCallShape;
+}
 function cancelRequestId(params) {
   if (!isRecord11(params) || !isJsonRpcId(params["requestId"])) {
     return;
   }
   return params["requestId"];
 }
+function isErrorResponse(value) {
+  return isRecord11(value) && typeof value["code"] === "number" && Number.isInteger(value["code"]) && typeof value["message"] === "string";
+}
 var Handled = {
   yes() {
     return { handled: true };
@@ -193515,6 +193555,9 @@ class ConnectionContext {
   sendNotification(method, params) {
     return this.connection.sendNotification(method, params);
   }
+  sendBatch(entries) {
+    return this.connection.sendBatch(entries);
+  }
   sendCancelRequest(requestId) {
     return this.connection.sendCancelRequest(requestId);
   }
@@ -193542,6 +193585,7 @@ class Connection {
   retryQueue = [];
   context = new ConnectionContext(this);
   receiveReader;
+  allowBatches = true;
   constructor(requestHandlerOrStream, notificationHandlerOrHandlers, streamOrOptions, options) {
     if (typeof requestHandlerOrStream === "function") {
       const requestHandler = requestHandlerOrStream;
@@ -193550,16 +193594,13 @@ class Connection {
       this.initialize(stream2, [
         ...options?.handlers ?? [],
         this.legacyHandler(requestHandler, notificationHandler)
-      ]);
+      ], options);
       return;
     }
     const stream = requestHandlerOrStream;
     const handlers = notificationHandlerOrHandlers;
     const connectionOptions = streamOrOptions;
-    this.initialize(stream, [
-      ...connectionOptions?.handlers ?? [],
-      ...handlers
-    ]);
+    this.initialize(stream, [...connectionOptions?.handlers ?? [], ...handlers], connectionOptions);
   }
   static builder() {
     return new ConnectionBuilder;
@@ -193604,14 +193645,73 @@ class Connection {
     if (this.abortController.signal.aborted) {
       return rejectedPromise(this.closedReason());
     }
+    const request = this.prepareRequest(method, params, mapResponse, options);
+    const requestSent = this.sendWireMessage(request.message);
+    requestSent.catch(() => {});
+    if (options.cancellationSignal?.aborted) {
+      request.cancel();
+    }
+    return request.response;
+  }
+  sendBatch(entries) {
+    if (this.abortController.signal.aborted) {
+      return rejectedPromise(this.closedReason());
+    }
+    if (!this.allowBatches) {
+      return rejectedPromise(new TypeError("JSON-RPC batches are not supported on this connection"));
+    }
+    if (entries.length === 0) {
+      return rejectedPromise(new TypeError("JSON-RPC batch must contain at least one entry"));
+    }
+    const messages = [];
+    const cancellations = [];
+    const outputs = [];
+    for (const entry of entries) {
+      if (entry.kind === "notification") {
+        messages.push({
+          jsonrpc: "2.0",
+          method: entry.method,
+          params: entry.params
+        });
+        outputs.push(Promise.resolve(undefined));
+        continue;
+      }
+      const request = this.prepareRequest(entry.method, entry.params, entry.mapResponse, entry.options);
+      messages.push(request.message);
+      outputs.push(request.response);
+      cancellations.push({
+        signal: entry.options?.cancellationSignal,
+        cancel: request.cancel
+      });
+    }
+    const batch = messages;
+    const batchSent = this.sendWireMessage(batch);
+    for (const cancellation of cancellations) {
+      if (cancellation.signal?.aborted) {
+        cancellation.cancel();
+      }
+    }
+    const response = Promise.all([batchSent, ...outputs]).then(([, ...resolved]) => resolved);
+    response.catch(() => {});
+    return response;
+  }
+  sendCancelRequest(requestId) {
+    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId });
+  }
+  sendNotification(method, params) {
+    if (this.abortController.signal.aborted) {
+      return rejectedPromise(this.closedReason());
+    }
+    return this.sendWireMessage({ jsonrpc: "2.0", method, params });
+  }
+  prepareRequest(method, params, mapResponse, options = {}) {
     const id = this.nextRequestId++;
     let cancel = () => {};
-    const responsePromise = new Promise((resolve9, reject) => {
+    const response = new Promise((resolve9, reject) => {
       const pendingResponse = {
-        resolve: (response) => {
+        resolve: (value) => {
           try {
-            const value = mapResponse ? mapResponse(response) : response;
-            resolve9(value);
+            resolve9(mapResponse ? mapResponse(value) : value);
           } catch (error51) {
             reject(error51);
           }
@@ -193634,27 +193734,12 @@ class Connection {
       };
       this.pendingResponses.set(id, pendingResponse);
     });
-    responsePromise.catch(() => {});
-    const requestSent = this.sendMessage({
-      jsonrpc: "2.0",
-      id,
-      method,
-      params
-    });
-    requestSent.catch(() => {});
-    if (options.cancellationSignal?.aborted) {
-      cancel();
-    }
-    return responsePromise;
-  }
-  sendCancelRequest(requestId) {
-    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId });
-  }
-  sendNotification(method, params) {
-    if (this.abortController.signal.aborted) {
-      return rejectedPromise(this.closedReason());
-    }
-    return this.sendMessage({ jsonrpc: "2.0", method, params });
+    response.catch(() => {});
+    return {
+      message: { jsonrpc: "2.0", id, method, params },
+      response,
+      cancel: () => cancel()
+    };
   }
   close(error51) {
     if (this.abortController.signal.aborted) {
@@ -193673,9 +193758,10 @@ class Connection {
     this.incomingRequests.clear();
     this.receiveReader?.cancel(closeError).catch(() => {});
   }
-  initialize(stream, handlers) {
+  initialize(stream, handlers, options) {
     this.stream = stream;
     this.staticHandlers = handlers;
+    this.allowBatches = options?.allowBatches ?? true;
     this.closedPromise = new Promise((resolve9) => {
       this.abortController.signal.addEventListener("abort", () => resolve9());
     });
@@ -193711,7 +193797,7 @@ class Connection {
           if (!message) {
             continue;
           }
-          this.receiveMessage(message);
+          this.receiveWireMessage(message);
         }
       } finally {
         if (this.receiveReader === reader) {
@@ -193725,24 +193811,91 @@ class Connection {
       this.close(closeError);
     }
   }
-  receiveMessage(message) {
-    if (this.abortController.signal.aborted) {
+  receiveWireMessage(message) {
+    if (Array.isArray(message)) {
+      if (!this.allowBatches) {
+        this.close(new TypeError("JSON-RPC batches are not supported on this connection"));
+        return;
+      }
+      this.receiveBatch(message);
       return;
     }
     if (!isRecord11(message)) {
       console.error("Invalid message", { message });
       return;
     }
+    this.receiveMessage(message);
+  }
+  receiveBatch(batch) {
+    if (batch.length === 0) {
+      this.sendWireMessage({
+        jsonrpc: "2.0",
+        id: null,
+        error: RequestError.invalidRequest(batch).toErrorResponse()
+      }).catch(() => {});
+      return;
+    }
+    const responseBatch = isResponseBatch(batch);
+    const responseCount = responseBatch ? 0 : batch.reduce((count, message) => count + (isNotificationMessage(message) ? 0 : 1), 0);
+    let remaining = responseCount;
+    let remainingNotifications = batch.reduce((count, message) => count + (isNotificationMessage(message) ? 1 : 0), 0);
+    let responseSent = false;
+    const responses = [];
+    const sendResponsesIfReady = async () => {
+      if (responseSent || remaining !== 0 || remainingNotifications !== 0 || responses.length === 0) {
+        return;
+      }
+      responseSent = true;
+      await this.sendWireMessage(responses);
+    };
+    const collectResponse = async (response) => {
+      responses.push(response);
+      remaining -= 1;
+      await sendResponsesIfReady();
+    };
+    for (const message of batch) {
+      if (responseBatch) {
+        if (isResponseShapedMessage(message)) {
+          this.receiveMessage(message);
+        }
+        continue;
+      }
+      if (!isRequestMessage(message) && !isNotificationMessage(message)) {
+        collectResponse({
+          jsonrpc: "2.0",
+          id: null,
+          error: RequestError.invalidRequest(message).toErrorResponse()
+        }).catch(() => {});
+        continue;
+      }
+      const processing = this.receiveMessage(message, isRequestMessage(message) ? collectResponse : undefined);
+      if (isNotificationMessage(message)) {
+        processing.finally(() => {
+          remainingNotifications -= 1;
+          sendResponsesIfReady().catch((error51) => this.close(error51));
+        });
+      }
+    }
+  }
+  receiveMessage(message, sendResponse) {
+    if (this.abortController.signal.aborted) {
+      return Promise.resolve();
+    }
+    if (!isRecord11(message)) {
+      console.error("Invalid message", { message });
+      return Promise.resolve();
+    }
     if ("method" in message) {
       if (!("id" in message)) {
         this.handleProtocolNotification(message);
       }
-      this.processIncomingMessage(this.toIncomingMessage(message)).catch((error51) => this.close(error51));
+      return this.processIncomingMessage(this.toIncomingMessage(message, sendResponse)).catch((error51) => this.close(error51));
     } else if ("id" in message) {
       this.handleResponse(message);
     } else {
       console.error("Invalid message", { message });
     }
+    return Promise.resolve();
   }
   async processIncomingMessage(message) {
     if (this.abortController.signal.aborted) {
@@ -193786,7 +193939,7 @@ class Connection {
       }
     }
   }
-  toIncomingMessage(message) {
+  toIncomingMessage(message, sendResponse) {
     if ("id" in message) {
       const abortController = new AbortController;
       this.incomingRequests.set(message.id, abortController);
@@ -193801,11 +193954,14 @@ class Connection {
         params: message.params,
         raw: message,
         signal: abortController.signal,
-        responder: new RequestResponder(message.id, (result) => this.sendMessage({
-          jsonrpc: "2.0",
-          id: message.id,
-          ...result
-        }), abortController.signal, finishRequest)
+        responder: new RequestResponder(message.id, (result) => {
+          const response = {
+            jsonrpc: "2.0",
+            id: message.id,
+            ...result
+          };
+          return sendResponse ? sendResponse(response) : this.sendWireMessage(response);
+        }, abortController.signal, finishRequest)
       };
     }
     return {
@@ -193820,13 +193976,13 @@ class Connection {
     if (pendingResponse) {
       this.pendingResponses.delete(response.id);
       pendingResponse.cleanup?.();
-      if ("result" in response) {
+      if (!isResponseMessage(response)) {
+        pendingResponse.reject(RequestError.invalidRequest(response));
+      } else if ("result" in response) {
         pendingResponse.resolve(response.result);
-      } else if ("error" in response && isRecord11(response.error)) {
+      } else {
         const { code, message, data } = response.error;
         pendingResponse.reject(new RequestError(code, message, data));
-      } else {
-        pendingResponse.reject(RequestError.invalidRequest(response));
       }
     } else {
       console.error("Got response to unknown request", response.id);
@@ -193849,7 +194005,7 @@ class Connection {
   closedReason() {
     return this.abortController.signal.reason ?? new Error("ACP connection closed");
   }
-  async sendMessage(message) {
+  async sendWireMessage(message) {
     if (this.abortController.signal.aborted) {
       return rejectedPromise(this.closedReason());
     }
@@ -194032,7 +194188,7 @@ function ndJsonStream(output2, input2) {
         if (trimmedLine) {
           try {
             const message = JSON.parse(trimmedLine);
-            if (isRecord11(message)) {
+            if (isRecord11(message) || Array.isArray(message)) {
               controller.enqueue(message);
             } else {
               console.warn("Skipping JSON line that is not an object:", trimmedLine);
@@ -194106,7 +194262,28 @@ function ndJsonStream(output2, input2) {
   });
   return { readable, writable };
 }
+
+// node_modules/@agentclientprotocol/sdk/dist/schema/guards.gen.js
+var zGuardCreateElicitationRequestForm = zElicitationFormMode.and(object({ mode: literal("form") })).and(object({ message: string2() }));
+var zGuardCreateElicitationRequestUrl = zElicitationUrlMode.and(object({ mode: literal("url") })).and(object({ message: string2() }));
+var zGuardCreateElicitationRequestCustom = union([zElicitationSessionScope, zElicitationRequestScope]).and(object({ message: string2() }));
+var zGuardElicitationPropertySchemaString = zStringPropertySchema.and(object({ type: literal("string") }));
+var zGuardElicitationPropertySchemaNumber = zNumberPropertySchema.and(object({ type: literal("number") }));
+var zGuardElicitationPropertySchemaInteger = zIntegerPropertySchema.and(object({ type: literal("integer") }));
+var zGuardElicitationPropertySchemaBoolean = zBooleanPropertySchema.and(object({ type: literal("boolean") }));
+var zGuardElicitationPropertySchemaArray = zMultiSelectPropertySchema.and(object({ type: literal("array") }));
+var zGuardMultiSelectItemsString = zStringMultiSelectItems.and(object({ type: literal("string") }));
+var zGuardCreateElicitationResponseAccept = zElicitationAcceptAction.and(object({ action: literal("accept") }));
+var zGuardCreateElicitationResponseDecline = object({
+  action: literal("decline")
+});
+var zGuardCreateElicitationResponseCancel = object({
+  action: literal("cancel")
+});
 // node_modules/@agentclientprotocol/sdk/dist/acp.js
+function ndJsonStream2(output2, input2) {
+  return ndJsonStream(output2, input2);
+}
 function emptyObjectResponse(response) {
   return response ?? {};
 }
@@ -194691,6 +194868,7 @@ function runConnectHandlers(connection, handlers) {
 var appBuilder = Symbol("appBuilder");
 var runAgentConnectHandlers = Symbol("runAgentConnectHandlers");
 var runClientConnectHandlers = Symbol("runClientConnectHandlers");
+var stableConnectionOptions = { allowBatches: false };
 class AgentApp {
   builder = Connection.builder();
   connectHandlers = [];
@@ -194753,7 +194931,7 @@ class AgentApp {
       return state2;
     }
     const [thisStream, peerStream] = memoryStreamPair();
-    const peerRawConnection = target[appBuilder]().connect(peerStream);
+    const peerRawConnection = target[appBuilder]().connect(peerStream, stableConnectionOptions);
     const peerConnection = clientConnection(peerRawConnection);
     const state = this.openStreamConnection(thisStream);
     state.rawConnection.closed.then(() => peerConnection.close());
@@ -194768,8 +194946,8 @@ class AgentApp {
     }
     return state;
   }
-  openStreamConnection(stream2) {
-    const rawConnection = this.builder.connect(stream2);
+  openStreamConnection(stream) {
+    const rawConnection = this.builder.connect(stream, stableConnectionOptions);
     return {
       rawConnection,
       connection: agentConnection(rawConnection, this.connectHandlers)
@@ -194844,7 +195022,7 @@ class ClientApp {
       return state2;
     }
     const [thisStream, peerStream] = memoryStreamPair();
-    const peerRawConnection = target[appBuilder]().connect(peerStream);
+    const peerRawConnection = target[appBuilder]().connect(peerStream, stableConnectionOptions);
     const peerConnection = agentConnection(peerRawConnection);
     const state = this.openStreamConnection(thisStream);
     state.rawConnection.closed.then(() => peerConnection.close());
@@ -194859,8 +195037,8 @@ class ClientApp {
     }
     return state;
   }
-  openStreamConnection(stream2) {
-    const rawConnection = this.builder.connect(stream2);
+  openStreamConnection(stream) {
+    const rawConnection = this.builder.connect(stream, stableConnectionOptions);
     return {
       rawConnection,
       connection: clientConnection(rawConnection, this.connectHandlers)
@@ -196057,7 +196235,7 @@ async function runAcpClientWorkflow(child, input2, abortController, configOption
   }
   const output2 = Writable.toWeb(child.stdin);
   const inputStream = Readable.toWeb(child.stdout);
-  const stream2 = ndJsonStream(output2, limitAcpNdJsonLineBytes(inputStream));
+  const stream = ndJsonStream2(output2, limitAcpNdJsonLineBytes(inputStream));
   const app = client({ name: "kyoso" }).onRequest(methods.client.session.requestPermission, () => ({
     outcome: { outcome: "cancelled" }
   })).onRequest(methods.client.fs.readTextFile, async (ctx) => ({
@@ -196079,7 +196257,7 @@ async function runAcpClientWorkflow(child, input2, abortController, configOption
       policy: "Kyoso does not create terminals."
     });
   }).onRequest(methods.client.terminal.kill, () => ({}));
-  return app.connectWith(stream2, async (ctx) => {
+  return app.connectWith(stream, async (ctx) => {
     await ctx.request(methods.agent.initialize, {
       protocolVersion: PROTOCOL_VERSION,
       clientCapabilities: {
@@ -196814,7 +196992,7 @@ var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__
   enumerable: true
 }) : target, mod));
 
-// node_modules/@modelcontextprotocol/core/dist/auth-DFgbUATV.mjs
+// node_modules/@modelcontextprotocol/core/dist/auth-CUe6YdwF.mjs
 var LATEST_PROTOCOL_VERSION = "2025-11-25";
 var SUPPORTED_PROTOCOL_VERSIONS = [
   LATEST_PROTOCOL_VERSION,
@@ -196826,6 +197004,7 @@ var SUPPORTED_PROTOCOL_VERSIONS = [
 var RELATED_TASK_META_KEY = "io.modelcontextprotocol/related-task";
 var PROTOCOL_VERSION_META_KEY = "io.modelcontextprotocol/protocolVersion";
 var CLIENT_INFO_META_KEY = "io.modelcontextprotocol/clientInfo";
+var SERVER_INFO_META_KEY = "io.modelcontextprotocol/serverInfo";
 var CLIENT_CAPABILITIES_META_KEY = "io.modelcontextprotocol/clientCapabilities";
 var SUBSCRIPTION_ID_META_KEY = "io.modelcontextprotocol/subscriptionId";
 var LOG_LEVEL_META_KEY = "io.modelcontextprotocol/logLevel";
@@ -196859,7 +197038,10 @@ var NotificationSchema = object({
   method: string2(),
   params: NotificationsParamsSchema.loose().optional()
 });
-var ResultSchema = looseObject({ _meta: RequestMetaSchema.optional() });
+var ResultMetaObjectSchema = looseObject({ get [SERVER_INFO_META_KEY]() {
+  return ImplementationSchema.optional().catch(undefined);
+} });
+var ResultSchema = looseObject({ _meta: ResultMetaObjectSchema.optional() });
 var RequestIdSchema = union([string2(), number2().int()]);
 var JSONRPCRequestSchema = object({
   jsonrpc: literal(JSONRPC_VERSION),
@@ -196990,7 +197172,6 @@ var DiscoverRequestSchema = RequestSchema.extend({
 var DiscoverResultSchema = ResultSchema.extend({
   supportedVersions: array(string2()),
   capabilities: ServerCapabilitiesSchema,
-  serverInfo: ImplementationSchema,
   instructions: string2().optional()
 });
 var PingRequestSchema = RequestSchema.extend({
@@ -197095,7 +197276,7 @@ var SubscriptionsAcknowledgedNotificationSchema = NotificationSchema.extend({
   method: literal("notifications/subscriptions/acknowledged"),
   params: SubscriptionsAcknowledgedNotificationParamsSchema
 });
-var SubscriptionsListenResultMetaSchema = looseObject({ [SUBSCRIPTION_ID_META_KEY]: RequestIdSchema });
+var SubscriptionsListenResultMetaSchema = ResultMetaObjectSchema.extend({ [SUBSCRIPTION_ID_META_KEY]: RequestIdSchema });
 var SubscriptionsListenResultSchema = ResultSchema.extend({ _meta: SubscriptionsListenResultMetaSchema });
 var ResourceUpdatedNotificationParamsSchema = NotificationsParamsSchema.extend({ uri: string2() });
 var ResourceUpdatedNotificationSchema = NotificationSchema.extend({
@@ -197752,7 +197933,7 @@ var OAuthTokenRevocationRequestSchema = object({
   token_type_hint: string2().optional()
 }).strip();
 
-// node_modules/@modelcontextprotocol/server/dist/src-D5Nfqtoz.mjs
+// node_modules/@modelcontextprotocol/server/dist/src-D86MbS1I.mjs
 var BRANDS = Symbol.for("mcp.sdk.errorBrands");
 function stampErrorBrands(instance, ctor) {
   const brands = /* @__PURE__ */ new Set;
@@ -197870,7 +198051,7 @@ var SdkHttpError = class extends SdkError {
     return this.data.statusText;
   }
 };
-function isPlainObject$6(value) {
+function isPlainObject$7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isImpliedCapabilityMember(capability, member, declaredValue) {
@@ -197904,7 +198085,7 @@ function missingClientCapabilities(required2, declared) {
       missing[capability] = requirement;
       continue;
     }
-    if (isPlainObject$6(requirement) && isPlainObject$6(declaredValue)) {
+    if (isPlainObject$7(requirement) && isPlainObject$7(declaredValue)) {
       const missingMembers = {};
       for (const [member, memberRequirement] of Object.entries(requirement))
         if (memberRequirement !== undefined && declaredValue[member] === undefined && !isImpliedCapabilityMember(capability, member, declaredValue))
@@ -199023,7 +199204,7 @@ function getNotificationSchema(method) {
 }
 var rev2025RequestMethods = Object.keys(requestMethodKeys$1);
 var rev2025NotificationMethods = Object.keys(notificationMethodKeys$1);
-function isPlainObject$5(value) {
+function isPlainObject$6(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function triState$1(schema, raw) {
@@ -199047,7 +199228,7 @@ var NOT_IN_ERA$1 = {
   reason: "not-in-era"
 };
 function toolNeedsLegacyWrap(t) {
-  return isPlainObject$5(t) && isPlainObject$5(t["outputSchema"]) && isNonObjectJsonSchemaRoot(t["outputSchema"]);
+  return isPlainObject$6(t) && isPlainObject$6(t["outputSchema"]) && isNonObjectJsonSchemaRoot(t["outputSchema"]);
 }
 function toNeutralResult(value) {
   return value;
@@ -199085,7 +199266,7 @@ var rev2025Codec = {
     };
   },
   decodeResult(_method, raw) {
-    if (isPlainObject$5(raw) && "resultType" in raw) {
+    if (isPlainObject$6(raw) && "resultType" in raw) {
       const stripped = { ...raw };
       delete stripped["resultType"];
       return {
@@ -199506,7 +199687,7 @@ function build() {
   const RequestMetaEnvelopeSchema = looseObject({
     progressToken: ProgressTokenSchema$1.optional(),
     [PROTOCOL_VERSION_META_KEY]: string2(),
-    [CLIENT_INFO_META_KEY]: ImplementationSchema$1,
+    [CLIENT_INFO_META_KEY]: ImplementationSchema$1.optional(),
     [CLIENT_CAPABILITIES_META_KEY]: ClientCapabilities2026Schema,
     [LOG_LEVEL_META_KEY]: LoggingLevelSchema$1.optional()
   });
@@ -199543,7 +199724,8 @@ function build() {
     _meta: record(string2(), unknown()).optional()
   });
   const ResultTypeSchema = string2();
-  const wireMeta = record(string2(), unknown()).optional();
+  const ResultMetaSchema = looseObject({ [SERVER_INFO_META_KEY]: ImplementationSchema$1.optional().catch(undefined) });
+  const wireMeta = ResultMetaSchema.optional();
   function wireResult(shape) {
     return looseObject({
       _meta: wireMeta,
@@ -199605,7 +199787,6 @@ function build() {
     cacheScope: _enum2(["public", "private"]).catch("private"),
     supportedVersions: array(string2()),
     capabilities: ServerCapabilities2026Schema,
-    serverInfo: ImplementationSchema$1,
     instructions: string2().optional()
   });
   const CreateMessageRequestParamsSchema$1 = object({
@@ -199742,7 +199923,7 @@ function build() {
   });
   const subscriptionsListenParamsShape = { notifications: SubscriptionFilterSchema$1 };
   const SubscriptionsListenRequestSchema$1 = wireRequest("subscriptions/listen", subscriptionsListenParamsShape);
-  const SubscriptionsListenResultMetaSchema$1 = looseObject({ "io.modelcontextprotocol/subscriptionId": RequestIdSchema$1 });
+  const SubscriptionsListenResultMetaSchema$1 = ResultMetaSchema.extend({ "io.modelcontextprotocol/subscriptionId": RequestIdSchema$1 });
   const SubscriptionsListenResultSchema$1 = looseObject({
     _meta: SubscriptionsListenResultMetaSchema$1,
     resultType: ResultTypeSchema.default("complete")
@@ -199817,7 +199998,6 @@ function build() {
       cacheScope: _enum2(["public", "private"]).catch("private"),
       supportedVersions: array(string2()),
       capabilities: ServerCapabilities2026Schema,
-      serverInfo: ImplementationSchema$1,
       instructions: string2().optional()
     }),
     "subscriptions/listen": liftedResult({})
@@ -199931,6 +200111,7 @@ function build() {
     SamplingMessageContentBlockSchema: SamplingMessageContentBlockSchema$1,
     SamplingMessageSchema: SamplingMessageSchema$1,
     ResultTypeSchema,
+    ResultMetaSchema,
     ResultSchema: ResultSchema$1,
     PaginatedResultSchema: PaginatedResultSchema$1,
     CallToolResultSchema: CallToolResultSchema$1,
@@ -200182,6 +200363,30 @@ function fillCacheFields(method, result) {
   delete filled[RESULT_CACHE_HINT_FALLBACK];
   return filled;
 }
+function isPlainObject$5(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function stampServerInfoMeta(result, serverInfo) {
+  if (serverInfo === undefined)
+    return result;
+  const meta3 = result["_meta"];
+  if (meta3 === undefined)
+    return {
+      ...result,
+      _meta: { [SERVER_INFO_META_KEY]: serverInfo }
+    };
+  if (!isPlainObject$5(meta3))
+    return result;
+  if (meta3[SERVER_INFO_META_KEY] !== undefined)
+    return result;
+  return {
+    ...result,
+    _meta: {
+      ...meta3,
+      [SERVER_INFO_META_KEY]: serverInfo
+    }
+  };
+}
 function resolveTtlMs(fallback) {
   return fallback !== undefined && isValidCacheTtlMs(fallback.ttlMs) ? fallback.ttlMs : DEFAULT_CACHE_TTL_MS;
 }
@@ -200300,11 +200505,7 @@ var NOT_IN_ERA = {
   ok: false,
   reason: "not-in-era"
 };
-var REQUIRED_ENVELOPE_KEYS = [
-  PROTOCOL_VERSION_META_KEY,
-  CLIENT_INFO_META_KEY,
-  CLIENT_CAPABILITIES_META_KEY
-];
+var REQUIRED_ENVELOPE_KEYS = [PROTOCOL_VERSION_META_KEY, CLIENT_CAPABILITIES_META_KEY];
 function enforceDeletedFields(method, result) {
   let next = result;
   let copied = false;
@@ -200441,13 +200642,13 @@ var rev2026Codec = {
       result: lifted
     };
   },
-  encodeResult(method, result) {
-    return fillCacheFields(method, stampResultType(method, enforceDeletedFields(method, result)));
+  encodeResult(method, result, serverInfo) {
+    return stampServerInfoMeta(fillCacheFields(method, stampResultType(method, enforceDeletedFields(method, result))), serverInfo);
   },
   encodeErrorCode: (code) => code === -32002 ? -32602 : code,
   checkInboundEnvelope(material) {
     if (material.envelope === undefined)
-      return "Request is missing the required _meta envelope for protocol revision 2026-07-28 (io.modelcontextprotocol/protocolVersion, io.modelcontextprotocol/clientInfo, io.modelcontextprotocol/clientCapabilities)";
+      return "Request is missing the required _meta envelope for protocol revision 2026-07-28 (io.modelcontextprotocol/protocolVersion, io.modelcontextprotocol/clientCapabilities)";
     const parsed = buildSchemas2026().RequestMetaEnvelopeSchema.safeParse(material.envelope);
     if (!parsed.success)
       return `Invalid _meta envelope for protocol revision 2026-07-28: ${parsed.error.issues.map((issue2) => issue2.message).join("; ")}`;
@@ -200606,6 +200807,7 @@ var schemas_exports = /* @__PURE__ */ __exportAll({
   ResourceTemplateSchema: () => ResourceTemplateSchema,
   ResourceUpdatedNotificationParamsSchema: () => ResourceUpdatedNotificationParamsSchema,
   ResourceUpdatedNotificationSchema: () => ResourceUpdatedNotificationSchema,
+  ResultMetaObjectSchema: () => ResultMetaObjectSchema,
   ResultSchema: () => ResultSchema,
   RoleSchema: () => RoleSchema,
   RootSchema: () => RootSchema,
@@ -201287,6 +201489,7 @@ var SPEC_SCHEMA_KEYS = [
   "ResourceTemplateReferenceSchema",
   "ResourceUpdatedNotificationSchema",
   "ResourceUpdatedNotificationParamsSchema",
+  "ResultMetaObjectSchema",
   "ResultSchema",
   "RoleSchema",
   "RootSchema",
@@ -201713,7 +201916,7 @@ var Protocol = class {
         return;
       let encoded;
       try {
-        encoded = codec2.encodeResult(request.method, result);
+        encoded = codec2.encodeResult(request.method, result, this._outboundServerInfo());
       } catch (error51) {
         this._onerror(/* @__PURE__ */ new Error(`Failed to encode result for ${request.method}: ${error51}`));
         sendErrorResponse(ProtocolErrorCode.InternalError, "Internal error");
@@ -202012,6 +202215,7 @@ var Protocol = class {
   _wrapHandler(_method, handler) {
     return handler;
   }
+  _outboundServerInfo() {}
   removeRequestHandler(method) {
     this._requestHandlers.delete(method);
   }
@@ -209439,7 +209643,7 @@ var Ajv = import_ajv.Ajv;
 // node_modules/@modelcontextprotocol/server/dist/shimsNode.mjs
 import process3 from "node:process";
 
-// node_modules/@modelcontextprotocol/server/dist/mcp-Ctiu4nBa.mjs
+// node_modules/@modelcontextprotocol/server/dist/mcp-IJurDZVN.mjs
 var COMPLETABLE_SYMBOL = Symbol.for("mcp.completable");
 function isCompletable(schema) {
   return !!schema && typeof schema === "object" && COMPLETABLE_SYMBOL in schema;
@@ -209602,6 +209806,7 @@ var INPUT_REQUIRED_CAPABLE_METHODS = new Set([
 ]);
 var writeClientIdentity;
 var installDiscoverHandler;
+var readServerIdentity;
 var Server = class extends Protocol {
   _clientCapabilities;
   _clientVersion;
@@ -209618,6 +209823,7 @@ var Server = class extends Protocol {
         server2._supportedProtocolVersions = [...server2._supportedProtocolVersions, ...missing];
       server2.setRequestHandler("server/discover", () => server2._ondiscover());
     };
+    readServerIdentity = (server2) => server2._serverInfo;
   }
   _capabilities;
   _instructions;
@@ -209922,10 +210128,12 @@ var Server = class extends Protocol {
     return {
       supportedVersions: modernProtocolVersions(this._supportedProtocolVersions),
       capabilities: discoverAdvertisedCapabilities(this.getCapabilities()),
-      serverInfo: this._serverInfo,
       ...this._instructions && { instructions: this._instructions }
     };
   }
+  _outboundServerInfo() {
+    return this._serverInfo;
+  }
   getClientCapabilities() {
     return this._clientCapabilities;
   }