@moxt-ai/mobius 0.0.355 → 0.0.356

package/dist/cli.js

@@ -2086,7 +2086,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@moxt-ai/mobius",
-      version: "0.0.355",
+      version: "0.0.356",
       description: "Mobius CLI for pairing and running local AI agent services.",
       type: "module",
       bin: {
@@ -27963,7 +27963,9 @@ var init_native = __esm({
         // unrecognized delivery from a newer peer reads as absent instead of failing the snapshot.
         command: commandDeliverySchema.optional().catch(void 0),
         // Absent from older Runtimes and while the last started command is still running.
-        lastTurn: lastTurnOutcomeSchema.optional().catch(void 0)
+        lastTurn: lastTurnOutcomeSchema.optional().catch(void 0),
+        // Runtime-owned support; older Relays strip this field before exposing the snapshot.
+        queuedCancellation: external_exports.literal("before-start").optional().catch(void 0)
       }).readonly(),
       external_exports.object({
         ...resultEnvelope,
@@ -78349,8 +78351,69 @@ var init_pi_commands = __esm({
   }
 });
 
+// src/engine/acp/harness/pi/upstream/dist/acp/pi-history.js
+import { readFileSync as readFileSync3 } from "node:fs";
+import { RequestError as RequestError8 } from "@agentclientprotocol/sdk";
+function readPiHistory(sessionFile) {
+  try {
+    const entries = /* @__PURE__ */ new Map();
+    let leaf = null;
+    for (const line of readFileSync3(sessionFile, "utf8").split(/\r?\n/u)) {
+      if (!line.trim()) {
+        continue;
+      }
+      const value = JSON.parse(line);
+      if (external_exports.object({ type: external_exports.literal("session") }).safeParse(value).success) {
+        continue;
+      }
+      const entry = entrySchema.parse(value);
+      entries.set(entry.id, entry);
+      leaf = entry.id;
+    }
+    const history = [];
+    const visited = /* @__PURE__ */ new Set();
+    while (leaf !== null) {
+      const entry = entries.get(leaf);
+      if (entry === void 0 || visited.has(leaf)) {
+        throw new Error("Invalid Pi history branch");
+      }
+      visited.add(leaf);
+      if (entry.type === "message") {
+        const { role } = external_exports.object({ role: external_exports.string() }).parse(entry.message);
+        if (role === "user" || role === "assistant" || role === "toolResult") {
+          history.push({ type: "message", message: messageSchema.parse(entry.message) });
+        }
+      } else if (entry.type === "compaction") {
+        history.push({ type: "compaction", id: entry.id, summary: external_exports.string().parse(entry.summary) });
+      }
+      leaf = entry.parentId;
+    }
+    return history.reverse();
+  } catch (cause) {
+    const error62 = RequestError8.internalError({ code: "PI_HISTORY_READ_FAILED" }, "Unable to read Pi history");
+    error62.cause = cause;
+    throw error62;
+  }
+}
+var entrySchema, messageSchema;
+var init_pi_history = __esm({
+  "src/engine/acp/harness/pi/upstream/dist/acp/pi-history.js"() {
+    "use strict";
+    init_zod();
+    entrySchema = external_exports.object({
+      type: external_exports.string(),
+      id: external_exports.string(),
+      parentId: external_exports.string().nullable()
+    }).passthrough();
+    messageSchema = external_exports.object({
+      role: external_exports.enum(["user", "assistant", "toolResult"]),
+      content: external_exports.unknown()
+    }).passthrough();
+  }
+});
+
 // src/engine/acp/harness/pi/upstream/dist/acp/pi-sessions.js
-import { closeSync as closeSync2, existsSync as existsSync4, openSync as openSync2, readdirSync as readdirSync4, readFileSync as readFileSync3, readSync as readSync2, statSync as statSync2 } from "node:fs";
+import { closeSync as closeSync2, existsSync as existsSync4, openSync as openSync2, readdirSync as readdirSync4, readFileSync as readFileSync4, readSync as readSync2, statSync as statSync2 } from "node:fs";
 import { isAbsolute as isAbsolute10, join as join19, resolve as resolve11 } from "node:path";
 function getPiAgentDir(environment) {
   const configured = environment["PI_CODING_AGENT_DIR"];
@@ -78362,7 +78425,7 @@ function readSessionDirFromSettings(agentDir) {
     if (!existsSync4(settingsPath)) {
       return null;
     }
-    const raw = readFileSync3(settingsPath, "utf8");
+    const raw = readFileSync4(settingsPath, "utf8");
     const data = JSON.parse(raw);
     if (!data || typeof data !== "object" || Array.isArray(data)) {
       return null;
@@ -78578,7 +78641,7 @@ function pickUpdatedAtFromTail(tail) {
 }
 function pickFallbackTitleFromHead(path8) {
   try {
-    const raw = readFileSync3(path8, { encoding: "utf8" });
+    const raw = readFileSync4(path8, { encoding: "utf8" });
     const lines = raw.split(/\r?\n/);
     for (const line0 of lines) {
       const line = line0.trim();
@@ -78683,7 +78746,7 @@ var init_pi_sessions = __esm({
 });
 
 // src/engine/acp/harness/pi/upstream/dist/acp/pi-settings.js
-import { existsSync as existsSync5, readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "node:fs";
 import { join as join20, resolve as resolve12 } from "node:path";
 function isObject2(x) {
   return Boolean(x) && typeof x === "object" && !Array.isArray(x);
@@ -78705,7 +78768,7 @@ function readJsonFile2(path8) {
     if (!existsSync5(path8)) {
       return {};
     }
-    const raw = readFileSync4(path8, "utf-8");
+    const raw = readFileSync5(path8, "utf-8");
     const data = JSON.parse(raw);
     return isObject2(data) ? data : {};
   } catch {
@@ -78755,7 +78818,7 @@ var init_pi_settings = __esm({
 });
 
 // src/engine/acp/harness/pi/upstream/dist/acp/extension-questions.js
-import { RequestError as RequestError8 } from "@agentclientprotocol/sdk";
+import { RequestError as RequestError9 } from "@agentclientprotocol/sdk";
 function questionField(question) {
   const title2 = question.title || "Answer";
   switch (question.method) {
@@ -78803,7 +78866,7 @@ var init_extension_questions = __esm({
       external_exports.object({ ...questionBase, method: external_exports.literal("editor"), prefill: external_exports.string().max(1e4).optional() })
     ]).readonly();
     QUESTION_TIMEOUT_MS = 36e5;
-    PiQuestionError = class extends RequestError8 {
+    PiQuestionError = class extends RequestError9 {
       constructor(kind, cause) {
         const messages = {
           request_failed: "Pi could not request an answer.",
@@ -78915,7 +78978,7 @@ var init_extension_questions = __esm({
             throw new PiQuestionError("invalid_response");
           }
         } catch (cause) {
-          if (!signal.aborted && !(cause instanceof RequestError8 && cause.code === -32800)) {
+          if (!signal.aborted && !(cause instanceof RequestError9 && cause.code === -32800)) {
             turn.controller.abort(cause instanceof PiQuestionError ? cause : new PiQuestionError("request_failed", cause));
           }
         } finally {
@@ -78931,14 +78994,14 @@ var init_extension_questions = __esm({
 });
 
 // src/engine/acp/harness/pi/upstream/dist/acp/session-store.js
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync5, writeFileSync } from "node:fs";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync } from "node:fs";
 import { dirname as dirname8 } from "node:path";
 function ensureParentDir(path8) {
   mkdirSync2(dirname8(path8), { recursive: true });
 }
 function loadFile(path8) {
   try {
-    const raw = readFileSync5(path8, "utf-8");
+    const raw = readFileSync6(path8, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed?.version !== 1 || typeof parsed.sessions !== "object" || !parsed.sessions) {
       return { version: 1, sessions: {} };
@@ -78990,7 +79053,7 @@ var init_session_store = __esm({
 });
 
 // src/engine/acp/harness/pi/upstream/dist/acp/slash-commands.js
-import { existsSync as existsSync6, readdirSync as readdirSync5, readFileSync as readFileSync6 } from "node:fs";
+import { existsSync as existsSync6, readdirSync as readdirSync5, readFileSync as readFileSync7 } from "node:fs";
 import { join as join21, resolve as resolve13 } from "node:path";
 function parseFrontmatter(content) {
   const frontmatter = {};
@@ -79029,7 +79092,7 @@ function loadCommandsFromDir(dir, source, subdir = "") {
         continue;
       }
       try {
-        const rawContent = readFileSync6(fullPath, "utf-8");
+        const rawContent = readFileSync7(fullPath, "utf-8");
         const { frontmatter, content } = parseFrontmatter(rawContent);
         const name2 = entry.name.slice(0, -3);
         const sourceStr = source === "user" ? subdir ? `(user:${subdir})` : "(user)" : subdir ? `(project:${subdir})` : "(project)";
@@ -79221,9 +79284,9 @@ var init_pi_tools = __esm({
 
 // src/engine/acp/harness/pi/upstream/dist/acp/session.js
 import { randomUUID as randomUUID10 } from "node:crypto";
-import { readFileSync as readFileSync7 } from "node:fs";
+import { readFileSync as readFileSync8 } from "node:fs";
 import { isAbsolute as isAbsolute11, resolve as resolvePath } from "node:path";
-import { RequestError as RequestError9 } from "@agentclientprotocol/sdk";
+import { RequestError as RequestError10 } from "@agentclientprotocol/sdk";
 function toUsageUpdate(stats) {
   const used = stats?.contextUsage?.tokens;
   const size = stats?.contextUsage?.contextWindow;
@@ -79338,10 +79401,11 @@ function toToolKind(toolName) {
       return "other";
   }
 }
-var SessionManager, PiAcpSession;
+var nativeUserMessageSchema, SessionManager, PiAcpSession;
 var init_session = __esm({
   "src/engine/acp/harness/pi/upstream/dist/acp/session.js"() {
     "use strict";
+    init_zod();
     init_process();
     init_auth_required();
     init_extension_questions();
@@ -79349,6 +79413,16 @@ var init_session = __esm({
     init_slash_commands();
     init_bash();
     init_pi_tools();
+    nativeUserMessageSchema = external_exports.object({
+      role: external_exports.literal("user"),
+      content: external_exports.union([
+        external_exports.string().transform((text2) => [{ type: "text", text: text2 }]),
+        external_exports.array(external_exports.discriminatedUnion("type", [
+          external_exports.object({ type: external_exports.literal("text"), text: external_exports.string() }),
+          external_exports.object({ type: external_exports.literal("image"), data: external_exports.string(), mimeType: external_exports.string() })
+        ]))
+      ])
+    });
     SessionManager = class {
       sessions = /* @__PURE__ */ new Map();
       store = new SessionStore();
@@ -79397,7 +79471,7 @@ var init_session = __esm({
           });
         } catch (e) {
           if (e instanceof PiRpcSpawnError) {
-            throw RequestError9.internalError({ code: e.code }, e.message);
+            throw RequestError10.internalError({ code: e.code }, e.message);
           }
           throw e;
         }
@@ -79426,7 +79500,7 @@ var init_session = __esm({
       get(sessionId) {
         const s = this.sessions.get(sessionId);
         if (!s) {
-          throw RequestError9.invalidParams(`Unknown sessionId: ${sessionId}`);
+          throw RequestError10.invalidParams(`Unknown sessionId: ${sessionId}`);
         }
         return s;
       }
@@ -79526,8 +79600,8 @@ var init_session = __esm({
           if (cause instanceof PiRpcProcessError) {
             const pending = this.pendingTurn;
             const reason = pending?.questionSignal.reason;
-            const error62 = reason instanceof RequestError9 ? reason : RequestError9.internalError({ code: cause.code, details: cause.message });
-            if (!(reason instanceof RequestError9)) {
+            const error62 = reason instanceof RequestError10 ? reason : RequestError10.internalError({ code: cause.code, details: cause.message });
+            if (!(reason instanceof RequestError10)) {
               error62.cause = cause;
             }
             this.extensionQuestions.endTurn(error62);
@@ -79595,12 +79669,12 @@ var init_session = __esm({
         const signal = this.extensionQuestions.startTurn();
         try {
           const result = await this.proc.compact(customInstructions, { signal, timeoutMs });
-          if (signal.aborted && signal.reason instanceof RequestError9) {
+          if (signal.aborted && signal.reason instanceof RequestError10) {
             throw signal.reason;
           }
           return result;
         } catch (cause) {
-          if (signal.aborted && signal.reason instanceof RequestError9) {
+          if (signal.aborted && signal.reason instanceof RequestError10) {
             try {
               await this.proc.abort({ signal: this.proc.signal, timeoutMs });
             } catch (abortCause) {
@@ -79693,14 +79767,14 @@ var init_session = __esm({
         await this.publishContextUsage();
         const retryFailure = this.turnRetryFailure;
         this.turnRetryFailure = null;
-        if (questionSignal?.aborted && questionSignal.reason instanceof RequestError9 && !this.cancelRequested) {
+        if (questionSignal?.aborted && questionSignal.reason instanceof RequestError10 && !this.cancelRequested) {
           this.pendingTurn?.reject(questionSignal.reason);
         } else if (retryFailure !== null && !this.cancelRequested) {
           this.pendingTurn?.reject(
             // The message rides in `data.details` so clients that unwrap the
             // JSON-RPC internal-error envelope (like Mobius) surface the real
             // model error; `code` keeps the failure machine-readable.
-            RequestError9.internalError({
+            RequestError10.internalError({
               code: "pi_retries_exhausted",
               details: `Pi retries exhausted: ${retryFailure}`
             })
@@ -79784,6 +79858,17 @@ var init_session = __esm({
       handlePiEvent(ev2) {
         const type = String(ev2.type ?? "");
         switch (type) {
+          case "message_start": {
+            const message = nativeUserMessageSchema.safeParse(ev2.message);
+            if (!message.success) {
+              break;
+            }
+            this.lastEmit = this.lastEmit.then(() => this.conn.startUserMessage());
+            for (const content of message.data.content) {
+              this.emit({ sessionUpdate: "user_message_chunk", content });
+            }
+            break;
+          }
           case "message_update": {
             const ame2 = ev2.assistantMessageEvent;
             if (this.turnRetryFailure !== null && (ame2?.type === "text_delta" || ame2?.type === "thinking_delta" || ame2?.type === "toolcall_start")) {
@@ -79890,7 +79975,7 @@ var init_session = __esm({
               if (p) {
                 try {
                   const abs = isAbsolute11(p) ? p : resolvePath(this.cwd, p);
-                  snapshotOldText = readFileSync7(abs, "utf8");
+                  snapshotOldText = readFileSync8(abs, "utf8");
                   this.fileSnapshots.set(toolCallId, { path: p, oldText: snapshotOldText });
                   if (toolName === "edit") {
                     for (const needle of getEditOldTexts(args)) {
@@ -79973,7 +80058,7 @@ var init_session = __esm({
             if (!isError && snapshot) {
               try {
                 const abs = isAbsolute11(snapshot.path) ? snapshot.path : resolvePath(this.cwd, snapshot.path);
-                const newText = readFileSync7(abs, "utf8");
+                const newText = readFileSync8(abs, "utf8");
                 if (snapshot.oldText === null || newText !== snapshot.oldText) {
                   hasStructuredDiff = true;
                   content = [
@@ -80150,9 +80235,9 @@ var init_prompt = __esm({
 // src/engine/acp/harness/pi/upstream/dist/acp/agent.js
 import { spawnSync } from "node:child_process";
 import { randomUUID as randomUUID11 } from "node:crypto";
-import { existsSync as existsSync7, readdirSync as readdirSync6, readFileSync as readFileSync8, realpathSync as realpathSync3, statSync as statSync3, unlinkSync as unlinkSync2 } from "node:fs";
+import { existsSync as existsSync7, readdirSync as readdirSync6, readFileSync as readFileSync9, realpathSync as realpathSync3, statSync as statSync3, unlinkSync as unlinkSync2 } from "node:fs";
 import { basename as basename6, dirname as dirname9, isAbsolute as isAbsolute12, join as join22 } from "node:path";
-import { RequestError as RequestError10 } from "@agentclientprotocol/sdk";
+import { RequestError as RequestError11 } from "@agentclientprotocol/sdk";
 function thinkingLevelName(id) {
   return id.split(/[_-]/u).map((part) => part.length === 0 ? part : `${part[0]?.toUpperCase() ?? ""}${part.slice(1)}`).join(" ");
 }
@@ -80356,7 +80441,7 @@ async function setSessionModel(proc, requestedModelId) {
     }
   }
   if (!provider || !modelId) {
-    throw RequestError10.invalidParams(`Unknown modelId: ${requestedModelId}`);
+    throw RequestError11.invalidParams(`Unknown modelId: ${requestedModelId}`);
   }
   await proc.setModel(provider, modelId);
 }
@@ -80510,7 +80595,7 @@ function buildStartupInfo(opts) {
   ];
   for (const settingsPath of settingsPaths) {
     try {
-      const settings = JSON.parse(readFileSync8(settingsPath, "utf-8"));
+      const settings = JSON.parse(readFileSync9(settingsPath, "utf-8"));
       const pkgs = Array.isArray(settings?.packages) ? settings.packages : [];
       for (const pkg of pkgs) {
         const s = String(pkg);
@@ -80543,6 +80628,7 @@ var init_agent2 = __esm({
     init_auth_required();
     init_paths();
     init_pi_commands();
+    init_pi_history();
     init_pi_sessions();
     init_pi_settings();
     init_session();
@@ -80638,7 +80724,7 @@ var init_agent2 = __esm({
         const restorePromise = (async () => {
           const stored = this.findStoredSession(sessionId);
           if (!stored) {
-            throw RequestError10.invalidParams(`Unknown sessionId: ${sessionId}`);
+            throw RequestError11.invalidParams(`Unknown sessionId: ${sessionId}`);
           }
           const cwd = opts?.cwd ?? stored.cwd;
           let proc;
@@ -80651,7 +80737,7 @@ var init_agent2 = __esm({
             });
           } catch (e) {
             if (e?.name === "PiRpcSpawnError") {
-              throw RequestError10.internalError({ code: e?.code }, String(e?.message ?? e));
+              throw RequestError11.internalError({ code: e?.code }, String(e?.message ?? e));
             }
             throw e;
           }
@@ -80711,7 +80797,7 @@ var init_agent2 = __esm({
       }
       async newSession(params) {
         if (!isAbsolute12(params.cwd)) {
-          throw RequestError10.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
+          throw RequestError11.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
         }
         this.lastSessionCwd = params.cwd;
         const fileCommands = loadSlashCommands(params.cwd, this.environment);
@@ -80750,16 +80836,16 @@ var init_agent2 = __esm({
         }
         if (availableModelsErr) {
           this.cleanupFailedNewSession(session.sessionId, state);
-          throw RequestError10.internalError({}, String(availableModelsErr?.message ?? availableModelsErr));
+          throw RequestError11.internalError({}, String(availableModelsErr?.message ?? availableModelsErr));
         }
         const rawModelsCount = Array.isArray(availableModels?.models) ? availableModels.models.length : 0;
         if (rawModelsCount === 0) {
           this.cleanupFailedNewSession(session.sessionId, state);
-          throw RequestError10.authRequired({ authMethods: getAuthMethods() }, "Configure an API key or log in with an OAuth provider.");
+          throw RequestError11.authRequired({ authMethods: getAuthMethods() }, "Configure an API key or log in with an OAuth provider.");
         }
         if (stateErr && maybeAuthRequiredError(stateErr)) {
           this.cleanupFailedNewSession(session.sessionId, state);
-          throw RequestError10.authRequired({ authMethods: getAuthMethods() }, "Configure an API key or log in with an OAuth provider.");
+          throw RequestError11.authRequired({ authMethods: getAuthMethods() }, "Configure an API key or log in with an OAuth provider.");
         }
         let configuration;
         try {
@@ -80769,7 +80855,7 @@ var init_agent2 = __esm({
           configuration = await getSessionConfiguration(session.proc, { state, availableModels });
         } catch (err) {
           this.cleanupFailedNewSession(session.sessionId, state);
-          throw maybeAuthRequiredError(err) ?? RequestError10.internalError({}, String(err?.message ?? err));
+          throw maybeAuthRequiredError(err) ?? RequestError11.internalError({}, String(err?.message ?? err));
         }
         const { configOptions, models, modes } = configuration;
         const quietStartup = getQuietStartup(params.cwd, this.environment);
@@ -80849,16 +80935,6 @@ 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" };
-          }
-          await this.conn.sessionUpdate({
-            sessionId: params.sessionId,
-            update: { sessionUpdate: "user_message_chunk", content }
-          });
-        }
         if (submission.aborted) {
           return { stopReason: "cancelled" };
         }
@@ -80869,6 +80945,9 @@ var init_agent2 = __esm({
           const cmd = space === -1 ? trimmed.slice(1) : trimmed.slice(1, space);
           const argsString = space === -1 ? "" : trimmed.slice(space + 1);
           const args = parseCommandArgs(argsString);
+          if (builtinAvailableCommands().some((command) => command.name === cmd)) {
+            this.conn.startUserMessage();
+          }
           if (cmd === "compact") {
             const customInstructions = args.join(" ").trim() || void 0;
             const compactionId = randomUUID11();
@@ -81130,7 +81209,7 @@ ${JSON.stringify(stats, null, 2)}`;
             }
             let text2 = "";
             try {
-              text2 = readFileSync8(changelogPath, "utf-8");
+              text2 = readFileSync9(changelogPath, "utf-8");
             } catch (e) {
               await this.conn.sessionUpdate({
                 sessionId: session.sessionId,
@@ -81174,7 +81253,7 @@ ${JSON.stringify(stats, null, 2)}`;
               return { stopReason: "end_turn" };
             }
             try {
-              const raw = readFileSync8(sessionFile, "utf-8");
+              const raw = readFileSync9(sessionFile, "utf-8");
               if (raw.trim().length === 0) {
                 await this.conn.sessionUpdate({
                   sessionId: session.sessionId,
@@ -81297,7 +81376,7 @@ ${JSON.stringify(stats, null, 2)}`;
         signal.throwIfAborted();
         const parsed = steerRequestSchema.safeParse(params);
         if (!parsed.success) {
-          throw RequestError10.invalidParams("Invalid steering request");
+          throw RequestError11.invalidParams("Invalid steering request");
         }
         const session = this.sessions.maybeGet(parsed.data.sessionId);
         if (session === void 0) {
@@ -81309,14 +81388,6 @@ ${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({
-                sessionId: parsed.data.sessionId,
-                update: { sessionUpdate: "user_message_chunk", content }
-              });
-            }
             return { outcome: "injected" };
           }
         }
@@ -81350,11 +81421,11 @@ ${JSON.stringify(stats, null, 2)}`;
       }
       async forkSession(params) {
         if (!isAbsolute12(params.cwd)) {
-          throw RequestError10.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
+          throw RequestError11.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
         }
         const source = this.findStoredSession(params.sessionId);
         if (!source) {
-          throw RequestError10.invalidParams(`Unknown sessionId: ${params.sessionId}`);
+          throw RequestError11.invalidParams(`Unknown sessionId: ${params.sessionId}`);
         }
         this.lastSessionCwd = params.cwd;
         const fileCommands = loadSlashCommands(params.cwd, this.environment);
@@ -81416,13 +81487,13 @@ ${JSON.stringify(stats, null, 2)}`;
       }
       async resumeSession(params) {
         if (!isAbsolute12(params.cwd)) {
-          throw RequestError10.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
+          throw RequestError11.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
         }
         this.sessions.close(params.sessionId);
         this.lastSessionCwd = params.cwd;
         const stored = this.findStoredSession(params.sessionId);
         if (!stored) {
-          throw RequestError10.invalidParams(`Unknown sessionId: ${params.sessionId}`);
+          throw RequestError11.invalidParams(`Unknown sessionId: ${params.sessionId}`);
         }
         const session = await this.restoreSession(params.sessionId, {
           cwd: params.cwd,
@@ -81487,13 +81558,13 @@ ${JSON.stringify(stats, null, 2)}`;
       }
       async loadSession(params) {
         if (!isAbsolute12(params.cwd)) {
-          throw RequestError10.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
+          throw RequestError11.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
         }
         this.sessions.close(params.sessionId);
         this.lastSessionCwd = params.cwd;
         const stored = this.findStoredSession(params.sessionId);
         if (!stored) {
-          throw RequestError10.invalidParams(`Unknown sessionId: ${params.sessionId}`);
+          throw RequestError11.invalidParams(`Unknown sessionId: ${params.sessionId}`);
         }
         const enableSkillCommands = getEnableSkillCommands(params.cwd, this.environment);
         const session = await this.restoreSession(params.sessionId, {
@@ -81516,9 +81587,29 @@ ${JSON.stringify(stats, null, 2)}`;
           cwd: params.cwd,
           sessionFile: stored.sessionFile
         });
-        const data = await proc.getMessages();
-        const messages = Array.isArray(data?.messages) ? data.messages : [];
-        for (const m of messages) {
+        for (const entry of readPiHistory(stored.sessionFile)) {
+          if (entry.type === "compaction") {
+            await this.conn.sessionUpdate({
+              sessionId: session.sessionId,
+              update: {
+                sessionUpdate: "compaction_update",
+                compactionId: entry.id,
+                status: "completed"
+              }
+            });
+            if (entry.summary) {
+              await this.conn.sessionUpdate({
+                sessionId: session.sessionId,
+                update: {
+                  sessionUpdate: "compaction_summary_chunk",
+                  compactionId: entry.id,
+                  content: { type: "text", text: entry.summary }
+                }
+              });
+            }
+            continue;
+          }
+          const m = entry.message;
           const role = String(m?.role ?? "");
           if (role === "user") {
             const text2 = normalizePiMessageText(m?.content);
@@ -81668,7 +81759,7 @@ ${JSON.stringify(stats, null, 2)}`;
         const session = await this.restoreSession(params.sessionId);
         const mode = params.modeId;
         if (typeof mode !== "string" || mode.length === 0) {
-          throw RequestError10.invalidParams("Expected nonempty string modeId");
+          throw RequestError11.invalidParams("Expected nonempty string modeId");
         }
         await session.proc.setThinkingLevel(mode);
         await emitConfigOptionsUpdate(this.conn, session.sessionId, session.proc);
@@ -81679,18 +81770,18 @@ ${JSON.stringify(stats, null, 2)}`;
         const configId = String(params.configId);
         let modelChanged = false;
         if (typeof params.value !== "string") {
-          throw RequestError10.invalidParams(`Expected string value for config option: ${configId}`);
+          throw RequestError11.invalidParams(`Expected string value for config option: ${configId}`);
         }
         if (configId === MODEL_CONFIG_ID2) {
           await setSessionModel(session.proc, params.value);
           modelChanged = true;
         } else if (configId === THOUGHT_LEVEL_CONFIG_ID) {
           if (params.value.length === 0) {
-            throw RequestError10.invalidParams("Expected nonempty thinking level");
+            throw RequestError11.invalidParams("Expected nonempty thinking level");
           }
           await session.proc.setThinkingLevel(params.value);
         } else {
-          throw RequestError10.invalidParams(`Unknown config option: ${configId}`);
+          throw RequestError11.invalidParams(`Unknown config option: ${configId}`);
         }
         const configOptions = await emitConfigOptionsUpdate(this.conn, session.sessionId, session.proc);
         if (modelChanged) {
@@ -91190,7 +91281,7 @@ var init_environment_proxy = __esm({
 });
 
 // src/engine/storage/logs/bounded-log.ts
-import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync9, renameSync as renameSync2, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync10, renameSync as renameSync2, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
 import { join as join26 } from "node:path";
 var BoundedLineLog;
 var init_bounded_log = __esm({
@@ -91235,7 +91326,7 @@ var init_bounded_log = __esm({
           appendFileSync2(this.#path, encoded, { encoding: "utf8", mode: 384 });
           return;
         }
-        const lines = `${existingBytes === 0 ? "" : readFileSync9(this.#path, "utf8")}${encoded}`.split("\n").filter((candidate) => candidate.length > 0);
+        const lines = `${existingBytes === 0 ? "" : readFileSync10(this.#path, "utf8")}${encoded}`.split("\n").filter((candidate) => candidate.length > 0);
         let totalBytes = lines.reduce((total, candidate) => total + Buffer.byteLength(candidate) + 1, 0);
         while (totalBytes > this.#maximumBytes && lines.length > 0) {
           const oldest = lines.shift();
@@ -91256,7 +91347,7 @@ var init_bounded_log = __esm({
 });
 
 // src/engine/storage/logs/log-files.ts
-import { readFileSync as readFileSync10 } from "node:fs";
+import { readFileSync as readFileSync11 } from "node:fs";
 import { join as join27 } from "node:path";
 function unhandledRejectionLogFilename(role) {
   return `unhandled-rejections-${role}.log`;
@@ -91273,7 +91364,7 @@ function processLogPaths(dataDirectory) {
 }
 function readLogText(path8) {
   try {
-    return readFileSync10(path8, "utf8");
+    return readFileSync11(path8, "utf8");
   } catch {
     return null;
   }
@@ -93205,7 +93296,7 @@ var init_session_configurations = __esm({
       restore = async (stored, options, apply, signal) => {
         this.#selected = stored;
         for (const selection of this.#selected) {
-          const current = options.find(
+          const current = options().find(
             (option) => option.id === selection.configId && option.type === selection.type
           );
           if (current === void 0) {
@@ -93414,6 +93505,7 @@ async function restoreSession(session, signal, recovery, origin) {
     session.store.remove(session.sessionId);
     stored = session.metrics.measureSync("session-state-read", () => session.store.read(session.sessionId));
   }
+  const forkSource = origin?.kind === "fork" ? session.store.findNative(session.agentId, origin.nativeSessionId)[0] : void 0;
   let lifecycleResponse2;
   if (origin?.kind === "fork") {
     if (!session.capabilities.unstableForkSession) {
@@ -93575,7 +93667,9 @@ async function restoreSession(session, signal, recovery, origin) {
   }
   session.restrictSessionCapabilities(lifecycleResponse2);
   session.setConfigOptions(session.sessionConfigProtocol.normalizeLifecycle(lifecycleResponse2));
-  if (stored instanceof FoundStoredSession && session.restored) {
+  if (forkSource !== void 0) {
+    await session.restoreStoredConfigurations(forkSource, signal, "fork");
+  } else if (stored instanceof FoundStoredSession && session.restored) {
     await session.restoreStoredConfigurations(stored.session, signal);
   }
   await session.drained();
@@ -93819,13 +93913,31 @@ var init_agent_session = __esm({
           this.writeStoredSession((/* @__PURE__ */ new Date()).toISOString());
         }
       };
-      restoreStoredConfigurations = async (session, signal) => {
+      restoreStoredConfigurations = async (session, signal, intent = "restore") => {
+        const configurations = intent === "fork" ? session.configurations.toSorted(
+          (left, right) => Number(right.configId === "model") - Number(left.configId === "model")
+        ) : session.configurations;
         await this.#sessionConfigurations.restore(
-          session.configurations,
-          this.#configOptions,
+          configurations,
+          () => this.#configOptions,
           this.#applyConfiguration,
           signal
         );
+        if (intent === "fork") {
+          for (const selection of session.configurations) {
+            if (selection.configId !== "mode") {
+              continue;
+            }
+            const current = this.#configOptions.find((option) => option.id === selection.configId);
+            if (current?.type !== selection.type || (selection.type === "select" ? current.currentValue !== selection.value : current.booleanValue !== selection.booleanValue)) {
+              throw new AcpExecutionError(
+                "The Agent could not preserve the source Session mode for this Fork",
+                {},
+                "invalid_session_configuration"
+              );
+            }
+          }
+        }
       };
       restrictSessionCapabilities = (response) => {
         this.#capabilities = restrictAcpSessionCapabilities(this.#capabilities, response);
@@ -95311,7 +95423,8 @@ var init_native_session_browser = __esm({
             requestId: command.requestId,
             sessionId: command.sessionId,
             targetSessionId: command.targetSessionId,
-            ...await this.#activeTurn(command, options)
+            ...await this.#activeTurn(command, options),
+            queuedCancellation: "before-start"
           };
         }
         const capabilities = await options.adapter.getCapabilities(options);
@@ -95945,6 +96058,11 @@ var init_execution_receipts = __esm({
             return void 0;
         }
       };
+      /** Started identities remain authoritative after their detailed receipt is evicted. */
+      hasStarted = (commandId, sessionId) => {
+        const receipt = this.#executions.get(commandId);
+        return receipt === void 0 ? this.#table.identity(commandId)?.sessionId === sessionId : receipt.sessionId === sessionId && receipt.started;
+      };
       /** Reserves an unseen command for cancellation before a delayed prompt can claim its identity. */
       recordCancellationBeforeAdmission = (commandId, sessionId) => {
         const existing = this.#executions.get(commandId);
@@ -98730,10 +98848,19 @@ var init_interactions2 = __esm({
         if (message.kind !== SESSION_CANCEL_BEFORE_START_KIND) {
           throw new Error("Command kind mismatch");
         }
+        if (operations.hasStarted(message.commandId, message.sessionId)) {
+          reportOperationFailure(
+            socket,
+            message.commandId,
+            message.sessionId,
+            new SessionError("turn_already_started", "The message already started and could not be withdrawn")
+          );
+          return;
+        }
         const turn = sessionTurns.get(message.commandId, message.sessionId);
         if (turn === void 0) {
           const outcome = operations.recordCancellationBeforeAdmission(message.commandId, message.sessionId);
-          if (outcome !== void 0) {
+          if (outcome?.type === "lifecycle-metadata" && outcome.payload.kind === "prompt.completed" && outcome.payload.stopReason === "cancelled") {
             void eventProjection.replayOutcome(message.sessionId, outcome).catch((error62) => {
               reportOperationFailure(socket, message.commandId, message.sessionId, error62);
             });
@@ -99230,6 +99357,7 @@ async function executePrompt({
       );
       prepared = await sessions.prepareExecutionSession(preparation);
     }
+    signal.throwIfAborted();
     operations.markExecutionStarted(command.commandId);
     if (availability.disposition === SessionPromptDisposition.Steer) {
       if (!recordSteeringPrompt()) {