@moxt-ai/mobius 0.0.388 → 0.0.389

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

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-Z4WUPVBL.js";
+} from "./chunk-Z6ERJZ2H.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -86026,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();
@@ -86192,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.
@@ -86236,6 +86220,7 @@ var AgentSession = class _AgentSession {
   #cwd;
   #environment;
   #getObserver;
+  #agentCommand;
   #interactions;
   #mobiusSessionId;
   #metrics;
@@ -86256,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;
@@ -86272,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
@@ -86307,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",
@@ -86321,6 +86306,7 @@ var AgentSession = class _AgentSession {
           options.additionalDirectories,
           options.sessionId,
           getObserver,
+          agentCommand,
           store,
           metrics,
           adapter,
@@ -86347,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;
@@ -86360,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(
@@ -86692,7 +86677,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 +86694,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 +86709,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 +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(
@@ -86788,9 +86780,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 +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";
@@ -87031,32 +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) => {
-    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 +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();
@@ -87080,7 +87120,6 @@ var SessionManager2 = class {
   #closedSessions = /* @__PURE__ */ new Set();
   #store;
   #sessionIdentity;
-  #onSessionStatusChanged;
   #onSessionClosed;
   #timer;
   #observer;
@@ -87097,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;
   }
@@ -87198,6 +87239,7 @@ var SessionManager2 = class {
           effectiveOptions,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           metrics,
           options.adapter,
@@ -87220,6 +87262,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           metrics,
           options.adapter,
@@ -87239,6 +87282,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -87310,6 +87354,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
+          this.#executions.agentCommand,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -87368,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",
               {},
@@ -87400,6 +87445,7 @@ var SessionManager2 = class {
         },
         { kind: "interactive-only" },
         () => this.#agentSettingsObserver,
+        () => void 0,
         new MemorySessionStore(),
         unmeasuredOperationMetrics,
         options2.adapter
@@ -87484,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",
         {},
@@ -87536,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);
@@ -87583,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" };
       }
@@ -87601,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
@@ -87612,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);
@@ -87636,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();
       }
@@ -87718,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) => {
@@ -87867,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",
@@ -88953,8 +88995,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 +89156,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 +89240,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 = [];
@@ -91774,7 +91811,6 @@ async function executePrompt({
   epoch,
   waitForSessionAvailability,
   signal,
-  steerTargetStarted,
   cancellationRequested
 }) {
   try {
@@ -91801,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;
@@ -91832,9 +91871,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 +92027,6 @@ var sessionPromptCommand = {
         queueChanged();
       }),
       signal: turn.signal,
-      steerTargetStarted: () => context.sessionTurns.steerTargetStarted(message),
       cancellationRequested: turn.cancellationRequested
     }).catch((error62) => {
       console.error("Mobius daemon turn failed", error62);
@@ -93596,4 +93631,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-7BSIM5AK.js.map
+//# sourceMappingURL=chunk-77O2RBRQ.js.map