@moxt-ai/mobius 0.0.388 → 0.0.390

package/dist/{chunk-7BSIM5AK.js → chunk-ZW763PCS.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-Z4WUPVBL.js";
+} from "./chunk-KWRP3J26.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -85244,7 +85244,7 @@ var PreparedSession = class {
   prompted;
   restored;
   configurationRevision;
-  constructor(agentName, agentVersion, capabilities, commands, configOptions, prompted, restored, configurationRevision) {
+  constructor(agentName, agentVersion, capabilities, commands, configOptions, prompted, restored, configurationRevision2) {
     this.agentName = agentName;
     this.agentVersion = agentVersion;
     this.capabilities = capabilities;
@@ -85252,7 +85252,7 @@ var PreparedSession = class {
     this.configOptions = configOptions;
     this.prompted = prompted;
     this.restored = restored;
-    this.configurationRevision = configurationRevision;
+    this.configurationRevision = configurationRevision2;
   }
 };
 var AgentSettingsSnapshot = class {
@@ -86026,21 +86026,21 @@ 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/configuration-revision.ts
+import { createHash as createHash6 } from "node:crypto";
+var configurationRevision = (options) => {
+  const canonical = options.map(
+    (option) => JSON.stringify(
+      option.type === "boolean" ? [option.id, option.type, option.category, option.booleanValue] : [
+        option.id,
+        option.type,
+        option.category,
+        option.currentValue,
+        option.values.map((value) => value.value).toSorted()
+      ]
+    )
+  ).toSorted();
+  return createHash6("sha256").update(JSON.stringify(canonical)).digest("hex");
 };
 
 // src/engine/session/live/session-restore.ts
@@ -86192,6 +86192,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.
@@ -86236,6 +86237,7 @@ var AgentSession = class _AgentSession {
   #cwd;
   #environment;
   #getObserver;
+  #agentCommand;
   #interactions;
   #mobiusSessionId;
   #metrics;
@@ -86244,7 +86246,6 @@ var AgentSession = class _AgentSession {
   #agentVersion = "";
   #capabilities = unsupportedSessionCapabilities();
   #commands = [];
-  #configRevision = crypto.randomUUID();
   #configurationChanges = new SerialTaskQueue();
   #configOptions = [];
   #sessionConfigurations = new SessionConfigurations();
@@ -86256,8 +86257,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;
@@ -86272,7 +86273,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
@@ -86307,7 +86308,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",
@@ -86321,6 +86322,7 @@ var AgentSession = class _AgentSession {
           options.additionalDirectories,
           options.sessionId,
           getObserver,
+          agentCommand,
           store,
           metrics,
           adapter,
@@ -86347,9 +86349,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;
@@ -86360,8 +86363,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(
@@ -86453,7 +86454,7 @@ var AgentSession = class _AgentSession {
     this.#configOptions,
     this.#prompted,
     this.#restored,
-    this.#configRevision
+    configurationRevision(this.#configOptions)
   );
   ensureHistoryLoaded = async (signal) => {
     if (!this.#capabilities.loadSession) {
@@ -86638,38 +86639,45 @@ var AgentSession = class _AgentSession {
     this.#mobiusSessionId = sessionId;
   };
   #applyConfiguration = async (selection, signal) => {
-    const configRevision = this.#configRevision;
+    const before = this.#configOptions;
     const configured = await this.#writeNativeHistory(
       async () => await this.#adapter.configureSession({ ...this.#target(), selection, signal })
     );
-    if (this.#configRevision === configRevision) {
+    if (this.#configOptions === before) {
       this.#configOptions = configured;
-      this.#configRevision = crypto.randomUUID();
       await this.#publishConfiguration();
     }
   };
-  // The revision check and Agent mutation share one queue, including settings the Runtime applies itself.
+  // The revision check and Agent mutation share one queue with the settings the Runtime applies itself.
   // A lost response may have committed: reread after a conflict, never replay an edit blindly.
   configure = async (options) => this.#configurationChanges.run(async (signal) => {
-    if (options.expectedConfigurationRevision !== null && options.expectedConfigurationRevision !== this.#configRevision) {
+    if (options.expectedConfigurationRevision !== configurationRevision(this.#configOptions)) {
       throw new AcpExecutionError(
         "Session settings changed. Review the current settings before applying your selection again.",
         {},
         "session_configuration_conflict"
       );
     }
+    return await this.#change(options, signal);
+  }, options.signal);
+  /** Applies a setting the Runtime owns, whatever the configuration's current revision. */
+  applyConfiguration = async (change) => this.#configurationChanges.run(async (signal) => await this.#change(change, signal), change.signal);
+  #change = async (change, signal) => {
     await this.#applyConfiguration(
-      options.valueType === "boolean" ? { type: "boolean", configId: options.configId, booleanValue: options.booleanValue } : { type: "select", configId: options.configId, value: options.value },
+      change.valueType === "boolean" ? { type: "boolean", configId: change.configId, booleanValue: change.booleanValue } : { type: "select", configId: change.configId, value: change.value },
       signal
     );
-    const applied = this.#configOptions.find((option) => option.id === options.configId);
+    const applied = this.#configOptions.find((option) => option.id === change.configId);
     if (applied === void 0) {
       throw new AcpExecutionError("The requested ACP configuration option is unavailable");
     }
     this.#sessionConfigurations.select(applied);
     this.writeStoredSession((/* @__PURE__ */ new Date()).toISOString());
-    return { configOptions: this.#configOptions, configurationRevision: this.#configRevision };
-  }, options.signal);
+    return {
+      configOptions: this.#configOptions,
+      configurationRevision: configurationRevision(this.#configOptions)
+    };
+  };
   #publishConfiguration = async () => {
     const event = this.#store.events.append(this.#mobiusSessionId, {
       type: "acp",
@@ -86692,7 +86700,8 @@ var AgentSession = class _AgentSession {
     cwd: this.#cwd,
     additionalDirectories: this.#additionalDirectories
   });
-  prompt = async (options) => {
+  /** 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",
@@ -86708,8 +86717,14 @@ 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) {
@@ -86717,8 +86732,6 @@ var AgentSession = class _AgentSession {
     }
     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({
@@ -86776,10 +86789,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(
@@ -86788,9 +86803,6 @@ 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;
@@ -86850,7 +86862,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";
@@ -86895,7 +86907,6 @@ var AgentSession = class _AgentSession {
       this.#configOptions = event.kind === "configuration" ? event.configOptions : this.#configOptions.map(
         (option) => option.category === "mode" ? { ...option, currentValue: event.modeId } : option
       );
-      this.#configRevision = crypto.randomUUID();
       this.#captureSelectedConfigurationValues();
     }
     if (this.#sessionLoad.kind === "capturing") {
@@ -86978,7 +86989,6 @@ var AgentSession = class _AgentSession {
   openSessionWithReplay = async (signal) => (await this.#loadSession(signal)).opened;
   setConfigOptions(options) {
     this.#configOptions = options;
-    this.#configRevision = crypto.randomUUID();
   }
   setNativeHistoryOwnership(ownership) {
     this.#nativeHistoryOwnership = ownership;
@@ -87000,7 +87010,7 @@ var AgentSession = class _AgentSession {
   emitConfigUpdate = async () => {
     await this.#getObserver().onConfig({
       configOptions: this.#configOptions,
-      configurationRevision: this.#configRevision,
+      configurationRevision: configurationRevision(this.#configOptions),
       kind: SESSION_CONFIG_UPDATED_KIND,
       requestId: `agent-update-${crypto.randomUUID()}`,
       sessionId: this.#mobiusSessionId
@@ -87031,32 +87041,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) => {
-    this.#entries.set(id, { kind: "running", commandId });
-  };
-  cancel = (id, commandId, stop) => {
-    const state = this.#entries.get(id);
-    if (state?.commandId !== commandId) {
+  #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" });
+    }
+  };
+  /**
+   * 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));
   };
 };
 
@@ -87071,7 +87132,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();
@@ -87080,7 +87141,6 @@ var SessionManager2 = class {
   #closedSessions = /* @__PURE__ */ new Set();
   #store;
   #sessionIdentity;
-  #onSessionStatusChanged;
   #onSessionClosed;
   #timer;
   #observer;
@@ -87097,7 +87157,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;
   }
@@ -87198,6 +87260,7 @@ var SessionManager2 = class {
           effectiveOptions,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           metrics,
           options.adapter,
@@ -87220,6 +87283,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           metrics,
           options.adapter,
@@ -87239,6 +87303,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -87253,11 +87318,10 @@ var SessionManager2 = class {
           }
           if (desired.type === "boolean") {
             if (current.booleanValue !== desired.booleanValue) {
-              await runtime.configure({
+              await runtime.applyConfiguration({
                 ...options,
                 booleanValue: desired.booleanValue,
                 configId: desired.id,
-                expectedConfigurationRevision: null,
                 requestId: `execution-prepare-${desired.id}`,
                 value: "",
                 valueType: "boolean"
@@ -87266,11 +87330,10 @@ var SessionManager2 = class {
             continue;
           }
           if (current.currentValue !== desired.currentValue && current.values.some((value) => value.value === desired.currentValue)) {
-            await runtime.configure({
+            await runtime.applyConfiguration({
               ...options,
               booleanValue: false,
               configId: desired.id,
-              expectedConfigurationRevision: null,
               requestId: `execution-prepare-${desired.id}`,
               value: desired.currentValue,
               valueType: "select"
@@ -87310,6 +87373,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -87368,7 +87432,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",
               {},
@@ -87400,6 +87464,7 @@ var SessionManager2 = class {
         },
         { kind: "interactive-only" },
         () => this.#agentSettingsObserver,
+        () => void 0,
         new MemorySessionStore(),
         unmeasuredOperationMetrics,
         options2.adapter
@@ -87412,11 +87477,10 @@ var SessionManager2 = class {
           (option) => option.id === "model" || option.category === "model"
         );
         const modelIsFixed = modelOption2?.type === "select" && modelOption2.values.length < 2 && modelOption2.currentValue === model;
-        const configOptions = model === void 0 || modelIsFixed ? prepared.configOptions : (await runtime.configure({
+        const configOptions = model === void 0 || modelIsFixed ? prepared.configOptions : (await runtime.applyConfiguration({
           ...options2,
           booleanValue: false,
           configId: modelOption2?.id ?? "model",
-          expectedConfigurationRevision: null,
           requestId: "agent-settings-model",
           sessionId: `agent-settings-${crypto.randomUUID()}`,
           value: model,
@@ -87484,7 +87548,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",
         {},
@@ -87493,12 +87557,20 @@ var SessionManager2 = class {
     }
     return (await this.#replaceExecutionPreparation(existing, options2)).prepared();
   });
+  /** Applies a client's edit only while the Session's configuration still has the revision the client read. */
   configureSession = async (options) => this.#operations.run(options, async (options2) => {
     return await this.#executionProcesses.use(options2.sessionId, async () => {
       const runtime = await this.ensureSession(options2);
       return await runtime.configure(options2);
     });
   });
+  /** Applies a setting the Runtime owns, such as one a prompt or a preparation requested. */
+  applySessionConfiguration = async (change) => this.#operations.run(change, async (change2) => {
+    return await this.#executionProcesses.use(change2.sessionId, async () => {
+      const runtime = await this.ensureSession(change2);
+      return await runtime.applyConfiguration(change2);
+    });
+  });
   renameSession = async (options, title2) => await this.#executionProcesses.use(
     options.sessionId,
     async () => this.#operations.run(options, async (options2) => {
@@ -87536,15 +87608,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);
@@ -87583,13 +87657,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" };
       }
@@ -87601,6 +87670,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
@@ -87612,6 +87686,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);
@@ -87636,11 +87712,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();
       }
@@ -87718,10 +87789,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) => {
@@ -87867,7 +87935,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",
@@ -88284,7 +88352,7 @@ var NativeSessionService = class {
 };
 
 // src/engine/session/prompt/prompt-artifacts.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 var PromptArtifactError = class extends OperationError {
   constructor(code, message, options = {}) {
@@ -88310,7 +88378,7 @@ async function resolvePromptArtifacts(read, attachments, signal) {
     signal.throwIfAborted();
     const artifact = await read(attachment, signal);
     const { bytes } = artifact;
-    if (bytes.byteLength !== attachment.byteLength || createHash6("sha256").update(bytes).digest("hex") !== attachment.contentKey) {
+    if (bytes.byteLength !== attachment.byteLength || createHash7("sha256").update(bytes).digest("hex") !== attachment.contentKey) {
       throw new PromptArtifactError(
         "artifact_integrity_failed",
         "The prompt attachment failed integrity validation"
@@ -88532,7 +88600,7 @@ async function settleAbandonedTurn(projection, operations, cancellation) {
 }
 
 // src/engine/session/turn/execution-receipts.ts
-import { createHash as createHash7, randomUUID as randomUUID15 } from "node:crypto";
+import { createHash as createHash8, randomUUID as randomUUID15 } from "node:crypto";
 var MAX_TERMINAL_RECEIPTS = 1024;
 function executionStarted(state) {
   switch (state.kind) {
@@ -88705,7 +88773,7 @@ var ExecutionReceipts = class {
       type: "lifecycle-metadata",
       payload: { kind: "prompt.completed", commandId, stopReason: "cancelled", execution: "not-started" }
     };
-    const commandHash = createHash7("sha256").update(
+    const commandHash = createHash8("sha256").update(
       encodeSessionCancelBeforeStartCommand({
         commandId,
         kind: "session.cancel-before-start",
@@ -88790,7 +88858,7 @@ var ExecutionReceipts = class {
     return recovered;
   };
   claimExecution = (commandId, sessionId, commandJson) => {
-    const commandHash = createHash7("sha256").update(commandJson).digest("hex");
+    const commandHash = createHash8("sha256").update(commandJson).digest("hex");
     let existing = this.#executions.get(commandId);
     const previous = this.outcome(commandId);
     if (existing?.sessionId === sessionId && !executionStarted(existing.state) && previous?.type === "lifecycle-metadata" && previous.payload.kind === "prompt.failed-before-start" && previous.payload.code === "runtime_restarted") {
@@ -88953,8 +89021,6 @@ var ActiveRuntimeTurn = class {
     this.#admission = { kind: "queued", promotion: Promise.withResolvers() };
   };
   isQueued = () => (this.#admission.kind === "queued" || this.#admission.kind === "admitted" && this.#admission.disposition === SessionPromptDisposition.Queue) && !this.#started() && !this.#controller.signal.aborted;
-  /** Whether the command's execution was handed to the Agent. */
-  hasStarted = () => this.#started();
   abortRuntime = () => {
     this.#controller.abort();
   };
@@ -89116,8 +89182,6 @@ var SessionExecutionState = class {
     }
     return event;
   };
-  /** A steering prompt can join only a target whose execution already started. */
-  steerTargetStarted = (command) => this.#turnsByCommandId.get(command.targetCommandId)?.hasStarted() ?? false;
   turns = () => [...this.#turnsByCommandId.values()];
   close = async () => {
     const turns = [...this.#turnsByCommandId.values()];
@@ -89202,7 +89266,6 @@ var SessionTurns = class {
       this.recordEvent(event.payload.event);
     }
   };
-  steerTargetStarted = (command) => this.#bySessionId.get(command.sessionId)?.steerTargetStarted(command) ?? false;
   executionSnapshot = async (matches) => {
     for (const session of this.#bySessionId.values()) {
       const matching = [];
@@ -89533,7 +89596,7 @@ function buildSessionLayer(options) {
 }
 
 // src/engine/session/content/external-content-store.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 import { extname as extname2, join as join29 } from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 
@@ -89668,7 +89731,7 @@ var LocalExternalContentStore = class {
     const active = AbortSignal.any([signal, this.#lifetime.signal]);
     active.throwIfAborted();
     const metadata = metadataSchema.parse({ kind, mediaType, name: name2 });
-    const key = createHash8("sha256").update(bytes).digest("hex");
+    const key = createHash9("sha256").update(bytes).digest("hex");
     const request = `mobius-content:${kind}:${key}`;
     const existing = this.#entries.get(request);
     if (existing !== void 0 && existing.expiresAt > Date.now()) {
@@ -90388,7 +90451,7 @@ var SessionError = class extends OperationError {
 };
 
 // src/engine/session/settings/discover-agent-settings.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 
 // src/engine/agent/settings/agent-settings-base.ts
 var AgentSettingsLaunchSelectionResult = class {
@@ -90706,7 +90769,7 @@ function settingsRevision(agent, reportedAgentVersion, settings, modelEffort) {
     unsupportedModelIds: modelEffort.unsupportedModelIds,
     valuesByModel: {}
   };
-  return createHash9("sha256").update(
+  return createHash10("sha256").update(
     JSON.stringify({
       adapterVersion: agent.adapterVersion,
       agentId: agent.id,
@@ -90862,7 +90925,7 @@ function createAgentSettingsCommands(context) {
 }
 
 // src/engine/runtime/command/registry/content-write/index.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 function createContentWriteCommands(context) {
   const pending = /* @__PURE__ */ new Map();
   const operations = /* @__PURE__ */ new Set();
@@ -90892,7 +90955,7 @@ function createContentWriteCommands(context) {
         pending.set(message.requestId, {
           bytes: new Uint8Array(message.byteLength),
           command: message,
-          hash: createHash10("sha256"),
+          hash: createHash11("sha256"),
           receivedBytes: 0,
           sequence: 0
         });
@@ -91712,13 +91775,12 @@ async function applySessionConfigurationSelection(sessions, options, selection,
   if (sessionConfigurationMatches(option, selection)) {
     return options;
   }
-  return (await sessions.configureSession({
+  return (await sessions.applySessionConfiguration({
     adapter,
     additionalDirectories,
     agent,
     booleanValue: selection.booleanValue,
     configId: selection.configId,
-    expectedConfigurationRevision: null,
     cwd,
     requestId: `cfg_${randomUUID18()}`,
     sessionId,
@@ -91774,7 +91836,6 @@ async function executePrompt({
   epoch,
   waitForSessionAvailability,
   signal,
-  steerTargetStarted,
   cancellationRequested
 }) {
   try {
@@ -91801,6 +91862,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;
@@ -91832,9 +91896,6 @@ async function executePrompt({
       prepared = await sessions.prepareExecutionSession(preparation);
     }
     signal.throwIfAborted();
-    if (availability.disposition === SessionPromptDisposition.Steer && !steerTargetStarted()) {
-      throw new AcpExecutionError("The steering target is unavailable", {}, "prompt_queue_target_unavailable");
-    }
     const lifecycle = eventProjection.lifecycle(
       command.sessionId,
       command.commandId,
@@ -91991,7 +92052,6 @@ var sessionPromptCommand = {
         queueChanged();
       }),
       signal: turn.signal,
-      steerTargetStarted: () => context.sessionTurns.steerTargetStarted(message),
       cancellationRequested: turn.cancellationRequested
     }).catch((error62) => {
       console.error("Mobius daemon turn failed", error62);
@@ -92065,11 +92125,10 @@ async function prepareSession(command, recovery, closed, config2, resolveAgent,
     const configuration = command.configuration;
     const snapshot = configuration === void 0 ? prepared : await metrics.measure(
       "configuration",
-      async () => await sessions.configureSession({
+      async () => await sessions.applySessionConfiguration({
         ...preparation,
         booleanValue: configuration.booleanValue,
         configId: configuration.configId,
-        expectedConfigurationRevision: null,
         requestId: command.requestId,
         value: configuration.value,
         valueType: configuration.valueType
@@ -93596,4 +93655,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-7BSIM5AK.js.map
+//# sourceMappingURL=chunk-ZW763PCS.js.map