@moxt-ai/mobius 0.0.353 → 0.0.355

package/dist/cli.js

@@ -2086,7 +2086,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@moxt-ai/mobius",
-      version: "0.0.353",
+      version: "0.0.355",
       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,
@@ -28066,8 +28031,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 +65807,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 +65817,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"() {
@@ -66262,14 +66139,16 @@ var init_environment_session_list = __esm({
 });
 
 // src/engine/acp/harness/claude/upstream/dist/environment-session-messages.js
-function getEnvironmentSessionMessages(environment, sessionId, signal) {
+function getEnvironmentSessionMessages(environment, sessionId, cancellationSignal) {
+  const signal = AbortSignal.any([cancellationSignal, AbortSignal.timeout(SESSION_MESSAGES_TIMEOUT_MILLISECONDS)]);
   return withEnvironment(environment, () => withDeadline(signal, SESSION_MESSAGES_TIMEOUT_MILLISECONDS, async () => {
-    const messages = await FZt(sessionId);
     const authenticationFailures = /* @__PURE__ */ new Set();
+    const transcript = [];
     const nativeMetadata = /* @__PURE__ */ new Map();
     await GZt(sessionId, {
       append: async (_key, entries) => {
         signal.throwIfAborted();
+        transcript.push(...entries);
         for (const entry of entries) {
           if (entry.type === "user" && typeof entry.uuid === "string") {
             nativeMetadata.set(entry.uuid, {
@@ -66285,16 +66164,151 @@ function getEnvironmentSessionMessages(environment, sessionId, signal) {
       load: async () => null
     }, { includeSubagents: false });
     signal.throwIfAborted();
+    const messages = await readFullHistory(transcript, sessionId, signal) ?? await FZt(sessionId);
     return messages.filter((message) => !authenticationFailures.has(message.uuid)).map((message) => ({ ...message, ...nativeMetadata.get(message.uuid) }));
   }));
 }
-var SESSION_MESSAGES_TIMEOUT_MILLISECONDS;
+async function readFullHistory(transcript, sessionId, signal) {
+  const entries = /* @__PURE__ */ new Map();
+  for (const [index2, raw] of transcript.entries()) {
+    signal.throwIfAborted();
+    if (typeof raw.uuid !== "string") {
+      continue;
+    }
+    if (!["user", "assistant", "system", "progress", "attachment"].includes(raw.type)) {
+      continue;
+    }
+    const parsed = chainEntrySchema.safeParse(raw);
+    if (!parsed.success) {
+      return null;
+    }
+    entries.set(parsed.data.uuid, { entry: parsed.data, index: index2 });
+  }
+  const validated = /* @__PURE__ */ new Set();
+  for (const uuid3 of entries.keys()) {
+    signal.throwIfAborted();
+    const visiting = /* @__PURE__ */ new Set();
+    let current = uuid3;
+    while (current !== null && !validated.has(current)) {
+      const node2 = entries.get(current);
+      if (node2 === void 0 || visiting.has(current)) {
+        return null;
+      }
+      visiting.add(current);
+      const entry = node2.entry;
+      current = entry.subtype === "compact_boundary" ? entry.logicalParentUuid ?? entry.parentUuid : entry.parentUuid;
+    }
+    for (const id of visiting) {
+      validated.add(id);
+    }
+  }
+  for (const { entry } of entries.values()) {
+    if (entry.subtype !== "compact_boundary") {
+      continue;
+    }
+    const preserved = entry.compactMetadata;
+    const references = preserved?.preservedMessages !== void 0 ? [...preserved.preservedMessages.uuids, preserved.preservedMessages.anchorUuid] : preserved?.preservedSegment !== void 0 ? [
+      preserved.preservedSegment.headUuid,
+      preserved.preservedSegment.tailUuid,
+      preserved.preservedSegment.anchorUuid
+    ] : [];
+    if (references.some((id) => !entries.has(id))) {
+      return null;
+    }
+  }
+  const project = async (source) => {
+    signal.throwIfAborted();
+    const messages = await FZt(sessionId, {
+      includeSystemMessages: true,
+      sessionStore: { append: async () => {
+      }, load: async () => source }
+    });
+    signal.throwIfAborted();
+    return messages;
+  };
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  const expanding = /* @__PURE__ */ new Set();
+  const append = async (messages) => {
+    let compactionId;
+    for (const message of messages) {
+      signal.throwIfAborted();
+      const node2 = entries.get(message.uuid);
+      if (node2 === void 0) {
+        return false;
+      }
+      if (node2.entry.subtype === "compact_boundary") {
+        compactionId = message.uuid;
+        if (seen.has(message.uuid)) {
+          continue;
+        }
+        if (expanding.has(message.uuid)) {
+          return false;
+        }
+        expanding.add(message.uuid);
+        const parent = node2.entry.logicalParentUuid;
+        if (typeof parent === "string") {
+          const ancestor = entries.get(parent);
+          if (ancestor === void 0 || ancestor.index >= node2.index) {
+            return false;
+          }
+          const anchor2 = `history-anchor-${message.uuid}`;
+          if (entries.has(anchor2)) {
+            return false;
+          }
+          const earlier = await project([
+            ...transcript.slice(0, node2.index),
+            {
+              type: "user",
+              uuid: anchor2,
+              parentUuid: parent,
+              sessionId,
+              message: { role: "user", content: "" }
+            }
+          ]);
+          if (!await append(earlier.filter((entry) => entry.uuid !== anchor2))) {
+            return false;
+          }
+        }
+        expanding.delete(message.uuid);
+        seen.add(message.uuid);
+        result.push({ ...message, nativeCompaction: { kind: "boundary", id: message.uuid } });
+      } else if (!seen.has(message.uuid)) {
+        seen.add(message.uuid);
+        if (node2.entry.isCompactSummary === true) {
+          if (compactionId === void 0) {
+            return false;
+          }
+          result.push({ ...message, nativeCompaction: { kind: "summary", id: compactionId } });
+        } else if (message.type !== "system") {
+          result.push(message);
+        }
+      }
+    }
+    return true;
+  };
+  return await append(await project([...transcript])) ? result : null;
+}
+var SESSION_MESSAGES_TIMEOUT_MILLISECONDS, chainEntrySchema;
 var init_environment_session_messages = __esm({
   "src/engine/acp/harness/claude/upstream/dist/environment-session-messages.js"() {
     "use strict";
     init_sdk();
+    init_zod();
     init_utils();
     SESSION_MESSAGES_TIMEOUT_MILLISECONDS = 3e4;
+    chainEntrySchema = external_exports.object({
+      type: external_exports.enum(["user", "assistant", "system", "progress", "attachment"]),
+      uuid: external_exports.string(),
+      parentUuid: external_exports.string().nullable(),
+      logicalParentUuid: external_exports.string().nullable().optional(),
+      subtype: external_exports.string().optional(),
+      isCompactSummary: external_exports.boolean().optional(),
+      compactMetadata: external_exports.object({
+        preservedSegment: external_exports.object({ headUuid: external_exports.string(), tailUuid: external_exports.string(), anchorUuid: external_exports.string() }).optional(),
+        preservedMessages: external_exports.object({ uuids: external_exports.array(external_exports.string()), anchorUuid: external_exports.string() }).optional()
+      }).passthrough().optional()
+    }).passthrough();
   }
 });
 
@@ -69215,9 +69229,16 @@ function stripMarkerTags(text2) {
   }
   return result + text2.slice(copiedUpTo);
 }
-function stripLocalCommandMetadata(content) {
+function stripLocalCommandMetadata(content, options) {
+  const strip = (text2) => {
+    if (options?.preserveCompactionCommand === true && /<command-name>\/compact<\/command-name>/u.test(text2)) {
+      const args = /<command-args>([\s\S]*?)<\/command-args>/u.exec(text2)?.[1]?.trim() ?? "";
+      return stripMarkerTags(text2.replace(/<command-name>\/compact<\/command-name>/u, () => args.length > 0 ? `/compact ${args}` : "/compact")).trim();
+    }
+    return stripMarkerTags(text2);
+  };
   if (typeof content === "string") {
-    const stripped = stripMarkerTags(content);
+    const stripped = strip(content);
     return stripped.trim() === "" ? null : stripped;
   }
   if (!Array.isArray(content)) {
@@ -69226,7 +69247,7 @@ function stripLocalCommandMetadata(content) {
   const kept = [];
   for (const block of content) {
     if (block && typeof block === "object" && "type" in block && block.type === "text" && "text" in block && typeof block.text === "string") {
-      const stripped = stripMarkerTags(block.text);
+      const stripped = strip(block.text);
       if (stripped.trim() === "") {
         continue;
       }
@@ -70158,13 +70179,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": {
@@ -70173,7 +70189,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
             }
@@ -72851,6 +72867,35 @@ ${message.api_refusal_explanation}` : "";
         const forwardSubagentText = this.sessions[sessionId]?.forwardSubagentText ?? supportsSubagentTranscript(this.clientCapabilities);
         const seenTools = /* @__PURE__ */ new Set();
         for (const message of messages) {
+          signal.throwIfAborted();
+          if (message.nativeCompaction !== void 0) {
+            const compaction = message.nativeCompaction;
+            if (compaction.kind === "boundary") {
+              await this.client.sessionUpdate({
+                sessionId,
+                update: {
+                  sessionUpdate: "compaction_update",
+                  compactionId: compaction.id,
+                  status: "completed"
+                }
+              });
+            } else {
+              const body = message.message;
+              const content2 = typeof body === "object" && body !== null && "content" in body ? body.content : void 0;
+              const text2 = typeof content2 === "string" ? content2 : Array.isArray(content2) ? content2.flatMap((block) => typeof block === "object" && block !== null && "type" in block && block.type === "text" && "text" in block && typeof block.text === "string" ? [block.text] : []).join("\n") : "";
+              if (text2.length > 0) {
+                await this.client.sessionUpdate({
+                  sessionId,
+                  update: {
+                    sessionUpdate: "compaction_summary_chunk",
+                    compactionId: compaction.id,
+                    content: { type: "text", text: text2 }
+                  }
+                });
+              }
+            }
+            continue;
+          }
           if (isTaskNotificationOrigin(message.nativeOrigin)) {
             const body = message.message;
             const content2 = typeof body === "object" && body !== null && "content" in body ? body.content : void 0;
@@ -72872,7 +72917,7 @@ ${message.api_refusal_explanation}` : "";
           }
           let content = message.message.content;
           if (message.message.role === "user") {
-            content = stripLocalCommandMetadata(content);
+            content = stripLocalCommandMetadata(content, { preserveCompactionCommand: true });
             if (content === null) {
               continue;
             }
@@ -74121,9 +74166,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";
       }
     };
@@ -74133,7 +74180,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];
 }
@@ -74148,14 +74195,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"));
@@ -74520,11 +74567,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;
     }
@@ -74536,12 +74588,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);
@@ -82407,7 +82466,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;
 }
@@ -82436,9 +82502,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();
@@ -82446,7 +82530,7 @@ async function probeWithRetry(signal, probe) {
     if (!isRetryableProbeFailure(error62)) {
       throw error62;
     }
-    return await probe();
+    return await run(2);
   }
 }
 function integrationProbeFailure(specification, error62) {
@@ -82476,7 +82560,9 @@ async function discoverAgent(specification, context) {
     let agentVersion = "";
     try {
       agentVersion = await probeWithRetry(
-        context.signal,
+        context,
+        specification,
+        "agent_version",
         async () => await probeVersion(
           agent,
           specification.agentVersionArguments,
@@ -82524,7 +82610,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,
@@ -82559,7 +82647,9 @@ async function discoverAgent(specification, context) {
       );
       try {
         const readiness = await probeWithRetry(
-          context.signal,
+          context,
+          specification,
+          "acp_readiness",
           async () => await probeAcpReadiness(
             specification,
             buildDefinition(adapterVersion, unsupportedSessionCapabilities()),
@@ -91099,6 +91189,294 @@ var init_environment_proxy = __esm({
   }
 });
 
+// src/engine/storage/logs/bounded-log.ts
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync9, renameSync as renameSync2, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
+import { 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 ? "" : 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 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 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 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") ?? "";
@@ -91573,21 +91951,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;
 }
@@ -91631,12 +92015,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;
@@ -91649,6 +92036,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();
@@ -96109,7 +96497,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) {
@@ -96239,7 +96627,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();
@@ -96419,7 +96807,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 {
@@ -96437,7 +96825,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) => {
@@ -96448,7 +96836,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;
           }
@@ -96463,10 +96851,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;
       };
@@ -96501,9 +96889,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;
@@ -96527,7 +96915,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);
@@ -96923,230 +97311,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) => {
@@ -98161,7 +98325,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")) {
@@ -98217,7 +98381,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,
@@ -100734,13 +100898,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(
     {
@@ -100767,6 +100934,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();