@moxt-ai/mobius 0.0.312 → 0.0.314

package/dist/cli.js

@@ -2086,7 +2086,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@moxt-ai/mobius",
-      version: "0.0.312",
+      version: "0.0.314",
       description: "Mobius CLI for pairing and running local AI agent services.",
       type: "module",
       bin: {
@@ -41949,14 +41949,14 @@ function unreachable(value, logger = console) {
 async function withDeadline(signal, timeoutMilliseconds, operation) {
   const deadline = AbortSignal.any([signal, AbortSignal.timeout(timeoutMilliseconds)]);
   deadline.throwIfAborted();
-  return await new Promise((resolve20, reject2) => {
+  return await new Promise((resolve21, reject2) => {
     const settle2 = (callback) => {
       deadline.removeEventListener("abort", onAbort);
       callback();
     };
     const onAbort = () => settle2(() => reject2(deadline.reason));
     deadline.addEventListener("abort", onAbort, { once: true });
-    operation().then((value) => settle2(() => resolve20(value)), (error62) => settle2(() => reject2(error62)));
+    operation().then((value) => settle2(() => resolve21(value)), (error62) => settle2(() => reject2(error62)));
   });
 }
 function withEnvironment(environment, operation) {
@@ -41983,11 +41983,11 @@ var init_utils = __esm({
       done = false;
       push(item) {
         if (this.resolvers.length > 0) {
-          const resolve20 = this.resolvers.shift();
-          if (resolve20 === void 0) {
+          const resolve21 = this.resolvers.shift();
+          if (resolve21 === void 0) {
             return;
           }
-          resolve20({ value: item, done: false });
+          resolve21({ value: item, done: false });
         } else {
           this.queue.push(item);
         }
@@ -41995,8 +41995,8 @@ var init_utils = __esm({
       end() {
         this.done = true;
         while (this.resolvers.length > 0) {
-          const resolve20 = this.resolvers.shift();
-          resolve20?.({ done: true, value: void 0 });
+          const resolve21 = this.resolvers.shift();
+          resolve21?.({ done: true, value: void 0 });
         }
       }
       [Symbol.asyncIterator]() {
@@ -42012,8 +42012,8 @@ var init_utils = __esm({
             if (this.done) {
               return Promise.resolve({ done: true, value: void 0 });
             }
-            return new Promise((resolve20) => {
-              this.resolvers.push(resolve20);
+            return new Promise((resolve21) => {
+              this.resolvers.push(resolve21);
             });
           }
         };
@@ -47489,7 +47489,7 @@ function isRef(value) {
 function cloneIssues(issues) {
   return issues.map((iss) => iss.path ? { ...iss, path: iss.path.slice() } : { ...iss });
 }
-function isRecursive(inst, stack, resolve20) {
+function isRecursive(inst, stack, resolve21) {
   const cached2 = recursive.get(inst);
   if (cached2 !== void 0)
     return cached2 ? PROVEN : NONE;
@@ -47499,7 +47499,7 @@ function isRecursive(inst, stack, resolve20) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve20);
+      const answer = isRecursive(child, stack, resolve21);
       if (answer > result)
         result = answer;
     }
@@ -47510,7 +47510,7 @@ function isRecursive(inst, stack, resolve20) {
       const desc2 = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc2.enumerable)
         continue;
-      const child = desc2.get ? ASSUMED : desc2.value?._zod ? isRecursive(desc2.value, stack, resolve20) : NONE;
+      const child = desc2.get ? ASSUMED : desc2.value?._zod ? isRecursive(desc2.value, stack, resolve21) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -47574,7 +47574,7 @@ function isRecursive(inst, stack, resolve20) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve20 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve21 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -65177,14 +65177,14 @@ function waitUnlessAborted(milliseconds, signal) {
   if (signal.aborted) {
     return Promise.resolve(false);
   }
-  return new Promise((resolve20) => {
+  return new Promise((resolve21) => {
     const timer = setTimeout(() => {
       signal.removeEventListener("abort", onAbort);
-      resolve20(true);
+      resolve21(true);
     }, milliseconds);
     const onAbort = () => {
       clearTimeout(timer);
-      resolve20(false);
+      resolve21(false);
     };
     signal.addEventListener("abort", onAbort, { once: true });
   });
@@ -65368,7 +65368,7 @@ function stripLocalCommandMetadata(content) {
   return kept;
 }
 function raceWithAbort(operation, signal) {
-  return new Promise((resolve20, reject2) => {
+  return new Promise((resolve21, reject2) => {
     const cleanup = () => signal.removeEventListener("abort", onAbort);
     const onAbort = () => {
       cleanup();
@@ -65380,7 +65380,7 @@ function raceWithAbort(operation, signal) {
     }
     void operation.then((value) => {
       cleanup();
-      resolve20(value);
+      resolve21(value);
     }, (error62) => {
       cleanup();
       reject2(error62);
@@ -67309,12 +67309,12 @@ var init_acp_agent = __esm({
           }
         };
         let completeTurn;
-        turn.completion = new Promise((resolve20) => {
-          completeTurn = resolve20;
+        turn.completion = new Promise((resolve21) => {
+          completeTurn = resolve21;
         });
-        const response = new Promise((resolve20, reject2) => {
+        const response = new Promise((resolve21, reject2) => {
           turn.resolve = (result) => {
-            resolve20(result);
+            resolve21(result);
             completeTurn();
           };
           turn.reject = (error62) => {
@@ -67718,8 +67718,8 @@ var init_acp_agent = __esm({
             pendingNext ??= session.query.next().then((result) => ({ kind: "message", result }));
             const nextMessage = pendingNext;
             let onAbort;
-            const abortRace = new Promise((resolve20) => {
-              onAbort = () => resolve20("abort");
+            const abortRace = new Promise((resolve21) => {
+              onAbort = () => resolve21("abort");
               cancelController.signal.addEventListener("abort", onAbort, { once: true });
             });
             const raced = await Promise.race([nextMessage, abortRace]);
@@ -76684,10 +76684,10 @@ var init_process = __esm({
           shell: shouldUseShellForPiCommand(cmd)
         });
         try {
-          await new Promise((resolve20, reject2) => {
+          await new Promise((resolve21, reject2) => {
             const onSpawn = () => {
               cleanup();
-              resolve20();
+              resolve21();
             };
             const onError = (err) => {
               cleanup();
@@ -76889,7 +76889,7 @@ var init_process = __esm({
         const timeoutMs = opts?.timeoutMs;
         const line = `${JSON.stringify(withId)}
 `;
-        return new Promise((resolve20, reject2) => {
+        return new Promise((resolve21, reject2) => {
           const signal = opts?.signal;
           if (signal?.aborted === true) {
             reject2(signal.reason);
@@ -76911,7 +76911,7 @@ var init_process = __esm({
           this.pending.set(id, {
             resolve: (res) => {
               drop();
-              resolve20(res);
+              resolve21(res);
             },
             reject: (error62) => {
               drop();
@@ -76944,14 +76944,14 @@ var init_process = __esm({
         });
       }
       writeLine(line) {
-        return new Promise((resolve20, reject2) => {
+        return new Promise((resolve21, reject2) => {
           try {
             this.child.stdin.write(line, (error62) => {
               if (error62) {
                 reject2(error62);
                 return;
               }
-              resolve20();
+              resolve21();
             });
           } catch (error62) {
             reject2(error62);
@@ -78316,8 +78316,8 @@ var init_session = __esm({
       }
       async prompt(message, images = []) {
         const expandedMessage = expandSlashCommand(message, this.fileCommands);
-        const turnPromise = new Promise((resolve20, reject2) => {
-          const queued = { message: expandedMessage, images, resolve: resolve20, reject: reject2 };
+        const turnPromise = new Promise((resolve21, reject2) => {
+          const queued = { message: expandedMessage, images, resolve: resolve21, reject: reject2 };
           if (this.pendingTurn) {
             this.turnQueue.push(queued);
             this.emit({
@@ -81617,8 +81617,8 @@ var init_adapter_registry = __esm({
       #resolve;
       #dependencies;
       #adapters = /* @__PURE__ */ new Map();
-      constructor(resolve20, dependencies) {
-        this.#resolve = resolve20;
+      constructor(resolve21, dependencies) {
+        this.#resolve = resolve21;
         this.#dependencies = dependencies;
       }
       resolve = (agent) => {
@@ -82028,7 +82028,7 @@ function createWritableAcpStream(output2) {
       if (outputFailure !== void 0) {
         return Promise.reject(outputFailure);
       }
-      return new Promise((resolve20, reject2) => {
+      return new Promise((resolve21, reject2) => {
         pendingWriteFailures.add(reject2);
         output2.write(chunk, (error62) => {
           pendingWriteFailures.delete(reject2);
@@ -82041,7 +82041,7 @@ function createWritableAcpStream(output2) {
             reject2(outputFailure);
             return;
           }
-          resolve20();
+          resolve21();
         });
       });
     }
@@ -82095,12 +82095,12 @@ var init_agent_connection = __esm({
         stderr.on("data", (chunk) => {
           process.stderr.write(`[${agent.id}-acp] ${chunk}`);
         });
-        this.termination = new Promise((resolve20) => {
+        this.termination = new Promise((resolve21) => {
           child.once("error", (cause) => {
-            resolve20({ kind: "failed", error: new AcpExecutionError("The ACP process could not run", { cause }) });
+            resolve21({ kind: "failed", error: new AcpExecutionError("The ACP process could not run", { cause }) });
           });
           child.once("exit", (code, signal) => {
-            resolve20({
+            resolve21({
               kind: "failed",
               error: new AcpExecutionError("The ACP process stopped", { cause: { code, signal } })
             });
@@ -82543,7 +82543,7 @@ var init_live_sessions = __esm({
         this.#sessions.add(session);
         return connection;
       };
-      #resolve = (target) => {
+      #find = (target) => {
         const decoded = targetSchema.safeParse(target);
         if (!decoded.success) {
           throw new AcpExecutionError(
@@ -82561,12 +82561,52 @@ var init_live_sessions = __esm({
         if (matches.length > 1) {
           throw new AcpExecutionError("Another writer is using this native session", {}, "session_busy");
         }
-        const session = matches[0];
+        return matches[0];
+      };
+      #resolve = (target) => {
+        const session = this.#find(target);
         if (session === void 0) {
           throw new AcpExecutionError("The native session is not active", {}, "invalid_agent_session");
         }
         return session;
       };
+      cancel = async (target, signal) => {
+        const bounded = AbortSignal.any([signal, AbortSignal.timeout(3e4)]);
+        bounded.throwIfAborted();
+        const { connection } = this.#resolve(target);
+        await connection.race(
+          connection.connection.agent.notify(methods10.agent.session.cancel, {
+            sessionId: connection.events.sessionId()
+          }),
+          "ACP agent exited while cancelling a prompt",
+          bounded
+        );
+      };
+      closeSession = async (target, signal) => {
+        const session = this.#find(target);
+        if (session === void 0) {
+          signal.throwIfAborted();
+          return;
+        }
+        const { connection, scope } = session;
+        try {
+          signal.throwIfAborted();
+          if (scope.capabilities().closeSession) {
+            try {
+              await connection.connection.agent.request(
+                methods10.agent.session.close,
+                { sessionId: connection.events.sessionId() },
+                { cancellationSignal: AbortSignal.any([signal, AbortSignal.timeout(1e3)]) }
+              );
+            } catch {
+              signal.throwIfAborted();
+            }
+          }
+        } finally {
+          await connection.closeProcess();
+        }
+        signal.throwIfAborted();
+      };
       prompt = async (target, content, signal) => {
         signal.throwIfAborted();
         const { connection, scope } = this.#resolve(target);
@@ -82879,7 +82919,7 @@ var init_session_event_history_projection = __esm({
     SessionEventHistoryProjection = class {
       #toolCallEventIds = /* @__PURE__ */ new Map();
       #latestEvent = null;
-      apply = (liveEvent2, resolve20) => {
+      apply = (liveEvent2, resolve21) => {
         if (liveEvent2.type === "lifecycle-metadata") {
           this.#latestEvent = null;
           const prompt = liveEvent2.payload;
@@ -82900,7 +82940,7 @@ var init_session_event_history_projection = __esm({
         }
         if (liveEvent2.type === "acp" && liveEvent2.payload.sessionUpdate === "tool_call_update") {
           const targetEventId = this.#toolCallEventIds.get(liveEvent2.payload.toolCallId);
-          const current = targetEventId === void 0 ? void 0 : resolve20([targetEventId]).get(targetEventId);
+          const current = targetEventId === void 0 ? void 0 : resolve21([targetEventId]).get(targetEventId);
           if (current?.type === "acp" && (current.payload.sessionUpdate === "tool_call" || current.payload.sessionUpdate === "tool_call_update")) {
             return this.#replace(
               current,
@@ -82924,12 +82964,12 @@ var init_session_event_history_projection = __esm({
        * The projected tool call announced with this identifier, in its current
        * merged form, or `undefined` when the projection has not recorded one.
        */
-      getToolCall = (toolCallId, resolve20) => {
+      getToolCall = (toolCallId, resolve21) => {
         const eventId = this.#toolCallEventIds.get(toolCallId);
         if (eventId === void 0) {
           return void 0;
         }
-        const event = resolve20([eventId]).get(eventId);
+        const event = resolve21([eventId]).get(eventId);
         if (event?.type === "acp" && (event.payload.sessionUpdate === "tool_call" || event.payload.sessionUpdate === "tool_call_update")) {
           return event.payload;
         }
@@ -83024,8 +83064,8 @@ var init_session_event_store = __esm({
         this.sessionGenerationId = sessionGenerationId;
         this.#projection = new SessionEventHistoryProjection();
       }
-      apply = (event, resolve20) => {
-        const projected = this.#projection.apply(event, resolve20);
+      apply = (event, resolve21) => {
+        const projected = this.#projection.apply(event, resolve21);
         this.#throughPosition = event.position;
         if (projected.kind === "skip") {
           return;
@@ -83052,7 +83092,7 @@ var init_session_event_store = __esm({
         return this.#cachedItemsByEventId.size;
       }
       /** The projected tool call for this identifier, materializing it if needed. */
-      toolCall = (toolCallId, resolve20) => this.#projection.getToolCall(toolCallId, resolve20);
+      toolCall = (toolCallId, resolve21) => this.#projection.getToolCall(toolCallId, resolve21);
       endIndex = (cursor) => {
         if (cursor === null) {
           return this.#eventIds.length;
@@ -83880,6 +83920,8 @@ var init_adapter = __esm({
       }
       getCapabilities = async (query) => await this.#queryProcesses.capabilities(query);
       connectSession = (options) => this.#liveSessions.connectSession(options);
+      cancel = (...args) => this.#liveSessions.cancel(...args);
+      closeSession = (...args) => this.#liveSessions.closeSession(...args);
       prompt = (...args) => this.#liveSessions.prompt(...args);
       steer = (...args) => this.#liveSessions.steer(...args);
       renameSession = (...args) => this.#liveSessions.renameSession(...args);
@@ -89821,6 +89863,8 @@ var init_adapter2 = __esm({
       }
       getCapabilities = async (query) => await this.#queryProcesses.capabilities(query);
       connectSession = (options) => this.#liveSessions.connectSession(options);
+      cancel = (...args) => this.#liveSessions.cancel(...args);
+      closeSession = (...args) => this.#liveSessions.closeSession(...args);
       prompt = (...args) => this.#liveSessions.prompt(...args);
       steer = (...args) => this.#liveSessions.steer(...args);
       renameSession = (...args) => this.#liveSessions.renameSession(...args);
@@ -89928,6 +89972,8 @@ var init_adapter3 = __esm({
       }
       getCapabilities = async (query) => await this.#queryProcesses.capabilities(query);
       connectSession = (options) => this.#liveSessions.connectSession(options);
+      cancel = (...args) => this.#liveSessions.cancel(...args);
+      closeSession = (...args) => this.#liveSessions.closeSession(...args);
       prompt = (...args) => this.#liveSessions.prompt(...args);
       steer = (...args) => this.#liveSessions.steer(...args);
       renameSession = (...args) => this.#liveSessions.renameSession(...args);
@@ -91349,7 +91395,7 @@ function controlSocketPath(stateDirectory, endpoint = "manager") {
 }
 async function readSocketMessage(socket, signal) {
   signal.throwIfAborted();
-  return await new Promise((resolve20, reject2) => {
+  return await new Promise((resolve21, reject2) => {
     let encoded = "";
     const finish = (error62, value) => {
       signal.removeEventListener("abort", abort);
@@ -91357,7 +91403,7 @@ async function readSocketMessage(socket, signal) {
       socket.removeAllListeners("error");
       socket.removeAllListeners("end");
       if (error62 === void 0) {
-        resolve20(value);
+        resolve21(value);
       } else {
         reject2(error62);
       }
@@ -91393,14 +91439,14 @@ async function sendLocalRequest(stateDirectory, endpoint, command, signal) {
   deadline.throwIfAborted();
   const socket = createConnection(controlSocketPath(stateDirectory, endpoint));
   try {
-    await new Promise((resolve20, reject2) => {
+    await new Promise((resolve21, reject2) => {
       const abort = () => {
         socket.destroy();
         reject2(deadline.reason);
       };
       socket.once("connect", () => {
         deadline.removeEventListener("abort", abort);
-        resolve20();
+        resolve21();
       });
       socket.once("error", reject2);
       deadline.addEventListener("abort", abort, { once: true });
@@ -91846,6 +91892,56 @@ var init_pair_local_machine = __esm({
   }
 });
 
+// src/cli/util/options.ts
+function readOnce(optionName) {
+  return (value, previous) => {
+    if (previous !== void 0) {
+      throw new InvalidArgumentError(`${optionName} may only be specified once`);
+    }
+    return value;
+  };
+}
+function valueOption(flags, description, mandatory = false) {
+  const option = new Option(flags, description).argParser(readOnce(flags.split(" ")[0] ?? flags));
+  return mandatory ? option.makeOptionMandatory() : option;
+}
+var init_options2 = __esm({
+  "src/cli/util/options.ts"() {
+    "use strict";
+    init_commander();
+  }
+});
+
+// src/storage/files/output-file.ts
+import { constants as constants5 } from "node:fs";
+import { open as open6 } from "node:fs/promises";
+async function writeExistingFile(path8, content, signal) {
+  let file2;
+  try {
+    file2 = await open6(path8, constants5.O_WRONLY | constants5.O_NOFOLLOW);
+  } catch (cause) {
+    return isNodeError(cause, "ENOENT") ? { kind: "missing", cause } : { kind: "unwritable", cause };
+  }
+  try {
+    const metadata = await file2.stat();
+    if (!metadata.isFile()) {
+      return { kind: "not-a-file" };
+    }
+    signal.throwIfAborted();
+    await file2.truncate(0);
+    await file2.writeFile(content, "utf8");
+    return { kind: "written" };
+  } finally {
+    await file2.close();
+  }
+}
+var init_output_file = __esm({
+  "src/storage/files/output-file.ts"() {
+    "use strict";
+    init_node_error();
+  }
+});
+
 // src/cli/handler/agents/logic/agent-diagnostics.ts
 function withDetectionTime(diagnostic, detectionMilliseconds, verbose) {
   return verbose ? { ...diagnostic, detectionMilliseconds } : diagnostic;
@@ -91891,11 +91987,26 @@ function formatAgentDiagnostics(inventory, json2, verbose = false) {
   return `${lines.join("\n")}
 `;
 }
+async function writeAgentDiagnostics(path8, inventory, verbose, signal) {
+  signal.throwIfAborted();
+  const write = await writeExistingFile(path8, formatAgentDiagnostics(inventory, true, verbose), signal);
+  switch (write.kind) {
+    case "written":
+      return;
+    case "missing":
+      throw new Error("The JSON output file does not exist", { cause: write.cause });
+    case "unwritable":
+      throw new Error("The JSON output file cannot be written", { cause: write.cause });
+    case "not-a-file":
+      throw new Error("The JSON output path is not a regular file");
+  }
+}
 var AvailableAgentDiagnostic, UnavailableAgentDiagnostic, UnsupportedAgentVersionDiagnostic, AgentDiagnostics;
 var init_agent_diagnostics = __esm({
   "src/cli/handler/agents/logic/agent-diagnostics.ts"() {
     "use strict";
     init_agent_discovery();
+    init_output_file();
     AvailableAgentDiagnostic = class {
       adapterVersion;
       agentVersion;
@@ -91954,8 +92065,9 @@ var init_agent_diagnostics = __esm({
 });
 
 // src/cli/handler/agents/index.ts
+import { resolve as resolve17 } from "node:path";
 function registerAgentsHandler(program2, context) {
-  program2.command("agents").description("show detected, missing, and integration-ready Agents").option("--json", "write the Agent inventory as JSON").option("--verbose", "include per-Agent detection timing").action(async (options) => {
+  program2.command("agents").description("show detected, missing, and integration-ready Agents").option("--json", "write the Agent inventory as JSON").addOption(valueOption("--output-json <existing-file.json>", "write the JSON inventory to an existing file")).option("--verbose", "include per-Agent detection timing").action(async (options) => {
     const installation = await openMobiusCliInstallation(context.shutdownSignal, process.env);
     const localContext = new RuntimeLocalContext(installation.stateDirectory, process.env);
     const defaultWorkspace = loadDefaultWorkspace(localContext.environment);
@@ -91965,6 +92077,15 @@ function registerAgentsHandler(program2, context) {
       environment: localContext.environment,
       signal: context.shutdownSignal
     });
+    if (options.outputJson !== void 0) {
+      await writeAgentDiagnostics(
+        resolve17(options.outputJson),
+        inventory,
+        options.verbose === true,
+        context.shutdownSignal
+      );
+      return;
+    }
     process.stdout.write(formatAgentDiagnostics(inventory, options.json === true, options.verbose === true));
   });
 }
@@ -91975,6 +92096,7 @@ var init_agents = __esm({
     init_pair_local_machine();
     init_config();
     init_local_files();
+    init_options2();
     init_agent_diagnostics();
   }
 });
@@ -92070,21 +92192,21 @@ async function serveLocalControl(stateDirectory, endpoint, signal, handle, onLis
   });
   try {
     await platform2.prepareControlSocket(path8);
-    await new Promise((resolve20, reject2) => {
-      server.once("listening", resolve20);
+    await new Promise((resolve21, reject2) => {
+      server.once("listening", resolve21);
       server.once("error", reject2);
       server.listen(path8);
     });
     await platform2.secureControlSocket(path8);
     await onListening();
     if (!signal.aborted) {
-      await new Promise((resolve20) => signal.addEventListener("abort", () => resolve20(), { once: true }));
+      await new Promise((resolve21) => signal.addEventListener("abort", () => resolve21(), { once: true }));
     }
   } finally {
     for (const socket of sockets) {
       socket.destroy();
     }
-    await new Promise((resolve20) => server.close(() => resolve20()));
+    await new Promise((resolve21) => server.close(() => resolve21()));
     await Promise.allSettled(requests);
     await platform2.removeControlSocket(path8).catch(() => void 0);
   }
@@ -93015,13 +93137,13 @@ async function waitForManagerExit(stateDirectory, signal) {
     if (!await managerLockExists(stateDirectory)) {
       return;
     }
-    await new Promise((resolve20, reject2) => {
+    await new Promise((resolve21, reject2) => {
       const timeout = setTimeout(finish, 20);
       const abort = () => finish(deadline.reason);
       function finish(cause) {
         clearTimeout(timeout);
         deadline.removeEventListener("abort", abort);
-        cause === void 0 ? resolve20() : reject2(cause);
+        cause === void 0 ? resolve21() : reject2(cause);
       }
       deadline.addEventListener("abort", abort, { once: true });
     });
@@ -93082,13 +93204,13 @@ async function ensureManager(stateDirectory, launch, signal) {
         await launchManager(launch);
         managerStarted = true;
       }
-      await new Promise((resolve20, reject2) => {
+      await new Promise((resolve21, reject2) => {
         const timeout = setTimeout(finish, 50);
         const abort = () => finish(signal.reason);
         function finish(cause2) {
           clearTimeout(timeout);
           signal.removeEventListener("abort", abort);
-          cause2 === void 0 ? resolve20() : reject2(cause2);
+          cause2 === void 0 ? resolve21() : reject2(cause2);
         }
         signal.addEventListener("abort", abort, { once: true });
       });
@@ -93143,6 +93265,24 @@ var init_quit = __esm({
   }
 });
 
+// src/runtime/catalog/refresh-agent-catalog.ts
+async function refreshAgentCatalog(config2, discover, signal) {
+  const readyAgents = await discover(signal);
+  signal.throwIfAborted();
+  return await config2.catalog.replaceAndPublish(
+    () => readyAgents.map((agent) => withRuntimeEnvironment(agent, config2.localContext.environment)),
+    (publishSignal) => publishAgentCatalog(config2, publishSignal),
+    signal
+  );
+}
+var init_refresh_agent_catalog = __esm({
+  "src/runtime/catalog/refresh-agent-catalog.ts"() {
+    "use strict";
+    init_config();
+    init_publish_agent_catalog();
+  }
+});
+
 // src/schema/acp-session-store/acp-session.ts
 var acpSession;
 var init_acp_session = __esm({
@@ -94514,7 +94654,7 @@ var init_session_restore = __esm({
 
 // src/session/live/agent-session.ts
 import { methods as methods14 } from "@agentclientprotocol/sdk";
-var PROCESS_STOP_TIMEOUT_MILLISECONDS, AgentSession;
+var AgentSession;
 var init_agent_session = __esm({
   "src/session/live/agent-session.ts"() {
     "use strict";
@@ -94534,7 +94674,6 @@ var init_agent_session = __esm({
     init_session_configurations();
     init_session_restore();
     init_acp_error();
-    PROCESS_STOP_TIMEOUT_MILLISECONDS = 1e3;
     AgentSession = class _AgentSession {
       // The restore surface: AgentSessionRestore members expose private state to
       // session-restore.ts only. The class keeps the fields private.
@@ -95041,12 +95180,12 @@ var init_agent_session = __esm({
           throw failure2;
         }
       };
-      cancel = async () => {
+      cancel = async (signal) => {
+        signal.throwIfAborted();
         await this.#interactions.cancelPendingInteractions();
+        signal.throwIfAborted();
         if (this.#turn.running) {
-          await this.#connection.connection.agent.notify(methods14.agent.session.cancel, {
-            sessionId: this.#updates.sessionId()
-          });
+          await this.#adapter.cancel(this.#target(), signal);
         }
       };
       respondPermission = async (options) => {
@@ -95133,21 +95272,18 @@ var init_agent_session = __esm({
       close = async () => {
         try {
           await this.#interactions.cancelPendingInteractions();
-          if (this.#capabilities.closeSession && this.#updates.sessionId().length > 0) {
-            try {
-              await this.#connection.connection.agent.request(
-                methods14.agent.session.close,
-                { sessionId: this.#updates.sessionId() },
-                {
-                  cancellationSignal: AbortSignal.timeout(PROCESS_STOP_TIMEOUT_MILLISECONDS)
-                }
-              );
-            } catch {
-            }
+        } catch (error62) {
+          try {
+            throw error62;
+          } finally {
+            await this.closeProcess();
           }
-        } finally {
+        }
+        if (this.#updates.sessionId().length === 0) {
           await this.closeProcess();
+          return;
         }
+        await this.#adapter.closeSession(this.#target(), AbortSignal.timeout(3e4));
       };
       closeProcess = () => this.#connection.closeProcess();
       agentSettingsModelEffort = () => this.#connection.agentSettingsModelEffort();
@@ -95733,14 +95869,14 @@ var init_session_manager = __esm({
           return { title: normalized, updatedAt };
         })
       );
-      cancelPrompt = async (sessionId) => {
+      cancelPrompt = async (sessionId, signal = AbortSignal.timeout(3e4)) => this.#operations.run({ signal }, async ({ signal: signal2 }) => {
         await this.#executions.cancel(sessionId, async () => {
           const runtime = this.#executionProcesses.get(sessionId);
           if (runtime !== void 0) {
-            await runtime.cancel();
+            await runtime.cancel(signal2);
           }
         });
-      };
+      });
       steerPrompt = async (options) => this.#operations.run(options, async (options2) => {
         if (this.#executions.command(options2.sessionId) !== options2.targetCommandId) {
           throw new AcpExecutionError("The target turn is no longer active", {}, "steering_target_unavailable");
@@ -96890,7 +97026,7 @@ var init_runtime_turn_activity = __esm({
         if (this.#admission.kind !== "open") {
           throw new Error("A daemon upgrade already owns admission");
         }
-        return new Promise((resolve20, reject2) => {
+        return new Promise((resolve21, reject2) => {
           const abort = () => {
             this.#admission = { kind: "open" };
             signal.removeEventListener("abort", abort);
@@ -96899,7 +97035,7 @@ var init_runtime_turn_activity = __esm({
           const reserve = () => {
             this.#admission = { kind: "reserved" };
             signal.removeEventListener("abort", abort);
-            resolve20({
+            resolve21({
               [Symbol.dispose]: () => {
                 this.#admission = { kind: "open" };
               }
@@ -97031,7 +97167,7 @@ var init_session_execution = __esm({
     init_active_turn();
     waitForTurnCompletion = (turn, waitSignal) => {
       waitSignal.throwIfAborted();
-      return new Promise((resolve20, reject2) => {
+      return new Promise((resolve21, reject2) => {
         let settled = false;
         const finish = (result) => {
           if (settled) {
@@ -97040,7 +97176,7 @@ var init_session_execution = __esm({
           settled = true;
           waitSignal.removeEventListener("abort", onAbort);
           if (result.kind === "completed") {
-            resolve20();
+            resolve21();
           } else {
             reject2(result.error);
           }
@@ -98380,13 +98516,7 @@ function createAgentCatalogDiscoveryHandler(dependencies) {
     );
     completion = (async () => {
       try {
-        const readyAgents = await discover(operationSignal);
-        operationSignal.throwIfAborted();
-        const published = await config2.catalog.replaceAndPublish(
-          () => readyAgents.map((agent) => withRuntimeEnvironment(agent, config2.localContext.environment)),
-          (publishSignal) => publishAgentCatalog(config2, publishSignal),
-          operationSignal
-        );
+        const published = await refreshAgentCatalog(config2, discover, operationSignal);
         operationSignal.throwIfAborted();
         if (socket.readyState === WebSocket3.OPEN) {
           send(
@@ -98436,8 +98566,7 @@ var init_handle_agent_catalog_discovery = __esm({
     init_protocol();
     init_operation_error();
     init_transport();
-    init_config();
-    init_publish_agent_catalog();
+    init_refresh_agent_catalog();
     CATALOG_DISCOVERY_TIMEOUT_MILLISECONDS = 9e4;
   }
 });
@@ -99014,7 +99143,7 @@ var init_agent_settings = __esm({
 });
 
 // src/session/content/session-files.ts
-import { basename as basename8, extname as extname2, isAbsolute as isAbsolute18, join as join36, normalize as normalize3, resolve as resolve17 } from "node:path";
+import { basename as basename8, extname as extname2, isAbsolute as isAbsolute18, join as join36, normalize as normalize3, resolve as resolve18 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function requestedPath(value) {
   if (value.includes("\0")) {
@@ -99038,7 +99167,7 @@ async function resolveFile(value, workingDirectory, signal) {
   if (isAbsolute18(requested.path) && normalize3(requested.path) !== requested.path) {
     return null;
   }
-  const candidates = requested.explicitUrl || workingDirectory === null ? [requested.path] : isAbsolute18(requested.path) ? [join36(workingDirectory, requested.path), requested.path] : [resolve17(workingDirectory, requested.path)];
+  const candidates = requested.explicitUrl || workingDirectory === null ? [requested.path] : isAbsolute18(requested.path) ? [join36(workingDirectory, requested.path), requested.path] : [resolve18(workingDirectory, requested.path)];
   for (const candidate of candidates) {
     if (!isAbsolute18(candidate) || normalize3(candidate) !== candidate) {
       continue;
@@ -99399,7 +99528,7 @@ var init_interactions2 = __esm({
     init_transport();
     sessionCancelCommand = {
       kind: SESSION_CANCEL_KIND,
-      handle: ({ eventProjection, operations, sessions, sessionTurns }, message) => {
+      handle: ({ eventProjection, operations, sessions, sessionTurns, signal }, message) => {
         if (message.kind !== SESSION_CANCEL_KIND) {
           throw new Error("Command kind mismatch");
         }
@@ -99414,7 +99543,7 @@ var init_interactions2 = __esm({
         if (cancellationState === "already-requested" || cancellationState === "pending") {
           return;
         }
-        void sessions.cancelPrompt(message.sessionId).catch((error62) => {
+        void sessions.cancelPrompt(message.sessionId, signal).catch((error62) => {
           console.error("Mobius daemon could not cancel the agent turn", error62);
         });
       }
@@ -99510,13 +99639,13 @@ function createNativeSessionRequestHandler(dependencies) {
         operationSignal.throwIfAborted();
         const skipPrevious = command.action === "active-turn";
         if (previous.length > 0 && !skipPrevious) {
-          await new Promise((resolve20, reject2) => {
+          await new Promise((resolve21, reject2) => {
             const onAbort = () => reject2(operationSignal.reason);
             operationSignal.addEventListener("abort", onAbort, { once: true });
             void Promise.all(previous.map((request) => request.completion)).then(
               () => {
                 operationSignal.removeEventListener("abort", onAbort);
-                resolve20();
+                resolve21();
               },
               (error62) => {
                 operationSignal.removeEventListener("abort", onAbort);
@@ -100802,7 +100931,7 @@ var init_runtime_revocation = __esm({
 import { WebSocket as WebSocket7 } from "undici";
 function connectRelay(url2, signal) {
   signal.throwIfAborted();
-  return new Promise((resolve20, reject2) => {
+  return new Promise((resolve21, reject2) => {
     let dispatchController;
     const dispatcher = environmentProxyDispatcher.compose((dispatch) => (options, handler) => {
       const trackedHandler = Object.create(handler);
@@ -100887,7 +101016,7 @@ function connectRelay(url2, signal) {
       }
       finished = true;
       cleanup();
-      resolve20({ release, socket });
+      resolve21({ release, socket });
     };
     function onTimeout() {
       fail(
@@ -101120,7 +101249,7 @@ async function runRelayConnection({
     }
   });
   try {
-    await new Promise((resolve20, reject2) => {
+    await new Promise((resolve21, reject2) => {
       let finished = false;
       let ready = false;
       const cleanup = () => {
@@ -101138,7 +101267,7 @@ async function runRelayConnection({
         }
         finished = true;
         cleanup();
-        resolve20();
+        resolve21();
       };
       const rejectConnection = (failure2) => {
         if (finished) {
@@ -101472,12 +101601,12 @@ function waitForRelayRetry(signal, timer) {
   if (signal.aborted) {
     return Promise.resolve();
   }
-  return new Promise((resolve20) => {
+  return new Promise((resolve21) => {
     const retry = timer.schedule(finish, RELAY_RECONNECT_DELAY_MILLISECONDS);
     function finish() {
       retry.cancel();
       signal.removeEventListener("abort", finish);
-      resolve20();
+      resolve21();
     }
     signal.addEventListener("abort", finish, { once: true });
   });
@@ -101887,11 +102016,11 @@ async function checkDaemonReleaseUpgrade(signal, activity) {
     const _reservation = __using(_stack, await activity.reserveWhenIdle(signal));
     signal.throwIfAborted();
     await requestInstalledDaemonReleaseSwitch(control.stateDirectory, launch, signal);
-    await new Promise((resolve20) => {
+    await new Promise((resolve21) => {
       if (signal.aborted) {
-        resolve20();
+        resolve21();
       } else {
-        signal.addEventListener("abort", () => resolve20(), { once: true });
+        signal.addEventListener("abort", () => resolve21(), { once: true });
       }
     });
   } catch (_) {
@@ -102009,7 +102138,7 @@ async function runWorkerRuntime(version2, combined, shutdown, rejectionGuard) {
             }
           }
         ).finally(() => active.delete(connection.connectionId));
-        active.set(connection.connectionId, { controller, completion });
+        active.set(connection.connectionId, { config: paired.config, controller, completion });
       } catch (cause) {
         combined.throwIfAborted();
         fail(connection.connectionId, cause);
@@ -102017,6 +102146,26 @@ async function runWorkerRuntime(version2, combined, shutdown, rejectionGuard) {
       }
     }
   };
+  const refreshRunningCatalogs = async (connectionIds) => {
+    await Promise.all(
+      [...connectionIds].map(async (connectionId2) => {
+        const config2 = active.get(connectionId2)?.config;
+        if (config2?.rediscoverAgents === void 0) {
+          return;
+        }
+        try {
+          await refreshAgentCatalog(
+            config2,
+            config2.rediscoverAgents,
+            AbortSignal.any([combined, AbortSignal.timeout(9e4)])
+          );
+        } catch (cause) {
+          combined.throwIfAborted();
+          console.error(`Runtime ${connectionId2} could not refresh its Agent catalog`, cause);
+        }
+      })
+    );
+  };
   let reload = Promise.resolve();
   let upgrades = Promise.resolve();
   try {
@@ -102029,7 +102178,8 @@ async function runWorkerRuntime(version2, combined, shutdown, rejectionGuard) {
         if (typeof request !== "object" || request === null || !("kind" in request) || request.kind !== "reload") {
           return { kind: "error", code: "invalid_reload", message: "Expected a configuration reload" };
         }
-        const pending = reload.then(reconcile);
+        const running = new Set(active.keys());
+        const pending = reload.then(reconcile).then(async () => await refreshRunningCatalogs(running));
         reload = pending.catch(() => void 0);
         await pending;
         return { kind: "reloaded" };
@@ -102058,6 +102208,7 @@ var WorkerRuntimeError;
 var init_worker = __esm({
   "src/daemon/lifecycle/worker.ts"() {
     "use strict";
+    init_refresh_agent_catalog();
     init_engine();
     init_runtime_turn_activity();
     init_manager_lock();
@@ -102077,26 +102228,6 @@ var init_worker = __esm({
   }
 });
 
-// src/cli/util/options.ts
-function readOnce(optionName) {
-  return (value, previous) => {
-    if (previous !== void 0) {
-      throw new InvalidArgumentError(`${optionName} may only be specified once`);
-    }
-    return value;
-  };
-}
-function valueOption(flags, description, mandatory = false) {
-  const option = new Option(flags, description).argParser(readOnce(flags.split(" ")[0] ?? flags));
-  return mandatory ? option.makeOptionMandatory() : option;
-}
-var init_options2 = __esm({
-  "src/cli/util/options.ts"() {
-    "use strict";
-    init_commander();
-  }
-});
-
 // src/cli/handler/daemon/start.ts
 function registerStartCommand(program2, context) {
   program2.command("start").description("ensure the daemon is running and optionally activate a saved connection").addOption(valueOption("--connection <connection-id>", "saved Runtime connection identifier")).action(async (options) => {
@@ -102197,10 +102328,10 @@ var init_daemon = __esm({
 });
 
 // src/cli/handler/logs/logic/collect-local-logs.ts
-import { join as join37, relative as relative5, resolve as resolve18 } from "node:path";
+import { join as join37, relative as relative5, resolve as resolve19 } from "node:path";
 async function collectLocalDaemonLogs(stateDirectory, tailLines, signal) {
   signal.throwIfAborted();
-  const root = resolve18(stateDirectory);
+  const root = resolve19(stateDirectory);
   const entries = [];
   const unreadable = [];
   const directories = await findLogDirectories(root, unreadable, signal);
@@ -102229,7 +102360,7 @@ async function collectLocalDaemonLogs(stateDirectory, tailLines, signal) {
   return { entries, unreadable: [...unreadable].sort() };
 }
 function defaultStateDirectory(environment = process.env) {
-  return resolve18(readStateDirectory(environment));
+  return resolve19(readStateDirectory(environment));
 }
 var init_collect_local_logs = __esm({
   "src/cli/handler/logs/logic/collect-local-logs.ts"() {
@@ -102307,36 +102438,6 @@ var init_logs = __esm({
   }
 });
 
-// src/storage/files/output-file.ts
-import { constants as constants5 } from "node:fs";
-import { open as open6 } from "node:fs/promises";
-async function writeExistingFile(path8, content, signal) {
-  let file2;
-  try {
-    file2 = await open6(path8, constants5.O_WRONLY | constants5.O_NOFOLLOW);
-  } catch (cause) {
-    return isNodeError(cause, "ENOENT") ? { kind: "missing", cause } : { kind: "unwritable", cause };
-  }
-  try {
-    const metadata = await file2.stat();
-    if (!metadata.isFile()) {
-      return { kind: "not-a-file" };
-    }
-    signal.throwIfAborted();
-    await file2.truncate(0);
-    await file2.writeFile(content, "utf8");
-    return { kind: "written" };
-  } finally {
-    await file2.close();
-  }
-}
-var init_output_file = __esm({
-  "src/storage/files/output-file.ts"() {
-    "use strict";
-    init_node_error();
-  }
-});
-
 // src/cli/handler/pair/logic/pair-list-output.ts
 function savedPairSummary(connection) {
   return {
@@ -102389,11 +102490,11 @@ var init_pair_list_output = __esm({
 });
 
 // src/cli/handler/pair/list.ts
-import { resolve as resolve19 } from "node:path";
+import { resolve as resolve20 } from "node:path";
 function registerPairListCommand(command, context) {
   command.command("list").description("list saved pairings").addOption(valueOption("--output-json <existing-file.json>", "write JSON to an existing file")).action(async (options) => {
     const installation = await openMobiusCliInstallation(context.shutdownSignal, process.env);
-    const outputPath = options.outputJson === void 0 ? null : resolve19(options.outputJson);
+    const outputPath = options.outputJson === void 0 ? null : resolve20(options.outputJson);
     const pairs = (await installation.listConnections(context.shutdownSignal)).map(savedPairSummary).sort(
       (left, right) => left.appId.localeCompare(right.appId) || left.connectionId.localeCompare(right.connectionId)
     );