thinkwell 0.5.5 → 0.5.7

package/dist-pkg/thinkwell.cjs

@@ -29,31 +29,12 @@ __export(stdio_exports, {
 });
 function parseCommand(command) {
   const parts = [];
-  let current = "";
-  let inQuote = null;
+  let current = "", inQuote = null;
   for (let i = 0; i < command.length; i++) {
     const char = command[i];
-    if (inQuote) {
-      if (char === inQuote) {
-        inQuote = null;
-      } else {
-        current += char;
-      }
-    } else if (char === '"' || char === "'") {
-      inQuote = char;
-    } else if (char === " " || char === "	") {
-      if (current) {
-        parts.push(current);
-        current = "";
-      }
-    } else {
-      current += char;
-    }
-  }
-  if (current) {
-    parts.push(current);
+    inQuote ? char === inQuote ? inQuote = null : current += char : char === '"' || char === "'" ? inQuote = char : char === " " || char === "	" ? current && (parts.push(current), current = "") : current += char;
   }
-  return parts;
+  return current && parts.push(current), parts;
 }
 function stdio(options) {
   return new StdioConnector(options);
@@ -73,60 +54,43 @@ var init_stdio = __esm({
       closed = false;
       closingGracefully = false;
       constructor(process2) {
-        this.process = process2;
-        if (!process2.stdout || !process2.stdin) {
+        if (this.process = process2, !process2.stdout || !process2.stdin)
           throw new Error("Process must have stdio pipes");
-        }
         this.readline = (0, import_node_readline.createInterface)({
           input: process2.stdout,
-          crlfDelay: Infinity
-        });
-        process2.on("exit", (code, signal) => {
-          this.closed = true;
-          if (code !== 0 && code !== null && !this.closingGracefully) {
-            console.error(`Process exited with code ${code}`);
-          }
-          if (signal && !this.closingGracefully) {
-            console.error(`Process killed by signal ${signal}`);
-          }
-        });
-        process2.on("error", (error40) => {
-          console.error("Process error:", error40);
-          this.closed = true;
+          crlfDelay: 1 / 0
+        }), process2.on("exit", (code, signal) => {
+          this.closed = true, code !== 0 && code !== null && !this.closingGracefully && console.error(`Process exited with code ${code}`), signal && !this.closingGracefully && console.error(`Process killed by signal ${signal}`);
+        }), process2.on("error", (error40) => {
+          console.error("Process error:", error40), this.closed = true;
         });
       }
       /**
        * Send a JSON-RPC message to the subprocess
        */
       send(message) {
-        if (this.closed || !this.process.stdin) {
+        if (this.closed || !this.process.stdin)
           throw new Error("Connection is closed");
-        }
         const json2 = JSON.stringify(message);
-        this.process.stdin.write(json2 + "\n");
+        this.process.stdin.write(json2 + `
+`);
       }
       /**
        * Async iterable of messages received from the subprocess
        */
       get messages() {
-        const readline = this.readline;
-        const isClosed = /* @__PURE__ */ __name(() => this.closed, "isClosed");
+        const readline = this.readline, isClosed = /* @__PURE__ */ __name(() => this.closed, "isClosed");
         return {
           async *[Symbol.asyncIterator]() {
             for await (const line of readline) {
-              if (isClosed()) {
+              if (isClosed())
                 return;
-              }
-              if (!line.trim()) {
-                continue;
-              }
-              try {
-                const message = JSON.parse(line);
-                yield message;
-              } catch (error40) {
-                console.error("Failed to parse JSON-RPC message:", error40);
-                console.error("Line:", line);
-              }
+              if (line.trim())
+                try {
+                  yield JSON.parse(line);
+                } catch (error40) {
+                  console.error("Failed to parse JSON-RPC message:", error40), console.error("Line:", line);
+                }
             }
           }
         };
@@ -135,33 +99,17 @@ var init_stdio = __esm({
        * Close the connection and terminate the subprocess
        */
       async close() {
-        if (this.closed) {
-          return;
-        }
-        this.closed = true;
-        this.closingGracefully = true;
-        this.readline.close();
-        this.process.stdout?.destroy();
-        this.process.stdin?.end();
-        await new Promise((resolve2) => {
-          let sigtermTimeout = null;
-          let sigkillTimeout = null;
+        this.closed || (this.closed = true, this.closingGracefully = true, this.readline.close(), this.process.stdout?.destroy(), this.process.stdin?.end(), await new Promise((resolve2) => {
+          let sigtermTimeout = null, sigkillTimeout = null;
           const onExit = /* @__PURE__ */ __name(() => {
-            if (sigtermTimeout)
-              clearTimeout(sigtermTimeout);
-            if (sigkillTimeout)
-              clearTimeout(sigkillTimeout);
-            resolve2();
+            sigtermTimeout && clearTimeout(sigtermTimeout), sigkillTimeout && clearTimeout(sigkillTimeout), resolve2();
           }, "onExit");
-          this.process.once("exit", onExit);
-          sigtermTimeout = setTimeout(() => {
-            this.process.kill("SIGTERM");
-            sigkillTimeout = setTimeout(() => {
-              this.process.kill("SIGKILL");
-              resolve2();
+          this.process.once("exit", onExit), sigtermTimeout = setTimeout(() => {
+            this.process.kill("SIGTERM"), sigkillTimeout = setTimeout(() => {
+              this.process.kill("SIGKILL"), resolve2();
             }, 500);
           }, 250);
-        });
+        }));
       }
     };
     StdioConnector = class {
@@ -170,44 +118,35 @@ var init_stdio = __esm({
       }
       options;
       constructor(options) {
-        if (typeof options === "string") {
+        if (typeof options == "string") {
           const parts = parseCommand(options);
           this.options = {
             command: parts[0],
             args: parts.slice(1)
           };
-        } else {
+        } else
           this.options = options;
-        }
       }
       /**
        * Spawn the subprocess and return a connection to it
        */
       async connect() {
-        const { command, args = [], env, cwd } = this.options;
-        const process2 = (0, import_node_child_process.spawn)(command, args, {
+        const { command, args = [], env, cwd } = this.options, process2 = (0, import_node_child_process.spawn)(command, args, {
           stdio: ["pipe", "pipe", "inherit"],
           // stdin, stdout piped; stderr inherited
           env: env ? { ...globalThis.process.env, ...env } : void 0,
           cwd
         });
-        await new Promise((resolve2, reject) => {
+        return await new Promise((resolve2, reject) => {
           const onSpawn = /* @__PURE__ */ __name(() => {
-            cleanup();
-            resolve2();
-          }, "onSpawn");
-          const onError = /* @__PURE__ */ __name((error40) => {
-            cleanup();
-            reject(error40);
-          }, "onError");
-          const cleanup = /* @__PURE__ */ __name(() => {
-            process2.removeListener("spawn", onSpawn);
-            process2.removeListener("error", onError);
+            cleanup(), resolve2();
+          }, "onSpawn"), onError = /* @__PURE__ */ __name((error40) => {
+            cleanup(), reject(error40);
+          }, "onError"), cleanup = /* @__PURE__ */ __name(() => {
+            process2.removeListener("spawn", onSpawn), process2.removeListener("error", onError);
           }, "cleanup");
-          process2.once("spawn", onSpawn);
-          process2.once("error", onError);
-        });
-        return new StdioConnection(process2);
+          process2.once("spawn", onSpawn), process2.once("error", onError);
+        }), new StdioConnection(process2);
       }
     };
     __name(parseCommand, "parseCommand");
@@ -4410,11 +4349,12 @@ var coerce = {
 };
 var NEVER = INVALID;
 
-// ../../node_modules/.pnpm/@agentclientprotocol+sdk@0.12.0_zod@3.25.76/node_modules/@agentclientprotocol/sdk/dist/schema/index.js
+// ../../node_modules/.pnpm/@agentclientprotocol+sdk@0.16.1_zod@3.25.76/node_modules/@agentclientprotocol/sdk/dist/schema/index.js
 var AGENT_METHODS = {
   authenticate: "authenticate",
   initialize: "initialize",
   session_cancel: "session/cancel",
+  session_close: "session/close",
   session_fork: "session/fork",
   session_list: "session/list",
   session_load: "session/load",
@@ -15952,38 +15892,81 @@ __name(date4, "date");
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v4/classic/external.js
 config(en_default2());
 
-// ../../node_modules/.pnpm/@agentclientprotocol+sdk@0.12.0_zod@3.25.76/node_modules/@agentclientprotocol/sdk/dist/schema/zod.gen.js
-var zAuthMethod = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  description: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+// ../../node_modules/.pnpm/@agentclientprotocol+sdk@0.16.1_zod@3.25.76/node_modules/@agentclientprotocol/sdk/dist/schema/zod.gen.js
+var zAuthCapabilities = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  terminal: external_exports2.boolean().optional().default(false)
+});
+var zAuthEnvVar = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  label: external_exports2.string().nullish(),
+  name: external_exports2.string(),
+  optional: external_exports2.boolean().optional().default(false),
+  secret: external_exports2.boolean().optional().default(true)
+});
+var zAuthMethodAgent = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  description: external_exports2.string().nullish(),
+  id: external_exports2.string(),
+  name: external_exports2.string()
+});
+var zAuthMethodEnvVar = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  description: external_exports2.string().nullish(),
+  id: external_exports2.string(),
+  link: external_exports2.string().nullish(),
+  name: external_exports2.string(),
+  vars: external_exports2.array(zAuthEnvVar)
+});
+var zAuthMethodTerminal = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  args: external_exports2.array(external_exports2.string()).optional(),
+  description: external_exports2.string().nullish(),
+  env: external_exports2.record(external_exports2.string(), external_exports2.string()).optional(),
   id: external_exports2.string(),
   name: external_exports2.string()
 });
+var zAuthMethod = external_exports2.union([
+  zAuthMethodEnvVar.and(external_exports2.object({
+    type: external_exports2.literal("env_var")
+  })),
+  zAuthMethodTerminal.and(external_exports2.object({
+    type: external_exports2.literal("terminal")
+  })),
+  zAuthMethodAgent
+]);
 var zAuthenticateRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   methodId: external_exports2.string()
 });
 var zAuthenticateResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zBlobResourceContents = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   blob: external_exports2.string(),
-  mimeType: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  mimeType: external_exports2.string().nullish(),
   uri: external_exports2.string()
 });
+var zCloseSessionResponse = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
+});
+var zCost = external_exports2.object({
+  amount: external_exports2.number(),
+  currency: external_exports2.string()
+});
 var zCreateTerminalResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   terminalId: external_exports2.string()
 });
 var zDiff = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   newText: external_exports2.string(),
-  oldText: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  oldText: external_exports2.string().nullish(),
   path: external_exports2.string()
 });
 var zEnvVariable = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   name: external_exports2.string(),
   value: external_exports2.string()
 });
@@ -15996,7 +15979,11 @@ var zErrorCode = external_exports2.union([
   external_exports2.literal(-32800),
   external_exports2.literal(-32e3),
   external_exports2.literal(-32002),
-  external_exports2.number().int()
+  external_exports2.number().int().min(-2147483648, {
+    message: "Invalid value: Expected int32 to be >= -2147483648"
+  }).max(2147483647, {
+    message: "Invalid value: Expected int32 to be <= 2147483647"
+  })
 ]);
 var zError = external_exports2.object({
   code: zErrorCode,
@@ -16006,54 +15993,55 @@ var zError = external_exports2.object({
 var zExtNotification = external_exports2.unknown();
 var zExtRequest = external_exports2.unknown();
 var zExtResponse = external_exports2.unknown();
-var zFileSystemCapability = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+var zFileSystemCapabilities = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   readTextFile: external_exports2.boolean().optional().default(false),
   writeTextFile: external_exports2.boolean().optional().default(false)
 });
 var zClientCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  fs: zFileSystemCapability.optional().default({ readTextFile: false, writeTextFile: false }),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  auth: zAuthCapabilities.optional().default({ terminal: false }),
+  fs: zFileSystemCapabilities.optional().default({ readTextFile: false, writeTextFile: false }),
   terminal: external_exports2.boolean().optional().default(false)
 });
 var zHttpHeader = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   name: external_exports2.string(),
   value: external_exports2.string()
 });
 var zImplementation = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   name: external_exports2.string(),
-  title: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  title: external_exports2.string().nullish(),
   version: external_exports2.string()
 });
-var zKillTerminalCommandResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+var zKillTerminalResponse = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zListSessionsRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  cursor: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
-  cwd: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  cursor: external_exports2.string().nullish(),
+  cwd: external_exports2.string().nullish()
 });
 var zMcpCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   http: external_exports2.boolean().optional().default(false),
   sse: external_exports2.boolean().optional().default(false)
 });
 var zMcpServerHttp = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   headers: external_exports2.array(zHttpHeader),
   name: external_exports2.string(),
   url: external_exports2.string()
 });
 var zMcpServerSse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   headers: external_exports2.array(zHttpHeader),
   name: external_exports2.string(),
   url: external_exports2.string()
 });
 var zMcpServerStdio = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   args: external_exports2.array(external_exports2.string()),
   command: external_exports2.string(),
   env: external_exports2.array(zEnvVariable),
@@ -16070,13 +16058,13 @@ var zMcpServer = external_exports2.union([
 ]);
 var zModelId = external_exports2.string();
 var zModelInfo = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  description: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  description: external_exports2.string().nullish(),
   modelId: zModelId,
   name: external_exports2.string()
 });
 var zNewSessionRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   cwd: external_exports2.string(),
   mcpServers: external_exports2.array(zMcpServer)
 });
@@ -16088,7 +16076,7 @@ var zPermissionOptionKind = external_exports2.union([
   external_exports2.literal("reject_always")
 ]);
 var zPermissionOption = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   kind: zPermissionOptionKind,
   name: external_exports2.string(),
   optionId: zPermissionOptionId
@@ -16104,75 +16092,76 @@ var zPlanEntryStatus = external_exports2.union([
   external_exports2.literal("completed")
 ]);
 var zPlanEntry = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   content: external_exports2.string(),
   priority: zPlanEntryPriority,
   status: zPlanEntryStatus
 });
 var zPlan = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   entries: external_exports2.array(zPlanEntry)
 });
 var zPromptCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   audio: external_exports2.boolean().optional().default(false),
   embeddedContext: external_exports2.boolean().optional().default(false),
   image: external_exports2.boolean().optional().default(false)
 });
 var zProtocolVersion = external_exports2.number().int().gte(0).lte(65535);
 var zInitializeRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   clientCapabilities: zClientCapabilities.optional().default({
+    auth: { terminal: false },
     fs: { readTextFile: false, writeTextFile: false },
     terminal: false
   }),
-  clientInfo: external_exports2.union([zImplementation, external_exports2.null()]).optional(),
+  clientInfo: zImplementation.nullish(),
   protocolVersion: zProtocolVersion
 });
 var zReadTextFileResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   content: external_exports2.string()
 });
 var zReleaseTerminalResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
-var zRequestId = external_exports2.union([external_exports2.null(), external_exports2.coerce.bigint(), external_exports2.string()]);
+var zRequestId = external_exports2.union([external_exports2.number(), external_exports2.string()]).nullable();
 var zCancelRequestNotification = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   requestId: zRequestId
 });
 var zRole = external_exports2.enum(["assistant", "user"]);
 var zAnnotations = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  audience: external_exports2.union([external_exports2.array(zRole), external_exports2.null()]).optional(),
-  lastModified: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
-  priority: external_exports2.union([external_exports2.number(), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  audience: external_exports2.array(zRole).nullish(),
+  lastModified: external_exports2.string().nullish(),
+  priority: external_exports2.number().nullish()
 });
 var zAudioContent = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  annotations: external_exports2.union([zAnnotations, external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  annotations: zAnnotations.nullish(),
   data: external_exports2.string(),
   mimeType: external_exports2.string()
 });
 var zImageContent = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  annotations: external_exports2.union([zAnnotations, external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  annotations: zAnnotations.nullish(),
   data: external_exports2.string(),
   mimeType: external_exports2.string(),
-  uri: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional()
+  uri: external_exports2.string().nullish()
 });
 var zResourceLink = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  annotations: external_exports2.union([zAnnotations, external_exports2.null()]).optional(),
-  description: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
-  mimeType: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  annotations: zAnnotations.nullish(),
+  description: external_exports2.string().nullish(),
+  mimeType: external_exports2.string().nullish(),
   name: external_exports2.string(),
-  size: external_exports2.union([external_exports2.coerce.bigint(), external_exports2.null()]).optional(),
-  title: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  size: external_exports2.number().nullish(),
+  title: external_exports2.string().nullish(),
   uri: external_exports2.string()
 });
 var zSelectedPermissionOutcome = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   optionId: zPermissionOptionId
 });
 var zRequestPermissionOutcome = external_exports2.union([
@@ -16184,20 +16173,32 @@ var zRequestPermissionOutcome = external_exports2.union([
   }))
 ]);
 var zRequestPermissionResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   outcome: zRequestPermissionOutcome
 });
+var zSessionCloseCapabilities = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
+});
+var zSessionConfigBoolean = external_exports2.object({
+  currentValue: external_exports2.boolean()
+});
 var zSessionConfigGroupId = external_exports2.string();
 var zSessionConfigId = external_exports2.string();
+var zSessionConfigOptionCategory = external_exports2.union([
+  external_exports2.literal("mode"),
+  external_exports2.literal("model"),
+  external_exports2.literal("thought_level"),
+  external_exports2.string()
+]);
 var zSessionConfigValueId = external_exports2.string();
 var zSessionConfigSelectOption = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  description: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  description: external_exports2.string().nullish(),
   name: external_exports2.string(),
   value: zSessionConfigValueId
 });
 var zSessionConfigSelectGroup = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   group: zSessionConfigGroupId,
   name: external_exports2.string(),
   options: external_exports2.array(zSessionConfigSelectOption)
@@ -16210,152 +16211,167 @@ var zSessionConfigSelect = external_exports2.object({
   currentValue: zSessionConfigValueId,
   options: zSessionConfigSelectOptions
 });
-var zSessionConfigOption = zSessionConfigSelect.and(external_exports2.object({
-  type: external_exports2.literal("select")
-})).and(external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  description: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+var zSessionConfigOption = external_exports2.intersection(external_exports2.union([
+  zSessionConfigSelect.and(external_exports2.object({
+    type: external_exports2.literal("select")
+  })),
+  zSessionConfigBoolean.and(external_exports2.object({
+    type: external_exports2.literal("boolean")
+  }))
+]), external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  category: zSessionConfigOptionCategory.nullish(),
+  description: external_exports2.string().nullish(),
   id: zSessionConfigId,
   name: external_exports2.string()
 }));
 var zConfigOptionUpdate = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   configOptions: external_exports2.array(zSessionConfigOption)
 });
 var zSessionForkCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zSessionId = external_exports2.string();
 var zCancelNotification = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   sessionId: zSessionId
 });
 var zClientNotification = external_exports2.object({
   method: external_exports2.string(),
-  params: external_exports2.union([external_exports2.union([zCancelNotification, zExtNotification]), external_exports2.null()]).optional()
+  params: external_exports2.union([zCancelNotification, zExtNotification]).nullish()
+});
+var zCloseSessionRequest = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  sessionId: zSessionId
 });
 var zCreateTerminalRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   args: external_exports2.array(external_exports2.string()).optional(),
   command: external_exports2.string(),
-  cwd: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  cwd: external_exports2.string().nullish(),
   env: external_exports2.array(zEnvVariable).optional(),
-  outputByteLimit: external_exports2.union([external_exports2.number().int().gte(0), external_exports2.null()]).optional(),
+  outputByteLimit: external_exports2.number().nullish(),
   sessionId: zSessionId
 });
 var zForkSessionRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   cwd: external_exports2.string(),
   mcpServers: external_exports2.array(zMcpServer).optional(),
   sessionId: zSessionId
 });
-var zKillTerminalCommandRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+var zKillTerminalRequest = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   sessionId: zSessionId,
   terminalId: external_exports2.string()
 });
 var zLoadSessionRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   cwd: external_exports2.string(),
   mcpServers: external_exports2.array(zMcpServer),
   sessionId: zSessionId
 });
 var zReadTextFileRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  limit: external_exports2.union([external_exports2.number().int().gte(0), external_exports2.null()]).optional(),
-  line: external_exports2.union([external_exports2.number().int().gte(0), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  limit: external_exports2.number().int().gte(0).max(4294967295, {
+    message: "Invalid value: Expected uint32 to be <= 4294967295"
+  }).nullish(),
+  line: external_exports2.number().int().gte(0).max(4294967295, {
+    message: "Invalid value: Expected uint32 to be <= 4294967295"
+  }).nullish(),
   path: external_exports2.string(),
   sessionId: zSessionId
 });
 var zReleaseTerminalRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   sessionId: zSessionId,
   terminalId: external_exports2.string()
 });
 var zResumeSessionRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   cwd: external_exports2.string(),
   mcpServers: external_exports2.array(zMcpServer).optional(),
   sessionId: zSessionId
 });
 var zSessionInfo = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   cwd: external_exports2.string(),
   sessionId: zSessionId,
-  title: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
-  updatedAt: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional()
+  title: external_exports2.string().nullish(),
+  updatedAt: external_exports2.string().nullish()
 });
 var zListSessionsResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  nextCursor: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  nextCursor: external_exports2.string().nullish(),
   sessions: external_exports2.array(zSessionInfo)
 });
 var zSessionInfoUpdate = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  title: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
-  updatedAt: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  title: external_exports2.string().nullish(),
+  updatedAt: external_exports2.string().nullish()
 });
 var zSessionListCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zSessionModeId = external_exports2.string();
 var zCurrentModeUpdate = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   currentModeId: zSessionModeId
 });
 var zSessionMode = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  description: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  description: external_exports2.string().nullish(),
   id: zSessionModeId,
   name: external_exports2.string()
 });
 var zSessionModeState = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   availableModes: external_exports2.array(zSessionMode),
   currentModeId: zSessionModeId
 });
 var zSessionModelState = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   availableModels: external_exports2.array(zModelInfo),
   currentModelId: zModelId
 });
 var zForkSessionResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  configOptions: external_exports2.union([external_exports2.array(zSessionConfigOption), external_exports2.null()]).optional(),
-  models: external_exports2.union([zSessionModelState, external_exports2.null()]).optional(),
-  modes: external_exports2.union([zSessionModeState, external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  configOptions: external_exports2.array(zSessionConfigOption).nullish(),
+  models: zSessionModelState.nullish(),
+  modes: zSessionModeState.nullish(),
   sessionId: zSessionId
 });
 var zLoadSessionResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  configOptions: external_exports2.union([external_exports2.array(zSessionConfigOption), external_exports2.null()]).optional(),
-  models: external_exports2.union([zSessionModelState, external_exports2.null()]).optional(),
-  modes: external_exports2.union([zSessionModeState, external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  configOptions: external_exports2.array(zSessionConfigOption).nullish(),
+  models: zSessionModelState.nullish(),
+  modes: zSessionModeState.nullish()
 });
 var zNewSessionResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  configOptions: external_exports2.union([external_exports2.array(zSessionConfigOption), external_exports2.null()]).optional(),
-  models: external_exports2.union([zSessionModelState, external_exports2.null()]).optional(),
-  modes: external_exports2.union([zSessionModeState, external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  configOptions: external_exports2.array(zSessionConfigOption).nullish(),
+  models: zSessionModelState.nullish(),
+  modes: zSessionModeState.nullish(),
   sessionId: zSessionId
 });
 var zResumeSessionResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  configOptions: external_exports2.union([external_exports2.array(zSessionConfigOption), external_exports2.null()]).optional(),
-  models: external_exports2.union([zSessionModelState, external_exports2.null()]).optional(),
-  modes: external_exports2.union([zSessionModeState, external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  configOptions: external_exports2.array(zSessionConfigOption).nullish(),
+  models: zSessionModelState.nullish(),
+  modes: zSessionModeState.nullish()
 });
 var zSessionResumeCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zSessionCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  fork: external_exports2.union([zSessionForkCapabilities, external_exports2.null()]).optional(),
-  list: external_exports2.union([zSessionListCapabilities, external_exports2.null()]).optional(),
-  resume: external_exports2.union([zSessionResumeCapabilities, external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  close: zSessionCloseCapabilities.nullish(),
+  fork: zSessionForkCapabilities.nullish(),
+  list: zSessionListCapabilities.nullish(),
+  resume: zSessionResumeCapabilities.nullish()
 });
 var zAgentCapabilities = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   loadSession: external_exports2.boolean().optional().default(false),
   mcpCapabilities: zMcpCapabilities.optional().default({ http: false, sse: false }),
   promptCapabilities: zPromptCapabilities.optional().default({
@@ -16366,7 +16382,7 @@ var zAgentCapabilities = external_exports2.object({
   sessionCapabilities: zSessionCapabilities.optional().default({})
 });
 var zInitializeResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   agentCapabilities: zAgentCapabilities.optional().default({
     loadSession: false,
     mcpCapabilities: { http: false, sse: false },
@@ -16377,35 +16393,42 @@ var zInitializeResponse = external_exports2.object({
     },
     sessionCapabilities: {}
   }),
-  agentInfo: external_exports2.union([zImplementation, external_exports2.null()]).optional(),
+  agentInfo: zImplementation.nullish(),
   authMethods: external_exports2.array(zAuthMethod).optional().default([]),
   protocolVersion: zProtocolVersion
 });
-var zSetSessionConfigOptionRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+var zSetSessionConfigOptionRequest = external_exports2.intersection(external_exports2.union([
+  external_exports2.object({
+    type: external_exports2.literal("boolean"),
+    value: external_exports2.boolean()
+  }),
+  external_exports2.object({
+    value: zSessionConfigValueId
+  })
+]), external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   configId: zSessionConfigId,
-  sessionId: zSessionId,
-  value: zSessionConfigValueId
-});
+  sessionId: zSessionId
+}));
 var zSetSessionConfigOptionResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   configOptions: external_exports2.array(zSessionConfigOption)
 });
 var zSetSessionModeRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   modeId: zSessionModeId,
   sessionId: zSessionId
 });
 var zSetSessionModeResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zSetSessionModelRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   modelId: zModelId,
   sessionId: zSessionId
 });
 var zSetSessionModelResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zStopReason = external_exports2.union([
   external_exports2.literal("end_turn"),
@@ -16414,61 +16437,36 @@ var zStopReason = external_exports2.union([
   external_exports2.literal("refusal"),
   external_exports2.literal("cancelled")
 ]);
-var zPromptResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  stopReason: zStopReason
-});
-var zAgentResponse = external_exports2.union([
-  external_exports2.object({
-    id: zRequestId,
-    result: external_exports2.union([
-      zInitializeResponse,
-      zAuthenticateResponse,
-      zNewSessionResponse,
-      zLoadSessionResponse,
-      zListSessionsResponse,
-      zForkSessionResponse,
-      zResumeSessionResponse,
-      zSetSessionModeResponse,
-      zSetSessionConfigOptionResponse,
-      zPromptResponse,
-      zSetSessionModelResponse,
-      zExtResponse
-    ])
-  }),
-  external_exports2.object({
-    error: zError,
-    id: zRequestId
-  })
-]);
 var zTerminal = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   terminalId: external_exports2.string()
 });
 var zTerminalExitStatus = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  exitCode: external_exports2.union([external_exports2.number().int().gte(0), external_exports2.null()]).optional(),
-  signal: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  exitCode: external_exports2.number().int().gte(0).max(4294967295, {
+    message: "Invalid value: Expected uint32 to be <= 4294967295"
+  }).nullish(),
+  signal: external_exports2.string().nullish()
 });
 var zTerminalOutputRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   sessionId: zSessionId,
   terminalId: external_exports2.string()
 });
 var zTerminalOutputResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  exitStatus: external_exports2.union([zTerminalExitStatus, external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  exitStatus: zTerminalExitStatus.nullish(),
   output: external_exports2.string(),
   truncated: external_exports2.boolean()
 });
 var zTextContent = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  annotations: external_exports2.union([zAnnotations, external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  annotations: zAnnotations.nullish(),
   text: external_exports2.string()
 });
 var zTextResourceContents = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  mimeType: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  mimeType: external_exports2.string().nullish(),
   text: external_exports2.string(),
   uri: external_exports2.string()
 });
@@ -16477,8 +16475,8 @@ var zEmbeddedResourceResource = external_exports2.union([
   zBlobResourceContents
 ]);
 var zEmbeddedResource = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  annotations: external_exports2.union([zAnnotations, external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  annotations: zAnnotations.nullish(),
   resource: zEmbeddedResourceResource
 });
 var zContentBlock = external_exports2.union([
@@ -16499,15 +16497,17 @@ var zContentBlock = external_exports2.union([
   }))
 ]);
 var zContent = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   content: zContentBlock
 });
 var zContentChunk = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  content: zContentBlock
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  content: zContentBlock,
+  messageId: external_exports2.string().nullish()
 });
 var zPromptRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  messageId: external_exports2.string().nullish(),
   prompt: external_exports2.array(zContentBlock),
   sessionId: zSessionId
 });
@@ -16515,22 +16515,20 @@ var zClientRequest = external_exports2.object({
   id: zRequestId,
   method: external_exports2.string(),
   params: external_exports2.union([
-    external_exports2.union([
-      zInitializeRequest,
-      zAuthenticateRequest,
-      zNewSessionRequest,
-      zLoadSessionRequest,
-      zListSessionsRequest,
-      zForkSessionRequest,
-      zResumeSessionRequest,
-      zSetSessionModeRequest,
-      zSetSessionConfigOptionRequest,
-      zPromptRequest,
-      zSetSessionModelRequest,
-      zExtRequest
-    ]),
-    external_exports2.null()
-  ]).optional()
+    zInitializeRequest,
+    zAuthenticateRequest,
+    zNewSessionRequest,
+    zLoadSessionRequest,
+    zListSessionsRequest,
+    zForkSessionRequest,
+    zResumeSessionRequest,
+    zCloseSessionRequest,
+    zSetSessionModeRequest,
+    zSetSessionConfigOptionRequest,
+    zPromptRequest,
+    zSetSessionModelRequest,
+    zExtRequest
+  ]).nullish()
 });
 var zToolCallContent = external_exports2.union([
   zContent.and(external_exports2.object({
@@ -16545,8 +16543,10 @@ var zToolCallContent = external_exports2.union([
 ]);
 var zToolCallId = external_exports2.string();
 var zToolCallLocation = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  line: external_exports2.union([external_exports2.number().int().gte(0), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  line: external_exports2.number().int().gte(0).max(4294967295, {
+    message: "Invalid value: Expected uint32 to be <= 4294967295"
+  }).nullish(),
   path: external_exports2.string()
 });
 var zToolCallStatus = external_exports2.union([
@@ -16568,7 +16568,7 @@ var zToolKind = external_exports2.union([
   external_exports2.literal("other")
 ]);
 var zToolCall = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   content: external_exports2.array(zToolCallContent).optional(),
   kind: zToolKind.optional(),
   locations: external_exports2.array(zToolCallLocation).optional(),
@@ -16579,37 +16579,81 @@ var zToolCall = external_exports2.object({
   toolCallId: zToolCallId
 });
 var zToolCallUpdate = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  content: external_exports2.union([external_exports2.array(zToolCallContent), external_exports2.null()]).optional(),
-  kind: external_exports2.union([zToolKind, external_exports2.null()]).optional(),
-  locations: external_exports2.union([external_exports2.array(zToolCallLocation), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  content: external_exports2.array(zToolCallContent).nullish(),
+  kind: zToolKind.nullish(),
+  locations: external_exports2.array(zToolCallLocation).nullish(),
   rawInput: external_exports2.unknown().optional(),
   rawOutput: external_exports2.unknown().optional(),
-  status: external_exports2.union([zToolCallStatus, external_exports2.null()]).optional(),
-  title: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional(),
+  status: zToolCallStatus.nullish(),
+  title: external_exports2.string().nullish(),
   toolCallId: zToolCallId
 });
 var zRequestPermissionRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   options: external_exports2.array(zPermissionOption),
   sessionId: zSessionId,
   toolCall: zToolCallUpdate
 });
 var zUnstructuredCommandInput = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   hint: external_exports2.string()
 });
 var zAvailableCommandInput = zUnstructuredCommandInput;
 var zAvailableCommand = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   description: external_exports2.string(),
-  input: external_exports2.union([zAvailableCommandInput, external_exports2.null()]).optional(),
+  input: zAvailableCommandInput.nullish(),
   name: external_exports2.string()
 });
 var zAvailableCommandsUpdate = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   availableCommands: external_exports2.array(zAvailableCommand)
 });
+var zUsage = external_exports2.object({
+  cachedReadTokens: external_exports2.number().nullish(),
+  cachedWriteTokens: external_exports2.number().nullish(),
+  inputTokens: external_exports2.number(),
+  outputTokens: external_exports2.number(),
+  thoughtTokens: external_exports2.number().nullish(),
+  totalTokens: external_exports2.number()
+});
+var zPromptResponse = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  stopReason: zStopReason,
+  usage: zUsage.nullish(),
+  userMessageId: external_exports2.string().nullish()
+});
+var zAgentResponse = external_exports2.union([
+  external_exports2.object({
+    id: zRequestId,
+    result: external_exports2.union([
+      zInitializeResponse,
+      zAuthenticateResponse,
+      zNewSessionResponse,
+      zLoadSessionResponse,
+      zListSessionsResponse,
+      zForkSessionResponse,
+      zResumeSessionResponse,
+      zCloseSessionResponse,
+      zSetSessionModeResponse,
+      zSetSessionConfigOptionResponse,
+      zPromptResponse,
+      zSetSessionModelResponse,
+      zExtResponse
+    ])
+  }),
+  external_exports2.object({
+    error: zError,
+    id: zRequestId
+  })
+]);
+var zUsageUpdate = external_exports2.object({
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  cost: zCost.nullish(),
+  size: external_exports2.number(),
+  used: external_exports2.number()
+});
 var zSessionUpdate = external_exports2.union([
   zContentChunk.and(external_exports2.object({
     sessionUpdate: external_exports2.literal("user_message_chunk")
@@ -16640,29 +16684,34 @@ var zSessionUpdate = external_exports2.union([
   })),
   zSessionInfoUpdate.and(external_exports2.object({
     sessionUpdate: external_exports2.literal("session_info_update")
+  })),
+  zUsageUpdate.and(external_exports2.object({
+    sessionUpdate: external_exports2.literal("usage_update")
   }))
 ]);
 var zSessionNotification = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   sessionId: zSessionId,
   update: zSessionUpdate
 });
 var zAgentNotification = external_exports2.object({
   method: external_exports2.string(),
-  params: external_exports2.union([external_exports2.union([zSessionNotification, zExtNotification]), external_exports2.null()]).optional()
+  params: external_exports2.union([zSessionNotification, zExtNotification]).nullish()
 });
 var zWaitForTerminalExitRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   sessionId: zSessionId,
   terminalId: external_exports2.string()
 });
 var zWaitForTerminalExitResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
-  exitCode: external_exports2.union([external_exports2.number().int().gte(0), external_exports2.null()]).optional(),
-  signal: external_exports2.union([external_exports2.string(), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
+  exitCode: external_exports2.number().int().gte(0).max(4294967295, {
+    message: "Invalid value: Expected uint32 to be <= 4294967295"
+  }).nullish(),
+  signal: external_exports2.string().nullish()
 });
 var zWriteTextFileRequest = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional(),
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish(),
   content: external_exports2.string(),
   path: external_exports2.string(),
   sessionId: zSessionId
@@ -16671,22 +16720,19 @@ var zAgentRequest = external_exports2.object({
   id: zRequestId,
   method: external_exports2.string(),
   params: external_exports2.union([
-    external_exports2.union([
-      zWriteTextFileRequest,
-      zReadTextFileRequest,
-      zRequestPermissionRequest,
-      zCreateTerminalRequest,
-      zTerminalOutputRequest,
-      zReleaseTerminalRequest,
-      zWaitForTerminalExitRequest,
-      zKillTerminalCommandRequest,
-      zExtRequest
-    ]),
-    external_exports2.null()
-  ]).optional()
+    zWriteTextFileRequest,
+    zReadTextFileRequest,
+    zRequestPermissionRequest,
+    zCreateTerminalRequest,
+    zTerminalOutputRequest,
+    zReleaseTerminalRequest,
+    zWaitForTerminalExitRequest,
+    zKillTerminalRequest,
+    zExtRequest
+  ]).nullish()
 });
 var zWriteTextFileResponse = external_exports2.object({
-  _meta: external_exports2.union([external_exports2.record(external_exports2.string(), external_exports2.unknown()), external_exports2.null()]).optional()
+  _meta: external_exports2.record(external_exports2.string(), external_exports2.unknown()).nullish()
 });
 var zClientResponse = external_exports2.union([
   external_exports2.object({
@@ -16699,7 +16745,7 @@ var zClientResponse = external_exports2.union([
       zTerminalOutputResponse,
       zReleaseTerminalResponse,
       zWaitForTerminalExitResponse,
-      zKillTerminalCommandResponse,
+      zKillTerminalResponse,
       zExtResponse
     ])
   }),
@@ -16709,7 +16755,7 @@ var zClientResponse = external_exports2.union([
   })
 ]);
 
-// ../../node_modules/.pnpm/@agentclientprotocol+sdk@0.12.0_zod@3.25.76/node_modules/@agentclientprotocol/sdk/dist/acp.js
+// ../../node_modules/.pnpm/@agentclientprotocol+sdk@0.16.1_zod@3.25.76/node_modules/@agentclientprotocol/sdk/dist/acp.js
 var ClientSideConnection = class {
   static {
     __name(this, "ClientSideConnection");
@@ -16761,17 +16807,13 @@ var ClientSideConnection = class {
           return client.waitForTerminalExit?.(validatedParams);
         }
         case CLIENT_METHODS.terminal_kill: {
-          const validatedParams = zKillTerminalCommandRequest.parse(params);
+          const validatedParams = zKillTerminalRequest.parse(params);
           const result = await client.killTerminal?.(validatedParams);
           return result ?? {};
         }
         default:
-          if (method.startsWith("_")) {
-            const customMethod = method.substring(1);
-            if (!client.extMethod) {
-              throw RequestError.methodNotFound(method);
-            }
-            return client.extMethod(customMethod, params);
+          if (client.extMethod) {
+            return client.extMethod(method, params);
           }
           throw RequestError.methodNotFound(method);
       }
@@ -16783,12 +16825,8 @@ var ClientSideConnection = class {
           return client.sessionUpdate(validatedParams);
         }
         default:
-          if (method.startsWith("_")) {
-            const customMethod = method.substring(1);
-            if (!client.extNotification) {
-              return;
-            }
-            return client.extNotification(customMethod, params);
+          if (client.extNotification) {
+            return client.extNotification(method, params);
           }
           throw RequestError.methodNotFound(method);
       }
@@ -16860,10 +16898,6 @@ var ClientSideConnection = class {
     return await this.#connection.sendRequest(AGENT_METHODS.session_fork, params);
   }
   /**
-   * **UNSTABLE**
-   *
-   * This capability is not part of the spec yet, and may be removed or changed at any point.
-   *
    * Lists existing sessions from the agent.
    *
    * This method is only available if the agent advertises the `listSessions` capability.
@@ -16871,10 +16905,8 @@ var ClientSideConnection = class {
    * Returns a list of sessions with metadata like session ID, working directory,
    * title, and last update time. Supports filtering by working directory and
    * cursor-based pagination.
-   *
-   * @experimental
    */
-  async unstable_listSessions(params) {
+  async listSessions(params) {
     return await this.#connection.sendRequest(AGENT_METHODS.session_list, params);
   }
   /**
@@ -16894,6 +16926,23 @@ var ClientSideConnection = class {
   async unstable_resumeSession(params) {
     return await this.#connection.sendRequest(AGENT_METHODS.session_resume, params);
   }
+  /**
+   * **UNSTABLE**
+   *
+   * This capability is not part of the spec yet, and may be removed or changed at any point.
+   *
+   * Closes an active session and frees up any resources associated with it.
+   *
+   * This method is only available if the agent advertises the `session.close` capability.
+   *
+   * The agent must cancel any ongoing work (as if `session/cancel` was called)
+   * and then free up any resources associated with the session.
+   *
+   * @experimental
+   */
+  async unstable_closeSession(params) {
+    return await this.#connection.sendRequest(AGENT_METHODS.session_close, params);
+  }
   /**
    * Sets the operational mode for a session.
    *
@@ -16924,6 +16973,15 @@ var ClientSideConnection = class {
   async unstable_setSessionModel(params) {
     return await this.#connection.sendRequest(AGENT_METHODS.session_set_model, params) ?? {};
   }
+  /**
+   * Set a configuration option for a given session.
+   *
+   * The response contains the full set of configuration options and their current values,
+   * as changing one option may affect the available values or state of other options.
+   */
+  async setSessionConfigOption(params) {
+    return await this.#connection.sendRequest(AGENT_METHODS.session_set_config_option, params);
+  }
   /**
    * Authenticates the client using the specified authentication method.
    *
@@ -16976,7 +17034,7 @@ var ClientSideConnection = class {
    * Allows the Client to send an arbitrary request that is not part of the ACP spec.
    */
   async extMethod(method, params) {
-    return await this.#connection.sendRequest(`_${method}`, params);
+    return await this.#connection.sendRequest(method, params);
   }
   /**
    * Extension notification
@@ -16984,7 +17042,7 @@ var ClientSideConnection = class {
    * Allows the Client to send an arbitrary notification that is not part of the ACP spec.
    */
   async extNotification(method, params) {
-    return await this.#connection.sendNotification(`_${method}`, params);
+    return await this.#connection.sendNotification(method, params);
   }
   /**
    * AbortSignal that aborts when the connection closes.
@@ -17314,18 +17372,12 @@ function isJsonRpcResponse(message) {
 __name(isJsonRpcResponse, "isJsonRpcResponse");
 function createRequest(id, method, params) {
   const request = { jsonrpc: "2.0", id, method };
-  if (params !== void 0) {
-    request.params = params;
-  }
-  return request;
+  return params !== void 0 && (request.params = params), request;
 }
 __name(createRequest, "createRequest");
 function createNotification(method, params) {
   const notification = { jsonrpc: "2.0", method };
-  if (params !== void 0) {
-    notification.params = params;
-  }
-  return notification;
+  return params !== void 0 && (notification.params = params), notification;
 }
 __name(createNotification, "createNotification");
 function createSuccessResponse(id, result) {
@@ -17387,24 +17439,15 @@ var MessageQueue = class {
    * Otherwise, it's buffered until the next consumer is ready.
    */
   push(message) {
-    if (this.closed) {
-      return;
-    }
-    if (this.resolvers.length > 0) {
-      const resolve2 = this.resolvers.shift();
-      resolve2(message);
-    } else {
-      this.queue.push(message);
-    }
+    this.closed || (this.resolvers.length > 0 ? this.resolvers.shift()(message) : this.queue.push(message));
   }
   /**
    * Close the queue, causing the async iterator to complete.
    */
   close() {
     this.closed = true;
-    for (const resolve2 of this.resolvers) {
+    for (const resolve2 of this.resolvers)
       resolve2({ type: "shutdown" });
-    }
     this.resolvers = [];
   }
   /**
@@ -17424,25 +17467,17 @@ var MessageQueue = class {
    * ```
    */
   async *[Symbol.asyncIterator]() {
-    while (!this.closed) {
+    for (; !this.closed; ) {
       let message;
-      if (this.queue.length > 0) {
-        message = this.queue.shift();
-      } else {
-        message = await new Promise((resolve2) => {
-          this.resolvers.push(resolve2);
-        });
-      }
-      if (message.type === "shutdown") {
+      if (this.queue.length > 0 ? message = this.queue.shift() : message = await new Promise((resolve2) => {
+        this.resolvers.push(resolve2);
+      }), message.type === "shutdown")
         return;
-      }
       yield message;
     }
-    while (this.queue.length > 0) {
+    for (; this.queue.length > 0; ) {
       const message = this.queue.shift();
-      if (message.type !== "shutdown") {
-        yield message;
-      }
+      message.type !== "shutdown" && (yield message);
     }
   }
 };
@@ -17453,31 +17488,23 @@ var import_node_crypto = require("node:crypto");
 async function createHttpListener(options) {
   const { acpUrl, onMessage } = options;
   let sessionId = null;
-  const connections = /* @__PURE__ */ new Map();
-  const sockets = /* @__PURE__ */ new Set();
+  const connections = /* @__PURE__ */ new Map(), sockets = /* @__PURE__ */ new Set();
   let server = null;
   server = (0, import_node_http.createServer)(async (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", "*");
-    res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS, GET");
-    res.setHeader("Access-Control-Allow-Headers", "Content-Type, Mcp-Session-Id");
-    if (req.method === "OPTIONS") {
-      res.writeHead(204);
-      res.end();
+    if (res.setHeader("Access-Control-Allow-Origin", "*"), res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS, GET"), res.setHeader("Access-Control-Allow-Headers", "Content-Type, Mcp-Session-Id"), req.method === "OPTIONS") {
+      res.writeHead(204), res.end();
       return;
     }
     if (req.method === "GET") {
-      res.writeHead(204);
-      res.end();
+      res.writeHead(204), res.end();
       return;
     }
     if (req.method !== "POST") {
-      res.writeHead(405, { "Content-Type": "application/json" });
-      res.end(JSON.stringify({ error: "Method not allowed" }));
+      res.writeHead(405, { "Content-Type": "application/json" }), res.end(JSON.stringify({ error: "Method not allowed" }));
       return;
     }
     try {
-      const body = await readBody(req);
-      const message = JSON.parse(body);
+      const body = await readBody(req), message = JSON.parse(body);
       let connection = connections.get("default");
       if (!connection) {
         const connectionId = (0, import_node_crypto.randomUUID)();
@@ -17485,9 +17512,7 @@ async function createHttpListener(options) {
           connectionId,
           sessionId: sessionId ?? "pending",
           pendingResponses: /* @__PURE__ */ new Map()
-        };
-        connections.set("default", connection);
-        onMessage({
+        }, connections.set("default", connection), onMessage({
           type: "connection-received",
           acpUrl,
           sessionId: connection.sessionId,
@@ -17501,81 +17526,59 @@ async function createHttpListener(options) {
       }
       await handleMessage(connection, message, res, onMessage);
     } catch (error40) {
-      console.error("MCP bridge HTTP error:", error40);
-      res.writeHead(500, { "Content-Type": "application/json" });
-      res.end(JSON.stringify({ error: "Internal server error" }));
+      console.error("MCP bridge HTTP error:", error40), res.writeHead(500, { "Content-Type": "application/json" }), res.end(JSON.stringify({ error: "Internal server error" }));
     }
-  });
-  await new Promise((resolve2, reject) => {
-    server.listen(0, "127.0.0.1", () => resolve2());
-    server.on("error", reject);
-  });
-  server.on("connection", (socket) => {
-    sockets.add(socket);
-    socket.on("close", () => {
+  }), await new Promise((resolve2, reject) => {
+    server.listen(0, "127.0.0.1", () => resolve2()), server.on("error", reject);
+  }), server.on("connection", (socket) => {
+    sockets.add(socket), socket.on("close", () => {
       sockets.delete(socket);
     });
   });
   const address = server.address();
-  if (!address || typeof address === "string") {
+  if (!address || typeof address == "string")
     throw new Error("Failed to get server address");
-  }
   const port = address.port;
   return {
     acpUrl,
     port,
     setSessionId(id) {
       sessionId = id;
-      for (const conn of connections.values()) {
+      for (const conn of connections.values())
         conn.sessionId = id;
-      }
     },
     async close() {
-      for (const [key, conn] of connections) {
+      for (const [key, conn] of connections)
         onMessage({
           type: "connection-closed",
           connectionId: conn.connectionId
-        });
-        connections.delete(key);
-      }
-      for (const socket of sockets) {
+        }), connections.delete(key);
+      for (const socket of sockets)
         socket.destroy();
-      }
-      sockets.clear();
-      if (server) {
-        await new Promise((resolve2, reject) => {
-          server.close((err) => {
-            if (err) {
-              reject(err);
-            } else {
-              resolve2();
-            }
-          });
+      sockets.clear(), server && await new Promise((resolve2, reject) => {
+        server.close((err) => {
+          err ? reject(err) : resolve2();
         });
-      }
+      });
     }
   };
 }
 __name(createHttpListener, "createHttpListener");
 async function handleMessage(connection, message, res, onMessage) {
   if (isJsonRpcRequest(message)) {
-    const idKey = String(message.id);
-    const responsePromise = new Promise((resolve2) => {
+    const idKey = String(message.id), responsePromise = new Promise((resolve2) => {
       connection.pendingResponses.set(idKey, resolve2);
-    });
-    const dispatch = {
+    }), dispatch = {
       type: "request",
       id: message.id,
       method: message.method,
       params: message.params,
       responder: createResponder((result) => {
         const resolver = connection.pendingResponses.get(idKey);
-        connection.pendingResponses.delete(idKey);
-        resolver?.({ jsonrpc: "2.0", id: message.id, result });
+        connection.pendingResponses.delete(idKey), resolver?.({ jsonrpc: "2.0", id: message.id, result });
       }, (error40) => {
         const resolver = connection.pendingResponses.get(idKey);
-        connection.pendingResponses.delete(idKey);
-        resolver?.({ jsonrpc: "2.0", id: message.id, error: error40 });
+        connection.pendingResponses.delete(idKey), resolver?.({ jsonrpc: "2.0", id: message.id, error: error40 });
       })
     };
     onMessage({
@@ -17587,8 +17590,7 @@ async function handleMessage(connection, message, res, onMessage) {
     res.writeHead(200, {
       "Content-Type": "application/json",
       "Mcp-Session-Id": connection.connectionId
-    });
-    res.end(JSON.stringify(response));
+    }), res.end(JSON.stringify(response));
   } else if (isJsonRpcNotification(message)) {
     const dispatch = {
       type: "notification",
@@ -17599,21 +17601,15 @@ async function handleMessage(connection, message, res, onMessage) {
       type: "client-message",
       connectionId: connection.connectionId,
       dispatch
-    });
-    res.writeHead(202);
-    res.end();
-  } else {
-    res.writeHead(400, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({ error: "Invalid message type" }));
-  }
+    }), res.writeHead(202), res.end();
+  } else
+    res.writeHead(400, { "Content-Type": "application/json" }), res.end(JSON.stringify({ error: "Invalid message type" }));
 }
 __name(handleMessage, "handleMessage");
 function readBody(req) {
   return new Promise((resolve2, reject) => {
     const chunks = [];
-    req.on("data", (chunk) => chunks.push(chunk));
-    req.on("end", () => resolve2(Buffer.concat(chunks).toString("utf-8")));
-    req.on("error", reject);
+    req.on("data", (chunk) => chunks.push(chunk)), req.on("end", () => resolve2(Buffer.concat(chunks).toString("utf-8"))), req.on("error", reject);
   });
 }
 __name(readBody, "readBody");
@@ -17643,38 +17639,28 @@ var McpBridge = class {
    * Returns the transformed server list and a session key for later correlation.
    */
   async transformMcpServers(servers, sessionKey) {
-    if (!servers || servers.length === 0) {
+    if (!servers || servers.length === 0)
       return { transformedServers: servers, hasAcpServers: false };
-    }
     const pendingSession = {
       listeners: [],
       urlMap: /* @__PURE__ */ new Map()
-    };
-    const transformedServers = [];
+    }, transformedServers = [];
     let hasAcpServers = false;
-    for (const server of servers) {
+    for (const server of servers)
       if (server.url.startsWith("acp:")) {
         hasAcpServers = true;
         const listener = await createHttpListener({
           acpUrl: server.url,
           onMessage: /* @__PURE__ */ __name((msg) => this.handleBridgeMessage(msg), "onMessage")
         });
-        this.listeners.set(server.url, listener);
-        pendingSession.listeners.push(listener);
-        pendingSession.urlMap.set(server.url, `http://127.0.0.1:${listener.port}`);
-        transformedServers.push({
+        this.listeners.set(server.url, listener), pendingSession.listeners.push(listener), pendingSession.urlMap.set(server.url, `http://127.0.0.1:${listener.port}`), transformedServers.push({
           ...server,
           url: `http://127.0.0.1:${listener.port}`,
           type: "http"
         });
-      } else {
+      } else
         transformedServers.push(server);
-      }
-    }
-    if (hasAcpServers) {
-      this.pendingSessions.set(sessionKey, pendingSession);
-    }
-    return { transformedServers, hasAcpServers };
+    return hasAcpServers && this.pendingSessions.set(sessionKey, pendingSession), { transformedServers, hasAcpServers };
   }
   /**
    * Complete session creation after receiving the session ID from the agent
@@ -17684,25 +17670,22 @@ var McpBridge = class {
    */
   completeSession(sessionKey, sessionId) {
     const pending = this.pendingSessions.get(sessionKey);
-    if (!pending)
-      return;
-    for (const listener of pending.listeners) {
-      listener.setSessionId(sessionId);
+    if (pending) {
+      for (const listener of pending.listeners)
+        listener.setSessionId(sessionId);
+      this.pendingSessions.delete(sessionKey);
     }
-    this.pendingSessions.delete(sessionKey);
   }
   /**
    * Cancel a pending session (e.g., on error)
    */
   async cancelSession(sessionKey) {
     const pending = this.pendingSessions.get(sessionKey);
-    if (!pending)
-      return;
-    for (const listener of pending.listeners) {
-      await listener.close();
-      this.listeners.delete(listener.acpUrl);
+    if (pending) {
+      for (const listener of pending.listeners)
+        await listener.close(), this.listeners.delete(listener.acpUrl);
+      this.pendingSessions.delete(sessionKey);
     }
-    this.pendingSessions.delete(sessionKey);
   }
   /**
    * Handle a message from an HTTP listener
@@ -17715,8 +17698,7 @@ var McpBridge = class {
           acpUrl: msg.acpUrl,
           sessionId: msg.sessionId,
           responder: null
-        });
-        this.messageQueue.push({
+        }), this.messageQueue.push({
           type: "mcp-connection-received",
           acpUrl: msg.acpUrl,
           connectionId: msg.connectionId
@@ -17732,8 +17714,7 @@ var McpBridge = class {
         break;
       }
       case "connection-closed": {
-        this.connections.delete(msg.connectionId);
-        this.messageQueue.push({
+        this.connections.delete(msg.connectionId), this.messageQueue.push({
           type: "mcp-connection-disconnected",
           connectionId: msg.connectionId
         });
@@ -17752,13 +17733,11 @@ var McpBridge = class {
    */
   async close() {
     this.connections.clear();
-    for (const listener of this.listeners.values()) {
+    for (const listener of this.listeners.values())
       await listener.close();
-    }
     this.listeners.clear();
-    for (const key of this.pendingSessions.keys()) {
+    for (const key of this.pendingSessions.keys())
       await this.cancelSession(key);
-    }
   }
 };
 
@@ -17789,22 +17768,16 @@ function createNoopLogger() {
 }
 __name(createNoopLogger, "createNoopLogger");
 function createLogger(options = {}) {
-  const level = options.level ?? "info";
-  const levelNum = LOG_LEVELS[level];
-  const name = options.name;
-  const useJson = options.json ?? false;
+  const level = options.level ?? "info", levelNum = LOG_LEVELS[level], name = options.name, useJson = options.json ?? false;
   let traceStream = null;
-  if (options.trace) {
-    traceStream = (0, import_node_fs.createWriteStream)(options.trace.path, { flags: "a" });
-  }
+  options.trace && (traceStream = (0, import_node_fs.createWriteStream)(options.trace.path, { flags: "a" }));
   function isEnabled(checkLevel) {
     return LOG_LEVELS[checkLevel] <= levelNum;
   }
   __name(isEnabled, "isEnabled");
   function log(logLevel, message, data) {
-    if (!isEnabled(logLevel)) {
+    if (!isEnabled(logLevel))
       return;
-    }
     const entry = {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       level: logLevel,
@@ -17812,27 +17785,23 @@ function createLogger(options = {}) {
       message,
       data
     };
-    if (useJson) {
-      const output = logLevel === "error" || logLevel === "warn" ? console.error : console.log;
-      output(JSON.stringify(entry));
-    } else {
-      const prefix = name ? `[${name}]` : "";
-      const levelStr = logLevel.toUpperCase().padEnd(5);
-      const dataStr = data ? ` ${JSON.stringify(data)}` : "";
-      const output = logLevel === "error" || logLevel === "warn" ? console.error : console.log;
-      output(`${entry.timestamp} ${levelStr} ${prefix}${prefix ? " " : ""}${message}${dataStr}`);
+    if (useJson)
+      (logLevel === "error" || logLevel === "warn" ? console.error : console.log)(JSON.stringify(entry));
+    else {
+      const prefix = name ? `[${name}]` : "", levelStr = logLevel.toUpperCase().padEnd(5), dataStr = data ? ` ${JSON.stringify(data)}` : "";
+      (logLevel === "error" || logLevel === "warn" ? console.error : console.log)(`${entry.timestamp} ${levelStr} ${prefix}${prefix ? " " : ""}${message}${dataStr}`);
     }
   }
   __name(log, "log");
   function traceMessage(entry) {
-    if (!traceStream) {
+    if (!traceStream)
       return;
-    }
     const fullEntry = {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       ...entry
     };
-    traceStream.write(JSON.stringify(fullEntry) + "\n");
+    traceStream.write(JSON.stringify(fullEntry) + `
+`);
   }
   __name(traceMessage, "traceMessage");
   function child(childName) {
@@ -17847,17 +17816,11 @@ function createLogger(options = {}) {
   }
   __name(child, "child");
   async function close() {
-    if (traceStream) {
-      await new Promise((resolve2, reject) => {
-        traceStream.end((err) => {
-          if (err)
-            reject(err);
-          else
-            resolve2();
-        });
+    traceStream && (await new Promise((resolve2, reject) => {
+      traceStream.end((err) => {
+        err ? reject(err) : resolve2();
       });
-      traceStream = null;
-    }
+    }), traceStream = null);
   }
   __name(close, "close");
   return {
@@ -17879,9 +17842,7 @@ var defaultLogger = createNoopLogger();
 function staticInstantiator(config2) {
   return {
     async instantiate() {
-      const { StdioConnector: StdioConnector2 } = await Promise.resolve().then(() => (init_stdio(), stdio_exports));
-      const proxyConnectors = (config2.proxies ?? []).map((spec) => new StdioConnector2(normalizeCommandSpec(spec)));
-      const agentConnector = new StdioConnector2(normalizeCommandSpec(config2.agent));
+      const { StdioConnector: StdioConnector2 } = await Promise.resolve().then(() => (init_stdio(), stdio_exports)), proxyConnectors = (config2.proxies ?? []).map((spec) => new StdioConnector2(normalizeCommandSpec(spec))), agentConnector = new StdioConnector2(normalizeCommandSpec(config2.agent));
       return {
         proxies: proxyConnectors,
         agent: agentConnector
@@ -17891,9 +17852,8 @@ function staticInstantiator(config2) {
 }
 __name(staticInstantiator, "staticInstantiator");
 function fromCommands(commands) {
-  if (commands.length === 0) {
+  if (commands.length === 0)
     throw new Error("At least one command (the agent) is required");
-  }
   return staticInstantiator({
     proxies: commands.slice(0, -1),
     agent: commands[commands.length - 1]
@@ -17901,7 +17861,7 @@ function fromCommands(commands) {
 }
 __name(fromCommands, "fromCommands");
 function normalizeCommandSpec(spec) {
-  if (typeof spec === "string") {
+  if (typeof spec == "string") {
     const parts = parseCommand2(spec);
     return {
       command: parts[0],
@@ -17913,31 +17873,12 @@ function normalizeCommandSpec(spec) {
 __name(normalizeCommandSpec, "normalizeCommandSpec");
 function parseCommand2(command) {
   const parts = [];
-  let current = "";
-  let inQuote = null;
+  let current = "", inQuote = null;
   for (let i = 0; i < command.length; i++) {
     const char = command[i];
-    if (inQuote) {
-      if (char === inQuote) {
-        inQuote = null;
-      } else {
-        current += char;
-      }
-    } else if (char === '"' || char === "'") {
-      inQuote = char;
-    } else if (char === " " || char === "	") {
-      if (current) {
-        parts.push(current);
-        current = "";
-      }
-    } else {
-      current += char;
-    }
-  }
-  if (current) {
-    parts.push(current);
+    inQuote ? char === inQuote ? inQuote = null : current += char : char === '"' || char === "'" ? inQuote = char : char === " " || char === "	" ? current && (parts.push(current), current = "") : current += char;
   }
-  return parts;
+  return current && parts.push(current), parts;
 }
 __name(parseCommand2, "parseCommand");
 
@@ -17967,25 +17908,15 @@ var Conductor = class {
   // Maps MCP connection IDs to their responders for _mcp/connect
   mcpConnectResponders = /* @__PURE__ */ new Map();
   constructor(config2) {
-    this.config = config2;
-    if (config2.logging) {
-      this.logger = createLogger({
-        ...config2.logging,
-        name: config2.logging.name ?? config2.name ?? "conductor",
-        trace: config2.trace ?? config2.logging.trace
-      });
-    } else if (config2.trace) {
-      this.logger = createLogger({
-        level: "info",
-        name: config2.name ?? "conductor",
-        trace: config2.trace
-      });
-    } else {
-      this.logger = createNoopLogger();
-    }
-    if (config2.mcpBridgeMode !== "disabled") {
-      this.mcpBridge = new McpBridge({ messageQueue: this.messageQueue });
-    }
+    this.config = config2, config2.logging ? this.logger = createLogger({
+      ...config2.logging,
+      name: config2.logging.name ?? config2.name ?? "conductor",
+      trace: config2.trace ?? config2.logging.trace
+    }) : config2.trace ? this.logger = createLogger({
+      level: "info",
+      name: config2.name ?? "conductor",
+      trace: config2.trace
+    }) : this.logger = createNoopLogger(), config2.mcpBridgeMode !== "disabled" && (this.mcpBridge = new McpBridge({ messageQueue: this.messageQueue }));
   }
   /**
    * Connect to a client and run the conductor's message loop.
@@ -17993,42 +17924,22 @@ var Conductor = class {
    * This method blocks until the conductor shuts down.
    */
   async connect(clientConnector) {
-    if (this.state.type !== "uninitialized") {
+    if (this.state.type !== "uninitialized")
       throw new Error(`Conductor is already ${this.state.type}`);
-    }
-    this.logger.info("Connecting to client");
-    this.clientConnection = await clientConnector.connect();
-    this.logger.debug("Client connected, starting message pump");
-    this.pumpClientMessages(this.clientConnection);
-    this.logger.debug("Starting event loop");
-    await this.runEventLoop();
-    this.logger.info("Event loop exited");
+    this.logger.info("Connecting to client"), this.clientConnection = await clientConnector.connect(), this.logger.debug("Client connected, starting message pump"), this.pumpClientMessages(this.clientConnection), this.logger.debug("Starting event loop"), await this.runEventLoop(), this.logger.info("Event loop exited");
   }
   /**
    * Shut down the conductor
    */
   async shutdown() {
-    if (this.state.type === "shutdown") {
+    if (this.state.type === "shutdown")
       return;
-    }
-    this.logger.info("Shutting down conductor");
-    this.state = { type: "shutdown" };
-    this.messageQueue.close();
+    this.logger.info("Shutting down conductor"), this.state = { type: "shutdown" }, this.messageQueue.close();
     const closePromises = [];
-    if (this.clientConnection) {
-      closePromises.push(this.clientConnection.close());
-    }
-    for (const proxy of this.proxies) {
+    this.clientConnection && closePromises.push(this.clientConnection.close());
+    for (const proxy of this.proxies)
       closePromises.push(proxy.close());
-    }
-    if (this.agentConnection) {
-      closePromises.push(this.agentConnection.close());
-    }
-    if (this.mcpBridge) {
-      closePromises.push(this.mcpBridge.close());
-    }
-    await Promise.all(closePromises);
-    await this.logger.close();
+    this.agentConnection && closePromises.push(this.agentConnection.close()), this.mcpBridge && closePromises.push(this.mcpBridge.close()), await Promise.all(closePromises), await this.logger.close();
   }
   /**
    * Pump messages from the client into the message queue
@@ -18039,26 +17950,21 @@ var Conductor = class {
         for await (const message of client.messages) {
           if (isJsonRpcResponse(message)) {
             const dispatch2 = this.messageToDispatch(message, { type: "client" });
-            if (dispatch2 && dispatch2.type === "response") {
-              this.handleResponse(dispatch2);
-            }
+            dispatch2 && dispatch2.type === "response" && this.handleResponse(dispatch2);
             continue;
           }
           const dispatch = this.messageToDispatch(message, { type: "client" });
-          if (dispatch) {
-            this.messageQueue.push({
-              type: "left-to-right",
-              targetIndex: 0,
-              // First component (proxy[0] or agent if no proxies)
-              dispatch
-            });
-          }
+          dispatch && this.messageQueue.push({
+            type: "left-to-right",
+            targetIndex: 0,
+            // First component (proxy[0] or agent if no proxies)
+            dispatch
+          });
         }
       } catch (error40) {
         this.logger.error("Error reading from client", { error: String(error40) });
       } finally {
-        this.logger.debug("Client disconnected, shutting down");
-        this.shutdown();
+        this.logger.debug("Client disconnected, shutting down"), this.shutdown();
       }
     })();
   }
@@ -18069,35 +17975,28 @@ var Conductor = class {
     (async () => {
       try {
         for await (const message of connection.messages) {
-          if (isJsonRpcRequest(message)) {
-            if (message.method === PROXY_SUCCESSOR_REQUEST) {
-              this.handleProxySuccessorRequest(proxyIndex, message);
-              continue;
-            }
+          if (isJsonRpcRequest(message) && message.method === PROXY_SUCCESSOR_REQUEST) {
+            this.handleProxySuccessorRequest(proxyIndex, message);
+            continue;
           }
-          if (isJsonRpcNotification(message)) {
-            if (message.method === PROXY_SUCCESSOR_NOTIFICATION) {
-              this.handleProxySuccessorNotification(proxyIndex, message);
-              continue;
-            }
+          if (isJsonRpcNotification(message) && message.method === PROXY_SUCCESSOR_NOTIFICATION) {
+            this.handleProxySuccessorNotification(proxyIndex, message);
+            continue;
           }
           const dispatch = this.messageToDispatch(message, {
             type: "proxy",
             index: proxyIndex
           });
-          if (dispatch) {
-            this.messageQueue.push({
-              type: "right-to-left",
-              sourceIndex: { type: "proxy", index: proxyIndex },
-              dispatch
-            });
-          }
+          dispatch && this.messageQueue.push({
+            type: "right-to-left",
+            sourceIndex: { type: "proxy", index: proxyIndex },
+            dispatch
+          });
         }
       } catch (error40) {
         this.logger.error("Error reading from proxy", { proxyIndex, error: String(error40) });
       } finally {
-        this.logger.debug("Proxy disconnected, shutting down", { proxyIndex });
-        this.shutdown();
+        this.logger.debug("Proxy disconnected, shutting down", { proxyIndex }), this.shutdown();
       }
     })();
   }
@@ -18111,19 +18010,16 @@ var Conductor = class {
           const dispatch = this.messageToDispatch(message, {
             type: "successor"
           });
-          if (dispatch) {
-            this.messageQueue.push({
-              type: "right-to-left",
-              sourceIndex: { type: "successor" },
-              dispatch
-            });
-          }
+          dispatch && this.messageQueue.push({
+            type: "right-to-left",
+            sourceIndex: { type: "successor" },
+            dispatch
+          });
         }
       } catch (error40) {
         this.logger.error("Error reading from agent", { error: String(error40) });
       } finally {
-        this.logger.debug("Agent disconnected, shutting down");
-        this.shutdown();
+        this.logger.debug("Agent disconnected, shutting down"), this.shutdown();
       }
     })();
   }
@@ -18134,21 +18030,17 @@ var Conductor = class {
    * We unwrap the inner request and forward it.
    */
   handleProxySuccessorRequest(proxyIndex, message) {
-    const params = message.params;
-    const inner = unwrapProxySuccessorRequest(params);
-    const responder = createResponder((result) => {
+    const params = message.params, inner = unwrapProxySuccessorRequest(params), responder = createResponder((result) => {
       this.proxies[proxyIndex]?.send(createSuccessResponse(message.id, result));
     }, (error40) => {
       this.proxies[proxyIndex]?.send(createErrorResponse(message.id, error40));
-    });
-    const dispatch = {
+    }), dispatch = {
       type: "request",
       id: message.id,
       method: inner.method,
       params: inner.params,
       responder
-    };
-    const targetIndex = proxyIndex + 1;
+    }, targetIndex = proxyIndex + 1;
     this.messageQueue.push({
       type: "left-to-right",
       targetIndex,
@@ -18161,14 +18053,11 @@ var Conductor = class {
    * The proxy is forwarding a notification to its successor.
    */
   handleProxySuccessorNotification(proxyIndex, message) {
-    const params = message.params;
-    const inner = unwrapProxySuccessorNotification(params);
-    const dispatch = {
+    const params = message.params, inner = unwrapProxySuccessorNotification(params), dispatch = {
       type: "notification",
       method: inner.method,
       params: inner.params
-    };
-    const targetIndex = proxyIndex + 1;
+    }, targetIndex = proxyIndex + 1;
     this.messageQueue.push({
       type: "left-to-right",
       targetIndex,
@@ -18189,101 +18078,87 @@ var Conductor = class {
         responder
       };
     }
-    if (isJsonRpcNotification(message)) {
-      return {
-        type: "notification",
-        method: message.method,
-        params: message.params
-      };
-    }
-    if (isJsonRpcResponse(message)) {
-      return {
-        type: "response",
-        id: message.id,
-        result: "result" in message ? message.result : void 0,
-        error: "error" in message ? message.error : void 0
-      };
-    }
-    return null;
+    return isJsonRpcNotification(message) ? {
+      type: "notification",
+      method: message.method,
+      params: message.params
+    } : isJsonRpcResponse(message) ? {
+      type: "response",
+      id: message.id,
+      result: "result" in message ? message.result : void 0,
+      error: "error" in message ? message.error : void 0
+    } : null;
   }
   /**
    * Create a responder that routes the response back to the appropriate destination
    */
   createResponderForSource(source, requestId) {
-    if (source.type === "client") {
+    if (source.type === "client")
       return createResponder((result) => {
         this.clientConnection?.send(createSuccessResponse(requestId, result));
       }, (error40) => {
         this.clientConnection?.send(createErrorResponse(requestId, error40));
       });
-    } else if (source.type === "proxy") {
+    if (source.type === "proxy") {
       const proxyIndex = source.index;
       return createResponder((result) => {
         this.proxies[proxyIndex]?.send(createSuccessResponse(requestId, result));
       }, (error40) => {
         this.proxies[proxyIndex]?.send(createErrorResponse(requestId, error40));
       });
-    } else {
+    } else
       return createResponder((result) => {
         this.agentConnection?.send(createSuccessResponse(requestId, result));
       }, (error40) => {
         this.agentConnection?.send(createErrorResponse(requestId, error40));
       });
-    }
   }
   /**
    * Run the main event loop, processing messages from the queue
    */
   async runEventLoop() {
-    for await (const message of this.messageQueue) {
+    for await (const message of this.messageQueue)
       await this.handleMessage(message);
-    }
   }
   /**
    * Handle a message from the queue
    */
   async handleMessage(message) {
-    this.logger.traceMessage({
+    switch (this.logger.traceMessage({
       direction: message.type === "left-to-right" ? "left-to-right" : message.type === "right-to-left" ? "right-to-left" : "internal",
       source: this.getMessageSource(message),
       target: this.getMessageTarget(message),
       message
-    });
-    switch (message.type) {
+    }), message.type) {
       case "left-to-right":
         this.logger.trace("Routing left-to-right", {
           targetIndex: message.targetIndex,
           dispatchType: message.dispatch.type,
           method: "method" in message.dispatch ? message.dispatch.method : void 0
-        });
-        await this.handleLeftToRight(message.targetIndex, message.dispatch);
+        }), await this.handleLeftToRight(message.targetIndex, message.dispatch);
         break;
       case "right-to-left":
         this.logger.trace("Routing right-to-left", {
           sourceIndex: message.sourceIndex,
           dispatchType: message.dispatch.type,
           method: "method" in message.dispatch ? message.dispatch.method : void 0
-        });
-        await this.handleRightToLeft(message.sourceIndex, message.dispatch);
+        }), await this.handleRightToLeft(message.sourceIndex, message.dispatch);
         break;
       case "shutdown":
         this.logger.debug("Received shutdown message");
         break;
       // MCP bridge messages
       case "mcp-connection-received":
-        this.logger.debug("MCP connection received", { acpUrl: message.acpUrl, connectionId: message.connectionId });
-        await this.handleMcpConnectionReceived(message.acpUrl, message.connectionId);
+        this.logger.debug("MCP connection received", { acpUrl: message.acpUrl, connectionId: message.connectionId }), await this.handleMcpConnectionReceived(message.acpUrl, message.connectionId);
         break;
       case "mcp-connection-established":
         this.logger.debug("MCP connection established", { connectionId: message.connectionId });
         break;
       case "mcp-client-to-server":
-        this.logger.trace("MCP client-to-server message", { connectionId: message.connectionId });
-        await this.handleMcpClientToServer(message.connectionId, message.dispatch);
+        this.logger.trace("MCP client-to-server message", { connectionId: message.connectionId }), await this.handleMcpClientToServer(message.connectionId, message.dispatch);
         break;
       case "mcp-connection-disconnected":
-        this.logger.debug("MCP connection disconnected", { connectionId: message.connectionId });
-        await this.handleMcpConnectionDisconnected(message.connectionId);
+        this.logger.debug("MCP connection disconnected", { connectionId: message.connectionId }), await this.handleMcpConnectionDisconnected(message.connectionId);
         break;
     }
   }
@@ -18312,10 +18187,7 @@ var Conductor = class {
       case "left-to-right":
         return message.targetIndex < this.proxies.length ? `proxy[${message.targetIndex}]` : "agent";
       case "right-to-left":
-        if (message.sourceIndex.type === "proxy" && message.sourceIndex.index === 0) {
-          return "client";
-        }
-        return message.sourceIndex.type === "successor" ? `proxy[${this.proxies.length - 1}]` : `proxy[${message.sourceIndex.index - 1}]`;
+        return message.sourceIndex.type === "proxy" && message.sourceIndex.index === 0 ? "client" : message.sourceIndex.type === "successor" ? `proxy[${this.proxies.length - 1}]` : `proxy[${message.sourceIndex.index - 1}]`;
       case "mcp-connection-received":
       case "mcp-client-to-server":
       case "mcp-connection-disconnected":
@@ -18338,12 +18210,10 @@ var Conductor = class {
     }
     const target = this.getTargetConnection(targetIndex);
     if (!target) {
-      if (dispatch.type === "request") {
-        dispatch.responder.respondWithError({
-          code: -32603,
-          message: `No target connection for index ${targetIndex}`
-        });
-      }
+      dispatch.type === "request" && dispatch.responder.respondWithError({
+        code: -32603,
+        message: `No target connection for index ${targetIndex}`
+      });
       return;
     }
     this.forwardToConnection(target, dispatch);
@@ -18357,9 +18227,7 @@ var Conductor = class {
       return;
     }
     if (this.proxies.length === 0) {
-      if (this.clientConnection) {
-        this.forwardToConnection(this.clientConnection, dispatch);
-      }
+      this.clientConnection && this.forwardToConnection(this.clientConnection, dispatch);
       return;
     }
     if (sourceIndex.type === "successor") {
@@ -18367,13 +18235,7 @@ var Conductor = class {
       this.forwardWrappedToProxy(lastProxyIndex, dispatch);
     } else if (sourceIndex.type === "proxy") {
       const proxyIndex = sourceIndex.index;
-      if (proxyIndex === 0) {
-        if (this.clientConnection) {
-          this.forwardToConnection(this.clientConnection, dispatch);
-        }
-      } else {
-        this.forwardWrappedToProxy(proxyIndex - 1, dispatch);
-      }
+      proxyIndex === 0 ? this.clientConnection && this.forwardToConnection(this.clientConnection, dispatch) : this.forwardWrappedToProxy(proxyIndex - 1, dispatch);
     }
   }
   /**
@@ -18384,28 +18246,25 @@ var Conductor = class {
    */
   forwardWrappedToProxy(proxyIndex, dispatch) {
     const proxy = this.proxies[proxyIndex];
-    if (!proxy)
-      return;
-    switch (dispatch.type) {
-      case "request": {
-        const wrappedParams = wrapAsProxySuccessorRequest(dispatch.method, dispatch.params);
-        const outgoingId = this.generateRequestId();
-        this.pendingRequests.set(String(outgoingId), {
-          originalId: dispatch.id,
-          responder: dispatch.responder,
-          source: proxyIndex
-        });
-        proxy.send(createRequest(outgoingId, PROXY_SUCCESSOR_REQUEST, wrappedParams));
-        break;
-      }
-      case "notification": {
-        const wrappedParams = wrapAsProxySuccessorNotification(dispatch.method, dispatch.params);
-        proxy.send(createNotification(PROXY_SUCCESSOR_NOTIFICATION, wrappedParams));
-        break;
+    if (proxy)
+      switch (dispatch.type) {
+        case "request": {
+          const wrappedParams = wrapAsProxySuccessorRequest(dispatch.method, dispatch.params), outgoingId = this.generateRequestId();
+          this.pendingRequests.set(String(outgoingId), {
+            originalId: dispatch.id,
+            responder: dispatch.responder,
+            source: proxyIndex
+          }), proxy.send(createRequest(outgoingId, PROXY_SUCCESSOR_REQUEST, wrappedParams));
+          break;
+        }
+        case "notification": {
+          const wrappedParams = wrapAsProxySuccessorNotification(dispatch.method, dispatch.params);
+          proxy.send(createNotification(PROXY_SUCCESSOR_NOTIFICATION, wrappedParams));
+          break;
+        }
+        case "response":
+          break;
       }
-      case "response":
-        break;
-    }
   }
   /**
    * Handle the initialize request - instantiate components and perform initialization sequence
@@ -18426,8 +18285,7 @@ var Conductor = class {
       });
       return;
     }
-    this.state = { type: "initializing" };
-    this.logger.info("Starting initialization");
+    this.state = { type: "initializing" }, this.logger.info("Starting initialization");
     try {
       const initRequest = {
         method: dispatch.method,
@@ -18438,38 +18296,25 @@ var Conductor = class {
       this.logger.info("Components instantiated", { proxyCount: proxies.length });
       for (const proxyConnector of proxies) {
         const proxyConnection = await proxyConnector.connect();
-        this.proxies.push(proxyConnection);
-        this.logger.debug("Proxy connected", { proxyIndex: this.proxies.length - 1 });
-        this.pumpProxyMessages(proxyConnection, this.proxies.length - 1);
-      }
-      this.logger.debug("Connecting to agent");
-      this.agentConnection = await agent.connect();
-      this.pumpAgentMessages(this.agentConnection);
-      this.logger.info("Agent connected");
-      this.state = { type: "running" };
-      this.logger.info("Conductor running");
-      if (this.proxies.length === 0) {
+        this.proxies.push(proxyConnection), this.logger.debug("Proxy connected", { proxyIndex: this.proxies.length - 1 }), this.pumpProxyMessages(proxyConnection, this.proxies.length - 1);
+      }
+      if (this.logger.debug("Connecting to agent"), this.agentConnection = await agent.connect(), this.pumpAgentMessages(this.agentConnection), this.logger.info("Agent connected"), this.state = { type: "running" }, this.logger.info("Conductor running"), this.proxies.length === 0) {
         const outgoingId = this.generateRequestId();
         this.pendingRequests.set(String(outgoingId), {
           originalId: dispatch.id,
           responder: this.createAgentInitializeResponder(dispatch.responder),
           source: "client"
-        });
-        this.agentConnection.send(createRequest(outgoingId, dispatch.method, dispatch.params));
+        }), this.agentConnection.send(createRequest(outgoingId, dispatch.method, dispatch.params));
       } else {
-        const paramsWithProxy = this.addProxyCapability(dispatch.params);
-        const outgoingId = this.generateRequestId();
+        const paramsWithProxy = this.addProxyCapability(dispatch.params), outgoingId = this.generateRequestId();
         this.pendingRequests.set(String(outgoingId), {
           originalId: dispatch.id,
           responder: this.createProxyInitializeResponder(this.createAgentInitializeResponder(dispatch.responder)),
           source: "client"
-        });
-        this.proxies[0].send(createRequest(outgoingId, dispatch.method, paramsWithProxy));
+        }), this.proxies[0].send(createRequest(outgoingId, dispatch.method, paramsWithProxy));
       }
     } catch (error40) {
-      this.state = { type: "uninitialized" };
-      this.logger.error("Initialization failed", { error: String(error40) });
-      dispatch.responder.respondWithError({
+      this.state = { type: "uninitialized" }, this.logger.error("Initialization failed", { error: String(error40) }), dispatch.responder.respondWithError({
         code: -32603,
         message: `Failed to initialize: ${error40}`
       });
@@ -18479,8 +18324,7 @@ var Conductor = class {
    * Add proxy capability to initialize params
    */
   addProxyCapability(params) {
-    const p = params ?? {};
-    const meta = p._meta ?? {};
+    const p = params ?? {}, meta = p._meta ?? {};
     return {
       ...p,
       _meta: {
@@ -18493,9 +18337,7 @@ var Conductor = class {
    * Remove proxy capability from initialize params (for forwarding to agent)
    */
   removeProxyCapability(params) {
-    const p = params ?? {};
-    const meta = p._meta ?? {};
-    const { proxy: _, ...restMeta } = meta;
+    const p = params ?? {}, meta = p._meta ?? {}, { proxy: _, ...restMeta } = meta;
     return {
       ...p,
       _meta: restMeta
@@ -18506,8 +18348,7 @@ var Conductor = class {
    */
   createProxyInitializeResponder(originalResponder) {
     return createResponder((result) => {
-      const response = result;
-      if (!response?._meta?.proxy) {
+      if (!result?._meta?.proxy) {
         originalResponder.respondWithError({
           code: -32600,
           message: "Proxy component did not accept proxy capability"
@@ -18524,11 +18365,7 @@ var Conductor = class {
    */
   createAgentInitializeResponder(originalResponder) {
     return createResponder((result) => {
-      const response = result;
-      if (response?.capabilities?.mcp_acp_transport) {
-        this.agentSupportsMcpAcpTransport = true;
-      }
-      originalResponder.respond(result);
+      result?.capabilities?.mcp_acp_transport && (this.agentSupportsMcpAcpTransport = true), originalResponder.respond(result);
     }, (error40) => {
       originalResponder.respondWithError(error40);
     });
@@ -18542,12 +18379,7 @@ var Conductor = class {
       this.logger.warn("No pending request for response ID", { id: dispatch.id });
       return;
     }
-    this.pendingRequests.delete(String(dispatch.id));
-    if (dispatch.error) {
-      pending.responder.respondWithError(dispatch.error);
-    } else {
-      pending.responder.respond(dispatch.result);
-    }
+    this.pendingRequests.delete(String(dispatch.id)), dispatch.error ? pending.responder.respondWithError(dispatch.error) : pending.responder.respond(dispatch.result);
   }
   /**
    * Forward a dispatch to a connection, handling request ID rewriting
@@ -18561,19 +18393,14 @@ var Conductor = class {
           responder: dispatch.responder,
           source: "client"
           // Default - actual source tracking is in PendingRequest
-        });
-        connection.send(createRequest(outgoingId, dispatch.method, dispatch.params));
+        }), connection.send(createRequest(outgoingId, dispatch.method, dispatch.params));
         break;
       }
       case "notification":
         connection.send(createNotification(dispatch.method, dispatch.params));
         break;
       case "response":
-        if (dispatch.error) {
-          connection.send(createErrorResponse(dispatch.id, dispatch.error));
-        } else {
-          connection.send(createSuccessResponse(dispatch.id, dispatch.result));
-        }
+        dispatch.error ? connection.send(createErrorResponse(dispatch.id, dispatch.error)) : connection.send(createSuccessResponse(dispatch.id, dispatch.result));
         break;
     }
   }
@@ -18582,13 +18409,7 @@ var Conductor = class {
    * Index 0..n-1 are proxies, index n is the agent
    */
   getTargetConnection(targetIndex) {
-    if (targetIndex < this.proxies.length) {
-      return this.proxies[targetIndex];
-    }
-    if (targetIndex === this.proxies.length) {
-      return this.agentConnection;
-    }
-    return null;
+    return targetIndex < this.proxies.length ? this.proxies[targetIndex] : targetIndex === this.proxies.length ? this.agentConnection : null;
   }
   /**
    * Handle a session/new request - transform acp: URLs to http: URLs
@@ -18601,33 +18422,21 @@ var Conductor = class {
    * 4. When the response comes back with session_id, deliver it to the listeners
    */
   async handleSessionNew(targetIndex, dispatch) {
-    const params = dispatch.params;
-    const servers = params?.mcpServers;
-    const sessionKey = `session-${this.generateRequestId()}`;
-    const { transformedServers, hasAcpServers } = await this.mcpBridge.transformMcpServers(servers, sessionKey);
+    const params = dispatch.params, servers = params?.mcpServers, sessionKey = `session-${this.generateRequestId()}`, { transformedServers, hasAcpServers } = await this.mcpBridge.transformMcpServers(servers, sessionKey);
     if (!hasAcpServers) {
       const target2 = this.getTargetConnection(targetIndex);
-      if (target2) {
-        this.forwardToConnection(target2, dispatch);
-      }
+      target2 && this.forwardToConnection(target2, dispatch);
       return;
     }
     const modifiedParams = {
       ...params,
       mcpServers: transformedServers
-    };
-    const originalResponder = dispatch.responder;
-    const wrappedResponder = createResponder((result) => {
+    }, originalResponder = dispatch.responder, wrappedResponder = createResponder((result) => {
       const response = result;
-      if (response?.sessionId) {
-        this.mcpBridge.completeSession(sessionKey, response.sessionId);
-      }
-      originalResponder.respond(result);
+      response?.sessionId && this.mcpBridge.completeSession(sessionKey, response.sessionId), originalResponder.respond(result);
     }, async (error40) => {
-      await this.mcpBridge.cancelSession(sessionKey);
-      originalResponder.respondWithError(error40);
-    });
-    const target = this.getTargetConnection(targetIndex);
+      await this.mcpBridge.cancelSession(sessionKey), originalResponder.respondWithError(error40);
+    }), target = this.getTargetConnection(targetIndex);
     if (!target) {
       dispatch.responder.respondWithError({
         code: -32603,
@@ -18655,8 +18464,7 @@ var Conductor = class {
     const mcpConnectParams = {
       connectionId,
       url: acpUrl
-    };
-    const responder = createResponder((result) => {
+    }, responder = createResponder((result) => {
       const response = result;
       this.messageQueue.push({
         type: "mcp-connection-established",
@@ -18674,13 +18482,7 @@ var Conductor = class {
       params: mcpConnectParams,
       responder
     };
-    if (this.proxies.length === 0) {
-      if (this.clientConnection) {
-        this.forwardToConnection(this.clientConnection, dispatch);
-      }
-    } else {
-      this.forwardWrappedToProxy(this.proxies.length - 1, dispatch);
-    }
+    this.proxies.length === 0 ? this.clientConnection && this.forwardToConnection(this.clientConnection, dispatch) : this.forwardWrappedToProxy(this.proxies.length - 1, dispatch);
   }
   /**
    * Handle an MCP message from a client (through the HTTP bridge)
@@ -18702,26 +18504,14 @@ var Conductor = class {
         params: mcpMessageParams,
         responder: dispatch.responder
       };
-      if (this.proxies.length === 0) {
-        if (this.clientConnection) {
-          this.forwardToConnection(this.clientConnection, mcpDispatch);
-        }
-      } else {
-        this.forwardWrappedToProxy(this.proxies.length - 1, mcpDispatch);
-      }
+      this.proxies.length === 0 ? this.clientConnection && this.forwardToConnection(this.clientConnection, mcpDispatch) : this.forwardWrappedToProxy(this.proxies.length - 1, mcpDispatch);
     } else if (dispatch.type === "notification") {
       const mcpDispatch = {
         type: "notification",
         method: "_mcp/message",
         params: mcpMessageParams
       };
-      if (this.proxies.length === 0) {
-        if (this.clientConnection) {
-          this.forwardToConnection(this.clientConnection, mcpDispatch);
-        }
-      } else {
-        this.forwardWrappedToProxy(this.proxies.length - 1, mcpDispatch);
-      }
+      this.proxies.length === 0 ? this.clientConnection && this.forwardToConnection(this.clientConnection, mcpDispatch) : this.forwardWrappedToProxy(this.proxies.length - 1, mcpDispatch);
     }
   }
   /**
@@ -18734,13 +18524,7 @@ var Conductor = class {
       method: "_mcp/disconnect",
       params: { connectionId }
     };
-    if (this.proxies.length === 0) {
-      if (this.clientConnection) {
-        this.forwardToConnection(this.clientConnection, dispatch);
-      }
-    } else {
-      this.forwardWrappedToProxy(this.proxies.length - 1, dispatch);
-    }
+    this.proxies.length === 0 ? this.clientConnection && this.forwardToConnection(this.clientConnection, dispatch) : this.forwardWrappedToProxy(this.proxies.length - 1, dispatch);
   }
   /**
    * Generate a unique request ID for outgoing requests
@@ -18762,44 +18546,28 @@ var MessageChannel = class {
   resolvers = [];
   closed = false;
   push(message) {
-    if (this.closed) {
-      return;
-    }
-    if (this.resolvers.length > 0) {
-      const resolve2 = this.resolvers.shift();
-      resolve2(message);
-    } else {
-      this.queue.push(message);
-    }
+    this.closed || (this.resolvers.length > 0 ? this.resolvers.shift()(message) : this.queue.push(message));
   }
   close() {
     this.closed = true;
-    for (const resolve2 of this.resolvers) {
+    for (const resolve2 of this.resolvers)
       resolve2(null);
-    }
     this.resolvers = [];
   }
   isClosed() {
     return this.closed;
   }
   async *[Symbol.asyncIterator]() {
-    while (!this.closed) {
+    for (; !this.closed; ) {
       let message;
-      if (this.queue.length > 0) {
-        message = this.queue.shift();
-      } else {
-        message = await new Promise((resolve2) => {
-          this.resolvers.push(resolve2);
-        });
-      }
-      if (message === null) {
+      if (this.queue.length > 0 ? message = this.queue.shift() : message = await new Promise((resolve2) => {
+        this.resolvers.push(resolve2);
+      }), message === null)
         return;
-      }
       yield message;
     }
-    while (this.queue.length > 0) {
+    for (; this.queue.length > 0; )
       yield this.queue.shift();
-    }
   }
 };
 var ChannelConnectionEnd = class {
@@ -18809,8 +18577,7 @@ var ChannelConnectionEnd = class {
   sendChannel;
   receiveChannel;
   constructor(sendChannel, receiveChannel) {
-    this.sendChannel = sendChannel;
-    this.receiveChannel = receiveChannel;
+    this.sendChannel = sendChannel, this.receiveChannel = receiveChannel;
   }
   send(message) {
     this.sendChannel.push(message);
@@ -18819,13 +18586,11 @@ var ChannelConnectionEnd = class {
     return this.receiveChannel;
   }
   async close() {
-    this.sendChannel.close();
-    this.receiveChannel.close();
+    this.sendChannel.close(), this.receiveChannel.close();
   }
 };
 function createChannelPair() {
-  const leftToRight = new MessageChannel();
-  const rightToLeft = new MessageChannel();
+  const leftToRight = new MessageChannel(), rightToLeft = new MessageChannel();
   return {
     left: new ChannelConnectionEnd(leftToRight, rightToLeft),
     right: new ChannelConnectionEnd(rightToLeft, leftToRight)
@@ -18902,21 +18667,19 @@ var McpServerBuilder = class {
    * Set instructions for the MCP server
    */
   instructions(text) {
-    this._instructions = text;
-    return this;
+    return this._instructions = text, this;
   }
   /**
    * Register a tool with input/output JSON schemas
    */
   tool(name, description, inputSchema, outputSchema, handler) {
-    this._tools.set(name, {
+    return this._tools.set(name, {
       name,
       description,
       inputSchema,
       outputSchema,
       handler
-    });
-    return this;
+    }), this;
   }
   /**
    * Build the MCP server
@@ -18934,10 +18697,7 @@ var McpServer = class {
   _instructions;
   _tools;
   constructor(name, instructions, tools) {
-    this.id = v4_default();
-    this.name = name;
-    this._instructions = instructions;
-    this._tools = tools;
+    this.id = v4_default(), this.name = name, this._instructions = instructions, this._tools = tools;
   }
   /**
    * Get the acp: URL for this server
@@ -18977,17 +18737,15 @@ var McpServer = class {
       case "initialize":
         return this.handleInitialize(params);
       case "notifications/initialized":
-        return void 0;
+        return;
       default:
         throw new Error(`Unknown MCP method: ${method}`);
     }
   }
   handleInitialize(params) {
-    const instructions = this._instructions ?? "You have access to tools. Call return_result when done.";
-    const tools = this.getToolDefinitions();
-    const clientVersion = params?.protocolVersion ?? "2024-11-05";
+    const instructions = this._instructions ?? "You have access to tools. Call return_result when done.", tools = this.getToolDefinitions();
     return {
-      protocolVersion: clientVersion,
+      protocolVersion: params?.protocolVersion ?? "2024-11-05",
       serverInfo: {
         name: this.name,
         version: "0.1.0"
@@ -19007,22 +18765,19 @@ var McpServer = class {
   }
   async handleToolsCall(params, context) {
     const tool = this._tools.get(params.name);
-    if (!tool) {
+    if (!tool)
       return {
         content: [{ type: "text", text: `Unknown tool: ${params.name}` }],
         isError: true
       };
-    }
     try {
       const result = await tool.handler(params.arguments, context);
-      const resultText = typeof result === "string" ? result : JSON.stringify(result);
       return {
-        content: [{ type: "text", text: resultText }]
+        content: [{ type: "text", text: typeof result == "string" ? result : JSON.stringify(result) }]
       };
     } catch (error40) {
-      const message = error40 instanceof Error ? error40.message : String(error40);
       return {
-        content: [{ type: "text", text: `Tool error: ${message}` }],
+        content: [{ type: "text", text: `Tool error: ${error40 instanceof Error ? error40.message : String(error40)}` }],
         isError: true
       };
     }
@@ -19068,12 +18823,9 @@ var McpOverAcpHandler = class {
    * Handle an incoming mcp/connect request
    */
   handleConnect(params) {
-    const connectionId = params.connectionId ?? `conn-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    const url2 = params.acp_url ?? params.url;
-    const server = this._serversByUrl.get(url2);
-    if (!server) {
+    const connectionId = params.connectionId ?? `conn-${Date.now()}-${Math.random().toString(36).slice(2)}`, url2 = params.acp_url ?? params.url, server = this._serversByUrl.get(url2);
+    if (!server)
       throw new Error(`No MCP server registered for URL: ${url2}`);
-    }
     this._connections.set(connectionId, {
       connectionId,
       server,
@@ -19103,16 +18855,10 @@ var McpOverAcpHandler = class {
    * MCP response (e.g., InitializeResult, ToolsListResult) directly.
    */
   async handleMessage(params) {
-    const connectionId = params.connectionId;
-    const method = params.method;
-    const mcpParams = params.params;
-    const connection = this._connections.get(connectionId);
-    if (!connection) {
+    const connectionId = params.connectionId, method = params.method, mcpParams = params.params, connection = this._connections.get(connectionId);
+    if (!connection)
       throw new Error(`Unknown connection: ${connectionId}`);
-    }
-    if (method === "tools/list") {
-      this._resolveToolsDiscovery(connection.sessionId);
-    }
+    method === "tools/list" && this._resolveToolsDiscovery(connection.sessionId);
     const context = {
       connectionId,
       sessionId: connection.sessionId
@@ -19131,27 +18877,18 @@ var McpOverAcpHandler = class {
    */
   waitForToolsDiscovery(sessionId, timeout = 2e3) {
     const existing = this._toolsDiscoveryBySession.get(sessionId);
-    if (existing) {
-      return new Promise((resolve2) => {
-        const originalResolve = existing.resolve;
-        existing.resolve = () => {
-          originalResolve();
-          resolve2();
-        };
-      });
-    }
-    return new Promise((resolve2) => {
+    return existing ? new Promise((resolve2) => {
+      const originalResolve = existing.resolve;
+      existing.resolve = () => {
+        originalResolve(), resolve2();
+      };
+    }) : new Promise((resolve2) => {
       const state = {
         resolve: /* @__PURE__ */ __name(() => {
-          if (state.timeoutId) {
-            clearTimeout(state.timeoutId);
-          }
-          this._toolsDiscoveryBySession.delete(sessionId);
-          resolve2();
+          state.timeoutId && clearTimeout(state.timeoutId), this._toolsDiscoveryBySession.delete(sessionId), resolve2();
         }, "resolve"),
         timeoutId: setTimeout(() => {
-          state.timeoutId = null;
-          state.resolve();
+          state.timeoutId = null, state.resolve();
         }, timeout)
       };
       this._toolsDiscoveryBySession.set(sessionId, state);
@@ -19162,9 +18899,7 @@ var McpOverAcpHandler = class {
    */
   _resolveToolsDiscovery(sessionId) {
     const state = this._toolsDiscoveryBySession.get(sessionId);
-    if (state) {
-      state.resolve();
-    }
+    state && state.resolve();
   }
   /**
    * Handle an incoming mcp/disconnect notification
@@ -19175,637 +18910,53 @@ var McpOverAcpHandler = class {
   }
   /**
    * Check if this is an MCP-over-ACP request.
-   * Note: The ACP SDK strips the underscore prefix, so we check for "mcp/".
    */
   isMcpRequest(method) {
-    return method.startsWith("mcp/");
+    return method.startsWith("_mcp/");
   }
   /**
    * Route an MCP-over-ACP request to the appropriate handler.
-   * Note: Methods arrive without the underscore prefix (e.g., "mcp/connect" not "_mcp/connect").
    */
   async routeRequest(method, params) {
     switch (method) {
-      case "mcp/connect":
+      case "_mcp/connect":
         return this.handleConnect(params);
-      case "mcp/message":
+      case "_mcp/message":
         return this.handleMessage(params);
-      case "mcp/disconnect":
+      case "_mcp/disconnect":
         this.handleDisconnect(params);
-        return void 0;
+        return;
       default:
         throw new Error(`Unknown MCP-over-ACP method: ${method}`);
     }
   }
 };
 
-// ../../node_modules/.pnpm/@agentclientprotocol+sdk@0.4.9/node_modules/@agentclientprotocol/sdk/dist/schema.js
-var writeTextFileRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  content: external_exports.string(),
-  path: external_exports.string(),
-  sessionId: external_exports.string()
-});
-var readTextFileRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  limit: external_exports.number().optional().nullable(),
-  line: external_exports.number().optional().nullable(),
-  path: external_exports.string(),
-  sessionId: external_exports.string()
-});
-var terminalOutputRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  sessionId: external_exports.string(),
-  terminalId: external_exports.string()
-});
-var releaseTerminalRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  sessionId: external_exports.string(),
-  terminalId: external_exports.string()
-});
-var waitForTerminalExitRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  sessionId: external_exports.string(),
-  terminalId: external_exports.string()
-});
-var killTerminalCommandRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  sessionId: external_exports.string(),
-  terminalId: external_exports.string()
-});
-var extMethodRequestSchema = external_exports.record(external_exports.unknown());
-var roleSchema = external_exports.union([external_exports.literal("assistant"), external_exports.literal("user")]);
-var textResourceContentsSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  mimeType: external_exports.string().optional().nullable(),
-  text: external_exports.string(),
-  uri: external_exports.string()
-});
-var blobResourceContentsSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  blob: external_exports.string(),
-  mimeType: external_exports.string().optional().nullable(),
-  uri: external_exports.string()
-});
-var toolKindSchema = external_exports.union([
-  external_exports.literal("read"),
-  external_exports.literal("edit"),
-  external_exports.literal("delete"),
-  external_exports.literal("move"),
-  external_exports.literal("search"),
-  external_exports.literal("execute"),
-  external_exports.literal("think"),
-  external_exports.literal("fetch"),
-  external_exports.literal("switch_mode"),
-  external_exports.literal("other")
-]);
-var toolCallStatusSchema = external_exports.union([
-  external_exports.literal("pending"),
-  external_exports.literal("in_progress"),
-  external_exports.literal("completed"),
-  external_exports.literal("failed")
-]);
-var writeTextFileResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional()
-});
-var readTextFileResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  content: external_exports.string()
-});
-var requestPermissionResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  outcome: external_exports.union([
-    external_exports.object({
-      outcome: external_exports.literal("cancelled")
-    }),
-    external_exports.object({
-      optionId: external_exports.string(),
-      outcome: external_exports.literal("selected")
-    })
-  ])
-});
-var createTerminalResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  terminalId: external_exports.string()
-});
-var releaseTerminalResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional()
-});
-var waitForTerminalExitResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  exitCode: external_exports.number().optional().nullable(),
-  signal: external_exports.string().optional().nullable()
-});
-var killTerminalResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional()
-});
-var extMethodResponseSchema = external_exports.record(external_exports.unknown());
-var cancelNotificationSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  sessionId: external_exports.string()
-});
-var extNotificationSchema = external_exports.record(external_exports.unknown());
-var authenticateRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  methodId: external_exports.string()
-});
-var setSessionModeRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  modeId: external_exports.string(),
-  sessionId: external_exports.string()
-});
-var setSessionModelRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  modelId: external_exports.string(),
-  sessionId: external_exports.string()
-});
-var extMethodRequest1Schema = external_exports.record(external_exports.unknown());
-var httpHeaderSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  name: external_exports.string(),
-  value: external_exports.string()
-});
-var annotationsSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  audience: external_exports.array(roleSchema).optional().nullable(),
-  lastModified: external_exports.string().optional().nullable(),
-  priority: external_exports.number().optional().nullable()
-});
-var embeddedResourceResourceSchema = external_exports.union([
-  textResourceContentsSchema,
-  blobResourceContentsSchema
-]);
-var authenticateResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional()
-});
-var setSessionModeResponseSchema = external_exports.object({
-  meta: external_exports.unknown().optional()
-});
-var promptResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  stopReason: external_exports.union([
-    external_exports.literal("end_turn"),
-    external_exports.literal("max_tokens"),
-    external_exports.literal("max_turn_requests"),
-    external_exports.literal("refusal"),
-    external_exports.literal("cancelled")
-  ])
-});
-var setSessionModelResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional()
-});
-var extMethodResponse1Schema = external_exports.record(external_exports.unknown());
-var sessionModeIdSchema = external_exports.string();
-var extNotification1Schema = external_exports.record(external_exports.unknown());
-var unstructuredCommandInputSchema = external_exports.object({
-  hint: external_exports.string()
-});
-var permissionOptionSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  kind: external_exports.union([
-    external_exports.literal("allow_once"),
-    external_exports.literal("allow_always"),
-    external_exports.literal("reject_once"),
-    external_exports.literal("reject_always")
-  ]),
-  name: external_exports.string(),
-  optionId: external_exports.string()
-});
-var toolCallContentSchema = external_exports.union([
-  external_exports.object({
-    content: external_exports.union([
-      external_exports.object({
-        _meta: external_exports.record(external_exports.unknown()).optional(),
-        annotations: annotationsSchema.optional().nullable(),
-        text: external_exports.string(),
-        type: external_exports.literal("text")
-      }),
-      external_exports.object({
-        _meta: external_exports.record(external_exports.unknown()).optional(),
-        annotations: annotationsSchema.optional().nullable(),
-        data: external_exports.string(),
-        mimeType: external_exports.string(),
-        type: external_exports.literal("image"),
-        uri: external_exports.string().optional().nullable()
-      }),
-      external_exports.object({
-        _meta: external_exports.record(external_exports.unknown()).optional(),
-        annotations: annotationsSchema.optional().nullable(),
-        data: external_exports.string(),
-        mimeType: external_exports.string(),
-        type: external_exports.literal("audio")
-      }),
-      external_exports.object({
-        _meta: external_exports.record(external_exports.unknown()).optional(),
-        annotations: annotationsSchema.optional().nullable(),
-        description: external_exports.string().optional().nullable(),
-        mimeType: external_exports.string().optional().nullable(),
-        name: external_exports.string(),
-        size: external_exports.number().optional().nullable(),
-        title: external_exports.string().optional().nullable(),
-        type: external_exports.literal("resource_link"),
-        uri: external_exports.string()
-      }),
-      external_exports.object({
-        _meta: external_exports.record(external_exports.unknown()).optional(),
-        annotations: annotationsSchema.optional().nullable(),
-        resource: embeddedResourceResourceSchema,
-        type: external_exports.literal("resource")
-      })
-    ]),
-    type: external_exports.literal("content")
-  }),
-  external_exports.object({
-    _meta: external_exports.record(external_exports.unknown()).optional(),
-    newText: external_exports.string(),
-    oldText: external_exports.string().optional().nullable(),
-    path: external_exports.string(),
-    type: external_exports.literal("diff")
-  }),
-  external_exports.object({
-    terminalId: external_exports.string(),
-    type: external_exports.literal("terminal")
-  })
-]);
-var toolCallLocationSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  line: external_exports.number().optional().nullable(),
-  path: external_exports.string()
-});
-var envVariableSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  name: external_exports.string(),
-  value: external_exports.string()
-});
-var terminalExitStatusSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  exitCode: external_exports.number().optional().nullable(),
-  signal: external_exports.string().optional().nullable()
-});
-var fileSystemCapabilitySchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  readTextFile: external_exports.boolean().optional(),
-  writeTextFile: external_exports.boolean().optional()
-});
-var stdioSchema = external_exports.object({
-  args: external_exports.array(external_exports.string()),
-  command: external_exports.string(),
-  env: external_exports.array(envVariableSchema),
-  name: external_exports.string()
-});
-var mcpServerSchema = external_exports.union([
-  external_exports.object({
-    headers: external_exports.array(httpHeaderSchema),
-    name: external_exports.string(),
-    type: external_exports.literal("http"),
-    url: external_exports.string()
-  }),
-  external_exports.object({
-    headers: external_exports.array(httpHeaderSchema),
-    name: external_exports.string(),
-    type: external_exports.literal("sse"),
-    url: external_exports.string()
-  }),
-  stdioSchema
-]);
-var contentBlockSchema = external_exports.union([
-  external_exports.object({
-    _meta: external_exports.record(external_exports.unknown()).optional(),
-    annotations: annotationsSchema.optional().nullable(),
-    text: external_exports.string(),
-    type: external_exports.literal("text")
-  }),
-  external_exports.object({
-    _meta: external_exports.record(external_exports.unknown()).optional(),
-    annotations: annotationsSchema.optional().nullable(),
-    data: external_exports.string(),
-    mimeType: external_exports.string(),
-    type: external_exports.literal("image"),
-    uri: external_exports.string().optional().nullable()
-  }),
-  external_exports.object({
-    _meta: external_exports.record(external_exports.unknown()).optional(),
-    annotations: annotationsSchema.optional().nullable(),
-    data: external_exports.string(),
-    mimeType: external_exports.string(),
-    type: external_exports.literal("audio")
-  }),
-  external_exports.object({
-    _meta: external_exports.record(external_exports.unknown()).optional(),
-    annotations: annotationsSchema.optional().nullable(),
-    description: external_exports.string().optional().nullable(),
-    mimeType: external_exports.string().optional().nullable(),
-    name: external_exports.string(),
-    size: external_exports.number().optional().nullable(),
-    title: external_exports.string().optional().nullable(),
-    type: external_exports.literal("resource_link"),
-    uri: external_exports.string()
-  }),
-  external_exports.object({
-    _meta: external_exports.record(external_exports.unknown()).optional(),
-    annotations: annotationsSchema.optional().nullable(),
-    resource: embeddedResourceResourceSchema,
-    type: external_exports.literal("resource")
-  })
-]);
-var authMethodSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  description: external_exports.string().optional().nullable(),
-  id: external_exports.string(),
-  name: external_exports.string()
-});
-var mcpCapabilitiesSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  http: external_exports.boolean().optional(),
-  sse: external_exports.boolean().optional()
-});
-var promptCapabilitiesSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  audio: external_exports.boolean().optional(),
-  embeddedContext: external_exports.boolean().optional(),
-  image: external_exports.boolean().optional()
-});
-var modelInfoSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  description: external_exports.string().optional().nullable(),
-  modelId: external_exports.string(),
-  name: external_exports.string()
-});
-var sessionModeSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  description: external_exports.string().optional().nullable(),
-  id: sessionModeIdSchema,
-  name: external_exports.string()
-});
-var sessionModelStateSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  availableModels: external_exports.array(modelInfoSchema),
-  currentModelId: external_exports.string()
-});
-var sessionModeStateSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  availableModes: external_exports.array(sessionModeSchema),
-  currentModeId: external_exports.string()
-});
-var planEntrySchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  content: external_exports.string(),
-  priority: external_exports.union([external_exports.literal("high"), external_exports.literal("medium"), external_exports.literal("low")]),
-  status: external_exports.union([
-    external_exports.literal("pending"),
-    external_exports.literal("in_progress"),
-    external_exports.literal("completed")
-  ])
-});
-var availableCommandInputSchema = unstructuredCommandInputSchema;
-var clientNotificationSchema = external_exports.union([
-  cancelNotificationSchema,
-  extNotificationSchema
-]);
-var createTerminalRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  args: external_exports.array(external_exports.string()).optional(),
-  command: external_exports.string(),
-  cwd: external_exports.string().optional().nullable(),
-  env: external_exports.array(envVariableSchema).optional(),
-  outputByteLimit: external_exports.number().optional().nullable(),
-  sessionId: external_exports.string()
-});
-var terminalOutputResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  exitStatus: terminalExitStatusSchema.optional().nullable(),
-  output: external_exports.string(),
-  truncated: external_exports.boolean()
-});
-var newSessionRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  cwd: external_exports.string(),
-  mcpServers: external_exports.array(mcpServerSchema)
-});
-var loadSessionRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  cwd: external_exports.string(),
-  mcpServers: external_exports.array(mcpServerSchema),
-  sessionId: external_exports.string()
-});
-var promptRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  prompt: external_exports.array(contentBlockSchema),
-  sessionId: external_exports.string()
-});
-var newSessionResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  models: sessionModelStateSchema.optional().nullable(),
-  modes: sessionModeStateSchema.optional().nullable(),
-  sessionId: external_exports.string()
-});
-var loadSessionResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  models: sessionModelStateSchema.optional().nullable(),
-  modes: sessionModeStateSchema.optional().nullable()
-});
-var toolCallUpdateSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  content: external_exports.array(toolCallContentSchema).optional().nullable(),
-  kind: toolKindSchema.optional().nullable(),
-  locations: external_exports.array(toolCallLocationSchema).optional().nullable(),
-  rawInput: external_exports.record(external_exports.unknown()).optional(),
-  rawOutput: external_exports.record(external_exports.unknown()).optional(),
-  status: toolCallStatusSchema.optional().nullable(),
-  title: external_exports.string().optional().nullable(),
-  toolCallId: external_exports.string()
-});
-var clientCapabilitiesSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  fs: fileSystemCapabilitySchema.optional(),
-  terminal: external_exports.boolean().optional()
-});
-var agentCapabilitiesSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  loadSession: external_exports.boolean().optional(),
-  mcpCapabilities: mcpCapabilitiesSchema.optional(),
-  promptCapabilities: promptCapabilitiesSchema.optional()
-});
-var availableCommandSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  description: external_exports.string(),
-  input: availableCommandInputSchema.optional().nullable(),
-  name: external_exports.string()
-});
-var clientResponseSchema = external_exports.union([
-  writeTextFileResponseSchema,
-  readTextFileResponseSchema,
-  requestPermissionResponseSchema,
-  createTerminalResponseSchema,
-  terminalOutputResponseSchema,
-  releaseTerminalResponseSchema,
-  waitForTerminalExitResponseSchema,
-  killTerminalResponseSchema,
-  extMethodResponseSchema
-]);
-var requestPermissionRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  options: external_exports.array(permissionOptionSchema),
-  sessionId: external_exports.string(),
-  toolCall: toolCallUpdateSchema
-});
-var initializeRequestSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  clientCapabilities: clientCapabilitiesSchema.optional(),
-  protocolVersion: external_exports.number()
-});
-var initializeResponseSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  agentCapabilities: agentCapabilitiesSchema.optional(),
-  authMethods: external_exports.array(authMethodSchema).optional(),
-  protocolVersion: external_exports.number()
-});
-var sessionNotificationSchema = external_exports.object({
-  _meta: external_exports.record(external_exports.unknown()).optional(),
-  sessionId: external_exports.string(),
-  update: external_exports.union([
-    external_exports.object({
-      content: contentBlockSchema,
-      sessionUpdate: external_exports.literal("user_message_chunk")
-    }),
-    external_exports.object({
-      content: contentBlockSchema,
-      sessionUpdate: external_exports.literal("agent_message_chunk")
-    }),
-    external_exports.object({
-      content: contentBlockSchema,
-      sessionUpdate: external_exports.literal("agent_thought_chunk")
-    }),
-    external_exports.object({
-      _meta: external_exports.record(external_exports.unknown()).optional(),
-      content: external_exports.array(toolCallContentSchema).optional(),
-      kind: external_exports.union([
-        external_exports.literal("read"),
-        external_exports.literal("edit"),
-        external_exports.literal("delete"),
-        external_exports.literal("move"),
-        external_exports.literal("search"),
-        external_exports.literal("execute"),
-        external_exports.literal("think"),
-        external_exports.literal("fetch"),
-        external_exports.literal("switch_mode"),
-        external_exports.literal("other")
-      ]).optional(),
-      locations: external_exports.array(toolCallLocationSchema).optional(),
-      rawInput: external_exports.record(external_exports.unknown()).optional(),
-      rawOutput: external_exports.record(external_exports.unknown()).optional(),
-      sessionUpdate: external_exports.literal("tool_call"),
-      status: external_exports.union([
-        external_exports.literal("pending"),
-        external_exports.literal("in_progress"),
-        external_exports.literal("completed"),
-        external_exports.literal("failed")
-      ]).optional(),
-      title: external_exports.string(),
-      toolCallId: external_exports.string()
-    }),
-    external_exports.object({
-      _meta: external_exports.record(external_exports.unknown()).optional(),
-      content: external_exports.array(toolCallContentSchema).optional().nullable(),
-      kind: toolKindSchema.optional().nullable(),
-      locations: external_exports.array(toolCallLocationSchema).optional().nullable(),
-      rawInput: external_exports.record(external_exports.unknown()).optional(),
-      rawOutput: external_exports.record(external_exports.unknown()).optional(),
-      sessionUpdate: external_exports.literal("tool_call_update"),
-      status: toolCallStatusSchema.optional().nullable(),
-      title: external_exports.string().optional().nullable(),
-      toolCallId: external_exports.string()
-    }),
-    external_exports.object({
-      _meta: external_exports.record(external_exports.unknown()).optional(),
-      entries: external_exports.array(planEntrySchema),
-      sessionUpdate: external_exports.literal("plan")
-    }),
-    external_exports.object({
-      availableCommands: external_exports.array(availableCommandSchema),
-      sessionUpdate: external_exports.literal("available_commands_update")
-    }),
-    external_exports.object({
-      currentModeId: sessionModeIdSchema,
-      sessionUpdate: external_exports.literal("current_mode_update")
-    })
-  ])
-});
-var clientRequestSchema = external_exports.union([
-  writeTextFileRequestSchema,
-  readTextFileRequestSchema,
-  requestPermissionRequestSchema,
-  createTerminalRequestSchema,
-  terminalOutputRequestSchema,
-  releaseTerminalRequestSchema,
-  waitForTerminalExitRequestSchema,
-  killTerminalCommandRequestSchema,
-  extMethodRequestSchema
-]);
-var agentRequestSchema = external_exports.union([
-  initializeRequestSchema,
-  authenticateRequestSchema,
-  newSessionRequestSchema,
-  loadSessionRequestSchema,
-  setSessionModeRequestSchema,
-  promptRequestSchema,
-  setSessionModelRequestSchema,
-  extMethodRequest1Schema
-]);
-var agentResponseSchema = external_exports.union([
-  initializeResponseSchema,
-  authenticateResponseSchema,
-  newSessionResponseSchema,
-  loadSessionResponseSchema,
-  setSessionModeResponseSchema,
-  promptResponseSchema,
-  setSessionModelResponseSchema,
-  extMethodResponse1Schema
-]);
-var agentNotificationSchema = external_exports.union([
-  sessionNotificationSchema,
-  extNotification1Schema
-]);
-var agentClientProtocolSchema = external_exports.union([
-  clientRequestSchema,
-  clientResponseSchema,
-  clientNotificationSchema,
-  agentRequestSchema,
-  agentResponseSchema,
-  agentNotificationSchema
-]);
+// ../acp/dist/connection.js
+var import_node_fs2 = require("node:fs");
+var import_node_path = require("node:path");
 
 // ../acp/dist/skill.js
 var SKILL_NAME_PATTERN = /^[a-z0-9](?:[a-z0-9]|-(?=[a-z0-9]))*$/;
-var MAX_NAME_LENGTH = 64;
-var MAX_DESCRIPTION_LENGTH = 1024;
 function validateSkillName(name) {
-  if (typeof name !== "string" || name.length === 0) {
+  if (typeof name != "string" || name.length === 0)
     throw new Error("Skill name is required");
-  }
-  if (name.length > MAX_NAME_LENGTH) {
-    throw new Error(`Skill name must be at most ${MAX_NAME_LENGTH} characters, got ${name.length}`);
-  }
-  if (!SKILL_NAME_PATTERN.test(name)) {
+  if (name.length > 64)
+    throw new Error(`Skill name must be at most 64 characters, got ${name.length}`);
+  if (!SKILL_NAME_PATTERN.test(name))
     throw new Error(`Invalid skill name "${name}": must be lowercase alphanumeric with hyphens, no leading/trailing/consecutive hyphens`);
-  }
 }
 __name(validateSkillName, "validateSkillName");
 function validateSkillDescription(description) {
-  if (typeof description !== "string" || description.trim().length === 0) {
+  if (typeof description != "string" || description.trim().length === 0)
     throw new Error("Skill description is required");
-  }
-  if (description.length > MAX_DESCRIPTION_LENGTH) {
-    throw new Error(`Skill description must be at most ${MAX_DESCRIPTION_LENGTH} characters, got ${description.length}`);
-  }
+  if (description.length > 1024)
+    throw new Error(`Skill description must be at most 1024 characters, got ${description.length}`);
 }
 __name(validateSkillDescription, "validateSkillDescription");
 function parseSkillMd(content) {
-  const { frontmatter, body } = extractFrontmatter(content);
-  const fields = parseYamlFrontmatter(frontmatter);
-  validateSkillName(fields.name);
-  validateSkillDescription(fields.description);
-  return {
+  const { frontmatter, body } = extractFrontmatter(content), fields = parseYamlFrontmatter(frontmatter);
+  return validateSkillName(fields.name), validateSkillDescription(fields.description), {
     ...fields,
     name: fields.name,
     description: fields.description,
@@ -19815,37 +18966,29 @@ function parseSkillMd(content) {
 __name(parseSkillMd, "parseSkillMd");
 function extractFrontmatter(content) {
   const trimmed = content.trimStart();
-  if (!trimmed.startsWith("---")) {
+  if (!trimmed.startsWith("---"))
     throw new Error("SKILL.md must begin with YAML frontmatter (---)");
-  }
-  const endIndex = trimmed.indexOf("\n---", 3);
-  if (endIndex === -1) {
+  const endIndex = trimmed.indexOf(`
+---`, 3);
+  if (endIndex === -1)
     throw new Error("SKILL.md frontmatter is missing closing ---");
-  }
-  const frontmatter = trimmed.slice(3, endIndex).trim();
-  const afterClosing = endIndex + 4;
-  const body = trimmed.slice(afterClosing).replace(/^(\r?\n){1,2}/, "");
+  const frontmatter = trimmed.slice(3, endIndex).trim(), afterClosing = endIndex + 4, body = trimmed.slice(afterClosing).replace(/^(\r?\n){1,2}/, "");
   return { frontmatter, body };
 }
 __name(extractFrontmatter, "extractFrontmatter");
 function parseYamlFrontmatter(yaml) {
   const result = {};
-  for (const line of yaml.split("\n")) {
+  for (const line of yaml.split(`
+`)) {
     const trimmed = line.trim();
     if (trimmed === "" || trimmed.startsWith("#"))
       continue;
     const colonIndex = trimmed.indexOf(":");
-    if (colonIndex === -1) {
+    if (colonIndex === -1)
       throw new Error(`Invalid frontmatter line: ${trimmed}`);
-    }
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
-    if (typeof value === "string") {
-      if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-        value = value.slice(1, -1);
-      }
-    }
-    result[key] = value;
+    typeof value == "string" && (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) && (value = value.slice(1, -1)), result[key] = value;
   }
   return result;
 }
@@ -19853,16 +18996,15 @@ __name(parseYamlFrontmatter, "parseYamlFrontmatter");
 
 // ../acp/dist/skill-server.js
 var import_promises = require("node:fs/promises");
-var import_node_path = require("node:path");
+var import_node_path2 = require("node:path");
 function isStoredSkill(skill) {
-  return "basePath" in skill && typeof skill.basePath === "string";
+  return "basePath" in skill && typeof skill.basePath == "string";
 }
 __name(isStoredSkill, "isStoredSkill");
 function createSkillServer(skills) {
   const skillsByName = /* @__PURE__ */ new Map();
-  for (const skill of skills) {
+  for (const skill of skills)
     skillsByName.set(skill.name, skill);
-  }
   return mcpServer("skills").tool("activate_skill", "Activate a skill by name, returning its full instructions.", {
     type: "object",
     properties: {
@@ -19871,9 +19013,8 @@ function createSkillServer(skills) {
     required: ["skill_name"]
   }, { type: "string" }, async (input) => {
     const skill = skillsByName.get(input.skill_name);
-    if (!skill) {
+    if (!skill)
       throw new Error(`Unknown skill: "${input.skill_name}"`);
-    }
     return skill.body;
   }).tool("call_skill_tool", "Call a tool provided by a skill.", {
     type: "object",
@@ -19885,17 +19026,14 @@ function createSkillServer(skills) {
     required: ["skill_name", "tool_name"]
   }, {}, async (input) => {
     const skill = skillsByName.get(input.skill_name);
-    if (!skill) {
+    if (!skill)
       throw new Error(`Unknown skill: "${input.skill_name}"`);
-    }
     const tools = skill.tools;
-    if (!tools || tools.length === 0) {
+    if (!tools || tools.length === 0)
       throw new Error(`Skill "${input.skill_name}" has no tools`);
-    }
     const tool = tools.find((t) => t.name === input.tool_name);
-    if (!tool) {
+    if (!tool)
       throw new Error(`Unknown tool "${input.tool_name}" for skill "${input.skill_name}"`);
-    }
     return tool.handler(input.input);
   }).tool("read_skill_file", "Read a file from a stored skill's directory.", {
     type: "object",
@@ -19906,28 +19044,30 @@ function createSkillServer(skills) {
     required: ["skill_name", "path"]
   }, { type: "string" }, async (input) => {
     const skill = skillsByName.get(input.skill_name);
-    if (!skill) {
+    if (!skill)
       throw new Error(`Unknown skill: "${input.skill_name}"`);
-    }
-    if (!isStoredSkill(skill)) {
+    if (!isStoredSkill(skill))
       throw new Error(`Skill "${input.skill_name}" is not a stored skill (no basePath)`);
-    }
-    if ((0, import_node_path.isAbsolute)(input.path)) {
+    if ((0, import_node_path2.isAbsolute)(input.path))
       throw new Error("Path must be relative");
-    }
-    const resolved = (0, import_node_path.resolve)(skill.basePath, input.path);
-    const rel = (0, import_node_path.relative)(skill.basePath, resolved);
-    if (rel.startsWith("..") || (0, import_node_path.isAbsolute)(rel)) {
+    const resolved = (0, import_node_path2.resolve)(skill.basePath, input.path), rel = (0, import_node_path2.relative)(skill.basePath, resolved);
+    if (rel.startsWith("..") || (0, import_node_path2.isAbsolute)(rel))
       throw new Error("Path traversal is not allowed");
-    }
     return (0, import_promises.readFile)(resolved, "utf-8");
   }).build();
 }
 __name(createSkillServer, "createSkillServer");
 
+// dist/generated/features.js
+var features2 = {
+  FAULT_INJECTION: false,
+  LOG_PERMISSIONS: false,
+  STRIP_CLAUDECODE_ENV: true
+};
+
 // dist/think-builder.js
 var import_promises2 = require("node:fs/promises");
-var import_node_path2 = require("node:path");
+var import_node_path3 = require("node:path");
 
 // dist/thought-stream.js
 var ThoughtStream = class {
@@ -19943,8 +19083,7 @@ var ThoughtStream = class {
   _done = false;
   constructor() {
     this.result = new Promise((resolve2, reject) => {
-      this._resolveResult = resolve2;
-      this._rejectResult = reject;
+      this._resolveResult = resolve2, this._rejectResult = reject;
     });
   }
   /**
@@ -19952,27 +19091,19 @@ var ThoughtStream = class {
    * @internal
    */
   pushEvent(event) {
-    if (this._done)
-      return;
-    if (this._eventResolvers.length > 0) {
-      const resolver = this._eventResolvers.shift();
-      resolver({ value: event, done: false });
-    } else {
-      this._pendingEvents.push(event);
-    }
+    this._done || (this._eventResolvers.length > 0 ? this._eventResolvers.shift()({ value: event, done: false }) : this._pendingEvents.push(event));
   }
   /**
    * Signal that no more events will arrive. Flushes waiting consumers.
    * @internal
    */
   close() {
-    if (this._done)
-      return;
-    this._done = true;
-    for (const resolver of this._eventResolvers) {
-      resolver({ value: void 0, done: true });
+    if (!this._done) {
+      this._done = true;
+      for (const resolver of this._eventResolvers)
+        resolver({ value: void 0, done: true });
+      this._eventResolvers = [];
     }
-    this._eventResolvers = [];
   }
   /**
    * Resolve the result promise.
@@ -19990,28 +19121,17 @@ var ThoughtStream = class {
   }
   [Symbol.asyncIterator]() {
     return {
-      next: /* @__PURE__ */ __name(() => {
-        if (this._pendingEvents.length > 0) {
-          return Promise.resolve({
-            value: this._pendingEvents.shift(),
-            done: false
-          });
-        }
-        if (this._done) {
-          return Promise.resolve({ value: void 0, done: true });
-        }
-        return new Promise((resolve2) => {
-          this._eventResolvers.push(resolve2);
-        });
-      }, "next"),
+      next: /* @__PURE__ */ __name(() => this._pendingEvents.length > 0 ? Promise.resolve({
+        value: this._pendingEvents.shift(),
+        done: false
+      }) : this._done ? Promise.resolve({ value: void 0, done: true }) : new Promise((resolve2) => {
+        this._eventResolvers.push(resolve2);
+      }), "next"),
       return: /* @__PURE__ */ __name(() => {
-        this._done = true;
-        this._pendingEvents = [];
-        for (const resolver of this._eventResolvers) {
+        this._done = true, this._pendingEvents = [];
+        for (const resolver of this._eventResolvers)
           resolver({ value: void 0, done: true });
-        }
-        this._eventResolvers = [];
-        return Promise.resolve({ value: void 0, done: true });
+        return this._eventResolvers = [], Promise.resolve({ value: void 0, done: true });
       }, "return")
     };
   }
@@ -20028,45 +19148,30 @@ var ThinkSession = class {
   _updateResolvers = [];
   _closed = false;
   constructor(sessionId, conn) {
-    this.sessionId = sessionId;
-    this._conn = conn;
+    this.sessionId = sessionId, this._conn = conn;
   }
   async sendPrompt(content) {
     const response = await this._conn.connection.prompt({
       sessionId: this.sessionId,
       prompt: [{ type: "text", text: content }]
     });
-    if (response.stopReason) {
-      this._pushInternal({ type: "stop", reason: response.stopReason });
-    }
+    response.stopReason && this._pushInternal({ type: "stop", reason: response.stopReason });
   }
   pushUpdate(update) {
     this._pushInternal(update);
   }
   _pushInternal(update) {
-    if (this._updateResolvers.length > 0) {
-      const resolver = this._updateResolvers.shift();
-      resolver(update);
-    } else {
-      this._pendingUpdates.push(update);
-    }
+    this._updateResolvers.length > 0 ? this._updateResolvers.shift()(update) : this._pendingUpdates.push(update);
   }
   async readUpdate() {
-    if (this._pendingUpdates.length > 0) {
-      return this._pendingUpdates.shift();
-    }
-    if (this._closed) {
-      return { type: "stop", reason: "session_closed" };
-    }
-    return new Promise((resolve2) => {
+    return this._pendingUpdates.length > 0 ? this._pendingUpdates.shift() : this._closed ? { type: "stop", reason: "session_closed" } : new Promise((resolve2) => {
       this._updateResolvers.push(resolve2);
     });
   }
   close() {
     this._closed = true;
-    for (const resolver of this._updateResolvers) {
+    for (const resolver of this._updateResolvers)
       resolver({ type: "stop", reason: "session_closed" });
-    }
     this._updateResolvers = [];
   }
 };
@@ -20082,13 +19187,7 @@ var PlanImpl = class _PlanImpl {
   _cwd;
   _existingSessionId;
   constructor(state) {
-    this._conn = state.conn;
-    this._promptParts = state.promptParts;
-    this._tools = state.tools;
-    this._skills = state.skills;
-    this._schemaProvider = state.schemaProvider;
-    this._cwd = state.cwd;
-    this._existingSessionId = state.existingSessionId;
+    this._conn = state.conn, this._promptParts = state.promptParts, this._tools = state.tools, this._skills = state.skills, this._schemaProvider = state.schemaProvider, this._cwd = state.cwd, this._existingSessionId = state.existingSessionId;
   }
   _clone(overrides) {
     return new _PlanImpl({
@@ -20106,13 +19205,15 @@ var PlanImpl = class _PlanImpl {
     return this._clone({ promptParts: [...this._promptParts, content] });
   }
   textln(content) {
-    return this._clone({ promptParts: [...this._promptParts, content + "\n"] });
+    return this._clone({ promptParts: [...this._promptParts, content + `
+`] });
   }
   quote(content, tag = "quote") {
-    const part = !content.includes("\n") ? `<${tag}>${content}</${tag}>
-` : `<${tag}>
+    const part = content.includes(`
+`) ? `<${tag}>
 ${content}
 </${tag}>
+` : `<${tag}>${content}</${tag}>
 `;
     return this._clone({ promptParts: [...this._promptParts, part] });
   }
@@ -20125,233 +19226,210 @@ ${content}
     });
   }
   tool(name, description, inputSchemaOrHandler, outputSchemaOrHandler, handler) {
-    let inputSchema;
-    let outputSchema;
-    let actualHandler;
-    if (typeof inputSchemaOrHandler === "function") {
-      inputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") };
-      outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") };
-      actualHandler = inputSchemaOrHandler;
-    } else if (typeof outputSchemaOrHandler === "function") {
-      inputSchema = inputSchemaOrHandler;
-      outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") };
-      actualHandler = outputSchemaOrHandler;
-    } else {
-      inputSchema = inputSchemaOrHandler;
-      outputSchema = outputSchemaOrHandler;
-      actualHandler = handler;
-    }
+    let inputSchema, outputSchema, actualHandler;
+    typeof inputSchemaOrHandler == "function" ? (inputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") }, outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") }, actualHandler = inputSchemaOrHandler) : typeof outputSchemaOrHandler == "function" ? (inputSchema = inputSchemaOrHandler, outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") }, actualHandler = outputSchemaOrHandler) : (inputSchema = inputSchemaOrHandler, outputSchema = outputSchemaOrHandler, actualHandler = handler);
     const newTools = new Map(this._tools);
-    newTools.set(name, {
+    return newTools.set(name, {
       name,
       description,
       handler: actualHandler,
       inputSchema,
       outputSchema,
       includeInPrompt: true
-    });
-    return this._clone({ tools: newTools });
+    }), this._clone({ tools: newTools });
   }
   defineTool(name, description, inputSchemaOrHandler, outputSchemaOrHandler, handler) {
-    let inputSchema;
-    let outputSchema;
-    let actualHandler;
-    if (typeof inputSchemaOrHandler === "function") {
-      inputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") };
-      outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") };
-      actualHandler = inputSchemaOrHandler;
-    } else if (typeof outputSchemaOrHandler === "function") {
-      inputSchema = inputSchemaOrHandler;
-      outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") };
-      actualHandler = outputSchemaOrHandler;
-    } else {
-      inputSchema = inputSchemaOrHandler;
-      outputSchema = outputSchemaOrHandler;
-      actualHandler = handler;
-    }
+    let inputSchema, outputSchema, actualHandler;
+    typeof inputSchemaOrHandler == "function" ? (inputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") }, outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") }, actualHandler = inputSchemaOrHandler) : typeof outputSchemaOrHandler == "function" ? (inputSchema = inputSchemaOrHandler, outputSchema = { toJsonSchema: /* @__PURE__ */ __name(() => ({ type: "object" }), "toJsonSchema") }, actualHandler = outputSchemaOrHandler) : (inputSchema = inputSchemaOrHandler, outputSchema = outputSchemaOrHandler, actualHandler = handler);
     const newTools = new Map(this._tools);
-    newTools.set(name, {
+    return newTools.set(name, {
       name,
       description,
       handler: actualHandler,
       inputSchema,
       outputSchema,
       includeInPrompt: false
-    });
-    return this._clone({ tools: newTools });
+    }), this._clone({ tools: newTools });
   }
   skill(pathOrDef) {
-    if (typeof pathOrDef === "string") {
-      return this._clone({ skills: [...this._skills, { type: "stored", path: pathOrDef }] });
-    } else {
-      validateSkillName(pathOrDef.name);
-      validateSkillDescription(pathOrDef.description);
-      return this._clone({
-        skills: [...this._skills, {
-          type: "virtual",
-          skill: {
-            name: pathOrDef.name,
-            description: pathOrDef.description,
-            body: pathOrDef.body,
-            tools: pathOrDef.tools
-          }
-        }]
-      });
-    }
+    return typeof pathOrDef == "string" ? this._clone({ skills: [...this._skills, { type: "stored", path: pathOrDef }] }) : (validateSkillName(pathOrDef.name), validateSkillDescription(pathOrDef.description), this._clone({
+      skills: [...this._skills, {
+        type: "virtual",
+        skill: {
+          name: pathOrDef.name,
+          description: pathOrDef.description,
+          body: pathOrDef.body,
+          tools: pathOrDef.tools
+        }
+      }]
+    }));
   }
   cwd(path) {
     return this._clone({ cwd: path });
   }
   async _resolveSkills() {
     const resolved = [];
-    for (const deferred of this._skills) {
-      if (deferred.type === "virtual") {
+    for (const deferred of this._skills)
+      if (deferred.type === "virtual")
         resolved.push(deferred.skill);
-      } else {
-        const content = await (0, import_promises2.readFile)(deferred.path, "utf-8");
-        const parsed = parseSkillMd(content);
-        const stored = {
+      else {
+        const content = await (0, import_promises2.readFile)(deferred.path, "utf-8"), parsed = parseSkillMd(content), stored = {
           name: parsed.name,
           description: parsed.description,
           body: parsed.body,
-          basePath: (0, import_node_path2.dirname)(deferred.path)
+          basePath: (0, import_node_path3.dirname)(deferred.path)
         };
         resolved.push(stored);
       }
-    }
     return resolved;
   }
   _buildSkillsPrompt(skills) {
     if (skills.length === 0)
       return "";
-    let xml = "<available_skills>\n";
-    for (const skill of skills) {
-      xml += `  <skill>
-`;
-      xml += `    <name>${skill.name}</name>
+    let xml = `<available_skills>
 `;
-      xml += `    <description>${skill.description}</description>
+    for (const skill of skills)
+      xml += `  <skill>
+`, xml += `    <name>${skill.name}</name>
+`, xml += `    <description>${skill.description}</description>
+`, xml += `  </skill>
 `;
-      xml += `  </skill>
+    return xml += `</available_skills>
+`, xml += `
+`, xml += `The above skills are available to you. When a task matches a skill's description,
+`, xml += "call the `activate_skill` tool with the skill name to load its full instructions.\n", xml += "If the skill provides tools, use `call_skill_tool` to invoke them.\n", xml += "If the skill references files, use `read_skill_file` to access them.\n", xml + `
 `;
-    }
-    xml += "</available_skills>\n";
-    xml += "\n";
-    xml += "The above skills are available to you. When a task matches a skill's description,\n";
-    xml += "call the `activate_skill` tool with the skill name to load its full instructions.\n";
-    xml += "If the skill provides tools, use `call_skill_tool` to invoke them.\n";
-    xml += "If the skill references files, use `read_skill_file` to access them.\n";
-    return xml + "\n";
   }
   async run() {
     return this.stream().result;
   }
   stream() {
     const stream = new ThoughtStream();
-    this._executeStream(stream).catch((err) => {
-      stream.rejectResult(err instanceof Error ? err : new Error(String(err?.message ?? err)));
-      stream.close();
-    });
-    return stream;
+    return this._executeStream(stream).catch((err) => {
+      stream.rejectResult(err instanceof Error ? err : new Error(String(err?.message ?? err))), stream.close();
+    }), stream;
   }
   async _executeStream(stream) {
-    if (!this._conn.initialized) {
-      await this._conn.connection.initialize({
-        protocolVersion: 1,
-        clientCapabilities: {}
-      });
-      this._conn.initialized = true;
-    }
+    this._conn.initialized || (await this._conn.connection.initialize({
+      protocolVersion: 1,
+      clientCapabilities: {}
+    }), this._conn.initialized = true);
     const resolvedSkills = await this._resolveSkills();
     let prompt = this._buildSkillsPrompt(resolvedSkills) + this._promptParts.join("");
     const toolsWithPrompt = Array.from(this._tools.values()).filter((t) => t.includeInPrompt);
     if (toolsWithPrompt.length > 0) {
-      prompt += "\n\nAvailable tools:\n";
-      for (const tool of toolsWithPrompt) {
+      prompt += `
+
+Available tools:
+`;
+      for (const tool of toolsWithPrompt)
         prompt += `- ${tool.name}: ${tool.description}
 `;
-      }
     }
     const serverBuilder = mcpServer("thinkwell");
-    let resultReceived = false;
-    let result;
-    const rawSchema = this._schemaProvider?.toJsonSchema() ?? { type: "object" };
-    const needsWrap = rawSchema.type !== "object";
-    const outputSchema = needsWrap ? { type: "object", properties: { result: rawSchema }, required: ["result"] } : rawSchema;
-    prompt += "\n\nWhen you have your answer, call the `return_result` MCP tool with the result.";
-    serverBuilder.tool("return_result", "Return the final result", outputSchema, { type: "object", properties: { success: { type: "boolean" } } }, async (input) => {
-      result = needsWrap ? input.result : input;
-      resultReceived = true;
-      return { success: true };
-    });
-    for (const tool of this._tools.values()) {
-      serverBuilder.tool(tool.name, tool.description, tool.inputSchema.toJsonSchema(), tool.outputSchema.toJsonSchema(), async (input, _context) => {
-        return tool.handler(input);
-      });
-    }
-    const server = serverBuilder.build();
-    const skillServer = resolvedSkills.length > 0 ? createSkillServer(resolvedSkills) : void 0;
-    this._conn.mcpHandler.register(server);
-    if (skillServer) {
-      this._conn.mcpHandler.register(skillServer);
-    }
-    this._conn.mcpHandler.setSessionId(this._existingSessionId ?? "pending");
+    let resultReceived = false, result, resultError, resolveResultReady;
+    const resultReady = new Promise((r) => {
+      resolveResultReady = r;
+    }), rawSchema = this._schemaProvider?.toJsonSchema() ?? { type: "object" }, needsWrap = rawSchema.type !== "object", outputSchema = needsWrap ? { type: "object", properties: { result: rawSchema }, required: ["result"] } : rawSchema, acceptResult = /* @__PURE__ */ __name((input) => {
+      if (resultReceived)
+        return;
+      const value = needsWrap ? input.result : input, schemaRequired = rawSchema.required;
+      let required2 = Array.isArray(schemaRequired) ? schemaRequired : void 0;
+      if (features2.FAULT_INJECTION) {
+        const injectedField = process.env.THINKWELL_INJECT_REQUIRED_FIELD;
+        injectedField && (required2 = required2 ? [...required2, injectedField] : [injectedField]);
+      }
+      if (Array.isArray(required2)) {
+        if (value == null || typeof value != "object") {
+          resultError = new TypeError(`Agent result must be an object when schema has required fields, got ${value === null ? "null" : typeof value}`), resultReceived = true, resolveResultReady();
+          return;
+        }
+        const obj = value, missing = required2.filter((key) => !Object.hasOwn(obj, key));
+        if (missing.length > 0) {
+          resultError = new TypeError(`Agent result is missing required field(s): ${missing.join(", ")}`), resultReceived = true, resolveResultReady();
+          return;
+        }
+      }
+      result = value, resultReceived = true, resolveResultReady();
+    }, "acceptResult");
+    prompt += "\n\nWhen you have your answer, call the `return_result` MCP tool with the result.", serverBuilder.tool("return_result", "Return the final result", outputSchema, { type: "object", properties: { success: { type: "boolean" } } }, async (input) => (acceptResult(input), { success: true }));
+    for (const tool of this._tools.values())
+      serverBuilder.tool(tool.name, tool.description, tool.inputSchema.toJsonSchema(), tool.outputSchema.toJsonSchema(), async (input, _context) => tool.handler(input));
+    const server = serverBuilder.build(), skillServer = resolvedSkills.length > 0 ? createSkillServer(resolvedSkills) : void 0;
+    this._conn.mcpHandler.register(server), skillServer && this._conn.mcpHandler.register(skillServer), this._conn.mcpHandler.setSessionId(this._existingSessionId ?? "pending");
     try {
       let sessionId;
-      if (this._existingSessionId) {
+      if (this._existingSessionId)
         sessionId = this._existingSessionId;
-      } else {
+      else {
         const mcpServers = [{
           type: "http",
           name: server.name,
           url: server.acpUrl,
           headers: []
         }];
-        if (skillServer) {
-          mcpServers.push({
-            type: "http",
-            name: skillServer.name,
-            url: skillServer.acpUrl,
-            headers: []
-          });
-        }
+        skillServer && mcpServers.push({
+          type: "http",
+          name: skillServer.name,
+          url: skillServer.acpUrl,
+          headers: []
+        });
         const request = {
           cwd: this._cwd ?? process.cwd(),
           mcpServers
         };
-        const response = await this._conn.connection.newSession(request);
-        sessionId = response.sessionId;
+        sessionId = (await this._conn.connection.newSession(request)).sessionId;
       }
       this._conn.mcpHandler.setSessionId(sessionId);
       const session = new ThinkSession(sessionId, this._conn);
-      this._conn.sessionHandlers.set(sessionId, session);
-      await this._conn.mcpHandler.waitForToolsDiscovery(sessionId, 2e3);
+      this._conn.sessionHandlers.set(sessionId, session), await this._conn.mcpHandler.waitForToolsDiscovery(sessionId, 2e3);
       try {
-        const promptPromise = session.sendPrompt(prompt);
-        while (!resultReceived) {
-          const update = await session.readUpdate();
-          if (update.type === "stop") {
-            if (!resultReceived) {
-              stream.rejectResult(new Error("Session ended without calling return_result"));
+        const pendingToolCalls = [], sendTurn = /* @__PURE__ */ __name(async (text) => {
+          const promptPromise = session.sendPrompt(text);
+          for (; !resultReceived; ) {
+            const update = await session.readUpdate();
+            if (update.type === "stop")
+              break;
+            if (update.type === "tool_start") {
+              const toolName = update.title;
+              (this._tools.has(toolName) || toolName === "return_result") && pendingToolCalls.push({ id: update.id, name: toolName, input: update.input });
             }
-            break;
+            stream.pushEvent(update);
           }
-          stream.pushEvent(update);
-        }
-        await promptPromise;
-        if (resultReceived && result !== void 0) {
-          stream.resolveResult(result);
+          await promptPromise, !resultReceived && pendingToolCalls.some((c) => c.name === "return_result") && await resultReady;
+        }, "sendTurn");
+        for (await sendTurn(prompt); !resultReceived && pendingToolCalls.length > 0; ) {
+          const calls = pendingToolCalls.splice(0), results = [];
+          for (const call of calls) {
+            if (call.name === "return_result") {
+              acceptResult(call.input);
+              break;
+            }
+            const tool = this._tools.get(call.name);
+            if (tool)
+              try {
+                const output = await tool.handler(call.input), text = typeof output == "string" ? output : JSON.stringify(output);
+                results.push(`Tool "${call.name}" (id: ${call.id}) result:
+${text}`);
+              } catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                results.push(`Tool "${call.name}" (id: ${call.id}) error:
+${msg}`);
+              }
+          }
+          if (resultReceived || results.length === 0)
+            break;
+          const followUp = results.join(`
+
+`) + "\n\nWhen you have your answer, call the `return_result` MCP tool with the result.";
+          await sendTurn(followUp);
         }
+        resultError ? stream.rejectResult(resultError) : resultReceived && result !== void 0 ? stream.resolveResult(result) : resultReceived ? stream.rejectResult(new TypeError("Agent returned an undefined value")) : stream.rejectResult(new Error("Agent session ended without returning a result"));
       } finally {
-        stream.close();
-        session.close();
-        this._conn.sessionHandlers.delete(sessionId);
+        stream.close(), session.close(), this._conn.sessionHandlers.delete(sessionId);
       }
     } finally {
-      this._conn.mcpHandler.unregister(server);
-      if (skillServer) {
-        this._conn.mcpHandler.unregister(skillServer);
-      }
+      this._conn.mcpHandler.unregister(server), skillServer && this._conn.mcpHandler.unregister(skillServer);
     }
   }
 };
@@ -20381,9 +19459,7 @@ var Session = class {
    * @internal
    */
   constructor(conn, sessionId, options) {
-    this._conn = conn;
-    this._sessionId = sessionId;
-    this._options = options;
+    this._conn = conn, this._sessionId = sessionId, this._options = options;
   }
   /**
    * The unique session identifier
@@ -20412,9 +19488,8 @@ var Session = class {
    * ```
    */
   think(schema) {
-    if (this._closed) {
+    if (this._closed)
       throw new Error("Session is closed");
-    }
     return createPlan(this._conn, schema, this._sessionId);
   }
   /**
@@ -20429,8 +19504,10 @@ var Session = class {
 };
 
 // dist/agent.js
+var import_node_fs3 = require("node:fs");
+var import_node_path4 = require("node:path");
 var AGENT_COMMANDS = {
-  claude: "npx -y @zed-industries/claude-agent-acp",
+  claude: "npx -y @agentclientprotocol/claude-agent-acp",
   codex: "npx -y @zed-industries/codex-acp",
   gemini: "npx -y @google/gemini-cli --experimental-acp",
   kiro: "kiro-cli acp",
@@ -20444,9 +19521,8 @@ var AgentImpl = class {
   }
   _conn;
   constructor(key, conn) {
-    if (key !== AGENT_KEY) {
+    if (key !== AGENT_KEY)
       throw new Error("Agent cannot be constructed directly. Use open() instead.");
-    }
     this._conn = conn;
   }
   think(schema) {
@@ -20457,8 +19533,7 @@ var AgentImpl = class {
     const request = {
       cwd: options?.cwd ?? process.cwd(),
       mcpServers: []
-    };
-    const response = await this._conn.connection.newSession(request);
+    }, response = await this._conn.connection.newSession(request);
     return new Session(this._conn, response.sessionId, options);
   }
   async close() {
@@ -20470,31 +19545,53 @@ var AgentImpl = class {
     }
   }
   async _initialize() {
-    if (this._conn.initialized)
-      return;
-    await this._conn.connection.initialize({
+    this._conn.initialized || (await this._conn.connection.initialize({
       protocolVersion: 1,
       clientCapabilities: {}
-    });
-    this._conn.initialized = true;
+    }), this._conn.initialized = true);
   }
 };
-function componentConnectionToStream(connection) {
+function createTracer() {
+  const traceDir = process.env.THINKWELL_TRACE;
+  if (!traceDir)
+    return null;
+  try {
+    (0, import_node_fs3.mkdirSync)(traceDir, { recursive: true });
+  } catch {
+    return null;
+  }
+  const tracePath = (0, import_node_path4.join)(traceDir, `trace-${process.pid}-${Date.now()}.ndjson`);
+  let seq = 0;
+  const t0 = performance.now();
+  return (dir, msg) => {
+    const record2 = {
+      seq: seq++,
+      ms: Math.round((performance.now() - t0) * 1e3) / 1e3,
+      dir,
+      msg
+    };
+    try {
+      (0, import_node_fs3.appendFileSync)(tracePath, JSON.stringify(record2) + `
+`);
+    } catch {
+    }
+  };
+}
+__name(createTracer, "createTracer");
+function componentConnectionToStream(connection, trace) {
   const readable = new ReadableStream({
     async start(controller) {
       try {
-        for await (const message of connection.messages) {
-          controller.enqueue(message);
-        }
+        for await (const message of connection.messages)
+          trace?.("recv", message), controller.enqueue(message);
         controller.close();
       } catch (error40) {
         controller.error(error40);
       }
     }
-  });
-  const writable = new WritableStream({
+  }), writable = new WritableStream({
     write(message) {
-      connection.send(message);
+      trace?.("send", message), connection.send(message);
     },
     close() {
       connection.close();
@@ -20506,38 +19603,37 @@ __name(componentConnectionToStream, "componentConnectionToStream");
 function createClient(conn, mcpHandler) {
   return {
     sessionUpdate(notification) {
-      const { sessionId } = notification;
-      const handler = conn.sessionHandlers.get(sessionId);
-      if (!handler) {
-        console.error(`No handler for session: ${sessionId}`);
-        return Promise.resolve();
-      }
+      const { sessionId } = notification, handler = conn.sessionHandlers.get(sessionId);
+      if (!handler)
+        return console.error(`No handler for session: ${sessionId}`), Promise.resolve();
       const update = convertNotification(notification);
-      if (update) {
-        handler.pushUpdate(update);
-      }
-      return Promise.resolve();
+      return update && handler.pushUpdate(update), Promise.resolve();
     },
     requestPermission(request) {
-      const firstOption = request.options[0];
-      return Promise.resolve({
+      const response = {
         outcome: {
           outcome: "selected",
-          optionId: firstOption?.optionId ?? "approve"
+          optionId: request.options[0]?.optionId ?? "approve"
         }
-      });
+      };
+      if (features2.LOG_PERMISSIONS) {
+        const logDir = process.env.THINKWELL_LOG_DIR ?? process.cwd(), logPath = (0, import_node_path4.join)(logDir, "permissions.ndjson"), record2 = {
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          request,
+          response
+        };
+        (0, import_node_fs3.appendFileSync)(logPath, JSON.stringify(record2) + `
+`);
+      }
+      return Promise.resolve(response);
     },
     async extMethod(method, params) {
-      if (mcpHandler.isMcpRequest(method)) {
-        const result = await mcpHandler.routeRequest(method, params);
-        return result ?? {};
-      }
+      if (mcpHandler.isMcpRequest(method))
+        return await mcpHandler.routeRequest(method, params) ?? {};
       throw new Error(`Unknown extension method: ${method}`);
     },
     async extNotification(method, params) {
-      if (mcpHandler.isMcpRequest(method)) {
-        await mcpHandler.routeRequest(method, params);
-      }
+      mcpHandler.isMcpRequest(method) && await mcpHandler.routeRequest(method, params);
     }
   };
 }
@@ -20563,9 +19659,7 @@ function convertToolCallContent(content) {
       return { type: "terminal", terminalId: content.terminalId };
     case "content": {
       const block = convertContentBlock(content.content);
-      if (!block)
-        return null;
-      return { type: "content", content: block };
+      return block ? { type: "content", content: block } : null;
     }
   }
 }
@@ -20575,39 +19669,35 @@ function convertNotification(notification) {
   switch (update.sessionUpdate) {
     case "agent_thought_chunk": {
       const content = update.content;
-      if (content.type === "text") {
+      if (content.type === "text")
         return { type: "thought", text: content.text };
-      }
       break;
     }
     case "agent_message_chunk": {
       const content = update.content;
-      if (content.type === "text") {
+      if (content.type === "text")
         return { type: "message", text: content.text };
-      }
       break;
     }
     case "tool_call": {
-      return {
+      const event = {
         type: "tool_start",
         id: update.toolCallId,
         title: update.title,
         kind: update.kind
       };
+      return update.rawInput !== void 0 && (event.input = update.rawInput), event;
     }
     case "tool_call_update": {
       const status = update.status ?? "in_progress";
-      if (status === "completed" || status === "failed") {
-        return { type: "tool_done", id: update.toolCallId, status };
-      }
-      return {
+      return status === "completed" || status === "failed" ? { type: "tool_done", id: update.toolCallId, status } : {
         type: "tool_update",
         id: update.toolCallId,
         status,
         content: update.content?.map(convertToolCallContent).filter((c) => c !== null)
       };
     }
-    case "plan": {
+    case "plan":
       return {
         type: "plan",
         entries: update.entries.map((e) => ({
@@ -20616,10 +19706,12 @@ function convertNotification(notification) {
           priority: e.priority
         }))
       };
-    }
     case "user_message_chunk":
     case "available_commands_update":
     case "current_mode_update":
+    case "config_option_update":
+    case "session_info_update":
+    case "usage_update":
       break;
   }
   return null;
@@ -20635,35 +19727,27 @@ function parseCommandWithEnv(command, env) {
 }
 __name(parseCommandWithEnv, "parseCommandWithEnv");
 function resolveCommand(nameOrOptions, options) {
-  const envCmd = process.env.THINKWELL_AGENT_CMD;
-  const envAgent = process.env.THINKWELL_AGENT;
-  if (envCmd) {
-    const opts = typeof nameOrOptions === "string" ? options : nameOrOptions;
-    return { command: envCmd, options: opts };
-  }
+  const envCmd = process.env.THINKWELL_AGENT_CMD, envAgent = process.env.THINKWELL_AGENT;
+  if (envCmd)
+    return { command: envCmd, options: typeof nameOrOptions == "string" ? options : nameOrOptions };
   if (envAgent) {
-    if (!(envAgent in AGENT_COMMANDS)) {
+    if (!(envAgent in AGENT_COMMANDS))
       throw new Error(`Unknown agent name in $THINKWELL_AGENT: '${envAgent}'. Valid names: ${Object.keys(AGENT_COMMANDS).join(", ")}`);
-    }
-    const opts = typeof nameOrOptions === "string" ? options : nameOrOptions;
+    const opts = typeof nameOrOptions == "string" ? options : nameOrOptions;
     return { command: AGENT_COMMANDS[envAgent], options: opts };
   }
-  if (typeof nameOrOptions === "string") {
-    return { command: AGENT_COMMANDS[nameOrOptions], options };
-  }
-  return { command: nameOrOptions.cmd, options: nameOrOptions };
+  return typeof nameOrOptions == "string" ? { command: AGENT_COMMANDS[nameOrOptions], options } : { command: nameOrOptions.cmd, options: nameOrOptions };
 }
 __name(resolveCommand, "resolveCommand");
 async function open(nameOrOptions, maybeOptions) {
-  const { command, options } = resolveCommand(nameOrOptions, maybeOptions);
-  const commandSpec = options?.env ? parseCommandWithEnv(command, options.env) : command;
-  const conductor = new Conductor({
+  const { command, options } = resolveCommand(nameOrOptions, maybeOptions), agentEnv = {
+    // Strip CLAUDECODE to prevent the nested-session guard from blocking
+    // the agent's Claude Code subprocess when thinkwell runs inside Claude Code.
+    ...features2.STRIP_CLAUDECODE_ENV ? { CLAUDECODE: "" } : {},
+    ...options?.env
+  }, commandSpec = parseCommandWithEnv(command, agentEnv), conductor = new Conductor({
     instantiator: fromCommands([commandSpec])
-  });
-  const pair = createChannelPair();
-  const stream = componentConnectionToStream(pair.left);
-  const mcpHandler = new McpOverAcpHandler();
-  const conn = {
+  }), pair = createChannelPair(), trace = createTracer(), stream = componentConnectionToStream(pair.left, trace), mcpHandler = new McpOverAcpHandler(), conn = {
     conductor,
     connection: null,
     // Set below after creating the client
@@ -20672,19 +19756,16 @@ async function open(nameOrOptions, maybeOptions) {
     initialized: false,
     conductorPromise: null
     // Set below after starting the conductor
-  };
-  const clientConnection = new ClientSideConnection((_agent) => createClient(conn, mcpHandler), stream);
+  }, clientConnection = new ClientSideConnection((_agent) => createClient(conn, mcpHandler), stream);
   conn.connection = clientConnection;
   const clientConnector = {
     async connect() {
       return pair.right;
     }
   };
-  conn.conductorPromise = conductor.connect(clientConnector);
-  conn.conductorPromise.catch((error40) => {
+  return conn.conductorPromise = conductor.connect(clientConnector), conn.conductorPromise.catch((error40) => {
     console.error("Conductor error:", error40);
-  });
-  return new AgentImpl(AGENT_KEY, conn);
+  }), new AgentImpl(AGENT_KEY, conn);
 }
 __name(open, "open");