@moxt-ai/mobius 0.0.382 → 0.0.384

package/dist/{chunk-3GTWYIU4.js → chunk-4INIQJPN.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-WGPROR4Q.js";
+} from "./chunk-F2V4THMG.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -22878,8 +22878,8 @@ function acpEndpointTerminationError(termination) {
     case "closed":
       return new AcpExecutionError("The ACP endpoint is closed", {}, "acp_endpoint_closed");
     default: {
-      const unreachable3 = termination;
-      return unreachable3;
+      const unreachable2 = termination;
+      return unreachable2;
     }
   }
 }
@@ -61555,7 +61555,7 @@ function parseTaskListOutput(content) {
     const tasks = [];
     const lines = text2.trim().split("\n");
     for (const line of lines) {
-      const match = /^#(\S+) \[(pending|in_progress|completed)\] (.+?)(?: \(([^()]*)\))?(?: \[blocked by ((?:#[^,\]]+(?:, )?)+)\])?$/.exec(line);
+      const match = /^#(\S+) \[(pending|in_progress|completed)\] (.+?)(?: \(([^()]*)\))?(?: \[blocked by (#[^,\]]+(?:, #[^,\]]+)*(?:, )?)\])?$/.exec(line);
       if (!match) {
         tasks.length = 0;
         break;
@@ -77933,8 +77933,8 @@ var AcpQuerySession = class _AcpQuerySession {
       case "terminated":
         return true;
       default: {
-        const unreachable3 = this.#lifecycle;
-        return unreachable3;
+        const unreachable2 = this.#lifecycle;
+        return unreachable2;
       }
     }
   };
@@ -86549,8 +86549,8 @@ var AgentSession = class _AgentSession {
         return !this.#writingNativeHistory() && this.#nativeHistoryBaseline === baseline && current.kind === "tracked" && current.latestEntryId !== baseline.latestEntryId;
       }
       default: {
-        const unreachable3 = baseline;
-        throw new AcpExecutionError("Unexpected native history baseline", { cause: unreachable3 });
+        const unreachable2 = baseline;
+        throw new AcpExecutionError("Unexpected native history baseline", { cause: unreachable2 });
       }
     }
   };
@@ -87011,76 +87011,30 @@ function nativeSessionQuery(options) {
 }
 
 // src/engine/session/turn/active-executions.ts
-var unreachable2 = (state) => {
-  throw new AcpExecutionError("Unexpected execution state", { cause: state });
-};
 var ActiveExecutions = class {
   #entries = /* @__PURE__ */ new Map();
-  command = (id) => {
-    const state = this.#entries.get(id);
-    switch (state?.kind) {
-      case "running":
-      case "cancelling":
-        return state.commandId;
-      case "cancelled-before-start":
-      case void 0:
-        return void 0;
-      default:
-        return unreachable2(state);
-    }
-  };
+  command = (id) => this.#entries.get(id)?.commandId;
   cancellation = (id) => {
     const state = this.#entries.get(id);
-    switch (state?.kind) {
-      case "cancelling":
-      case "cancelled-before-start":
-        return state.completion;
-      case "running":
-      case void 0:
-        return void 0;
-      default:
-        return unreachable2(state);
-    }
+    return state?.kind === "cancelling" ? state.completion : void 0;
   };
   isBusy = (id) => this.#entries.has(id);
   begin = (id, commandId) => {
-    const state = this.#entries.get(id);
-    switch (state?.kind) {
-      case "running":
-      case "cancelling":
-        throw new AcpExecutionError(
-          "Another prompt is already running in this conversation",
-          {},
-          "session_busy"
-        );
-      case "cancelled-before-start":
-      case void 0:
-        break;
-      default:
-        unreachable2(state);
+    if (this.#entries.has(id)) {
+      throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
     }
-    this.#entries.set(
-      id,
-      state?.kind === "cancelled-before-start" ? { kind: "cancelling", commandId, completion: state.completion } : { kind: "running", commandId }
-    );
+    this.#entries.set(id, { kind: "running", commandId });
   };
-  cancel = (id, stop) => {
+  cancel = (id, commandId, stop) => {
     const state = this.#entries.get(id);
-    switch (state?.kind) {
-      case "cancelling":
-      case "cancelled-before-start":
-        return state.completion;
-      case "running":
-      case void 0:
-        break;
-      default:
-        return unreachable2(state);
+    if (state?.commandId !== commandId) {
+      return Promise.resolve();
+    }
+    if (state.kind === "cancelling") {
+      return state.completion;
     }
     const completion = Promise.withResolvers();
-    this.#entries.set(
-      id,
-      state?.kind === "running" ? { kind: "cancelling", commandId: state.commandId, completion: completion.promise } : { kind: "cancelled-before-start", completion: completion.promise }
-    );
+    this.#entries.set(id, { kind: "cancelling", commandId, completion: completion.promise });
     void (async () => await stop())().then(completion.resolve, completion.reject);
     return completion.promise;
   };
@@ -87547,8 +87501,9 @@ var SessionManager2 = class {
       return await runtime.renameSession(title2, options2.signal);
     })
   );
-  cancelPrompt = async (sessionId, signal = AbortSignal.timeout(3e4)) => this.#operations.run({ signal }, async ({ signal: signal2 }) => {
-    await this.#executions.cancel(sessionId, async () => {
+  /** Cancels the named command's Agent execution; a command that is not executing has nothing to stop. */
+  cancelPrompt = async (sessionId, commandId, signal = AbortSignal.timeout(3e4)) => this.#operations.run({ signal }, async ({ signal: signal2 }) => {
+    await this.#executions.cancel(sessionId, commandId, async () => {
       const runtime = this.#executionProcesses.get(sessionId);
       if (runtime !== void 0) {
         const outcome = await runtime.cancel(signal2);
@@ -87559,8 +87514,8 @@ var SessionManager2 = class {
             await this.#stopSessionProcess(sessionId, runtime);
             break;
           default: {
-            const unreachable3 = outcome;
-            throw new AcpExecutionError("Unexpected cancellation outcome", { cause: unreachable3 });
+            const unreachable2 = outcome;
+            throw new AcpExecutionError("Unexpected cancellation outcome", { cause: unreachable2 });
           }
         }
       }
@@ -87613,30 +87568,31 @@ var SessionManager2 = class {
       throw new AcpExecutionError("The native session is being managed", {}, "session_busy");
     }
     this.#executions.begin(options2.sessionId, options2.commandId);
+    const cancelled = () => options2.cancellationRequested?.() === true || this.#executions.cancellation(options2.sessionId) !== void 0;
     try {
       this.#onSessionStatusChanged({
         kind: "session.status.changed",
         sessionId: options2.sessionId,
         status: { commandId: options2.commandId, kind: "working" }
       });
-      if (this.#executions.cancellation(options2.sessionId) !== void 0) {
+      if (cancelled()) {
         return { stopReason: "cancelled" };
       }
       const runtime = await this.ensureSession(options2);
       if (this.#nativeOperations.has(nativeOperationKey(options2.agent.id, runtime.nativeSessionId()))) {
         throw new AcpExecutionError("The native session is being managed", {}, "session_busy");
       }
-      if (this.#executions.cancellation(options2.sessionId) !== void 0) {
+      if (cancelled()) {
         return { stopReason: "cancelled" };
       }
       try {
         const result = await runtime.prompt({
           ...options2,
-          cancellationRequested: () => this.#executions.cancellation(options2.sessionId) !== void 0
+          cancellationRequested: cancelled
         });
-        return this.#executions.cancellation(options2.sessionId) !== void 0 ? { stopReason: "cancelled" } : result;
+        return cancelled() ? { stopReason: "cancelled" } : result;
       } catch (error62) {
-        if (this.#executions.cancellation(options2.sessionId) !== void 0) {
+        if (cancelled()) {
           await this.#executions.cancellation(options2.sessionId);
           return { stopReason: "cancelled" };
         }
@@ -87651,7 +87607,7 @@ var SessionManager2 = class {
           async () => await failedRuntime.close()
         );
       }
-      if (this.#executions.cancellation(options2.sessionId) !== void 0) {
+      if (cancelled()) {
         return { stopReason: "cancelled" };
       }
       if (error62 instanceof AcpExecutionError) {
@@ -88567,8 +88523,8 @@ function executionStarted(state) {
     case "settled-after-start":
       return true;
     default: {
-      const unreachable3 = state;
-      throw new Error("Unexpected execution state", { cause: unreachable3 });
+      const unreachable2 = state;
+      throw new Error("Unexpected execution state", { cause: unreachable2 });
     }
   }
 }
@@ -88581,8 +88537,8 @@ function executionOutcome(state) {
     case "settled-after-start":
       return state.outcome;
     default: {
-      const unreachable3 = state;
-      throw new Error("Unexpected execution state", { cause: unreachable3 });
+      const unreachable2 = state;
+      throw new Error("Unexpected execution state", { cause: unreachable2 });
     }
   }
 }
@@ -88856,8 +88812,8 @@ var ExecutionReceipts = class {
       case "settled-after-start":
         throw new Error("The runtime execution transition is invalid");
       default: {
-        const unreachable3 = state;
-        throw new Error("Unexpected execution state", { cause: unreachable3 });
+        const unreachable2 = state;
+        throw new Error("Unexpected execution state", { cause: unreachable2 });
       }
     }
   };
@@ -88994,8 +88950,8 @@ var ActiveRuntimeTurn = class {
   finish = () => {
     this.#finished.resolve();
   };
-  activate = () => {
-    this.#dispatch = { kind: "running" };
+  activate = (execution) => {
+    this.#dispatch = { kind: "running", execution };
     return { epoch: this.#epoch, sequence: 0 };
   };
   promoteQueuedPrompt = (command) => {
@@ -89061,14 +89017,14 @@ var ActiveRuntimeTurn = class {
   matchesInteraction = (interactionId, sessionId) => this.command.sessionId === sessionId && this.#interaction?.interactionId === interactionId;
   requestCancellation = () => {
     if (this.#cancellationRequested) {
-      return "already-requested";
+      return { kind: "already-requested" };
     }
     this.#cancellationRequested = true;
     if (this.#dispatch.kind !== "running") {
       this.#controller.abort(new Error("The queued Agent turn was cancelled"));
-      return "pending";
+      return { kind: "pending" };
     }
-    return "running";
+    return { kind: "running", execution: this.#dispatch.execution };
   };
   cancellationRequested = () => this.#cancellationRequested;
   get signal() {
@@ -91357,11 +91313,11 @@ var sessionCancelCommand = {
       });
       return;
     }
-    const cancellationState = turn.requestCancellation();
-    if (cancellationState === "already-requested" || cancellationState === "pending") {
+    const cancellation = turn.requestCancellation();
+    if (cancellation.kind !== "running") {
       return;
     }
-    void sessions.cancelPrompt(message.sessionId, signal).catch((error62) => {
+    void sessions.cancelPrompt(message.sessionId, cancellation.execution, signal).catch((error62) => {
       console.error("Mobius daemon could not cancel the agent turn", error62);
     });
   }
@@ -91868,7 +91824,9 @@ async function executePrompt({
         );
       }
     }
-    const stream = activateAttempt();
+    const stream = activateAttempt(
+      availability.disposition === SessionPromptDisposition.Steer ? command.targetCommandId : command.commandId
+    );
     const lifecycle = eventProjection.started(
       command.sessionId,
       command.commandId,
@@ -91905,6 +91863,7 @@ async function executePrompt({
     } else {
       const result = await sessions.runPrompt({
         adapter,
+        cancellationRequested,
         ...externalizeSessionUpdate === void 0 ? {} : { externalizeSessionUpdate },
         additionalDirectories: resolved.additionalDirectories,
         agent: executionAgent,
@@ -93636,4 +93595,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-3GTWYIU4.js.map
+//# sourceMappingURL=chunk-4INIQJPN.js.map