@moxt-ai/mobius 0.0.312 → 0.0.313

package/dist/runtime/command/registry/interactions.js

@@ -3,7 +3,7 @@ import { settleAbandonedTurn } from "../../../session/prompt/prompt-lifecycle.js
 import { reportOperationFailure, send } from "../transport.js";
 export const 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");
         }
@@ -18,7 +18,7 @@ export const sessionCancelCommand = {
         if (cancellationState === "already-requested" || cancellationState === "pending") {
             return;
         }
-        void sessions.cancelPrompt(message.sessionId).catch((error) => {
+        void sessions.cancelPrompt(message.sessionId, signal).catch((error) => {
             console.error("Mobius daemon could not cancel the agent turn", error);
         });
     },

package/dist/runtime/command/registry/interactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"interactions.js","sourceRoot":"","sources":["../../../../src/runtime/command/registry/interactions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interactions.js","sourceRoot":"","sources":["../../../../src/runtime/command/registry/interactions.ts"],"names":[],"mappings":"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"}

package/dist/runtime.js

@@ -23625,7 +23625,7 @@ var AcpLiveSessions = class {
     this.#sessions.add(session);
     return connection;
   };
-  #resolve = (target) => {
+  #find = (target) => {
     const decoded = targetSchema.safeParse(target);
     if (!decoded.success) {
       throw new AcpExecutionError(
@@ -23643,12 +23643,52 @@ var AcpLiveSessions = class {
     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(methods3.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(
+            methods3.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);
@@ -24882,6 +24922,8 @@ var ClaudeAdapter = class {
   }
   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);
@@ -32021,6 +32063,8 @@ var CodexAdapter = class {
   }
   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);
@@ -32117,6 +32161,8 @@ var PiAdapter = class {
   }
   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);
@@ -32407,7 +32453,7 @@ import { fetch as fetch3 } from "undici";
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.312",
+  version: "0.0.313",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -84743,7 +84789,6 @@ async function restoreSession(session, signal, recovery, origin) {
 }
 
 // src/session/live/agent-session.ts
-var PROCESS_STOP_TIMEOUT_MILLISECONDS = 1e3;
 var AgentSession = class _AgentSession {
   // The restore surface: AgentSessionRestore members expose private state to
   // session-restore.ts only. The class keeps the fields private.
@@ -85250,12 +85295,12 @@ var AgentSession = class _AgentSession {
       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) => {
@@ -85342,21 +85387,18 @@ var AgentSession = class _AgentSession {
   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();
@@ -85913,14 +85955,14 @@ var SessionManager2 = class {
       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");
@@ -89414,7 +89456,7 @@ var previewHistoryPageLoadCommand = {
 // src/runtime/command/registry/interactions.ts
 var 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");
     }
@@ -89429,7 +89471,7 @@ var sessionCancelCommand = {
     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);
     });
   }