@moxt-ai/mobius 0.0.328 → 0.0.331

package/dist/cli.js

@@ -2086,7 +2086,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@moxt-ai/mobius",
-      version: "0.0.328",
+      version: "0.0.331",
       description: "Mobius CLI for pairing and running local AI agent services.",
       type: "module",
       bin: {
@@ -5605,182 +5605,6 @@ var init_commander = __esm({
   }
 });
 
-// src/util/node-error.ts
-function isNodeError(error62, code) {
-  return typeof error62 === "object" && error62 !== null && "code" in error62 && error62.code === code;
-}
-var init_node_error = __esm({
-  "src/util/node-error.ts"() {
-    "use strict";
-  }
-});
-
-// src/storage/state-root-layout.ts
-var STATE_ROOT_LAYOUT, STATE_ROOT_ENTRY_NAMES;
-var init_state_root_layout = __esm({
-  "src/storage/state-root-layout.ts"() {
-    "use strict";
-    STATE_ROOT_LAYOUT = Object.freeze({
-      /** Names the version whose data is current. */
-      currentData: "current-data.txt",
-      /** Applications' installations: `installations/<application>/<installation>`. */
-      installations: "installations",
-      /** Managed CLI releases: `npm/<version>`. */
-      releases: "npm",
-      /** Each CLI version's data: `versions/<version>`. */
-      versions: "versions"
-    });
-    STATE_ROOT_ENTRY_NAMES = new Set(Object.values(STATE_ROOT_LAYOUT));
-  }
-});
-
-// src/storage/installation/installation-files.ts
-import { createHash, randomUUID } from "node:crypto";
-import { mkdir, open, readdir, rename, unlink, writeFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
-function applicationDirectory(root, applicationId) {
-  return join(root, STATE_ROOT_LAYOUT.installations, applicationId);
-}
-function installationPointerPath(applicationDirectory2) {
-  return join(applicationDirectory2, "current.json");
-}
-function installationDirectory(applicationDirectory2, installationId2) {
-  return join(applicationDirectory2, installationId2);
-}
-function connectionDirectory(installationDirectory2) {
-  return join(installationDirectory2, "connections");
-}
-function connectionFilePath(connectionDirectory2, connectionId2) {
-  return join(connectionDirectory2, `${connectionId2}.json`);
-}
-function channelIndexFilePath(installationDirectory2, channelId) {
-  return join(installationDirectory2, "channels", `mci_${createHash("sha256").update(channelId).digest("hex")}.json`);
-}
-async function readInstallationFile(path8) {
-  let handle;
-  try {
-    handle = await open(path8, "r");
-  } catch (cause) {
-    return isNodeError(cause, "ENOENT") ? { kind: "missing", cause } : { kind: "unopenable", cause };
-  }
-  try {
-    const metadata = await handle.stat();
-    if (!metadata.isFile() || metadata.size > MAXIMUM_FILE_BYTES) {
-      return { kind: "not-a-small-file" };
-    }
-    return { kind: "read", text: await handle.readFile({ encoding: "utf8" }) };
-  } finally {
-    await handle.close();
-  }
-}
-async function writeInstallationFile(path8, text2, signal) {
-  signal.throwIfAborted();
-  const directory = dirname(path8);
-  const temporaryPath = join(directory, `.${randomUUID()}.tmp`);
-  try {
-    await mkdir(directory, { mode: 448, recursive: true });
-    signal.throwIfAborted();
-    await writeFile(temporaryPath, text2, { flag: "wx", mode: 384 });
-    signal.throwIfAborted();
-    await rename(temporaryPath, path8);
-  } catch (cause) {
-    await unlink(temporaryPath).catch(() => void 0);
-    throw cause;
-  }
-}
-async function createInstallationFile(path8, text2) {
-  await writeFile(path8, text2, { flag: "wx", mode: 384 });
-}
-async function listInstallationFiles(directory) {
-  return await readdir(directory);
-}
-async function removeInstallationFile(path8) {
-  await unlink(path8);
-}
-var MAXIMUM_FILE_BYTES;
-var init_installation_files = __esm({
-  "src/storage/installation/installation-files.ts"() {
-    "use strict";
-    init_node_error();
-    init_state_root_layout();
-    MAXIMUM_FILE_BYTES = 16 * 1024;
-  }
-});
-
-// src/storage/state-directory.ts
-import { homedir } from "node:os";
-import { join as join2, resolve } from "node:path";
-function readStateDirectory(environment = process.env) {
-  const configured = environment["MOBIUS_STATE_DIRECTORY"]?.trim();
-  if (configured !== void 0 && configured.length > 0) {
-    return resolve(configured);
-  }
-  return join2(homedir(), ".mobius");
-}
-var init_state_directory = __esm({
-  "src/storage/state-directory.ts"() {
-    "use strict";
-  }
-});
-
-// src/storage/state-root.ts
-import { readFile, stat } from "node:fs/promises";
-import { basename, dirname as dirname2, join as join3 } from "node:path";
-async function exists(path8) {
-  return await stat(path8).then(
-    () => true,
-    () => false
-  );
-}
-async function owningRoot(directory) {
-  const application = dirname2(directory);
-  const installations = dirname2(application);
-  if (basename(installations) !== STATE_ROOT_LAYOUT.installations) {
-    return null;
-  }
-  let pointer;
-  try {
-    pointer = JSON.parse(await readFile(installationPointerPath(application), "utf8"));
-  } catch {
-    return null;
-  }
-  if (typeof pointer !== "object" || pointer === null || !("installationId" in pointer) || pointer.installationId !== basename(directory)) {
-    return null;
-  }
-  const container = dirname2(installations);
-  return basename(dirname2(container)) === STATE_ROOT_LAYOUT.versions ? dirname2(dirname2(container)) : container;
-}
-async function validateStateRoot(environment) {
-  const directory = readStateDirectory(environment);
-  if (await exists(join3(directory, STATE_ROOT_LAYOUT.currentData)) || await exists(join3(directory, STATE_ROOT_LAYOUT.versions))) {
-    return;
-  }
-  const root = await owningRoot(directory);
-  if (root !== null) {
-    throw new StateRootError(directory, root);
-  }
-}
-var StateRootError;
-var init_state_root = __esm({
-  "src/storage/state-root.ts"() {
-    "use strict";
-    init_installation_files();
-    init_state_directory();
-    init_state_root_layout();
-    StateRootError = class extends Error {
-      code = "state_root_is_installation_data";
-      owningRoot;
-      constructor(stateDirectory, owningRoot2) {
-        super(
-          `MOBIUS_STATE_DIRECTORY (${stateDirectory}) is Mobius installation data, not a state root. Use the state root that owns it: MOBIUS_STATE_DIRECTORY=${owningRoot2}`
-        );
-        this.name = "StateRootError";
-        this.owningRoot = owningRoot2;
-      }
-    };
-  }
-});
-
 // ../../node_modules/.pnpm/zod@4.6.5/node_modules/zod/v4/core/util.js
 var util_exports = {};
 __export(util_exports, {
@@ -10432,7 +10256,7 @@ function isBackEdge(ctx, value) {
   const backEdges = ctx[STATE]?.backEdges;
   return backEdges !== void 0 && isRef(value) && backEdges.has(value);
 }
-var $ZodCyclicError, STATE, NO_ISSUES, recursive, NONE, ASSUMED, PROVEN, handoff, open2, memo;
+var $ZodCyclicError, STATE, NO_ISSUES, recursive, NONE, ASSUMED, PROVEN, handoff, open, memo;
 var init_memoizer = __esm({
   "../../node_modules/.pnpm/zod@4.6.5/node_modules/zod/v4/core/memoizer.js"() {
     init_util();
@@ -10448,7 +10272,7 @@ var init_memoizer = __esm({
     NONE = 0;
     ASSUMED = 1;
     PROVEN = 2;
-    open2 = [];
+    open = [];
     memo = {
       alloc(_inst, payload, empty) {
         const bucket = handoff;
@@ -10457,7 +10281,7 @@ var init_memoizer = __esm({
         handoff = void 0;
         const entry = { value: empty, issues: null };
         bucket.set(payload.value, entry);
-        open2.push(entry);
+        open.push(entry);
         return empty;
       },
       guard(inst) {
@@ -10528,10 +10352,10 @@ var init_memoizer = __esm({
               return payload;
             }
             handoff = bucket;
-            const depth = open2.length;
+            const depth = open.length;
             const result = base(payload, ctx);
             handoff = void 0;
-            const entry = open2.length > depth ? open2.pop() : void 0;
+            const entry = open.length > depth ? open.pop() : void 0;
             if (result instanceof Promise) {
               return result.then((r) => {
                 if (entry)
@@ -26140,6 +25964,186 @@ var init_zod = __esm({
   }
 });
 
+// src/util/node-error.ts
+function isNodeError(error62, code) {
+  return typeof error62 === "object" && error62 !== null && "code" in error62 && error62.code === code;
+}
+var init_node_error = __esm({
+  "src/util/node-error.ts"() {
+    "use strict";
+  }
+});
+
+// src/storage/state-root-layout.ts
+var STATE_ROOT_LAYOUT, STATE_ROOT_ENTRY_NAMES;
+var init_state_root_layout = __esm({
+  "src/storage/state-root-layout.ts"() {
+    "use strict";
+    STATE_ROOT_LAYOUT = Object.freeze({
+      /** Names the version whose data is current. */
+      currentData: "current-data.txt",
+      /** Applications' installations: `installations/<application>/<installation>`. */
+      installations: "installations",
+      /** Managed CLI releases: `npm/<version>`. */
+      releases: "npm",
+      /** Each CLI version's data: `versions/<version>`. */
+      versions: "versions"
+    });
+    STATE_ROOT_ENTRY_NAMES = new Set(Object.values(STATE_ROOT_LAYOUT));
+  }
+});
+
+// src/storage/installation/installation-files.ts
+import { createHash, randomUUID } from "node:crypto";
+import { mkdir, open as open2, readdir, rename, unlink, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+function applicationDirectory(root, applicationId) {
+  return join(root, STATE_ROOT_LAYOUT.installations, applicationId);
+}
+function installationPointerPath(applicationDirectory2) {
+  return join(applicationDirectory2, "current.json");
+}
+function installationDirectory(applicationDirectory2, installationId2) {
+  return installationDirectorySchema.parse(join(applicationDirectory2, installationId2));
+}
+function connectionDirectory(installationDirectory2) {
+  return join(installationDirectory2, "connections");
+}
+function connectionFilePath(connectionDirectory2, connectionId2) {
+  return join(connectionDirectory2, `${connectionId2}.json`);
+}
+function channelIndexFilePath(installationDirectory2, channelId) {
+  return join(installationDirectory2, "channels", `mci_${createHash("sha256").update(channelId).digest("hex")}.json`);
+}
+async function readInstallationFile(path8) {
+  let handle;
+  try {
+    handle = await open2(path8, "r");
+  } catch (cause) {
+    return isNodeError(cause, "ENOENT") ? { kind: "missing", cause } : { kind: "unopenable", cause };
+  }
+  try {
+    const metadata = await handle.stat();
+    if (!metadata.isFile() || metadata.size > MAXIMUM_FILE_BYTES) {
+      return { kind: "not-a-small-file" };
+    }
+    return { kind: "read", text: await handle.readFile({ encoding: "utf8" }) };
+  } finally {
+    await handle.close();
+  }
+}
+async function writeInstallationFile(path8, text2, signal) {
+  signal.throwIfAborted();
+  const directory = dirname(path8);
+  const temporaryPath = join(directory, `.${randomUUID()}.tmp`);
+  try {
+    await mkdir(directory, { mode: 448, recursive: true });
+    signal.throwIfAborted();
+    await writeFile(temporaryPath, text2, { flag: "wx", mode: 384 });
+    signal.throwIfAborted();
+    await rename(temporaryPath, path8);
+  } catch (cause) {
+    await unlink(temporaryPath).catch(() => void 0);
+    throw cause;
+  }
+}
+async function createInstallationFile(path8, text2) {
+  await writeFile(path8, text2, { flag: "wx", mode: 384 });
+}
+async function listInstallationFiles(directory) {
+  return await readdir(directory);
+}
+async function removeInstallationFile(path8) {
+  await unlink(path8);
+}
+var MAXIMUM_FILE_BYTES, installationDirectorySchema;
+var init_installation_files = __esm({
+  "src/storage/installation/installation-files.ts"() {
+    "use strict";
+    init_zod();
+    init_node_error();
+    init_state_root_layout();
+    MAXIMUM_FILE_BYTES = 16 * 1024;
+    installationDirectorySchema = external_exports.string().brand();
+  }
+});
+
+// src/storage/state-directory.ts
+import { homedir } from "node:os";
+import { join as join2, resolve } from "node:path";
+function readStateDirectory(environment = process.env) {
+  const configured = environment["MOBIUS_STATE_DIRECTORY"]?.trim();
+  return stateRootSchema.parse(
+    configured !== void 0 && configured.length > 0 ? resolve(configured) : join2(homedir(), ".mobius")
+  );
+}
+var stateRootSchema;
+var init_state_directory = __esm({
+  "src/storage/state-directory.ts"() {
+    "use strict";
+    init_zod();
+    stateRootSchema = external_exports.string().brand();
+  }
+});
+
+// src/storage/state-root.ts
+import { readFile, stat } from "node:fs/promises";
+import { basename, dirname as dirname2, join as join3 } from "node:path";
+async function exists(path8) {
+  return await stat(path8).then(
+    () => true,
+    () => false
+  );
+}
+async function owningRoot(directory) {
+  const application = dirname2(directory);
+  const installations = dirname2(application);
+  if (basename(installations) !== STATE_ROOT_LAYOUT.installations) {
+    return null;
+  }
+  let pointer;
+  try {
+    pointer = JSON.parse(await readFile(installationPointerPath(application), "utf8"));
+  } catch {
+    return null;
+  }
+  if (typeof pointer !== "object" || pointer === null || !("installationId" in pointer) || pointer.installationId !== basename(directory)) {
+    return null;
+  }
+  const container = dirname2(installations);
+  return basename(dirname2(container)) === STATE_ROOT_LAYOUT.versions ? dirname2(dirname2(container)) : container;
+}
+async function validateStateRoot(environment) {
+  const directory = readStateDirectory(environment);
+  if (await exists(join3(directory, STATE_ROOT_LAYOUT.currentData)) || await exists(join3(directory, STATE_ROOT_LAYOUT.versions))) {
+    return;
+  }
+  const root = await owningRoot(directory);
+  if (root !== null) {
+    throw new StateRootError(directory, root);
+  }
+}
+var StateRootError;
+var init_state_root = __esm({
+  "src/storage/state-root.ts"() {
+    "use strict";
+    init_installation_files();
+    init_state_directory();
+    init_state_root_layout();
+    StateRootError = class extends Error {
+      code = "state_root_is_installation_data";
+      owningRoot;
+      constructor(stateDirectory, owningRoot2) {
+        super(
+          `MOBIUS_STATE_DIRECTORY (${stateDirectory}) is Mobius installation data, not a state root. Use the state root that owns it: MOBIUS_STATE_DIRECTORY=${owningRoot2}`
+        );
+        this.name = "StateRootError";
+        this.owningRoot = owningRoot2;
+      }
+    };
+  }
+});
+
 // src/util/value-utils.ts
 function truncate(value, maximumLength) {
   return value.length <= maximumLength ? value : `${value.slice(0, Math.max(0, maximumLength - 1))}\u2026`;
@@ -74997,6 +75001,15 @@ var init_lifecycle = __esm({
 });
 
 // ../mobius-sdk/src/protocol/session/prompt/commands.ts
+function decodeSessionCancelBeforeStartCommand(encoded) {
+  const value = parseJson(encoded);
+  assertKind(value, SESSION_CANCEL_BEFORE_START_KIND);
+  return {
+    commandId: readIdentifier(value, "commandId"),
+    kind: SESSION_CANCEL_BEFORE_START_KIND,
+    sessionId: readIdentifier(value, "sessionId")
+  };
+}
 function readPromptDisposition(value) {
   const field = value["disposition"];
   if (field === void 0 || field === SessionPromptDisposition.Reject) {
@@ -75097,7 +75110,7 @@ function encodeSessionCancelCommand(message) {
 function encodeSessionPromptDispositionCommand(message) {
   return JSON.stringify(decodeSessionPromptDispositionCommand(JSON.stringify(message)));
 }
-var SESSION_PROMPT_KIND, SESSION_PROMPT_DISPOSITION_KIND, SESSION_CANCEL_KIND, SessionPromptDisposition, SessionHistoryPolicy, MAX_PROMPT_LENGTH, MAX_PROMPT_ATTACHMENT_BYTES, promptAttachmentSchema, decodePromptAttachmentsValue;
+var SESSION_PROMPT_KIND, SESSION_PROMPT_DISPOSITION_KIND, SESSION_CANCEL_KIND, SESSION_CANCEL_BEFORE_START_KIND, SessionPromptDisposition, SessionHistoryPolicy, MAX_PROMPT_LENGTH, MAX_PROMPT_ATTACHMENT_BYTES, encodeSessionCancelBeforeStartCommand, promptAttachmentSchema, decodePromptAttachmentsValue;
 var init_commands = __esm({
   "../mobius-sdk/src/protocol/session/prompt/commands.ts"() {
     "use strict";
@@ -75108,6 +75121,7 @@ var init_commands = __esm({
     SESSION_PROMPT_KIND = "session.prompt";
     SESSION_PROMPT_DISPOSITION_KIND = "session.prompt.disposition";
     SESSION_CANCEL_KIND = "session.cancel";
+    SESSION_CANCEL_BEFORE_START_KIND = "session.cancel-before-start";
     SessionPromptDisposition = Object.freeze({
       Queue: "queue",
       Reject: "reject",
@@ -75119,6 +75133,7 @@ var init_commands = __esm({
     });
     MAX_PROMPT_LENGTH = 1e5;
     MAX_PROMPT_ATTACHMENT_BYTES = 32 * 1024 * 1024;
+    encodeSessionCancelBeforeStartCommand = (message) => JSON.stringify(decodeSessionCancelBeforeStartCommand(JSON.stringify(message)));
     promptAttachmentSchema = external_exports.object({
       byteLength: external_exports.number().int().positive().max(MAX_PROMPT_ATTACHMENT_BYTES),
       contentKey: external_exports.string().regex(/^[a-f0-9]{64}$/u),
@@ -75868,7 +75883,7 @@ var init_recording = __esm({
 });
 
 // ../mobius-sdk/src/protocol/session/recording/turn-history.ts
-var SESSION_RECORDING_TURN_PAGE_DECODE_MAX_ELEMENTS, SESSION_RECORDING_TURN_ITEM_ID_MAX_LENGTH, isoTimestamp, shortText, itemText, turnCursorSchema, turnItemCursorSchema, attemptTiming, promptSucceededOutcome, promptCancelledOutcome, promptFailedOutcome, sessionRecordingTurnAttemptSchema, turnItemBase, textItemFields, sessionRecordingToolDetailSchema, sessionRecordingTurnItemSchema, sessionRecordingTurnPromptSchema, sessionRecordingTurnPrecedingSchema, sessionRecordingTurnSchema, sessionRecordingInteractionSchema, sessionRecordingTurnPageSchema, sessionRecordingTurnItemPageSchema, sessionRecordingTurnItemDetailSchema;
+var SESSION_RECORDING_TURN_PAGE_DECODE_MAX_ELEMENTS, SESSION_RECORDING_TURN_ITEM_ID_MAX_LENGTH, isoTimestamp, shortText, itemText, turnCursorSchema, turnItemCursorSchema, attemptTiming, promptSucceededOutcome, promptCancelledOutcome, promptFailedOutcome, sessionRecordingTurnAttemptSchema, turnItemBase, textItemFields, sessionRecordingToolDetailSchema, sessionRecordingTurnItemSchema, sessionRecordingTurnPromptSchema, sessionRecordingTurnPrecedingSchema, sessionRecordingTurnSchema, sessionRecordingInteractionSchema, SESSION_RECORDING_EXECUTION_COMMAND_MAX_LIMIT, recordingActiveCommandsSchema, sessionRecordingExecutionSchema, sessionRecordingTurnPageSchema, sessionRecordingTurnItemPageSchema, sessionRecordingTurnItemDetailSchema;
 var init_turn_history = __esm({
   "../mobius-sdk/src/protocol/session/recording/turn-history.ts"() {
     "use strict";
@@ -75995,6 +76010,24 @@ var init_turn_history = __esm({
         kind: external_exports.literal("elicitation")
       }).readonly()
     ]);
+    SESSION_RECORDING_EXECUTION_COMMAND_MAX_LIMIT = 100;
+    recordingActiveCommandsSchema = external_exports.object({
+      commandIds: external_exports.array(identifierStringSchema).max(1e3).readonly(),
+      generationId: identifierStringSchema
+    }).readonly().nullable();
+    sessionRecordingExecutionSchema = external_exports.object({
+      activeCommands: recordingActiveCommandsSchema,
+      commands: external_exports.array(
+        external_exports.object({
+          attempt: sessionRecordingTurnAttemptSchema,
+          commandId: identifierStringSchema,
+          generationId: identifierStringSchema
+        }).readonly()
+      ).max(SESSION_RECORDING_EXECUTION_COMMAND_MAX_LIMIT).readonly(),
+      sessionId: identifierStringSchema,
+      tailCursor: recordingCursorSchema,
+      version: external_exports.literal(1)
+    }).readonly();
     sessionRecordingTurnPageSchema = external_exports.object({
       // Commands that own Agent output in the newest Session generation, innermost last.
       activeCommands: external_exports.object({
@@ -76289,6 +76322,11 @@ var init_daemon_transport = __esm({
         decodeRuntimeDiagnosticsRequest
       ),
       [RUNTIME_PING_KIND]: defineMessageSignature(RUNTIME_PING_KIND, encodeRuntimePingCommand, decodeRuntimePingCommand),
+      [SESSION_CANCEL_BEFORE_START_KIND]: defineMessageSignature(
+        SESSION_CANCEL_BEFORE_START_KIND,
+        encodeSessionCancelBeforeStartCommand,
+        decodeSessionCancelBeforeStartCommand
+      ),
       [SESSION_CANCEL_KIND]: defineMessageSignature(
         SESSION_CANCEL_KIND,
         encodeSessionCancelCommand,
@@ -80348,6 +80386,7 @@ var init_agent2 = __esm({
       }
       async promptSubmission(params, submission) {
         const session = await this.restoreSession(params.sessionId);
+        this.conn.startUserMessage();
         for (const content of params.prompt) {
           if (submission.aborted) {
             return { stopReason: "cancelled" };
@@ -80807,6 +80846,7 @@ ${JSON.stringify(stats, null, 2)}`;
           case "idle":
             return { outcome: "promptRequired", reason: "noRunningTurn" };
           case "injected": {
+            this.conn.startUserMessage();
             for (const content of parsed.data.prompt) {
               signal.throwIfAborted();
               await this.conn.sessionUpdate({
@@ -81201,11 +81241,12 @@ ${JSON.stringify(stats, null, 2)}`;
 
 // src/acp/harness/pi/upstream/dist/acp/client.js
 import { methods as methods5 } from "@agentclientprotocol/sdk";
-function createPiAcpClient(connection, onSessionUpdate) {
+function createPiAcpClient(connection, onSessionUpdate, onUserMessageStart = () => void 0) {
   return {
     requestElicitation: async (request, signal) => await connection.client.request(methods5.client.elicitation.create, request, { cancellationSignal: signal }),
     requestPermission: async (request) => await connection.client.request(methods5.client.session.requestPermission, request),
-    sessionUpdate: onSessionUpdate
+    sessionUpdate: onSessionUpdate,
+    startUserMessage: onUserMessageStart
   };
 }
 var init_client = __esm({
@@ -81250,7 +81291,10 @@ var init_endpoint2 = __esm({
         let piAgent = null;
         this.#app = createAgentApp2({ name: "mobius-pi" }).onConnect((connection) => {
           this.#connection = connection;
-          piAgent = new PiAcpAgent(createPiAcpClient(connection, options.onSessionUpdate), { environment });
+          piAgent = new PiAcpAgent(
+            createPiAcpClient(connection, options.onSessionUpdate, options.onUserMessageStart),
+            { environment }
+          );
           this.#agent = piAgent;
         }).onRequest(
           methods6.agent.initialize,
@@ -81337,6 +81381,11 @@ var init_agent_connection3 = __esm({
           command: options.command,
           cwd: options.cwd,
           environment: options.environment,
+          // Raw Pi owns submission boundaries, while synthetic identity stays here.
+          // Adjacent blocks within one submission still share the allocated ID.
+          onUserMessageStart: () => {
+            message = { kind: "none" };
+          },
           onSessionUpdate: async (notification) => {
             const update = notification.update;
             switch (update.sessionUpdate) {
@@ -92477,12 +92526,19 @@ async function prepareVersionData(version2, signal, environment = process.env, f
   signal.throwIfAborted();
   const root = readStateDirectory(environment);
   const targetVersion = runtimeUpgradeVersionSchema.parse(version2);
-  if (await versionDataExists(root, targetVersion, signal)) {
-    return;
-  }
-  const previous = await readCurrentDataVersion(root, signal) ?? fallbackVersion;
-  if (previous === null) {
-    return;
+  const current = await readCurrentDataVersion(root, signal);
+  let previous;
+  if (current !== null) {
+    if (current === targetVersion) {
+      return;
+    }
+    await discardVersionData(root, targetVersion, signal);
+    previous = current;
+  } else {
+    if (fallbackVersion === null || await versionDataExists(root, targetVersion, signal)) {
+      return;
+    }
+    previous = fallbackVersion;
   }
   const leftBehind = await copyVersionData(root, runtimeUpgradeVersionSchema.parse(previous), targetVersion, signal);
   for (const entry of leftBehind) {
@@ -96215,34 +96271,18 @@ var init_session_manager = __esm({
           return await runtime.configure(options2);
         });
       });
-      renameSession = async (sessionId, title2, signal) => await this.#executionProcesses.use(
-        sessionId,
-        async () => this.#operations.run({ sessionId, signal }, async (options) => {
-          this.#assertOpen(options.sessionId);
-          const runtime = this.#executionProcesses.get(options.sessionId);
-          if (runtime !== void 0) {
-            return await runtime.renameSession(title2, options.signal);
-          }
-          const stored = this.#store.read(options.sessionId);
-          if (!(stored instanceof FoundStoredSession)) {
-            throw new AcpExecutionError("The Session was not found", {}, "session_not_found");
-          }
-          const normalized = title2.slice(0, 500);
-          const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-          this.#store.write(
-            new StoredSession(
-              stored.session.sessionId,
-              stored.session.agentId,
-              stored.session.nativeSessionId,
-              stored.session.cwd,
-              stored.session.additionalDirectories,
-              stored.session.prompted,
-              normalized,
-              updatedAt,
-              stored.session.configurations
-            )
-          );
-          return { title: normalized, updatedAt };
+      renameSession = async (options, title2) => await this.#executionProcesses.use(
+        options.sessionId,
+        async () => this.#operations.run(options, async (options2) => {
+          this.#assertOpen(options2.sessionId);
+          if (this.#executionProcesses.get(options2.sessionId) === void 0) {
+            await this.#prepareSession(options2, { kind: "interactive-only" }, "keep-closed");
+          }
+          const runtime = this.#executionProcesses.get(options2.sessionId);
+          if (runtime === void 0) {
+            throw new AcpExecutionError("ACP session did not start");
+          }
+          return await runtime.renameSession(title2, options2.signal);
         })
       );
       cancelPrompt = async (sessionId, signal = AbortSignal.timeout(3e4)) => this.#operations.run({ signal }, async ({ signal: signal2 }) => {
@@ -97013,6 +97053,11 @@ function promptContent(command) {
   return content;
 }
 async function settleAbandonedTurn(projection, operations, cancellation) {
+  const outcome = operations.recordCancellationBeforeAdmission(cancellation.commandId, cancellation.sessionId);
+  if (outcome !== void 0) {
+    await projection.replayOutcome(cancellation.sessionId, outcome);
+    return;
+  }
   const attemptId = operations.findUnsettledAttemptId(cancellation.commandId, cancellation.sessionId);
   if (attemptId === null) {
     console.warn("Mobius daemon ignored cancellation for an inactive turn");
@@ -97233,6 +97278,33 @@ var init_execution_receipts = __esm({
         const receipt = this.#executions.get(commandId);
         return receipt?.outcome === null || receipt === void 0 ? void 0 : sessionEventPayloadSchema.parse(JSON.parse(receipt.outcome));
       };
+      /** Reserves an unseen command for cancellation before a delayed prompt can claim its identity. */
+      recordCancellationBeforeAdmission = (commandId, sessionId) => {
+        const existing = this.#executions.get(commandId);
+        if (existing !== void 0) {
+          return existing.sessionId === sessionId && isTerminal(existing.state) ? this.outcome(commandId) : void 0;
+        }
+        const outcome = {
+          type: "lifecycle-metadata",
+          payload: { kind: "prompt.completed", commandId, stopReason: "cancelled" }
+        };
+        const commandHash = createHash7("sha256").update(
+          encodeSessionCancelBeforeStartCommand({
+            commandId,
+            kind: "session.cancel-before-start",
+            sessionId
+          })
+        ).digest("hex");
+        this.#save(commandId, {
+          attemptId: randomUUID16(),
+          commandHash,
+          sessionId,
+          state: "cancelled",
+          started: false,
+          outcome: JSON.stringify({ ...outcome, recordedAt: (/* @__PURE__ */ new Date()).toISOString() })
+        });
+        return outcome;
+      };
       recordOutcome = (event) => {
         if (event.type !== "lifecycle-metadata") {
           return;
@@ -100045,11 +100117,12 @@ var init_history3 = __esm({
 });
 
 // src/runtime/command/registry/interactions.ts
-var sessionCancelCommand, sessionCloseCommand, promptDispositionCommand, permissionRespondCommand, elicitationRespondCommand;
+var sessionCancelCommand, sessionCancelBeforeStartCommand, sessionCloseCommand, promptDispositionCommand, permissionRespondCommand, elicitationRespondCommand;
 var init_interactions2 = __esm({
   "src/runtime/command/registry/interactions.ts"() {
     "use strict";
     init_protocol();
+    init_session_error();
     init_prompt_lifecycle();
     init_transport();
     sessionCancelCommand = {
@@ -100074,6 +100147,41 @@ var init_interactions2 = __esm({
         });
       }
     };
+    sessionCancelBeforeStartCommand = {
+      kind: SESSION_CANCEL_BEFORE_START_KIND,
+      handle: ({ eventProjection, operations, sessionTurns, socket }, message) => {
+        if (message.kind !== SESSION_CANCEL_BEFORE_START_KIND) {
+          throw new Error("Command kind mismatch");
+        }
+        const turn = sessionTurns.get(message.commandId, message.sessionId);
+        if (turn === void 0) {
+          const outcome = operations.recordCancellationBeforeAdmission(message.commandId, message.sessionId);
+          if (outcome !== void 0) {
+            void eventProjection.replayOutcome(message.sessionId, outcome).catch((error62) => {
+              reportOperationFailure(socket, message.commandId, message.sessionId, error62);
+            });
+            return;
+          }
+          reportOperationFailure(
+            socket,
+            message.commandId,
+            message.sessionId,
+            new SessionError("turn_not_active", "The command is not waiting to start")
+          );
+          return;
+        }
+        if (turn.snapshot() !== null) {
+          reportOperationFailure(
+            socket,
+            message.commandId,
+            message.sessionId,
+            new SessionError("turn_already_started", "The command already started")
+          );
+          return;
+        }
+        turn.requestCancellation();
+      }
+    };
     sessionCloseCommand = {
       kind: SESSION_CLOSE_KIND,
       handle: ({ sessions, signal, socket }, message) => {
@@ -100613,24 +100721,20 @@ async function executePrompt({
       recovery
     };
     let prepared = await sessions.prepareExecutionSession(preparation);
-    if (command.sessionConfigurations !== void 0) {
-      if (availability.disposition === SessionPromptDisposition.Steer) {
-        assertAppliedSessionConfiguration(prepared.configOptions, sessionConfigurations ?? []);
-      } else {
-        await applyCompleteSessionConfiguration(
-          sessions,
-          prepared.configOptions,
-          sessionConfigurations ?? [],
-          executionAgent,
-          adapter,
-          resolved.cwd,
-          resolved.additionalDirectories,
-          command.commandId,
-          command.sessionId,
-          signal
-        );
-        prepared = await sessions.prepareExecutionSession(preparation);
-      }
+    if (command.sessionConfigurations !== void 0 && availability.disposition !== SessionPromptDisposition.Steer) {
+      await applyCompleteSessionConfiguration(
+        sessions,
+        prepared.configOptions,
+        sessionConfigurations ?? [],
+        executionAgent,
+        adapter,
+        resolved.cwd,
+        resolved.additionalDirectories,
+        command.commandId,
+        command.sessionId,
+        signal
+      );
+      prepared = await sessions.prepareExecutionSession(preparation);
     }
     operations.transitionExecution(command.commandId, "running");
     if (availability.disposition === SessionPromptDisposition.Steer) {
@@ -101020,9 +101124,29 @@ async function executeSessionRestore(socket, command, config2, resolveAgent, dir
     reportOperationFailure(socket, command.requestId, command.sessionId, error62, metrics.snapshot());
   }
 }
-async function executeSessionRename(socket, command, sessions, signal) {
+async function executeSessionRename(socket, command, config2, resolveAgent, directories, sessions, nativeSessions, signal) {
   try {
-    const renamed = await sessions.renameSession(command.sessionId, command.title, signal);
+    const [entry] = await nativeSessions.querySessions([command.sessionId], signal);
+    if (entry === void 0) {
+      throw new SessionError("session_not_found", "The Session was not found");
+    }
+    const resolved = await resolveSessionDirectories(
+      directories,
+      config2.bindingId,
+      entry.directoryId,
+      entry.additionalDirectories.map((directory) => directory.directoryId),
+      signal
+    );
+    const renamed = await sessions.renameSession(
+      {
+        additionalDirectories: resolved.additionalDirectories,
+        ...await resolveAgent(entry.agentId, signal, command.sessionId),
+        cwd: resolved.cwd,
+        sessionId: command.sessionId,
+        signal
+      },
+      command.title
+    );
     send(socket, {
       kind: "session.renamed",
       requestId: command.requestId,
@@ -101205,7 +101329,16 @@ var init_session5 = __esm({
         if (message.kind !== SESSION_RENAME_KIND) {
           throw new Error("Command kind mismatch");
         }
-        void executeSessionRename(context.socket, message, context.sessions, context.signal);
+        void executeSessionRename(
+          context.socket,
+          message,
+          context.config,
+          context.resolveAgent,
+          context.directories,
+          context.sessions,
+          context.nativeSessions,
+          context.signal
+        );
       }
     };
     sessionConfigReadCommand = {
@@ -101243,6 +101376,7 @@ function createCommandRegistry(context) {
     ...createAgentSettingsCommands(context),
     ...contentWrites.commands,
     fileReadCommand,
+    sessionCancelBeforeStartCommand,
     sessionCancelCommand,
     sessionCloseCommand,
     promptDispositionCommand,