@moxt-ai/mobius 0.0.354 → 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.354",
+      version: "0.0.356",
       description: "Mobius CLI for pairing and running local AI agent services.",
       type: "module",
       bin: {
@@ -26964,7 +26964,7 @@ function sanitizeConsumableNativeSessionEvents(value) {
     )
   };
 }
-var MAX_EVENT_COUNT, MAX_COLLECTION_SIZE2, MAX_CONTENT_LENGTH2, SESSION_EVENT_KIND, SESSION_EVENT_BATCH_MAX_SIZE, boundedString2, shortString, externalContentKeySchema, annotationsSchema, contentFields, textContentSchema, imageContentSchema, audioContentSchema, externalImageContentSchema, externalAudioContentSchema, externalResourceContentSchema, resourceLinkSchema, textResourceSchema, blobResourceSchema, embeddedResourceSchema, contentBlockSchema, toolCallContentSchema, toolKindSchema, toolStatusSchema, backgroundTaskSchema, toolPatchFields, planEntrySchema, planContentSchema, commandSchema, configSelectOptionSchema, configSelectGroupSchema, configBaseFields, sessionConfigOptionSchema2, contentChunkFields, acpSessionUpdateSchema, lifecycleBase, promptExecutionContextSchema, lifecycleMetadataSchema, sessionEventPayloadSchema, positionSchema, sharedSessionEventFields, sessionLiveEventFields, sessionEventSchema, sessionLiveEventSchema, wireLifecyclePayloadSchema, wireEventFields, sessionWireEventSchema, sessionWireEnvelopeSchema, sessionEventBatchSchema, sessionLiveEventBatchSchema, sessionExportSchema, mobiusSessionExportSchema, sessionEventEnvelopeSchema, sessionEventLogPageSchema, sessionEventOmissionSchema, nativeEventPageRequestSchema, queuedPromptRequestEventLogSchema, nativeSessionEventsSchema, knownSessionLiveEventBatchSchema, decodeSessionEvent, decodeKnownSessionEventPayload, decodeSessionEventEnvelope, encodeSessionEventEnvelope, decodeAcpSessionUpdate, decodeKnownNativeSessionEvents;
+var MAX_EVENT_COUNT, MAX_COLLECTION_SIZE2, MAX_CONTENT_LENGTH2, SESSION_EVENT_KIND, SESSION_EVENT_BATCH_MAX_SIZE, boundedString2, shortString, externalContentKeySchema, annotationsSchema, contentFields, textContentSchema, imageContentSchema, audioContentSchema, externalImageContentSchema, externalAudioContentSchema, externalResourceContentSchema, resourceLinkSchema, textResourceSchema, blobResourceSchema, embeddedResourceSchema, contentBlockSchema, toolCallContentSchema, toolKindSchema, toolStatusSchema, backgroundTaskSchema, toolPatchFields, planEntrySchema, planContentSchema, commandSchema, configSelectOptionSchema, configSelectGroupSchema, configBaseFields, sessionConfigOptionSchema2, contentChunkFields, acpSessionUpdateSchema, lifecycleBase, promptExecutionContextSchema, lifecycleMetadataSchema, sessionEventPayloadSchema, positionSchema, sharedSessionEventFields, sessionLiveEventFields, sessionEventSchema, sessionLiveEventSchema, wireLifecyclePayloadSchema, wireEventFields, sessionWireEventSchema, sessionWireEnvelopeSchema, sessionEventBatchSchema, sessionLiveEventBatchSchema, sessionEventEnvelopeSchema, sessionEventLogPageSchema, nativeEventPageRequestSchema, queuedPromptRequestEventLogSchema, nativeSessionEventsSchema, knownSessionLiveEventBatchSchema, decodeSessionEvent, decodeKnownSessionEventPayload, decodeSessionEventEnvelope, encodeSessionEventEnvelope, decodeAcpSessionUpdate, decodeKnownNativeSessionEvents;
 var init_events = __esm({
   "../mobius-sdk/src/protocol/session/events/index.ts"() {
     "use strict";
@@ -27308,38 +27308,6 @@ var init_events = __esm({
     }).passthrough().readonly();
     sessionEventBatchSchema = external_exports.array(sessionEventSchema).min(1).max(SESSION_EVENT_BATCH_MAX_SIZE).readonly();
     sessionLiveEventBatchSchema = external_exports.array(sessionLiveEventSchema).min(1).max(SESSION_EVENT_BATCH_MAX_SIZE).readonly();
-    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);
-      }
-    });
-    mobiusSessionExportSchema = external_exports.object({
-      formatVersion: external_exports.literal("2"),
-      session: sessionExportSchema
-    }).readonly();
     sessionEventEnvelopeSchema = external_exports.object({ events: sessionLiveEventBatchSchema, kind: external_exports.literal(SESSION_EVENT_KIND) }).readonly();
     sessionEventLogPageSchema = external_exports.object({
       events: external_exports.array(sessionEventSchema).max(MAX_EVENT_COUNT).readonly(),
@@ -27352,12 +27320,9 @@ var init_events = __esm({
       truncated: external_exports.boolean(),
       version: external_exports.literal(2)
     }).readonly();
-    sessionEventOmissionSchema = external_exports.literal("agent-reasoning");
     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();
     queuedPromptRequestEventLogSchema = external_exports.object({
       commandId: identifierStringSchema,
@@ -27998,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,
@@ -28066,8 +28033,6 @@ var init_history = __esm({
     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
     };
@@ -65844,7 +65809,6 @@ var init_background_task_notifications = __esm({
 });
 
 // src/engine/acp/harness/claude/upstream/dist/context-resources.js
-import { extname } from "node:path";
 function formatUriAsLink(uri) {
   if (uri.startsWith("file://")) {
     const path8 = uri.slice(7);
@@ -65855,91 +65819,6 @@ function formatUriAsLink(uri) {
   }
   return uri;
 }
-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;
-}
 var formatContextBlock;
 var init_context_resources = __esm({
   "src/engine/acp/harness/claude/upstream/dist/context-resources.js"() {
@@ -70302,13 +70181,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": {
@@ -70317,7 +70191,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
             }
@@ -74294,9 +74168,11 @@ var init_process_error = __esm({
     "use strict";
     ProcessExecutionError = class extends Error {
       code;
+      diagnosticDetails;
       constructor(code, message, options = {}) {
         super(message, options);
         this.code = code;
+        this.diagnosticDetails = options.diagnosticDetails ?? {};
         this.name = "ProcessExecutionError";
       }
     };
@@ -74306,7 +74182,7 @@ var init_process_error = __esm({
 // src/engine/util/process/platform/windows.ts
 import { execFile as execFile4 } from "node:child_process";
 import { readFile as readFile6, realpath as realpath6 } from "node:fs/promises";
-import { dirname as dirname7, extname as extname2, join as join16, resolve as resolve9 } from "node:path";
+import { dirname as dirname7, extname, join as join16, resolve as resolve9 } from "node:path";
 function environmentValue2(environment, name2) {
   return Object.entries(environment).find(([key]) => key.toUpperCase() === name2.toUpperCase())?.[1];
 }
@@ -74321,14 +74197,14 @@ function executableExtensions(executableName, environment) {
 async function resolveExecutableTarget(path8) {
   let resolvedPath;
   try {
-    resolvedPath = await realpath6(extname2(path8) === "" ? `${path8}.cmd` : path8);
+    resolvedPath = await realpath6(extname(path8) === "" ? `${path8}.cmd` : path8);
   } catch (cause) {
-    if (extname2(path8) !== "" || !(cause instanceof Error) || !("code" in cause) || cause.code !== "ENOENT") {
+    if (extname(path8) !== "" || !(cause instanceof Error) || !("code" in cause) || cause.code !== "ENOENT") {
       throw cause;
     }
     resolvedPath = await realpath6(path8);
   }
-  if (extname2(resolvedPath).toLowerCase() === ".cmd") {
+  if (extname(resolvedPath).toLowerCase() === ".cmd") {
     const shim = await readFile6(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(resolve9(dirname7(resolvedPath), "node_modules/npm/bin/npm-cli.js"));
@@ -74693,11 +74569,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;
     }
@@ -74709,12 +74590,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);
@@ -78463,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"];
@@ -78476,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;
@@ -78692,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();
@@ -78797,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);
@@ -78819,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 {
@@ -78869,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) {
@@ -78917,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.",
@@ -79029,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 {
@@ -79045,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: {} };
@@ -79104,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 = {};
@@ -79143,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)";
@@ -79335,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;
@@ -79452,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();
@@ -79463,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();
@@ -79511,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;
         }
@@ -79540,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;
       }
@@ -79640,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);
@@ -79709,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) {
@@ -79807,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}`
             })
@@ -79898,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")) {
@@ -80004,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)) {
@@ -80087,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 = [
@@ -80264,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(" ");
 }
@@ -80470,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);
 }
@@ -80624,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);
@@ -80657,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();
@@ -80752,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;
@@ -80765,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;
           }
@@ -80825,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);
@@ -80864,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 {
@@ -80883,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);
@@ -80963,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" };
         }
@@ -80983,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();
@@ -81244,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,
@@ -81288,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,
@@ -81411,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) {
@@ -81423,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" };
           }
         }
@@ -81464,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);
@@ -81530,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,
@@ -81601,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, {
@@ -81630,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);
@@ -81782,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);
@@ -81793,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) {
@@ -82580,7 +82557,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;
 }
@@ -82609,9 +82593,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();
@@ -82619,7 +82621,7 @@ async function probeWithRetry(signal, probe) {
     if (!isRetryableProbeFailure(error62)) {
       throw error62;
     }
-    return await probe();
+    return await run(2);
   }
 }
 function integrationProbeFailure(specification, error62) {
@@ -82649,7 +82651,9 @@ async function discoverAgent(specification, context) {
     let agentVersion = "";
     try {
       agentVersion = await probeWithRetry(
-        context.signal,
+        context,
+        specification,
+        "agent_version",
         async () => await probeVersion(
           agent,
           specification.agentVersionArguments,
@@ -82697,7 +82701,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,
@@ -82732,7 +82738,9 @@ async function discoverAgent(specification, context) {
       );
       try {
         const readiness = await probeWithRetry(
-          context.signal,
+          context,
+          specification,
+          "acp_readiness",
           async () => await probeAcpReadiness(
             specification,
             buildDefinition(adapterVersion, unsupportedSessionCapabilities()),
@@ -91272,6 +91280,294 @@ var init_environment_proxy = __esm({
   }
 });
 
+// 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 join26 } from "node:path";
+var BoundedLineLog;
+var init_bounded_log = __esm({
+  "src/engine/storage/logs/bounded-log.ts"() {
+    "use strict";
+    BoundedLineLog = class {
+      #path;
+      #maximumBytes;
+      #directory;
+      #reportedFailure = false;
+      #onWriteFailure;
+      constructor(directory, filename, maximumBytes, onWriteFailure = () => void 0) {
+        this.#directory = directory;
+        this.#path = join26(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 join27 } from "node:path";
+function unhandledRejectionLogFilename(role) {
+  return `unhandled-rejections-${role}.log`;
+}
+function logDirectory(dataDirectory) {
+  return join27(dataDirectory, "logs");
+}
+function processLogPaths(dataDirectory) {
+  return [
+    WORKER_LIFECYCLE_LOG_FILENAME,
+    unhandledRejectionLogFilename("manager"),
+    unhandledRejectionLogFilename("worker")
+  ].map((filename) => join27(logDirectory(dataDirectory), filename));
+}
+function readLogText(path8) {
+  try {
+    return readFileSync11(path8, "utf8");
+  } catch {
+    return null;
+  }
+}
+var DAEMON_LOG_FILENAME, WORKER_LIFECYCLE_LOG_FILENAME;
+var init_log_files = __esm({
+  "src/engine/storage/logs/log-files.ts"() {
+    "use strict";
+    DAEMON_LOG_FILENAME = "daemon.log";
+    WORKER_LIFECYCLE_LOG_FILENAME = "worker-lifecycle.log";
+  }
+});
+
+// src/engine/runtime/observability/diagnostic-log.ts
+import { join as join28 } from "node:path";
+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;
+}
+var MAXIMUM_RUNTIME_LOG_BYTES, MAXIMUM_ENTRIES, MAXIMUM_REPORT_BYTES, REMOTE_DIAGNOSTIC_FIELDS, FIELD_VALUE_PATTERN, RuntimeDiagnosticLog;
+var init_diagnostic_log = __esm({
+  "src/engine/runtime/observability/diagnostic-log.ts"() {
+    "use strict";
+    init_bounded_log();
+    init_log_files();
+    MAXIMUM_RUNTIME_LOG_BYTES = 1 * 1024 * 1024;
+    MAXIMUM_ENTRIES = 200;
+    MAXIMUM_REPORT_BYTES = 6e4;
+    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"
+    ];
+    FIELD_VALUE_PATTERN = /^[a-zA-Z0-9_.: -]{1,256}$/u;
+    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: join28(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((path8) => ({ maximumBytes: null, path: path8 }))
+        ];
+      }
+      // 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 };
+      };
+    };
+  }
+});
+
+// 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;
+}
+var init_discover_agent_catalog = __esm({
+  "src/engine/runtime/catalog/discover-agent-catalog.ts"() {
+    "use strict";
+    init_agent_discovery();
+    init_agent_probe_error();
+    init_discover_local_agents();
+    init_process_error();
+    init_diagnostic_log();
+  }
+});
+
 // src/engine/runtime/relay/relay-authentication.ts
 function runtimeCredential(relayUrl) {
   return relayUrl.searchParams.get("token") ?? "";
@@ -91746,21 +92042,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;
 }
@@ -91804,12 +92106,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);
 }
 var PAIRING_TIMEOUT_MILLISECONDS, PAIRING_CODE_PATTERN, TOKEN_PATTERN, CLAIM_RESPONSE_KEYS, REDEEM_RESPONSE_KEYS, PairingClientError;
@@ -91822,6 +92127,7 @@ var init_pairing = __esm({
     init_local_files();
     init_environment_proxy();
     init_value_utils();
+    init_discover_agent_catalog();
     init_publish_agent_catalog();
     init_resolve_catalog_agent();
     init_config();
@@ -92990,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) {
@@ -93199,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) {
@@ -93360,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();
@@ -93604,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);
@@ -95096,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);
@@ -95730,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);
@@ -96282,7 +96615,7 @@ var init_session_turns = __esm({
 
 // src/engine/session/workspace/workspace-directory.ts
 import { homedir as homedir4 } from "node:os";
-import { basename as basename8, dirname as dirname11, isAbsolute as isAbsolute15, join as join26, normalize as normalize2, relative as relative2 } from "node:path";
+import { basename as basename8, dirname as dirname11, isAbsolute as isAbsolute15, join as join29, normalize as normalize2, relative as relative2 } from "node:path";
 function encodePath(path8) {
   const encoded = Buffer.from(path8, "utf8").toString("base64url");
   if (path8.length === 0 || path8.length > MAX_WORKSPACE_PATH_LENGTH || encoded.length + "path-".length > MAX_DIRECTORY_IDENTIFIER_LENGTH) {
@@ -96412,7 +96745,7 @@ var init_workspace_directory = __esm({
               continue;
             }
             try {
-              const path8 = await this.resolvePath(join26(target, child.name), signal);
+              const path8 = await this.resolvePath(join29(target, child.name), signal);
               entries.push({ directoryId: encodePath(path8), name: child.name });
             } catch (cause) {
               signal.throwIfAborted();
@@ -96592,7 +96925,7 @@ var init_session_layer = __esm({
 // 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 readFile7, realpath as realpath8, rename as rename4, rm as rm3, stat as stat8, utimes, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname12, join as join27 } from "node:path";
+import { dirname as dirname12, join as join30 } from "node:path";
 async function atomicWrite(path8, bytes, signal) {
   const temporary = `${path8}.${randomUUID17()}.tmp`;
   try {
@@ -96610,7 +96943,7 @@ var init_scratch_directory = __esm({
     ScratchDirectory = class {
       #root;
       constructor(parent) {
-        this.#root = join27(parent, randomUUID17());
+        this.#root = join30(parent, randomUUID17());
       }
       /** Refreshes this directory's lease and removes sibling directories whose lease is older than `leaseMilliseconds`. */
       refreshLease = async (leaseMilliseconds) => {
@@ -96621,7 +96954,7 @@ var init_scratch_directory = __esm({
           if (!directory.isDirectory() || !/^[a-f0-9-]{36}$/u.test(directory.name)) {
             continue;
           }
-          const path8 = join27(dirname12(this.#root), directory.name);
+          const path8 = join30(dirname12(this.#root), directory.name);
           if (path8 === this.#root) {
             continue;
           }
@@ -96636,10 +96969,10 @@ var init_scratch_directory = __esm({
       };
       /** Writes `bytes` atomically to `<group>/<name>` with owner-only permissions and returns the path. */
       write = async (group, name2, bytes, signal) => {
-        const directory = join27(this.#root, group);
+        const directory = join30(this.#root, group);
         await mkdir5(directory, { mode: 448, recursive: true });
         signal.throwIfAborted();
-        const path8 = join27(directory, name2);
+        const path8 = join30(directory, name2);
         await atomicWrite(path8, bytes, signal);
         return path8;
       };
@@ -96674,9 +97007,9 @@ var init_scratch_directory = __esm({
 
 // src/engine/session/content/external-content-store.ts
 import { createHash as createHash8 } from "node:crypto";
-import { extname as extname3, join as join28 } from "node:path";
+import { extname as extname2, join as join31 } from "node:path";
 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 contentRequest, CONTENT_LIFETIME_MILLISECONDS, metadataSchema, LocalExternalContentStore;
@@ -96700,7 +97033,7 @@ var init_external_content_store = __esm({
       #expirationTimer;
       #cleanup = Promise.resolve();
       constructor(stateDirectory) {
-        this.#scratch = new ScratchDirectory(join28(stateDirectory, "tmp", "session-content"));
+        this.#scratch = new ScratchDirectory(join31(stateDirectory, "tmp", "session-content"));
         this.#expirationTimer = setInterval(() => {
           void this.#expire().catch(() => void 0);
         }, 6e4);
@@ -97096,230 +97429,6 @@ var init_agent_process_pool = __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 { join as join29 } from "node:path";
-var BoundedLineLog;
-var init_bounded_log = __esm({
-  "src/engine/storage/logs/bounded-log.ts"() {
-    "use strict";
-    BoundedLineLog = class {
-      #path;
-      #maximumBytes;
-      #directory;
-      #reportedFailure = false;
-      #onWriteFailure;
-      constructor(directory, filename, maximumBytes, onWriteFailure = () => void 0) {
-        this.#directory = directory;
-        this.#path = join29(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 join30 } from "node:path";
-function unhandledRejectionLogFilename(role) {
-  return `unhandled-rejections-${role}.log`;
-}
-function logDirectory(dataDirectory) {
-  return join30(dataDirectory, "logs");
-}
-function processLogPaths(dataDirectory) {
-  return [
-    WORKER_LIFECYCLE_LOG_FILENAME,
-    unhandledRejectionLogFilename("manager"),
-    unhandledRejectionLogFilename("worker")
-  ].map((filename) => join30(logDirectory(dataDirectory), filename));
-}
-function readLogText(path8) {
-  try {
-    return readFileSync10(path8, "utf8");
-  } catch {
-    return null;
-  }
-}
-var DAEMON_LOG_FILENAME, WORKER_LIFECYCLE_LOG_FILENAME;
-var init_log_files = __esm({
-  "src/engine/storage/logs/log-files.ts"() {
-    "use strict";
-    DAEMON_LOG_FILENAME = "daemon.log";
-    WORKER_LIFECYCLE_LOG_FILENAME = "worker-lifecycle.log";
-  }
-});
-
-// src/engine/runtime/observability/diagnostic-log.ts
-import { join as join31 } from "node:path";
-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;
-}
-var MAXIMUM_RUNTIME_LOG_BYTES, MAXIMUM_ENTRIES, MAXIMUM_REPORT_BYTES, REMOTE_DIAGNOSTIC_FIELDS, FIELD_VALUE_PATTERN, RuntimeDiagnosticLog;
-var init_diagnostic_log = __esm({
-  "src/engine/runtime/observability/diagnostic-log.ts"() {
-    "use strict";
-    init_bounded_log();
-    init_log_files();
-    MAXIMUM_RUNTIME_LOG_BYTES = 1 * 1024 * 1024;
-    MAXIMUM_ENTRIES = 200;
-    MAXIMUM_REPORT_BYTES = 6e4;
-    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"
-    ];
-    FIELD_VALUE_PATTERN = /^[a-zA-Z0-9_.: -]{1,256}$/u;
-    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: join31(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((path8) => ({ maximumBytes: null, path: path8 }))
-        ];
-      }
-      // 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 };
-      };
-    };
-  }
-});
-
 // src/engine/runtime/relay/diagnostics.ts
 function sanitizeDiagnosticText(value) {
   const printable = Array.from(value, (character) => {
@@ -98334,7 +98443,7 @@ var init_content_write = __esm({
 });
 
 // src/engine/session/content/session-files.ts
-import { basename as basename9, extname as extname4, isAbsolute as isAbsolute16, join as join32, normalize as normalize3, resolve as resolve17 } from "node:path";
+import { basename as basename9, extname as extname3, isAbsolute as isAbsolute16, join as join32, normalize as normalize3, resolve as resolve17 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function requestedPath(value) {
   if (value.includes("\0")) {
@@ -98390,7 +98499,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 ?? (basename9(target) || "file"),
     requestId: command.requestId,
@@ -98739,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);
             });
@@ -99239,6 +99357,7 @@ async function executePrompt({
       );
       prepared = await sessions.prepareExecutionSession(preparation);
     }
+    signal.throwIfAborted();
     operations.markExecutionStarted(command.commandId);
     if (availability.disposition === SessionPromptDisposition.Steer) {
       if (!recordSteeringPrompt()) {
@@ -100907,13 +101026,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(
     {
@@ -100940,6 +101062,7 @@ var init_runtime_loop = __esm({
     init_discover_local_agents();
     init_runtime_agents();
     init_local_files();
+    init_discover_agent_catalog();
     init_publish_agent_catalog();
     init_resolve_catalog_agent();
     init_config();