@moxt-ai/mobius 0.0.354 → 0.0.356

package/dist/engine.js

@@ -20794,38 +20794,6 @@ function isRecord2(value) {
 }
 var sessionEventBatchSchema = external_exports.array(sessionEventSchema).min(1).max(SESSION_EVENT_BATCH_MAX_SIZE).readonly();
 var sessionLiveEventBatchSchema = external_exports.array(sessionLiveEventSchema).min(1).max(SESSION_EVENT_BATCH_MAX_SIZE).readonly();
-var sessionExportSchema = external_exports.object({
-  binding: external_exports.object({
-    bindingId: identifierStringSchema,
-    runtimeId: identifierStringSchema
-  }).readonly(),
-  events: external_exports.array(sessionEventSchema).max(MAX_EVENT_COUNT).readonly(),
-  sessionId: identifierStringSchema,
-  truncated: external_exports.boolean()
-}).readonly().superRefine((session, context) => {
-  const eventIds = /* @__PURE__ */ new Set();
-  for (const [index2, event] of session.events.entries()) {
-    if (event.sessionId !== session.sessionId) {
-      context.addIssue({
-        code: "custom",
-        message: "Exported event belongs to a different Session",
-        path: ["events", index2, "sessionId"]
-      });
-    }
-    if (eventIds.has(event.eventId)) {
-      context.addIssue({
-        code: "custom",
-        message: "Exported event identities are not unique",
-        path: ["events", index2, "eventId"]
-      });
-    }
-    eventIds.add(event.eventId);
-  }
-});
-var mobiusSessionExportSchema = external_exports.object({
-  formatVersion: external_exports.literal("2"),
-  session: sessionExportSchema
-}).readonly();
 var sessionEventEnvelopeSchema = external_exports.object({ events: sessionLiveEventBatchSchema, kind: external_exports.literal(SESSION_EVENT_KIND) }).readonly();
 var sessionEventLogPageSchema = external_exports.object({
   events: external_exports.array(sessionEventSchema).max(MAX_EVENT_COUNT).readonly(),
@@ -20838,12 +20806,9 @@ var sessionEventLogPageSchema = external_exports.object({
   truncated: external_exports.boolean(),
   version: external_exports.literal(2)
 }).readonly();
-var sessionEventOmissionSchema = external_exports.literal("agent-reasoning");
 var nativeEventPageRequestSchema = external_exports.object({
   cursor: external_exports.string().min(1).max(512).nullable(),
-  eventLimit: external_exports.number().int().min(1).max(1e4),
-  // Legacy callers may still send this option; readers must ignore it.
-  omit: external_exports.array(sessionEventOmissionSchema).max(1).readonly().optional()
+  eventLimit: external_exports.number().int().min(1).max(1e4)
 }).readonly();
 var queuedPromptRequestEventLogSchema = external_exports.object({
   commandId: identifierStringSchema,
@@ -21476,7 +21441,9 @@ var nativeSessionResultSchema = external_exports.discriminatedUnion("action", [
     // 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,
@@ -21522,8 +21489,6 @@ var SESSION_PREVIEW_HISTORY_PAGE_LOADED_KIND = "session.preview-history.page.loa
 var pageRequestFields = {
   cursor: external_exports.string().min(1).max(512).nullable(),
   eventLimit: external_exports.number().int().min(1).max(1e4),
-  // Decode old clients without rejecting their request; omission has no effect.
-  omit: external_exports.array(sessionEventOmissionSchema).max(1).readonly().optional(),
   requestId: identifierStringSchema,
   sessionId: identifierStringSchema
 };
@@ -59518,7 +59483,6 @@ function backgroundTaskId(result) {
 }
 
 // src/engine/acp/harness/claude/upstream/dist/context-resources.js
-import { extname } from "node:path";
 function formatUriAsLink(uri) {
   if (uri.startsWith("file://")) {
     const path7 = uri.slice(7);
@@ -59533,91 +59497,6 @@ var formatContextBlock = (uri, text2) => `
 <context ref="${uri}">
 ${text2}
 </context>`;
-function parseContextBlock(block) {
-  if (block.type !== "text" || typeof block.text !== "string") {
-    return null;
-  }
-  const match = /^\n<context ref="([^"\r\n]+)">\n([\s\S]*)\n<\/context>$/u.exec(block.text);
-  const uri = match?.[1];
-  const text2 = match?.[2];
-  if (uri === void 0 || text2 === void 0 || formatContextBlock(uri, text2) !== block.text) {
-    return null;
-  }
-  return { uri, text: text2 };
-}
-function contextMimeType(uri) {
-  let pathname = uri;
-  try {
-    pathname = new URL(uri).pathname;
-  } catch {
-  }
-  switch (extname(pathname).toLowerCase()) {
-    case ".html":
-    case ".htm":
-      return "text/html";
-    case ".js":
-    case ".mjs":
-    case ".cjs":
-      return "text/javascript";
-    case ".css":
-      return "text/css";
-    case ".json":
-      return "application/json";
-    case ".md":
-    case ".markdown":
-      return "text/markdown";
-    case ".xml":
-      return "application/xml";
-    case ".svg":
-      return "image/svg+xml";
-    case ".csv":
-      return "text/csv";
-    default:
-      return "text/plain";
-  }
-}
-function replayContextResources(content) {
-  const contexts = [];
-  let contextStart = content.length;
-  for (let index2 = content.length - 1; index2 >= 0; index2 -= 1) {
-    const block = content[index2];
-    const parsed = block === void 0 ? null : parseContextBlock(block);
-    if (parsed === null) {
-      break;
-    }
-    contexts.push(parsed);
-    contextStart = index2;
-  }
-  if (contexts.length === 0) {
-    return null;
-  }
-  contexts.reverse();
-  const links = new Set(contexts.map(({ uri }) => formatUriAsLink(uri)));
-  const resources = /* @__PURE__ */ new Map();
-  let nextContext = 0;
-  for (let index2 = 0; index2 < contextStart; index2 += 1) {
-    const block = content[index2];
-    if (block?.type !== "text" || typeof block.text !== "string") {
-      continue;
-    }
-    if (block.text.startsWith('\n<context ref="')) {
-      return null;
-    }
-    if (!links.has(block.text)) {
-      continue;
-    }
-    const context = contexts[nextContext];
-    if (context === void 0 || block.text !== formatUriAsLink(context.uri)) {
-      return null;
-    }
-    resources.set(index2, {
-      type: "resource",
-      resource: { ...context, mimeType: contextMimeType(context.uri) }
-    });
-    nextContext += 1;
-  }
-  return nextContext === contexts.length ? { contextStart, resources } : null;
-}
 
 // src/engine/acp/harness/claude/upstream/dist/elicitation.js
 import { randomUUID as randomUUID4 } from "node:crypto";
@@ -66932,13 +66811,8 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
   const toolUseResult = options?.toolUseResult !== void 0 && content.filter((c) => typeof c === "object" && c !== null && c.type === "tool_result").length === 1 ? options.toolUseResult : void 0;
   const toolResultMeta = parseToolResultMeta(options?.toolResultMeta);
   const output2 = [];
-  const replayedResources = role === "user" && options.historical === true ? replayContextResources(content) : null;
-  for (const [index2, chunk] of content.entries()) {
-    if (replayedResources !== null && index2 >= replayedResources.contextStart) {
-      break;
-    }
+  for (const chunk of content) {
     let update = null;
-    const resource = replayedResources?.resources.get(index2);
     switch (chunk.type) {
       case "text":
       case "text_delta": {
@@ -66947,7 +66821,7 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
           update = {
             sessionUpdate: role === "assistant" ? "agent_message_chunk" : "user_message_chunk",
             messageId,
-            content: resource ?? {
+            content: {
               type: "text",
               text: chunk.text
             }
@@ -67717,14 +67591,16 @@ var macosProcessPlatform = {
 // src/engine/util/process/platform/windows.ts
 import { execFile as execFile4 } from "node:child_process";
 import { readFile as readFile5, realpath as realpath6 } from "node:fs/promises";
-import { dirname as dirname6, extname as extname2, join as join14, resolve as resolve8 } from "node:path";
+import { dirname as dirname6, extname, join as join14, resolve as resolve8 } from "node:path";
 
 // src/engine/util/process/process-error.ts
 var ProcessExecutionError = class extends Error {
   code;
+  diagnosticDetails;
   constructor(code, message, options = {}) {
     super(message, options);
     this.code = code;
+    this.diagnosticDetails = options.diagnosticDetails ?? {};
     this.name = "ProcessExecutionError";
   }
 };
@@ -67744,14 +67620,14 @@ function executableExtensions(executableName, environment) {
 async function resolveExecutableTarget(path7) {
   let resolvedPath;
   try {
-    resolvedPath = await realpath6(extname2(path7) === "" ? `${path7}.cmd` : path7);
+    resolvedPath = await realpath6(extname(path7) === "" ? `${path7}.cmd` : path7);
   } catch (cause) {
-    if (extname2(path7) !== "" || !(cause instanceof Error) || !("code" in cause) || cause.code !== "ENOENT") {
+    if (extname(path7) !== "" || !(cause instanceof Error) || !("code" in cause) || cause.code !== "ENOENT") {
       throw cause;
     }
     resolvedPath = await realpath6(path7);
   }
-  if (extname2(resolvedPath).toLowerCase() === ".cmd") {
+  if (extname(resolvedPath).toLowerCase() === ".cmd") {
     const shim = await readFile5(resolvedPath, "utf8");
     if (shim.includes('SET "NPM_CLI_JS=%~dp0\\node_modules\\npm\\bin\\npm-cli.js"') && shim.includes('"%NODE_EXE%" "%NPM_CLI_JS%" %*')) {
       return await realpath6(resolve8(dirname6(resolvedPath), "node_modules/npm/bin/npm-cli.js"));
@@ -68135,11 +68011,16 @@ async function runBoundedProcess(options) {
     abort();
   }
   try {
-    const exit = new Promise((resolveExit, rejectExit) => {
-      child.once("error", rejectExit);
-      child.once("exit", (code) => resolveExit(code ?? 1));
+    const completion = new Promise((resolveCompletion, rejectCompletion) => {
+      child.once("error", rejectCompletion);
+      child.once("exit", (code) => {
+        if (code !== 0) {
+          resolveCompletion(code ?? 1);
+        }
+      });
+      child.once("close", (code) => resolveCompletion(code ?? 1));
     });
-    const exitCode = await Promise.race([exit, interrupted.promise.then(() => -1)]);
+    const exitCode = await Promise.race([completion, interrupted.promise.then(() => -1)]);
     if (interruptionCleanupFailure !== null) {
       throw interruptionCleanupFailure;
     }
@@ -68151,12 +68032,19 @@ async function runBoundedProcess(options) {
     }
     return new ProcessResult(Buffer.concat(stdout).toString("utf8"), Buffer.concat(stderr).toString("utf8"));
   } catch (error62) {
-    if (error62 instanceof ProcessExecutionError) {
-      throw error62;
-    }
-    throw new ProcessExecutionError("process_spawn_failed", "The executable could not be started", {
+    const failure2 = error62 instanceof ProcessExecutionError ? error62 : new ProcessExecutionError("process_spawn_failed", "The executable could not be started", {
       cause: error62
     });
+    throw new ProcessExecutionError(failure2.code, failure2.message, {
+      cause: error62,
+      diagnosticDetails: {
+        stdoutBytes: stdoutBytes.toString(),
+        stderrBytes: stderrBytes.toString(),
+        outputLimitBytes: outputLimitBytes.toString(),
+        ...child.exitCode === null ? {} : { exitCode: child.exitCode.toString() },
+        ...child.signalCode === null ? {} : { signal: child.signalCode }
+      }
+    });
   } finally {
     clearTimeout(timeout);
     options.signal.removeEventListener("abort", abort);
@@ -71184,9 +71072,9 @@ import {
 // 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 basename5, dirname as dirname8, isAbsolute as isAbsolute12, join as join20 } from "node:path";
-import { RequestError as RequestError10 } from "@agentclientprotocol/sdk";
+import { RequestError as RequestError11 } from "@agentclientprotocol/sdk";
 
 // src/engine/acp/harness/pi/upstream/dist/pi-rpc/process.js
 import { spawn as spawn5 } from "node:child_process";
@@ -71699,8 +71587,62 @@ function toAvailableCommandsFromPiGetCommands(data, opts) {
   return { commands: out2, raw: commandsRaw };
 }
 
+// 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";
+var entrySchema = external_exports.object({
+  type: external_exports.string(),
+  id: external_exports.string(),
+  parentId: external_exports.string().nullable()
+}).passthrough();
+var messageSchema = external_exports.object({
+  role: external_exports.enum(["user", "assistant", "toolResult"]),
+  content: external_exports.unknown()
+}).passthrough();
+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;
+  }
+}
+
 // 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 join17, resolve as resolve10 } from "node:path";
 var DEFAULT_TAIL_BYTES = 256 * 1024;
 var DEFAULT_HEAD_BYTES = 64 * 1024;
@@ -71714,7 +71656,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;
@@ -71930,7 +71872,7 @@ function pickUpdatedAtFromTail(tail) {
 }
 function pickFallbackTitleFromHead(path7) {
   try {
-    const raw = readFileSync3(path7, { encoding: "utf8" });
+    const raw = readFileSync4(path7, { encoding: "utf8" });
     const lines = raw.split(/\r?\n/);
     for (const line0 of lines) {
       const line = line0.trim();
@@ -72026,7 +71968,7 @@ function findPiSession(sessionId, environment = process.env) {
 }
 
 // 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 join18, resolve as resolve11 } from "node:path";
 function isObject2(x) {
   return Boolean(x) && typeof x === "object" && !Array.isArray(x);
@@ -72048,7 +71990,7 @@ function readJsonFile2(path7) {
     if (!existsSync5(path7)) {
       return {};
     }
-    const raw = readFileSync4(path7, "utf-8");
+    const raw = readFileSync5(path7, "utf-8");
     const data = JSON.parse(raw);
     return isObject2(data) ? data : {};
   } catch {
@@ -72093,12 +72035,12 @@ function getQuietStartup(cwd, environment = process.env) {
 
 // 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";
 
 // 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";
 var questionBase = {
   id: external_exports.string().min(1).max(255),
   title: external_exports.string().max(255),
@@ -72115,7 +72057,7 @@ var questionSchema = external_exports.discriminatedUnion("method", [
   external_exports.object({ ...questionBase, method: external_exports.literal("editor"), prefill: external_exports.string().max(1e4).optional() })
 ]).readonly();
 var QUESTION_TIMEOUT_MS = 36e5;
-var PiQuestionError = class extends RequestError8 {
+var PiQuestionError = class extends RequestError9 {
   constructor(kind, cause) {
     const messages = {
       request_failed: "Pi could not request an answer.",
@@ -72253,7 +72195,7 @@ var PiExtensionQuestions = class {
         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 {
@@ -72267,14 +72209,14 @@ var PiExtensionQuestions = class {
 };
 
 // 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 dirname7 } from "node:path";
 function ensureParentDir(path7) {
   mkdirSync2(dirname7(path7), { recursive: true });
 }
 function loadFile(path7) {
   try {
-    const raw = readFileSync5(path7, "utf-8");
+    const raw = readFileSync6(path7, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed?.version !== 1 || typeof parsed.sessions !== "object" || !parsed.sessions) {
       return { version: 1, sessions: {} };
@@ -72319,7 +72261,7 @@ var SessionStore = class {
 };
 
 // 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 join19, resolve as resolve12 } from "node:path";
 function parseFrontmatter(content) {
   const frontmatter = {};
@@ -72358,7 +72300,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)";
@@ -72533,6 +72475,16 @@ ${stderr}`);
 }
 
 // src/engine/acp/harness/pi/upstream/dist/acp/session.js
+var 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() })
+    ]))
+  ])
+});
 function toUsageUpdate(stats) {
   const used = stats?.contextUsage?.tokens;
   const size = stats?.contextUsage?.contextWindow;
@@ -72678,7 +72630,7 @@ var SessionManager = class {
       });
     } catch (e) {
       if (e instanceof PiRpcSpawnError) {
-        throw RequestError9.internalError({ code: e.code }, e.message);
+        throw RequestError10.internalError({ code: e.code }, e.message);
       }
       throw e;
     }
@@ -72707,7 +72659,7 @@ var SessionManager = class {
   get(sessionId) {
     const s = this.sessions.get(sessionId);
     if (!s) {
-      throw RequestError9.invalidParams(`Unknown sessionId: ${sessionId}`);
+      throw RequestError10.invalidParams(`Unknown sessionId: ${sessionId}`);
     }
     return s;
   }
@@ -72807,8 +72759,8 @@ var PiAcpSession = class {
       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);
@@ -72876,12 +72828,12 @@ var PiAcpSession = class {
     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) {
@@ -72974,14 +72926,14 @@ var PiAcpSession = class {
     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}`
         })
@@ -73065,6 +73017,17 @@ var PiAcpSession = class {
   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")) {
@@ -73171,7 +73134,7 @@ var PiAcpSession = class {
           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)) {
@@ -73254,7 +73217,7 @@ var PiAcpSession = class {
         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 = [
@@ -73576,7 +73539,7 @@ var PiAcpAgent = class {
     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;
@@ -73589,7 +73552,7 @@ var PiAcpAgent = class {
         });
       } 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;
       }
@@ -73649,7 +73612,7 @@ var PiAcpAgent = class {
   }
   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);
@@ -73688,16 +73651,16 @@ var PiAcpAgent = class {
     }
     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 {
@@ -73707,7 +73670,7 @@ var PiAcpAgent = class {
       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);
@@ -73787,16 +73750,6 @@ var PiAcpAgent = class {
   }
   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" };
     }
@@ -73807,6 +73760,9 @@ var PiAcpAgent = class {
       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();
@@ -74068,7 +74024,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,
@@ -74112,7 +74068,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,
@@ -74235,7 +74191,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) {
@@ -74247,14 +74203,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" };
       }
     }
@@ -74288,11 +74236,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);
@@ -74354,13 +74302,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,
@@ -74425,13 +74373,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, {
@@ -74454,9 +74402,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);
@@ -74606,7 +74574,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);
@@ -74617,18 +74585,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) {
@@ -74784,7 +74752,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);
 }
@@ -74938,7 +74906,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);
@@ -75623,7 +75591,14 @@ async function probeVersion(executable, arguments_, environment, defaultWorkspac
   });
   const version2 = normalize4(result.stdout || result.stderr);
   if (version2.length === 0) {
-    throw new ProcessExecutionError("process_exit_failed", "The executable did not report a version");
+    throw new ProcessExecutionError("process_exit_failed", "The executable did not report a version", {
+      diagnosticDetails: {
+        probeReason: "empty_version_output",
+        exitCode: "0",
+        stdoutBytes: Buffer.byteLength(result.stdout).toString(),
+        stderrBytes: Buffer.byteLength(result.stderr).toString()
+      }
+    });
   }
   return version2;
 }
@@ -75645,9 +75620,27 @@ function isRetryableProbeFailure(error62) {
   }
   return error62 instanceof AgentProbeError && error62.code === "adapter_probe_timeout";
 }
-async function probeWithRetry(signal, probe) {
+async function probeWithRetry(context, specification, source, probe) {
+  const signal = context.signal;
+  const run = async (attempt) => {
+    const startedAt = performance.now();
+    try {
+      return await probe();
+    } catch (failure2) {
+      context.onProbeDiagnostic?.({
+        agentId: specification.id,
+        source,
+        event: signal.aborted ? "agent_probe_cancelled" : "agent_probe_failed",
+        attempt,
+        elapsedMilliseconds: Math.round(performance.now() - startedAt),
+        timeoutMilliseconds: source === "acp_readiness" ? specification.acpProbeTimeoutMilliseconds : specification.versionProbeTimeoutMilliseconds,
+        failure: failure2
+      });
+      throw failure2;
+    }
+  };
   try {
-    return await probe();
+    return await run(1);
   } catch (error62) {
     if (signal.aborted) {
       signal.throwIfAborted();
@@ -75655,7 +75648,7 @@ async function probeWithRetry(signal, probe) {
     if (!isRetryableProbeFailure(error62)) {
       throw error62;
     }
-    return await probe();
+    return await run(2);
   }
 }
 function integrationProbeFailure(specification, error62) {
@@ -75685,7 +75678,9 @@ async function discoverAgent(specification, context) {
     let agentVersion = "";
     try {
       agentVersion = await probeWithRetry(
-        context.signal,
+        context,
+        specification,
+        "agent_version",
         async () => await probeVersion(
           agent,
           specification.agentVersionArguments,
@@ -75733,7 +75728,9 @@ async function discoverAgent(specification, context) {
         launchEnvironment = await specification.createLaunchEnvironment(agent, context);
         if (specification.adapterVersionArguments.length > 0) {
           adapterVersion = await probeWithRetry(
-            context.signal,
+            context,
+            specification,
+            "adapter_version",
             async () => await probeVersion(
               adapter,
               specification.adapterVersionArguments,
@@ -75768,7 +75765,9 @@ async function discoverAgent(specification, context) {
       );
       try {
         const readiness = await probeWithRetry(
-          context.signal,
+          context,
+          specification,
+          "acp_readiness",
           async () => await probeAcpReadiness(
             specification,
             buildDefinition(adapterVersion, unsupportedSessionCapabilities()),
@@ -83471,6 +83470,266 @@ function describeEnvironmentProxyRoute(target) {
   };
 }
 
+// src/engine/runtime/observability/diagnostic-log.ts
+import { join as join26 } from "node:path";
+
+// src/engine/storage/logs/bounded-log.ts
+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 join24 } from "node:path";
+var BoundedLineLog = class {
+  #path;
+  #maximumBytes;
+  #directory;
+  #reportedFailure = false;
+  #onWriteFailure;
+  constructor(directory, filename, maximumBytes, onWriteFailure = () => void 0) {
+    this.#directory = directory;
+    this.#path = join24(directory, filename);
+    this.#maximumBytes = maximumBytes;
+    this.#onWriteFailure = onWriteFailure;
+  }
+  record = (line) => {
+    try {
+      mkdirSync4(this.#directory, { mode: 448, recursive: true });
+      this.#append(line);
+    } catch (cause) {
+      if (!this.#reportedFailure) {
+        this.#reportedFailure = true;
+        this.#onWriteFailure(cause);
+      }
+    }
+  };
+  #append = (line) => {
+    const encoded = `${line.replace(/[\r\n]+/gu, " ").trim()}
+`;
+    const encodedBytes = Buffer.byteLength(encoded);
+    let existingBytes = 0;
+    try {
+      existingBytes = statSync5(this.#path).size;
+    } catch (cause) {
+      if (!(cause instanceof Error && Reflect.get(cause, "code") === "ENOENT")) {
+        throw cause;
+      }
+    }
+    if (existingBytes + encodedBytes <= this.#maximumBytes) {
+      appendFileSync2(this.#path, encoded, { encoding: "utf8", mode: 384 });
+      return;
+    }
+    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();
+      if (oldest !== void 0) {
+        totalBytes -= Buffer.byteLength(oldest) + 1;
+      }
+    }
+    const temporaryPath = `${this.#path}.tmp`;
+    writeFileSync2(temporaryPath, lines.length === 0 ? "" : `${lines.join("\n")}
+`, {
+      encoding: "utf8",
+      mode: 384
+    });
+    renameSync2(temporaryPath, this.#path);
+  };
+};
+
+// src/engine/storage/logs/log-files.ts
+import { readFileSync as readFileSync11 } from "node:fs";
+import { join as join25 } from "node:path";
+var DAEMON_LOG_FILENAME = "daemon.log";
+var WORKER_LIFECYCLE_LOG_FILENAME = "worker-lifecycle.log";
+function unhandledRejectionLogFilename(role) {
+  return `unhandled-rejections-${role}.log`;
+}
+function logDirectory(dataDirectory) {
+  return join25(dataDirectory, "logs");
+}
+function processLogPaths(dataDirectory) {
+  return [
+    WORKER_LIFECYCLE_LOG_FILENAME,
+    unhandledRejectionLogFilename("manager"),
+    unhandledRejectionLogFilename("worker")
+  ].map((filename) => join25(logDirectory(dataDirectory), filename));
+}
+function readLogText(path7) {
+  try {
+    return readFileSync11(path7, "utf8");
+  } catch {
+    return null;
+  }
+}
+
+// src/engine/runtime/observability/diagnostic-log.ts
+var MAXIMUM_RUNTIME_LOG_BYTES = 1 * 1024 * 1024;
+var MAXIMUM_ENTRIES = 200;
+var MAXIMUM_REPORT_BYTES = 6e4;
+var REMOTE_DIAGNOSTIC_FIELDS = [
+  "agentId",
+  "operation",
+  "runtimeId",
+  "closeCode",
+  "timeoutMilliseconds",
+  "attempt",
+  "elapsedMilliseconds",
+  "stdoutBytes",
+  "stderrBytes",
+  "outputLimitBytes",
+  "probeReason",
+  "proxyRoute",
+  "timestamp",
+  "event",
+  "channelId",
+  "requestId",
+  "commandId",
+  "sessionId",
+  "turnId",
+  "connectionEpoch",
+  "code",
+  "source",
+  "kind",
+  "pid",
+  "version",
+  "exitCode",
+  "signal",
+  "failureName",
+  "failureCode",
+  "failureStatusCode",
+  "cause1Name",
+  "cause1Code",
+  "cause2Name",
+  "cause2Code"
+];
+var FIELD_VALUE_PATTERN = /^[a-zA-Z0-9_.: -]{1,256}$/u;
+var RuntimeDiagnosticLog = class {
+  #log;
+  #maximumBytes;
+  #sources;
+  constructor(stateDirectory, options = {}) {
+    const maximumBytes = options.maximumBytes ?? MAXIMUM_RUNTIME_LOG_BYTES;
+    const directory = logDirectory(stateDirectory);
+    this.#log = new BoundedLineLog(directory, DAEMON_LOG_FILENAME, maximumBytes);
+    this.#maximumBytes = maximumBytes;
+    const processLogsDirectory = options.processLogsDirectory;
+    this.#sources = [
+      { maximumBytes, path: join26(directory, DAEMON_LOG_FILENAME) },
+      // The process logs a Runtime does not own, but must read to explain its own deaths.
+      ...processLogsDirectory === void 0 ? [] : processLogPaths(processLogsDirectory).map((path7) => ({ maximumBytes: null, path: path7 }))
+    ];
+  }
+  // Export only correlation and failure metadata. Local messages and paths stay local.
+  snapshot = () => {
+    const merged = [];
+    let truncated = false;
+    for (const source of this.#sources) {
+      const collected = this.#read(source);
+      merged.push(...collected.entries);
+      truncated ||= collected.truncated;
+    }
+    merged.sort(compareTimestamp);
+    const entries = merged.slice(-MAXIMUM_ENTRIES);
+    truncated ||= entries.length < merged.length;
+    while (JSON.stringify(entries).length > MAXIMUM_REPORT_BYTES && entries.length > 0) {
+      entries.shift();
+      truncated = true;
+    }
+    return { entries, truncated };
+  };
+  record = (diagnostic) => {
+    this.#log.record(diagnostic);
+  };
+  #read = (source) => {
+    const content = readLogText(source.path);
+    if (content === null) {
+      return { entries: [], truncated: false };
+    }
+    const lines = content.split("\n").filter((line) => line.length > 0);
+    const entries = [];
+    for (const line of lines.slice(-MAXIMUM_ENTRIES)) {
+      const start = line.indexOf("{");
+      if (start < 0) {
+        continue;
+      }
+      let value;
+      try {
+        value = JSON.parse(line.slice(start));
+      } catch {
+        continue;
+      }
+      if (typeof value !== "object" || value === null) {
+        continue;
+      }
+      entries.push(exportedFields(value));
+    }
+    const nearRotation = source.maximumBytes !== null && Buffer.byteLength(content) >= source.maximumBytes - 4096;
+    return { entries, truncated: lines.length > MAXIMUM_ENTRIES || nearRotation };
+  };
+};
+function exportedFields(value) {
+  const entry = {};
+  for (const field of REMOTE_DIAGNOSTIC_FIELDS) {
+    const item = Reflect.get(value, field);
+    if (typeof item === "string" && FIELD_VALUE_PATTERN.test(item)) {
+      entry[field] = item;
+    } else if (typeof item === "number" && Number.isFinite(item)) {
+      entry[field] = String(item);
+    }
+  }
+  return entry;
+}
+function compareTimestamp(left, right) {
+  const leftAt = left["timestamp"] ?? "";
+  const rightAt = right["timestamp"] ?? "";
+  return leftAt < rightAt ? -1 : leftAt > rightAt ? 1 : 0;
+}
+
+// src/engine/runtime/catalog/discover-agent-catalog.ts
+function failureDetails(failure2) {
+  const fields = {};
+  let current = failure2;
+  for (let depth = 0; depth < 3 && current instanceof Error; depth += 1) {
+    const prefix = depth === 0 ? "failure" : `cause${depth.toString()}`;
+    if (current instanceof ProcessExecutionError || current instanceof AgentProbeError) {
+      fields[`${prefix}Name`] = current instanceof ProcessExecutionError ? "ProcessExecutionError" : "AgentProbeError";
+      fields[`${prefix}Code`] = current.code;
+    } else {
+      fields[`${prefix}Name`] = "Error";
+    }
+    if (depth === 0 && current instanceof ProcessExecutionError) {
+      Object.assign(fields, current.diagnosticDetails);
+    }
+    current = current.cause;
+  }
+  return fields;
+}
+async function discoverRuntimeAgentInventory(options, channelId) {
+  const log = new RuntimeDiagnosticLog(options.dataDirectory);
+  const record2 = (details) => {
+    log.record(
+      `Mobius agent discovery diagnostic ${JSON.stringify({
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        channelId,
+        ...details
+      })}`
+    );
+  };
+  const inventory = await discoverLocalAgentInventory({
+    ...options,
+    onProbeDiagnostic: ({ failure: failure2, ...diagnostic }) => {
+      record2({ ...diagnostic, ...failureDetails(failure2) });
+    }
+  });
+  for (const { discovery, detectionMilliseconds } of inventory.results) {
+    record2({
+      event: "agent_discovery_result",
+      agentId: discovery.specification.id,
+      code: discovery instanceof UnavailableAgent ? discovery.code : "ready",
+      source: discovery.status,
+      elapsedMilliseconds: detectionMilliseconds
+    });
+  }
+  return inventory;
+}
+
 // src/engine/runtime/catalog/publish-agent-catalog.ts
 import { fetch as fetch2 } from "undici";
 
@@ -83917,21 +84176,27 @@ function buildSavedRuntimeConfig(connection, defaultWorkspace, inventory, localC
     localContext,
     new OpaqueRuntimeReconnectTarget(connection.connectionId),
     createCatalogAgentResolver(
-      (refreshSignal) => discoverLocalAgentInventory({
+      (refreshSignal) => discoverRuntimeAgentInventory(
+        {
+          defaultWorkspace,
+          dataDirectory: localContext.stateDirectory,
+          environment: localContext.agentLaunchEnvironment,
+          signal: refreshSignal
+        },
+        connection.channelId
+      ),
+      () => config2,
+      publishAgentCatalog
+    ),
+    (refreshSignal) => discoverRuntimeAgentInventory(
+      {
         defaultWorkspace,
         dataDirectory: localContext.stateDirectory,
         environment: localContext.agentLaunchEnvironment,
         signal: refreshSignal
-      }),
-      () => config2,
-      publishAgentCatalog
-    ),
-    (refreshSignal) => discoverLocalAgentInventory({
-      defaultWorkspace,
-      dataDirectory: localContext.stateDirectory,
-      environment: localContext.agentLaunchEnvironment,
-      signal: refreshSignal
-    }).then((inventory2) => inventory2.readyAgents())
+      },
+      connection.channelId
+    ).then((inventory2) => inventory2.readyAgents())
   );
   return config2;
 }
@@ -83975,12 +84240,15 @@ async function pairRuntimeConnection(installation, options, signal, environment)
 async function prepareRuntimeConnection(installation, connection, signal, environment, maxAcpProcesses) {
   const localContext = new RuntimeLocalContext(installation.stateDirectory, environment, maxAcpProcesses);
   const defaultWorkspace = await resolveDefaultWorkspace(connection.defaultWorkspace);
-  const inventory = await discoverLocalAgentInventory({
-    defaultWorkspace,
-    dataDirectory: localContext.stateDirectory,
-    environment: localContext.agentLaunchEnvironment,
-    signal
-  });
+  const inventory = await discoverRuntimeAgentInventory(
+    {
+      defaultWorkspace,
+      dataDirectory: localContext.stateDirectory,
+      environment: localContext.agentLaunchEnvironment,
+      signal
+    },
+    connection.channelId
+  );
   return buildSavedRuntimeConfig(connection, defaultWorkspace, inventory, localContext);
 }
 
@@ -84926,7 +85194,7 @@ var SessionConfigurations = class {
   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) {
@@ -85118,6 +85386,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 lifecycleResponse;
   if (origin?.kind === "fork") {
     if (!session.capabilities.unstableForkSession) {
@@ -85279,7 +85548,9 @@ async function restoreSession(session, signal, recovery, origin) {
   }
   session.restrictSessionCapabilities(lifecycleResponse);
   session.setConfigOptions(session.sessionConfigProtocol.normalizeLifecycle(lifecycleResponse));
-  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();
@@ -85491,13 +85762,31 @@ var AgentSession = class _AgentSession {
       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);
@@ -86938,7 +87227,8 @@ var NativeSessionService = class {
         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);
@@ -87548,6 +87838,11 @@ var ExecutionReceipts = class {
         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);
@@ -88069,7 +88364,7 @@ var SessionTurns = class {
 
 // src/engine/session/workspace/workspace-directory.ts
 import { homedir as homedir3 } from "node:os";
-import { basename as basename7, dirname as dirname10, isAbsolute as isAbsolute15, join as join24, normalize as normalize2, relative as relative2 } from "node:path";
+import { basename as basename7, dirname as dirname10, isAbsolute as isAbsolute15, join as join27, normalize as normalize2, relative as relative2 } from "node:path";
 var WorkspaceDirectoryListing = class {
   directoryId;
   directoryLabel;
@@ -88192,7 +88487,7 @@ var WorkspaceDirectoryService = class {
           continue;
         }
         try {
-          const path7 = await this.resolvePath(join24(target, child.name), signal);
+          const path7 = await this.resolvePath(join27(target, child.name), signal);
           entries.push({ directoryId: encodePath(path7), name: child.name });
         } catch (cause) {
           signal.throwIfAborted();
@@ -88348,12 +88643,12 @@ function buildSessionLayer(options) {
 
 // src/engine/session/content/external-content-store.ts
 import { createHash as createHash8 } from "node:crypto";
-import { extname as extname3, join as join26 } from "node:path";
+import { extname as extname2, join as join29 } from "node:path";
 
 // src/engine/storage/files/scratch-directory.ts
 import { randomUUID as randomUUID17 } from "node:crypto";
 import { lstat as lstat4, mkdir as mkdir5, readdir as readdir6, readFile as readFile6, realpath as realpath7, rename as rename4, rm as rm3, stat as stat6, utimes, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname11, join as join25 } from "node:path";
+import { dirname as dirname11, join as join28 } from "node:path";
 async function atomicWrite(path7, bytes, signal) {
   const temporary = `${path7}.${randomUUID17()}.tmp`;
   try {
@@ -88367,7 +88662,7 @@ async function atomicWrite(path7, bytes, signal) {
 var ScratchDirectory = class {
   #root;
   constructor(parent) {
-    this.#root = join25(parent, randomUUID17());
+    this.#root = join28(parent, randomUUID17());
   }
   /** Refreshes this directory's lease and removes sibling directories whose lease is older than `leaseMilliseconds`. */
   refreshLease = async (leaseMilliseconds) => {
@@ -88378,7 +88673,7 @@ var ScratchDirectory = class {
       if (!directory.isDirectory() || !/^[a-f0-9-]{36}$/u.test(directory.name)) {
         continue;
       }
-      const path7 = join25(dirname11(this.#root), directory.name);
+      const path7 = join28(dirname11(this.#root), directory.name);
       if (path7 === this.#root) {
         continue;
       }
@@ -88393,10 +88688,10 @@ var ScratchDirectory = class {
   };
   /** Writes `bytes` atomically to `<group>/<name>` with owner-only permissions and returns the path. */
   write = async (group, name2, bytes, signal) => {
-    const directory = join25(this.#root, group);
+    const directory = join28(this.#root, group);
     await mkdir5(directory, { mode: 448, recursive: true });
     signal.throwIfAborted();
-    const path7 = join25(directory, name2);
+    const path7 = join28(directory, name2);
     await atomicWrite(path7, bytes, signal);
     return path7;
   };
@@ -88436,7 +88731,7 @@ var metadataSchema = external_exports.strictObject({
   name: external_exports.string().min(1).max(500)
 });
 function contentFileName(key, name2) {
-  const extension = extname3(name2).toLowerCase();
+  const extension = extname2(name2).toLowerCase();
   return /^\.[a-z0-9]{1,16}$/u.test(extension) ? `${key}${extension}` : key;
 }
 var LocalExternalContentStore = class {
@@ -88447,7 +88742,7 @@ var LocalExternalContentStore = class {
   #expirationTimer;
   #cleanup = Promise.resolve();
   constructor(stateDirectory) {
-    this.#scratch = new ScratchDirectory(join26(stateDirectory, "tmp", "session-content"));
+    this.#scratch = new ScratchDirectory(join29(stateDirectory, "tmp", "session-content"));
     this.#expirationTimer = setInterval(() => {
       void this.#expire().catch(() => void 0);
     }, 6e4);
@@ -88821,212 +89116,6 @@ var AgentProcessPool = class {
   };
 };
 
-// src/engine/runtime/observability/diagnostic-log.ts
-import { join as join29 } from "node:path";
-
-// 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 { join as join27 } from "node:path";
-var BoundedLineLog = class {
-  #path;
-  #maximumBytes;
-  #directory;
-  #reportedFailure = false;
-  #onWriteFailure;
-  constructor(directory, filename, maximumBytes, onWriteFailure = () => void 0) {
-    this.#directory = directory;
-    this.#path = join27(directory, filename);
-    this.#maximumBytes = maximumBytes;
-    this.#onWriteFailure = onWriteFailure;
-  }
-  record = (line) => {
-    try {
-      mkdirSync4(this.#directory, { mode: 448, recursive: true });
-      this.#append(line);
-    } catch (cause) {
-      if (!this.#reportedFailure) {
-        this.#reportedFailure = true;
-        this.#onWriteFailure(cause);
-      }
-    }
-  };
-  #append = (line) => {
-    const encoded = `${line.replace(/[\r\n]+/gu, " ").trim()}
-`;
-    const encodedBytes = Buffer.byteLength(encoded);
-    let existingBytes = 0;
-    try {
-      existingBytes = statSync5(this.#path).size;
-    } catch (cause) {
-      if (!(cause instanceof Error && Reflect.get(cause, "code") === "ENOENT")) {
-        throw cause;
-      }
-    }
-    if (existingBytes + encodedBytes <= this.#maximumBytes) {
-      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);
-    let totalBytes = lines.reduce((total, candidate) => total + Buffer.byteLength(candidate) + 1, 0);
-    while (totalBytes > this.#maximumBytes && lines.length > 0) {
-      const oldest = lines.shift();
-      if (oldest !== void 0) {
-        totalBytes -= Buffer.byteLength(oldest) + 1;
-      }
-    }
-    const temporaryPath = `${this.#path}.tmp`;
-    writeFileSync2(temporaryPath, lines.length === 0 ? "" : `${lines.join("\n")}
-`, {
-      encoding: "utf8",
-      mode: 384
-    });
-    renameSync2(temporaryPath, this.#path);
-  };
-};
-
-// src/engine/storage/logs/log-files.ts
-import { readFileSync as readFileSync10 } from "node:fs";
-import { join as join28 } from "node:path";
-var DAEMON_LOG_FILENAME = "daemon.log";
-var WORKER_LIFECYCLE_LOG_FILENAME = "worker-lifecycle.log";
-function unhandledRejectionLogFilename(role) {
-  return `unhandled-rejections-${role}.log`;
-}
-function logDirectory(dataDirectory) {
-  return join28(dataDirectory, "logs");
-}
-function processLogPaths(dataDirectory) {
-  return [
-    WORKER_LIFECYCLE_LOG_FILENAME,
-    unhandledRejectionLogFilename("manager"),
-    unhandledRejectionLogFilename("worker")
-  ].map((filename) => join28(logDirectory(dataDirectory), filename));
-}
-function readLogText(path7) {
-  try {
-    return readFileSync10(path7, "utf8");
-  } catch {
-    return null;
-  }
-}
-
-// src/engine/runtime/observability/diagnostic-log.ts
-var MAXIMUM_RUNTIME_LOG_BYTES = 1 * 1024 * 1024;
-var MAXIMUM_ENTRIES = 200;
-var MAXIMUM_REPORT_BYTES = 6e4;
-var REMOTE_DIAGNOSTIC_FIELDS = [
-  "agentId",
-  "operation",
-  "runtimeId",
-  "closeCode",
-  "timeoutMilliseconds",
-  "proxyRoute",
-  "timestamp",
-  "event",
-  "channelId",
-  "requestId",
-  "commandId",
-  "sessionId",
-  "turnId",
-  "connectionEpoch",
-  "code",
-  "source",
-  "kind",
-  "pid",
-  "version",
-  "exitCode",
-  "signal",
-  "failureName",
-  "failureCode",
-  "failureStatusCode",
-  "cause1Name",
-  "cause1Code",
-  "cause2Name",
-  "cause2Code"
-];
-var FIELD_VALUE_PATTERN = /^[a-zA-Z0-9_.: -]{1,256}$/u;
-var RuntimeDiagnosticLog = class {
-  #log;
-  #maximumBytes;
-  #sources;
-  constructor(stateDirectory, options = {}) {
-    const maximumBytes = options.maximumBytes ?? MAXIMUM_RUNTIME_LOG_BYTES;
-    const directory = logDirectory(stateDirectory);
-    this.#log = new BoundedLineLog(directory, DAEMON_LOG_FILENAME, maximumBytes);
-    this.#maximumBytes = maximumBytes;
-    const processLogsDirectory = options.processLogsDirectory;
-    this.#sources = [
-      { maximumBytes, path: join29(directory, DAEMON_LOG_FILENAME) },
-      // The process logs a Runtime does not own, but must read to explain its own deaths.
-      ...processLogsDirectory === void 0 ? [] : processLogPaths(processLogsDirectory).map((path7) => ({ maximumBytes: null, path: path7 }))
-    ];
-  }
-  // Export only correlation and failure metadata. Local messages and paths stay local.
-  snapshot = () => {
-    const merged = [];
-    let truncated = false;
-    for (const source of this.#sources) {
-      const collected = this.#read(source);
-      merged.push(...collected.entries);
-      truncated ||= collected.truncated;
-    }
-    merged.sort(compareTimestamp);
-    const entries = merged.slice(-MAXIMUM_ENTRIES);
-    truncated ||= entries.length < merged.length;
-    while (JSON.stringify(entries).length > MAXIMUM_REPORT_BYTES && entries.length > 0) {
-      entries.shift();
-      truncated = true;
-    }
-    return { entries, truncated };
-  };
-  record = (diagnostic) => {
-    this.#log.record(diagnostic);
-  };
-  #read = (source) => {
-    const content = readLogText(source.path);
-    if (content === null) {
-      return { entries: [], truncated: false };
-    }
-    const lines = content.split("\n").filter((line) => line.length > 0);
-    const entries = [];
-    for (const line of lines.slice(-MAXIMUM_ENTRIES)) {
-      const start = line.indexOf("{");
-      if (start < 0) {
-        continue;
-      }
-      let value;
-      try {
-        value = JSON.parse(line.slice(start));
-      } catch {
-        continue;
-      }
-      if (typeof value !== "object" || value === null) {
-        continue;
-      }
-      entries.push(exportedFields(value));
-    }
-    const nearRotation = source.maximumBytes !== null && Buffer.byteLength(content) >= source.maximumBytes - 4096;
-    return { entries, truncated: lines.length > MAXIMUM_ENTRIES || nearRotation };
-  };
-};
-function exportedFields(value) {
-  const entry = {};
-  for (const field of REMOTE_DIAGNOSTIC_FIELDS) {
-    const item = Reflect.get(value, field);
-    if (typeof item === "string" && FIELD_VALUE_PATTERN.test(item)) {
-      entry[field] = item;
-    } else if (typeof item === "number" && Number.isFinite(item)) {
-      entry[field] = String(item);
-    }
-  }
-  return entry;
-}
-function compareTimestamp(left, right) {
-  const leftAt = left["timestamp"] ?? "";
-  const rightAt = right["timestamp"] ?? "";
-  return leftAt < rightAt ? -1 : leftAt > rightAt ? 1 : 0;
-}
-
 // src/engine/runtime/relay/diagnostics.ts
 var MAX_DIAGNOSTIC_TEXT_LENGTH = 256;
 function sanitizeDiagnosticText(value) {
@@ -89951,7 +90040,7 @@ function createContentWriteCommands(context) {
 import { WebSocket as WebSocket5 } from "undici";
 
 // src/engine/session/content/session-files.ts
-import { basename as basename8, extname as extname4, isAbsolute as isAbsolute16, join as join30, normalize as normalize3, resolve as resolve16 } from "node:path";
+import { basename as basename8, extname as extname3, isAbsolute as isAbsolute16, join as join30, normalize as normalize3, resolve as resolve16 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function requestedPath(value) {
   if (value.includes("\0")) {
@@ -90007,7 +90096,7 @@ async function streamLocalFile(command, send2, sendChunk, signal, workingDirecto
   send2({
     byteLength: before.size,
     kind: FILE_BEGIN_KIND,
-    mediaType: external?.mediaType ?? raster?.mimeType ?? (extname4(target).toLowerCase() === ".svg" ? "image/svg+xml" : "application/octet-stream"),
+    mediaType: external?.mediaType ?? raster?.mimeType ?? (extname3(target).toLowerCase() === ".svg" ? "image/svg+xml" : "application/octet-stream"),
     modifiedAt: before.modifiedAt.toISOString(),
     name: external?.name ?? (basename8(target) || "file"),
     requestId: command.requestId,
@@ -90312,10 +90401,19 @@ var sessionCancelBeforeStartCommand = {
     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);
         });
@@ -90787,6 +90885,7 @@ async function executePrompt({
       );
       prepared = await sessions.prepareExecutionSession(preparation);
     }
+    signal.throwIfAborted();
     operations.markExecutionStarted(command.commandId);
     if (availability.disposition === SessionPromptDisposition.Steer) {
       if (!recordSteeringPrompt()) {
@@ -90969,7 +91068,7 @@ var sessionPromptCommand = {
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.354",
+  version: "0.0.356",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -92426,13 +92525,16 @@ async function prepareProvidedRuntime({
   const defaultWorkspace = await resolveWorkspace(connection.defaultWorkspace);
   const specifications = supportedLocalAgentSpecifications();
   const discoveryEnvironment = localContext.agentLaunchEnvironment;
-  const discover = async (refreshSignal) => await discoverLocalAgentInventory({
-    defaultWorkspace,
-    dataDirectory: localContext.stateDirectory,
-    environment: discoveryEnvironment,
-    signal: refreshSignal,
-    specifications
-  });
+  const discover = async (refreshSignal) => await discoverRuntimeAgentInventory(
+    {
+      defaultWorkspace,
+      dataDirectory: localContext.stateDirectory,
+      environment: discoveryEnvironment,
+      signal: refreshSignal,
+      specifications
+    },
+    connection.channelId
+  );
   const inventory = await discover(signal);
   const config2 = createRuntimeConfig(
     {