@moxt-ai/mobius 0.0.387 → 0.0.389

package/dist/{chunk-A62FEGIN.js → chunk-77O2RBRQ.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-S7PKNDIS.js";
+} from "./chunk-Z6ERJZ2H.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -20760,6 +20760,27 @@ var lifecycleMetadataSchema = external_exports.discriminatedUnion("kind", [
     message: external_exports.string().min(1).max(500)
   }).readonly()
 ]);
+var isPromptTerminal = (payload) => {
+  switch (payload.kind) {
+    case "prompt.completed":
+    case "prompt.failed":
+    case "prompt.failed-before-start":
+      return true;
+    case "prompt.requested":
+    case "prompt.started":
+    case "session.queue.changed":
+    case "session.permission.requested":
+    case "session.permission.resolved":
+    case "session.elicitation.requested":
+    case "session.elicitation.resolved":
+      return false;
+    default: {
+      const unknownKind = payload;
+      void unknownKind;
+      return false;
+    }
+  }
+};
 var sessionEventPayloadSchema = external_exports.discriminatedUnion("type", [
   external_exports.object({ payload: acpSessionUpdateSchema, type: external_exports.literal("acp") }).readonly(),
   external_exports.object({ payload: lifecycleMetadataSchema, type: external_exports.literal("lifecycle-metadata") }).readonly()
@@ -86005,23 +86026,6 @@ var SqliteSessionStore = class {
   };
 };
 
-// src/engine/session/live/agent-turn.ts
-var SESSION_CONTROL_COMMAND_ID = "session-control";
-var AgentTurnState = class {
-};
-var IdleAgentTurn = class extends AgentTurnState {
-  commandId = SESSION_CONTROL_COMMAND_ID;
-  running = false;
-};
-var RunningAgentTurn = class extends AgentTurnState {
-  commandId;
-  running = true;
-  constructor(commandId) {
-    super();
-    this.commandId = commandId;
-  }
-};
-
 // src/engine/session/live/session-restore.ts
 function hasMethodNotFoundCode(cause) {
   const visited = /* @__PURE__ */ new Set();
@@ -86171,6 +86175,7 @@ async function restoreSession(session, signal, recovery, origin) {
 }
 
 // src/engine/session/live/agent-session.ts
+var SESSION_CONTROL_COMMAND_ID = "session-control";
 var AgentSession = class _AgentSession {
   // The restore surface: AgentSessionRestore members expose private state to
   // session-restore.ts only. The class keeps the fields private.
@@ -86215,6 +86220,7 @@ var AgentSession = class _AgentSession {
   #cwd;
   #environment;
   #getObserver;
+  #agentCommand;
   #interactions;
   #mobiusSessionId;
   #metrics;
@@ -86235,8 +86241,8 @@ var AgentSession = class _AgentSession {
   #restored = false;
   #sessionTitle = null;
   #sessionUpdatedAt = "";
-  #turn = new IdleAgentTurn();
-  constructor(agent, cwd, additionalDirectories, mobiusSessionId, getObserver, store, metrics, adapter, externalize) {
+  constructor(agent, cwd, additionalDirectories, mobiusSessionId, getObserver, agentCommand, store, metrics, adapter, externalize) {
+    this.#agentCommand = () => agentCommand(this.#mobiusSessionId);
     this.#additionalDirectories = [...additionalDirectories];
     this.#adapter = adapter;
     this.#agentId = agent.id;
@@ -86251,7 +86257,7 @@ var AgentSession = class _AgentSession {
       cwd: () => this.#cwd,
       getToolCall: (toolCallId) => this.#store.events.getToolCall(this.#mobiusSessionId, toolCallId),
       sessionId: () => this.#mobiusSessionId,
-      commandId: () => this.#turn.commandId,
+      commandId: () => this.#agentCommand() ?? SESSION_CONTROL_COMMAND_ID,
       assertNativeSession: this.assertNativeSession,
       observer: getObserver,
       recordSessionEvent: this.recordLifecycleEvent
@@ -86286,7 +86292,7 @@ var AgentSession = class _AgentSession {
       }
     };
   }
-  static async #start(options, getObserver, store, initialize, metrics, adapter) {
+  static async #start(options, getObserver, agentCommand, store, initialize, metrics, adapter) {
     for (let attempt = 1; attempt <= 2; attempt += 1) {
       await metrics.measure(
         "executable-validation",
@@ -86300,6 +86306,7 @@ var AgentSession = class _AgentSession {
           options.additionalDirectories,
           options.sessionId,
           getObserver,
+          agentCommand,
           store,
           metrics,
           adapter,
@@ -86326,9 +86333,10 @@ var AgentSession = class _AgentSession {
     }
     throw new AcpExecutionError("ACP agent initialization failed");
   }
-  static start = async (options, recovery, getObserver, store, metrics, adapter, capabilities = unsupportedSessionCapabilities()) => await _AgentSession.#start(
+  static start = async (options, recovery, getObserver, agentCommand, store, metrics, adapter, capabilities = unsupportedSessionCapabilities()) => await _AgentSession.#start(
     options,
     getObserver,
+    agentCommand,
     store,
     async (runtime) => {
       runtime.#capabilities = capabilities;
@@ -86339,8 +86347,6 @@ var AgentSession = class _AgentSession {
   );
   belongsTo = (agentId, cwd, additionalDirectories) => this.#agentId === agentId && this.#cwd === cwd && arraysEqual(this.#additionalDirectories, additionalDirectories);
   usesEnvironment = (environment) => recordsEqual(this.#environment, environment);
-  canRebind = () => !this.#prompted && !this.#turn.running;
-  hasRunningTurn = () => this.#turn.running;
   writeStoredSession = (updatedAt) => {
     this.#store.write(
       new StoredSession(
@@ -86671,10 +86677,8 @@ var AgentSession = class _AgentSession {
     cwd: this.#cwd,
     additionalDirectories: this.#additionalDirectories
   });
-  prompt = async (options) => {
-    if (this.#turn.running) {
-      throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
-    }
+  /** Loads what the Agent needs before it can receive a prompt; the Agent does not receive it yet. */
+  preparePrompt = async (signal) => {
     if (!this.#capabilities.loadSession && this.#sessionLoad.kind === "not-requested") {
       this.#sessionLoad = {
         kind: "loaded",
@@ -86690,16 +86694,21 @@ var AgentSession = class _AgentSession {
       };
     }
     if (this.#capabilities.loadSession && this.#sessionLoad.kind !== "execution-only") {
-      await this.#completedHistory(options.signal);
+      await this.#completedHistory(signal);
     }
+  };
+  /**
+   * Hands a prepared prompt to the Agent. Precondition: `preparePrompt` completed and the Session's execution
+   * authority records this command as started.
+   */
+  prompt = async (options) => {
     validatePromptContent(options, this.#capabilities);
+    options.signal.throwIfAborted();
     if (this.#sessionTitle === null || this.#sessionTitle.length === 0) {
       this.#sessionTitle = conversationTitleFromText(options.prompt);
     }
     this.#prompted = true;
     this.writeStoredSession((/* @__PURE__ */ new Date()).toISOString());
-    const running = new RunningAgentTurn(options.commandId);
-    this.#turn = running;
     const lifecycle = options.lifecycle;
     if (lifecycle !== void 0) {
       await this.recordLifecycleEvent({
@@ -86757,10 +86766,12 @@ var AgentSession = class _AgentSession {
         throw error62;
       }
       throw failure2;
-    } finally {
-      this.#turn = new IdleAgentTurn();
     }
   };
+  /**
+   * Adds a steering prompt to the prompt the Agent holds. Precondition: the Session's execution authority accepts
+   * steering into `options.targetCommandId`.
+   */
   steer = async (options) => {
     if (!this.#capabilities.steering) {
       throw new AcpExecutionError(
@@ -86769,10 +86780,8 @@ var AgentSession = class _AgentSession {
         "steering_unsupported"
       );
     }
-    if (!this.#turn.running || this.#turn.commandId !== options.targetCommandId) {
-      throw new AcpExecutionError("The target turn is no longer active", {}, "steering_target_unavailable");
-    }
     validatePromptContent(options, this.#capabilities);
+    options.signal.throwIfAborted();
     const lifecycle = options.lifecycle;
     if (lifecycle !== void 0) {
       await this.recordLifecycleEvent({
@@ -86830,7 +86839,7 @@ var AgentSession = class _AgentSession {
     signal.throwIfAborted();
     await this.#interactions.cancelPendingInteractions();
     signal.throwIfAborted();
-    if (this.#turn.running) {
+    if (this.#agentCommand() !== void 0) {
       return await this.#adapter.cancel({ ...this.#target(), signal });
     }
     return "retained";
@@ -87011,35 +87020,83 @@ function nativeSessionQuery(options) {
 // src/engine/session/turn/active-executions.ts
 var ActiveExecutions = class {
   #entries = /* @__PURE__ */ new Map();
-  command = (id) => this.#entries.get(id)?.commandId;
-  cancellation = (id) => {
-    const state = this.#entries.get(id);
-    return state?.kind === "cancelling" ? state.completion : void 0;
-  };
-  isBusy = (id) => this.#entries.has(id);
-  begin = (id, commandId) => {
-    if (this.#entries.has(id)) {
-      throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
+  #statusChanged;
+  constructor(statusChanged) {
+    this.#statusChanged = statusChanged;
+  }
+  status = (sessionId) => {
+    const execution = this.#entries.get(sessionId);
+    return execution === void 0 ? { kind: "idle" } : { commandId: execution.commandId, kind: "working" };
+  };
+  isBusy = (sessionId) => this.#entries.has(sessionId);
+  /** A steering prompt can join only the named execution while the Agent holds it and no one is stopping it. */
+  acceptsSteering = (sessionId, targetCommandId) => {
+    const execution = this.#entries.get(sessionId);
+    return execution?.commandId === targetCommandId && execution.phase === "started" && execution.cancellation.kind === "none";
+  };
+  /** The command whose prompt the Session's Agent holds, if any. */
+  agentCommand = (sessionId) => {
+    const execution = this.#entries.get(sessionId);
+    return execution?.phase === "started" ? execution.commandId : void 0;
+  };
+  cancellationRequested = (sessionId, commandId) => {
+    const execution = this.#entries.get(sessionId);
+    return execution?.commandId === commandId && execution.cancellation.kind === "requested";
+  };
+  cancellation = (sessionId) => {
+    const cancellation = this.#entries.get(sessionId)?.cancellation;
+    return cancellation?.kind === "requested" ? cancellation.completion : void 0;
+  };
+  begin = (sessionId, commandId) => {
+    if (this.#entries.has(sessionId)) {
+      throw new Error("A Session executes one command at a time");
+    }
+    this.#entries.set(sessionId, { commandId, phase: "preparing", cancellation: { kind: "none" } });
+    this.#statusChanged(sessionId, this.status(sessionId));
+  };
+  /** The Agent receives the prompt. A cancelled execution must not start. */
+  start = (sessionId, commandId) => {
+    const execution = this.#entries.get(sessionId);
+    if (execution?.commandId !== commandId || execution.phase !== "preparing") {
+      throw new Error("Only the Session's preparing execution can start");
+    }
+    if (execution.cancellation.kind !== "none") {
+      throw new Error("A cancelled execution cannot start");
+    }
+    this.#entries.set(sessionId, { ...execution, phase: "started" });
+  };
+  settle = (sessionId, commandId) => {
+    const execution = this.#entries.get(sessionId);
+    if (execution?.commandId === commandId) {
+      this.#entries.set(sessionId, { ...execution, phase: "settled" });
     }
-    this.#entries.set(id, { kind: "running", commandId });
   };
-  cancel = (id, commandId, stop) => {
-    const state = this.#entries.get(id);
-    if (state?.commandId !== commandId) {
+  /**
+   * Records a cancellation of the named execution and asks `stop` to end it once. Another command's cancellation,
+   * or one for an idle Session, has nothing to stop. A cancelled execution that has not started never starts.
+   */
+  cancel = (sessionId, commandId, stop) => {
+    const execution = this.#entries.get(sessionId);
+    if (execution?.commandId !== commandId) {
       return Promise.resolve();
     }
-    if (state.kind === "cancelling") {
-      return state.completion;
+    if (execution.cancellation.kind === "requested") {
+      return execution.cancellation.completion;
     }
     const completion = Promise.withResolvers();
-    this.#entries.set(id, { kind: "cancelling", commandId, completion: completion.promise });
+    this.#entries.set(sessionId, {
+      ...execution,
+      cancellation: { kind: "requested", completion: completion.promise }
+    });
     void (async () => await stop())().then(completion.resolve, completion.reject);
     return completion.promise;
   };
-  finish = (id, commandId) => {
-    if (this.command(id) === commandId) {
-      this.#entries.delete(id);
+  finish = (sessionId, commandId) => {
+    if (this.#entries.get(sessionId)?.commandId !== commandId) {
+      return;
     }
+    this.#entries.delete(sessionId);
+    this.#statusChanged(sessionId, this.status(sessionId));
   };
 };
 
@@ -87054,7 +87111,7 @@ var SessionManager2 = class {
     touch: (runtime) => this.#processes.touch(runtime),
     changed: () => this.#processes.notifyChanged()
   });
-  #executions = new ActiveExecutions();
+  #executions;
   #agentSettingsObserver = new NullSessionObserver();
   #nativeOperations = /* @__PURE__ */ new Set();
   #sessionClosures = /* @__PURE__ */ new Map();
@@ -87063,7 +87120,6 @@ var SessionManager2 = class {
   #closedSessions = /* @__PURE__ */ new Set();
   #store;
   #sessionIdentity;
-  #onSessionStatusChanged;
   #onSessionClosed;
   #timer;
   #observer;
@@ -87080,7 +87136,9 @@ var SessionManager2 = class {
     this.#processes = processes;
     this.#store = store;
     this.#sessionIdentity = sessionIdentity;
-    this.#onSessionStatusChanged = onSessionStatusChanged;
+    this.#executions = new ActiveExecutions(
+      (sessionId, status) => onSessionStatusChanged({ kind: "session.status.changed", sessionId, status })
+    );
     this.#onSessionClosed = onSessionClosed;
     this.#timer = timer;
   }
@@ -87181,6 +87239,7 @@ var SessionManager2 = class {
           effectiveOptions,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           metrics,
           options.adapter,
@@ -87203,6 +87262,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           metrics,
           options.adapter,
@@ -87222,6 +87282,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -87293,6 +87354,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -87351,7 +87413,7 @@ var SessionManager2 = class {
             }
             return runtime3.prepared();
           }
-          if (!existing.canRebind()) {
+          if (existing.prepared().prompted || this.#executions.isBusy(options2.sessionId)) {
             throw new AcpExecutionError(
               "The agent or workspace cannot change after a conversation has started",
               {},
@@ -87383,6 +87445,7 @@ var SessionManager2 = class {
         },
         { kind: "interactive-only" },
         () => this.#agentSettingsObserver,
+        () => void 0,
         new MemorySessionStore(),
         unmeasuredOperationMetrics,
         options2.adapter
@@ -87467,7 +87530,7 @@ var SessionManager2 = class {
       this.#executionProcesses.touch(options2.sessionId, runtime);
       return runtime.prepared();
     }
-    if (existing.hasRunningTurn()) {
+    if (this.#executions.isBusy(options2.sessionId)) {
       throw new AcpExecutionError(
         "The execution environment cannot change while a conversation turn is running",
         {},
@@ -87519,15 +87582,17 @@ var SessionManager2 = class {
       }
     });
   });
+  /** Whether a steering prompt can join the named execution: the one rule every steering check asks. */
+  acceptsSteering = (sessionId, targetCommandId) => this.#executions.acceptsSteering(sessionId, targetCommandId);
   steerPrompt = async (options) => this.#operations.run(options, async (options2) => {
-    if (this.#executions.command(options2.sessionId) !== options2.targetCommandId) {
+    if (!this.acceptsSteering(options2.sessionId, options2.targetCommandId)) {
       throw new AcpExecutionError("The target turn is no longer active", {}, "steering_target_unavailable");
     }
     const pending = this.#executionProcesses.pending(options2.sessionId);
     if (pending !== void 0) {
       await waitForSharedOperation(pending, options2.signal);
     }
-    if (this.#executions.command(options2.sessionId) !== options2.targetCommandId) {
+    if (!this.acceptsSteering(options2.sessionId, options2.targetCommandId)) {
       throw new AcpExecutionError("The target turn is no longer active", {}, "steering_target_unavailable");
     }
     const runtime = this.#executionProcesses.get(options2.sessionId);
@@ -87566,13 +87631,8 @@ 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;
+    const cancelled = () => options2.cancellationRequested?.() === true || this.#executions.cancellationRequested(options2.sessionId, options2.commandId);
     try {
-      this.#onSessionStatusChanged({
-        kind: "session.status.changed",
-        sessionId: options2.sessionId,
-        status: { commandId: options2.commandId, kind: "working" }
-      });
       if (cancelled()) {
         return { stopReason: "cancelled" };
       }
@@ -87584,6 +87644,11 @@ var SessionManager2 = class {
         return { stopReason: "cancelled" };
       }
       try {
+        await runtime.preparePrompt(options2.signal);
+        if (cancelled()) {
+          return { stopReason: "cancelled" };
+        }
+        this.#executions.start(options2.sessionId, options2.commandId);
         const result = await runtime.prompt({
           ...options2,
           cancellationRequested: cancelled
@@ -87595,6 +87660,8 @@ var SessionManager2 = class {
           return { stopReason: "cancelled" };
         }
         throw error62;
+      } finally {
+        this.#executions.settle(options2.sessionId, options2.commandId);
       }
     } catch (error62) {
       const failedRuntime = this.#executionProcesses.get(options2.sessionId);
@@ -87619,11 +87686,6 @@ var SessionManager2 = class {
         await this.#executions.cancellation(options2.sessionId);
       } finally {
         this.#executions.finish(options2.sessionId, options2.commandId);
-        this.#onSessionStatusChanged({
-          kind: "session.status.changed",
-          sessionId: options2.sessionId,
-          status: { kind: "idle" }
-        });
         this.#executionProcesses.touch(options2.sessionId);
         this.#processes.notifyChanged();
       }
@@ -87701,10 +87763,7 @@ var SessionManager2 = class {
     const stored = this.#store.read(sessionId);
     return stored instanceof FoundStoredSession ? [stored.session] : [];
   });
-  sessionStatus = (sessionId) => {
-    const commandId = this.#executions.command(sessionId);
-    return commandId === void 0 ? { kind: "idle" } : { commandId, kind: "working" };
-  };
+  sessionStatus = (sessionId) => this.#executions.status(sessionId);
   listSessions = (limit) => this.#store.list().filter((session) => session.prompted).slice(0, limit);
   findLinkedSessions = (agentId, nativeSessionId) => this.#store.findNative(agentId, nativeSessionId);
   interactionSnapshot = (options) => {
@@ -87850,7 +87909,7 @@ var SessionManager2 = class {
       });
     }
     if (linked.some(
-      (entry) => this.#executions.command(entry.sessionId) !== void 0 || this.#executionProcesses.pending(entry.sessionId) !== void 0
+      (entry) => this.#executions.isBusy(entry.sessionId) || this.#executionProcesses.pending(entry.sessionId) !== void 0
     )) {
       throw new AcpExecutionError(
         "Wait for the native session's running operation to finish",
@@ -88351,16 +88410,17 @@ function promptContent(command) {
 }
 var PromptLifecycle = class {
   #sink;
+  /** Terminal events held until their command's admission and execution state are released. */
   #terminal = /* @__PURE__ */ new Map();
   #publications = /* @__PURE__ */ new Map();
   #queued = /* @__PURE__ */ new Map();
   #recordActiveTurn;
-  #hasStarted;
+  #executions;
   #recordLifecycle;
-  constructor(sink, recordLifecycle, recordActiveTurn, hasStarted) {
+  constructor(sink, recordLifecycle, recordActiveTurn, executions) {
     this.#recordLifecycle = recordLifecycle;
     this.#recordActiveTurn = recordActiveTurn;
-    this.#hasStarted = hasStarted;
+    this.#executions = executions;
     this.#sink = sink;
   }
   requested = (command) => {
@@ -88377,8 +88437,8 @@ var PromptLifecycle = class {
       ...command.targetCommandId.length === 0 ? {} : { targetCommandId: command.targetCommandId }
     });
   };
-  /** Metadata for an execution already claimed by the receipt owner. */
-  started = (sessionId, commandId, attemptId, epoch, disposition) => {
+  /** The lifecycle metadata the Agent session records when it starts this claimed command. */
+  lifecycle = (sessionId, commandId, attemptId, epoch, disposition) => {
     const request = this.#queued.get(commandId);
     if (request?.sessionId === sessionId) {
       return {
@@ -88395,7 +88455,7 @@ var PromptLifecycle = class {
   record = (recorded) => {
     this.#recordActiveTurn(recorded);
     const sessionId = recorded.sessionId;
-    if (recorded.type === "lifecycle-metadata" && (recorded.payload.kind === "prompt.completed" || recorded.payload.kind === "prompt.failed" || recorded.payload.kind === "prompt.failed-before-start")) {
+    if (recorded.type === "lifecycle-metadata" && isPromptTerminal(recorded.payload)) {
       this.#terminal.set(recorded.payload.commandId, recorded);
       const pending2 = this.#publications.get(sessionId) ?? [];
       pending2.push(recorded);
@@ -88446,7 +88506,7 @@ var PromptLifecycle = class {
   };
   completed = async (sessionId, commandId, stopReason) => {
     const request = this.#queued.get(commandId);
-    if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+    if (request?.sessionId !== sessionId || this.#executions.isTerminalExecution(commandId, sessionId)) {
       return;
     }
     const recorded = await this.#recordLifecycle(sessionId, {
@@ -88455,7 +88515,7 @@ var PromptLifecycle = class {
         kind: "prompt.completed",
         commandId,
         stopReason,
-        ...this.#hasStarted(commandId, sessionId) ? {} : { execution: "not-started" }
+        ...this.#executions.hasStarted(commandId, sessionId) ? {} : { execution: "not-started" }
       }
     });
     if (!recorded) {
@@ -88467,21 +88527,24 @@ var PromptLifecycle = class {
       );
     }
   };
-  failed = async (sessionId, commandId, code, message) => {
+  /** Settles a failed command; whether it failed before or after starting is its receipt's fact. */
+  failed = async (sessionId, commandId, attemptId, code, message) => {
     const request = this.#queued.get(commandId);
-    if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+    if (request?.sessionId !== sessionId || this.#executions.isTerminalExecution(commandId, sessionId)) {
       return;
     }
     const recorded = await this.#recordLifecycle(sessionId, {
       type: "lifecycle-metadata",
-      payload: { kind: "prompt.failed-before-start", commandId, code, message }
+      payload: this.#executions.hasStarted(commandId, sessionId) ? { kind: "prompt.failed", attemptId, commandId, code, message } : { kind: "prompt.failed-before-start", commandId, code, message }
     });
     if (!recorded || code === SESSION_CLOSED_ERROR_CODE) {
       this.#sink.publishOperationFailure(sessionId, commandId, code, message);
     }
   };
   promptRequestRecovery = (sessionId) => ({
-    queuedPromptRequests: [...this.#queued.values()].filter((request) => request.sessionId === sessionId && !this.#hasStarted(request.commandId, sessionId)).map(({ commandId, content, disposition, targetCommandId }) => ({
+    queuedPromptRequests: [...this.#queued.values()].filter(
+      (request) => request.sessionId === sessionId && !this.#executions.hasStarted(request.commandId, sessionId)
+    ).map(({ commandId, content, disposition, targetCommandId }) => ({
       commandId,
       content,
       ...disposition === void 0 ? {} : { disposition },
@@ -88503,6 +88566,7 @@ async function settleAbandonedTurn(projection, operations, cancellation) {
   await projection.failed(
     cancellation.sessionId,
     cancellation.commandId,
+    attemptId,
     "agent_execution_abandoned",
     "The local Agent execution was abandoned before it completed"
   );
@@ -88614,7 +88678,7 @@ var ExecutionReceipts = class {
       return { state: "accepted" };
     }
     const outcome = this.outcome(commandId);
-    if (outcome?.type !== "lifecycle-metadata") {
+    if (outcome?.type !== "lifecycle-metadata" || !isPromptTerminal(outcome.payload)) {
       return { state: "expired" };
     }
     switch (outcome.payload.kind) {
@@ -88623,8 +88687,6 @@ var ExecutionReceipts = class {
       case "prompt.failed":
       case "prompt.failed-before-start":
         return { code: outcome.payload.code, state: "failed" };
-      default:
-        return { state: "expired" };
     }
   };
   /**
@@ -88647,7 +88709,7 @@ var ExecutionReceipts = class {
       }
     }
     const outcome = last === void 0 ? void 0 : this.outcome(last);
-    if (last === void 0 || outcome?.type !== "lifecycle-metadata") {
+    if (last === void 0 || outcome?.type !== "lifecycle-metadata" || !isPromptTerminal(outcome.payload)) {
       return void 0;
     }
     switch (outcome.payload.kind) {
@@ -88661,8 +88723,6 @@ var ExecutionReceipts = class {
           message: outcome.payload.message,
           state: "failed"
         };
-      default:
-        return void 0;
     }
   };
   /** Started identities remain authoritative after their detailed receipt is evicted. */
@@ -88706,12 +88766,24 @@ var ExecutionReceipts = class {
     });
     return outcome;
   };
-  recordOutcome = (event) => {
+  /**
+   * Receipts follow their command's recorded lifecycle. `prompt.started` is recorded where the command is handed
+   * to the Agent, so the started mark and the event clients see are one transition; a terminal event settles the
+   * receipt. Nothing else marks a command started.
+   */
+  record = (event) => {
     if (event.type !== "lifecycle-metadata") {
       return;
     }
     const payload = event.payload;
-    if (payload.kind !== "prompt.completed" && payload.kind !== "prompt.failed" && payload.kind !== "prompt.failed-before-start") {
+    if (payload.kind === "prompt.started") {
+      const receipt2 = this.#executions.get(payload.commandId);
+      if (receipt2?.state.kind === "pending") {
+        this.#save(payload.commandId, { ...receipt2, state: { kind: "started" } });
+      }
+      return;
+    }
+    if (!isPromptTerminal(payload)) {
       return;
     }
     const receipt = this.#executions.get(payload.commandId);
@@ -88794,27 +88866,6 @@ var ExecutionReceipts = class {
     });
     return { attemptId, commandId, kind: "accepted" };
   };
-  markExecutionStarted = (commandId) => {
-    const current = this.#executions.get(commandId);
-    if (current === void 0) {
-      throw new Error("The runtime execution receipt does not exist");
-    }
-    const state = current.state;
-    switch (state.kind) {
-      case "pending":
-        this.#save(commandId, { ...current, state: { kind: "started" } });
-        return;
-      case "started":
-        return;
-      case "settled-before-start":
-      case "settled-after-start":
-        throw new Error("The runtime execution transition is invalid");
-      default: {
-        const unreachable2 = state;
-        throw new Error("Unexpected execution state", { cause: unreachable2 });
-      }
-    }
-  };
   /** Only commands without a terminal result can still be cancelled. */
   findUnsettledAttemptId = (commandId, sessionId) => {
     const receipt = this.#executions.get(commandId);
@@ -88922,69 +88973,77 @@ import { randomUUID as randomUUID16 } from "node:crypto";
 var ActiveRuntimeTurn = class {
   attemptId;
   command;
+  epoch = decodeIdentifier(randomUUID16());
   #controller;
   #finished = Promise.withResolvers();
+  #started;
   #cancellationRequested = false;
-  #dispatch;
+  #admission = { kind: "waiting" };
   #sequence = 0;
   #interaction = null;
-  #epoch = decodeIdentifier(randomUUID16());
-  constructor(command, attemptId) {
+  /** `started` reads the command's execution receipt, the single owner of whether the command started. */
+  constructor(command, attemptId, started) {
     this.attemptId = attemptId;
     this.command = command;
     this.#controller = new AbortController();
-    this.#dispatch = { kind: "pending" };
+    this.#started = started;
   }
   enqueue = () => {
-    if (this.#dispatch.kind !== "pending") {
-      throw new Error("Only a pending prompt can enter the queue");
+    if (this.#admission.kind !== "waiting") {
+      throw new Error("Only a waiting prompt can enter the queue");
     }
-    this.#dispatch = { kind: "queued", promotion: Promise.withResolvers() };
+    this.#admission = { kind: "queued", promotion: Promise.withResolvers() };
   };
-  isQueued = () => (this.#dispatch.kind === "queued" || this.#dispatch.kind === "admitted" && this.#dispatch.disposition === SessionPromptDisposition.Queue) && !this.#controller.signal.aborted;
+  isQueued = () => (this.#admission.kind === "queued" || this.#admission.kind === "admitted" && this.#admission.disposition === SessionPromptDisposition.Queue) && !this.#started() && !this.#controller.signal.aborted;
   abortRuntime = () => {
     this.#controller.abort();
   };
   finish = () => {
     this.#finished.resolve();
   };
-  activate = (execution) => {
-    this.#dispatch = { kind: "running", execution };
-    return { epoch: this.#epoch, sequence: 0 };
-  };
   promoteQueuedPrompt = (command) => {
     if (command.commandId !== this.command.commandId || command.sessionId !== this.command.sessionId || this.#controller.signal.aborted) {
       return "unavailable";
     }
-    switch (this.#dispatch.kind) {
+    switch (this.#admission.kind) {
       case "queued": {
-        const promotion = this.#dispatch.promotion;
-        this.#dispatch = { kind: "promoted" };
+        const promotion = this.#admission.promotion;
+        this.#admission = { kind: "promoted" };
         promotion.resolve();
         return "accepted";
       }
       case "promoted":
         return "accepted";
       case "admitted":
-        return this.#dispatch.disposition === SessionPromptDisposition.Steer ? "accepted" : "already-started";
-      case "running":
-        return "already-started";
-      case "pending":
+        return this.#admission.disposition === SessionPromptDisposition.Steer ? "accepted" : "already-started";
+      case "waiting":
         return "unavailable";
     }
   };
   admit = () => {
     const disposition = this.effectiveDisposition();
-    this.#dispatch = { kind: "admitted", disposition };
+    this.#admission = { kind: "admitted", disposition };
     return disposition;
   };
   queuePromotion = () => {
-    if (this.#dispatch.kind === "queued") {
-      return this.#dispatch.promotion.promise;
+    if (this.#admission.kind === "queued") {
+      return this.#admission.promotion.promise;
+    }
+    return this.#admission.kind === "promoted" ? Promise.resolve() : null;
+  };
+  effectiveDisposition = () => {
+    switch (this.#admission.kind) {
+      case "waiting":
+      case "queued":
+        return this.command.disposition;
+      case "promoted":
+        return SessionPromptDisposition.Steer;
+      case "admitted":
+        return this.#admission.disposition;
     }
-    return this.#dispatch.kind === "promoted" ? Promise.resolve() : null;
   };
-  effectiveDisposition = () => this.#dispatch.kind === "promoted" ? SessionPromptDisposition.Steer : this.command.disposition;
+  /** A steering prompt joins the execution of the turn it steers; every other prompt owns its execution. */
+  execution = () => this.effectiveDisposition() === SessionPromptDisposition.Steer ? this.command.targetCommandId : this.command.commandId;
   recordEvent = (event) => {
     if (event.sessionId !== this.command.sessionId || "commandId" in event && event.commandId !== this.command.commandId) {
       return event;
@@ -88996,33 +89055,33 @@ var ActiveRuntimeTurn = class {
     }
     return event;
   };
-  recordSteeringPrompt = (command) => {
-    return this.#dispatch.kind === "running" && command.sessionId === this.command.sessionId && command.targetCommandId === this.command.commandId;
-  };
   snapshot = () => {
-    if (this.#dispatch.kind !== "running") {
+    if (!this.#started()) {
       return null;
     }
     return {
       commandId: decodeIdentifier(this.command.commandId),
-      epoch: this.#epoch,
+      epoch: this.epoch,
       interaction: this.#interaction,
       sequence: this.#sequence,
       state: "running"
     };
   };
-  matches = (cancellation) => cancellation.commandId === this.command.commandId && cancellation.sessionId === this.command.sessionId;
   matchesInteraction = (interactionId, sessionId) => this.command.sessionId === sessionId && this.#interaction?.interactionId === interactionId;
+  /**
+   * Before the command starts, cancellation withdraws it by aborting its own admission and preparation. Once it
+   * started, the Agent execution it belongs to must be asked to stop.
+   */
   requestCancellation = () => {
     if (this.#cancellationRequested) {
       return { kind: "already-requested" };
     }
     this.#cancellationRequested = true;
-    if (this.#dispatch.kind !== "running") {
-      this.#controller.abort(new Error("The queued Agent turn was cancelled"));
+    if (!this.#started()) {
+      this.#controller.abort(new Error("The Agent turn was cancelled before it started"));
       return { kind: "pending" };
     }
-    return { kind: "running", execution: this.#dispatch.execution };
+    return { kind: "running", execution: this.execution() };
   };
   cancellationRequested = () => this.#cancellationRequested;
   get signal() {
@@ -89068,7 +89127,11 @@ var SessionExecutionState = class {
   }
   isEmpty = () => this.#turnsByCommandId.size === 0;
   start = (command, attemptId) => {
-    const turn = new ActiveRuntimeTurn(command, attemptId);
+    const turn = new ActiveRuntimeTurn(
+      command,
+      attemptId,
+      () => this.#operations.hasStarted(command.commandId, this.#sessionId)
+    );
     this.#turnsByCommandId.set(command.commandId, turn);
     return turn;
   };
@@ -89093,10 +89156,6 @@ var SessionExecutionState = class {
     }
     return event;
   };
-  recordSteeringPrompt = (command) => {
-    const target = this.#turnsByCommandId.get(command.targetCommandId);
-    return target?.recordSteeringPrompt(command) ?? false;
-  };
   turns = () => [...this.#turnsByCommandId.values()];
   close = async () => {
     const turns = [...this.#turnsByCommandId.values()];
@@ -89109,7 +89168,7 @@ var SessionExecutionState = class {
     const command = turn.command;
     waitSignal.throwIfAborted();
     const head = () => [...this.#turnsByCommandId.values()].find(
-      (turn2) => turn2.command.disposition !== SessionPromptDisposition.Steer
+      (turn2) => turn2.effectiveDisposition() !== SessionPromptDisposition.Steer
     );
     if (command.disposition === SessionPromptDisposition.Queue) {
       const target = head();
@@ -89181,7 +89240,6 @@ var SessionTurns = class {
       this.recordEvent(event.payload.event);
     }
   };
-  recordSteeringPrompt = (command) => this.#bySessionId.get(command.sessionId)?.recordSteeringPrompt(command) ?? false;
   executionSnapshot = async (matches) => {
     for (const session of this.#bySessionId.values()) {
       const matching = [];
@@ -89431,7 +89489,7 @@ function buildSessionLayer(options) {
   const manager = new SessionManager2({
     observer: new SessionLayerObserver(
       (event) => {
-        operations.recordOutcome(event);
+        operations.record(event);
         eventProjection.record(event);
       },
       sink.publishInfo,
@@ -89454,12 +89512,12 @@ function buildSessionLayer(options) {
         return true;
       }
       const recorded = events.append(sessionId, event);
-      operations.recordOutcome(recorded);
+      operations.record(recorded);
       eventProjection.record(recorded);
       return true;
     },
     activeSessions.recordSessionEvent,
-    operations.hasStarted
+    operations
   );
   const nativeSessions = new NativeSessionService(
     bindingId,
@@ -91742,7 +91800,6 @@ function warnIgnoredSetting(event, commandId, sessionId, agentId, selection, cat
 
 // src/engine/session/prompt/execute-prompt.ts
 async function executePrompt({
-  operations,
   eventProjection,
   command,
   resolveAgent,
@@ -91751,10 +91808,9 @@ async function executePrompt({
   directories,
   sessions,
   attemptId,
-  activateAttempt,
+  epoch,
   waitForSessionAvailability,
   signal,
-  recordSteeringPrompt,
   cancellationRequested
 }) {
   try {
@@ -91781,6 +91837,9 @@ async function executePrompt({
         "prompt_queue_target_unavailable"
       );
     }
+    if (availability.disposition === SessionPromptDisposition.Steer && !sessions.acceptsSteering(command.sessionId, command.targetCommandId)) {
+      throw new AcpExecutionError("The steering target is unavailable", {}, "prompt_queue_target_unavailable");
+    }
     const appliedSettings = command.sessionConfigurations === void 0 ? void 0 : agentForSessionConfiguration(agent, command.sessionConfigurations);
     const executionAgent = appliedSettings?.agent ?? agent;
     const sessionConfigurations = appliedSettings?.sessionConfigurations;
@@ -91812,24 +91871,11 @@ async function executePrompt({
       prepared = await sessions.prepareExecutionSession(preparation);
     }
     signal.throwIfAborted();
-    operations.markExecutionStarted(command.commandId);
-    if (availability.disposition === SessionPromptDisposition.Steer) {
-      if (!recordSteeringPrompt()) {
-        throw new AcpExecutionError(
-          "The steering target is unavailable",
-          {},
-          "prompt_queue_target_unavailable"
-        );
-      }
-    }
-    const stream = activateAttempt(
-      availability.disposition === SessionPromptDisposition.Steer ? command.targetCommandId : command.commandId
-    );
-    const lifecycle = eventProjection.started(
+    const lifecycle = eventProjection.lifecycle(
       command.sessionId,
       command.commandId,
       attemptId,
-      stream.epoch,
+      epoch,
       availability.disposition
     );
     const attachments = await resolvePromptArtifacts(readArtifact, command.attachments, signal);
@@ -91888,7 +91934,7 @@ async function executePrompt({
     const code = operationErrorCode(error62);
     const failureCode = code === "session_operation_failed" ? "agent_execution_failed" : code;
     const failureMessage = code === "session_operation_failed" ? "The local agent could not complete the request" : operationErrorMessage(error62);
-    await eventProjection.failed(command.sessionId, command.commandId, failureCode, failureMessage);
+    await eventProjection.failed(command.sessionId, command.commandId, attemptId, failureCode, failureMessage);
     reportFailure("session_prompt_failed", command.commandId, {
       agentId: command.agentId,
       code: failureCode,
@@ -91958,7 +92004,6 @@ var sessionPromptCommand = {
       });
     };
     void executePrompt({
-      operations: context.operations,
       eventProjection: context.eventProjection,
       command: message,
       resolveAgent: context.resolveAgent,
@@ -91977,12 +92022,11 @@ var sessionPromptCommand = {
       directories: context.directories,
       sessions: context.sessions,
       attemptId: receipt.attemptId,
-      activateAttempt: turn.activate,
+      epoch: turn.epoch,
       waitForSessionAvailability: (signal) => context.sessionTurns.admitAndWait(turn, signal, () => {
         queueChanged();
       }),
       signal: turn.signal,
-      recordSteeringPrompt: () => context.sessionTurns.recordSteeringPrompt(message),
       cancellationRequested: turn.cancellationRequested
     }).catch((error62) => {
       console.error("Mobius daemon turn failed", error62);
@@ -93082,7 +93126,7 @@ var RuntimeSessionEventPublisher = class {
           commandId: payload.commandId,
           generationId: event.sessionGenerationId
         });
-      } else if ((payload.kind === "prompt.completed" || payload.kind === "prompt.failed" || payload.kind === "prompt.failed-before-start") && this.#awaitingFirstAnswer.get(event.sessionId)?.commandId === payload.commandId && this.#awaitingFirstAnswer.get(event.sessionId)?.generationId === event.sessionGenerationId) {
+      } else if (isPromptTerminal(payload) && this.#awaitingFirstAnswer.get(event.sessionId)?.commandId === payload.commandId && this.#awaitingFirstAnswer.get(event.sessionId)?.generationId === event.sessionGenerationId) {
         this.#awaitingFirstAnswer.delete(event.sessionId);
       }
       return false;
@@ -93587,4 +93631,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-A62FEGIN.js.map
+//# sourceMappingURL=chunk-77O2RBRQ.js.map