@slock-ai/daemon 0.54.1 → 0.54.2

package/dist/{chunk-X366KJGT.js → chunk-7ZOPGUXT.js}

@@ -1950,6 +1950,7 @@ function unregisterAgentCredentialProxyForLaunch(input) {
 var shellSingleQuote = (value) => `'${value.replace(/'/g, `'\\''`)}'`;
 var powershellSingleQuote = (value) => `'${value.replace(/'/g, "''")}'`;
 var DEFAULT_ACTIVE_CAPABILITIES = "send,read,mentions,tasks,reactions,server,channels";
+var LOOPBACK_NO_PROXY = "127.0.0.1,localhost";
 var safePathPart = (value) => value.replace(/[^a-zA-Z0-9_.-]/g, "_");
 var RAW_CREDENTIAL_ENV_DENYLIST = [
   "SLOCK_AGENT_CREDENTIAL_KEY"
@@ -1996,6 +1997,34 @@ function windowsUtf8Env() {
     LC_ALL: "C.UTF-8"
   };
 }
+function posixLoopbackNoProxyPrelude() {
+  return [
+    `SLOCK_LOOPBACK_NO_PROXY=${shellSingleQuote(LOOPBACK_NO_PROXY)}`,
+    `SLOCK_EXISTING_NO_PROXY="\${NO_PROXY:-}"`,
+    `if [ -n "\${no_proxy:-}" ]; then SLOCK_EXISTING_NO_PROXY="\${SLOCK_EXISTING_NO_PROXY:+$SLOCK_EXISTING_NO_PROXY,}$no_proxy"; fi`,
+    `NO_PROXY="\${SLOCK_LOOPBACK_NO_PROXY}\${SLOCK_EXISTING_NO_PROXY:+,$SLOCK_EXISTING_NO_PROXY}"`,
+    `no_proxy="$NO_PROXY"`,
+    "export NO_PROXY no_proxy"
+  ].join("\n");
+}
+function cmdLoopbackNoProxyLines() {
+  return [
+    `set "SLOCK_LOOPBACK_NO_PROXY=${LOOPBACK_NO_PROXY}"`,
+    `set "SLOCK_EXISTING_NO_PROXY=%NO_PROXY%"`,
+    `if defined no_proxy (if defined SLOCK_EXISTING_NO_PROXY (set "SLOCK_EXISTING_NO_PROXY=%SLOCK_EXISTING_NO_PROXY%,%no_proxy%") else set "SLOCK_EXISTING_NO_PROXY=%no_proxy%")`,
+    `if defined SLOCK_EXISTING_NO_PROXY (set "NO_PROXY=%SLOCK_LOOPBACK_NO_PROXY%,%SLOCK_EXISTING_NO_PROXY%") else set "NO_PROXY=%SLOCK_LOOPBACK_NO_PROXY%"`,
+    `set "no_proxy=%NO_PROXY%"`
+  ];
+}
+function powershellLoopbackNoProxyLines() {
+  return [
+    `$loopbackNoProxy = ${powershellSingleQuote(LOOPBACK_NO_PROXY)}`,
+    "$existingNoProxy = @($env:NO_PROXY, $env:no_proxy) | Where-Object { $_ }",
+    `if ($existingNoProxy.Count -gt 0) { $mergedNoProxy = "$loopbackNoProxy,$($existingNoProxy -join ',')" } else { $mergedNoProxy = $loopbackNoProxy }`,
+    "$env:NO_PROXY = $mergedNoProxy",
+    "$env:no_proxy = $mergedNoProxy"
+  ];
+}
 function runtimeContextEnv(config) {
   const ctx = config.runtimeContext;
   if (!ctx) return {};
@@ -2045,6 +2074,7 @@ async function prepareCliTransport(ctx, extraEnv = {}, platform = process.platfo
   const posixWrapper = path2.join(slockDir, "slock");
   const posixCredentialPrefix = agentCredentialProxy ? `SLOCK_AGENT_PROXY_URL=${shellSingleQuote(agentCredentialProxy.proxyUrl)} SLOCK_AGENT_PROXY_TOKEN_FILE=${shellSingleQuote(agentCredentialProxyTokenFile)} SLOCK_AGENT_ACTIVE_CAPABILITIES=${shellSingleQuote(DEFAULT_ACTIVE_CAPABILITIES)} ` : "";
   const posixBody = `#!/usr/bin/env bash
+${posixLoopbackNoProxyPrelude()}
 ${posixCredentialPrefix}exec ${shellSingleQuote(process.execPath)} ${shellSingleQuote(ctx.slockCliPath)} "$@"
 `;
   writeFileSync(posixWrapper, posixBody, { mode: 493 });
@@ -2061,6 +2091,7 @@ set "SLOCK_AGENT_ACTIVE_CAPABILITIES=${DEFAULT_ACTIVE_CAPABILITIES}"\r
       "set LANG=C.UTF-8",
       "set LC_ALL=C.UTF-8",
       "chcp 65001 >NUL 2>NUL",
+      ...cmdLoopbackNoProxyLines(),
       cmdCredentialLine.trimEnd(),
       `"${process.execPath}" "${ctx.slockCliPath}" %*`,
       ""
@@ -2081,6 +2112,7 @@ set "SLOCK_AGENT_ACTIVE_CAPABILITIES=${DEFAULT_ACTIVE_CAPABILITIES}"\r
       "$env:PYTHONUTF8 = '1'",
       "$env:LANG = 'C.UTF-8'",
       "$env:LC_ALL = 'C.UTF-8'",
+      ...powershellLoopbackNoProxyLines(),
       ...psCredentialLines,
       `$node = ${powershellSingleQuote(process.execPath)}`,
       `$cli = ${powershellSingleQuote(ctx.slockCliPath)}`,
@@ -2715,6 +2747,114 @@ import { spawn as spawn2, execFileSync as execFileSync2, execSync } from "child_
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 import os3 from "os";
 import path5 from "path";
+
+// src/runtimeTurnState.ts
+var RuntimeTurnState = class {
+  currentTurnId = null;
+  /**
+   * Post-tool window where the app-server may not yet accept stdin steering.
+   * Gate busy-mode delivery until turn/completed or next progress.
+   */
+  steeringGateActive = false;
+  reset() {
+    this.currentTurnId = null;
+    this.steeringGateActive = false;
+  }
+  get activeTurnId() {
+    return this.currentTurnId;
+  }
+  get canSteerBusy() {
+    return Boolean(this.currentTurnId && !this.steeringGateActive);
+  }
+  markTurnStarted(turnId) {
+    if (turnId !== void 0 && turnId !== null) {
+      this.currentTurnId = turnId;
+    }
+    this.steeringGateActive = false;
+  }
+  adoptTurnId(turnId) {
+    this.currentTurnId = turnId;
+  }
+  markProgress() {
+    this.steeringGateActive = false;
+  }
+  markToolBoundary() {
+    this.steeringGateActive = true;
+  }
+  markTurnCompleted() {
+    this.currentTurnId = null;
+    this.steeringGateActive = false;
+  }
+};
+
+// src/drivers/codexTelemetrySidecar.ts
+function finiteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function finiteString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function ratio(numerator, denominator) {
+  if (numerator === void 0 || denominator === void 0 || denominator <= 0) return void 0;
+  return Number((numerator / denominator).toFixed(6));
+}
+function withDefined(attrs) {
+  return Object.fromEntries(Object.entries(attrs).filter(([, value]) => value !== void 0));
+}
+function parseTokenUsageTelemetry(message) {
+  const usage = message.params?.tokenUsage;
+  const total = usage?.total;
+  if (!total || typeof total !== "object") return null;
+  const inputTokens = finiteNumber(total.inputTokens);
+  const cachedInputTokens = finiteNumber(total.cachedInputTokens);
+  const totalTokens = finiteNumber(total.totalTokens);
+  const modelContextWindow = finiteNumber(usage.modelContextWindow);
+  const attrs = withDefined({
+    totalTokens,
+    inputTokens,
+    cachedInputTokens,
+    outputTokens: finiteNumber(total.outputTokens),
+    reasoningOutputTokens: finiteNumber(total.reasoningOutputTokens),
+    modelContextWindow,
+    cachedInputRatio: ratio(cachedInputTokens, inputTokens),
+    contextUtilization: ratio(totalTokens, modelContextWindow)
+  });
+  if (Object.keys(attrs).length === 0) return null;
+  return { kind: "telemetry", name: "token_usage", attrs };
+}
+function parseRateLimitTelemetry(message) {
+  const rateLimits = message.params?.rateLimits;
+  const primary = rateLimits?.primary;
+  if (!rateLimits || typeof rateLimits !== "object" || !primary || typeof primary !== "object") return null;
+  const attrs = withDefined({
+    limitId: finiteString(rateLimits.limitId),
+    planType: finiteString(rateLimits.planType),
+    usedPercent: finiteNumber(primary.usedPercent),
+    windowDurationMins: finiteNumber(primary.windowDurationMins),
+    resetsAt: finiteNumber(primary.resetsAt)
+  });
+  if (Object.keys(attrs).length === 0) return null;
+  return { kind: "telemetry", name: "rate_limits", attrs };
+}
+function parseCodexTelemetryEvent(message) {
+  switch (message.method) {
+    case "thread/tokenUsage/updated":
+      return parseTokenUsageTelemetry(message);
+    case "account/rateLimits/updated":
+      return parseRateLimitTelemetry(message);
+    default:
+      return null;
+  }
+}
+
+// src/drivers/codexEventNormalizer.ts
+function parseCodexJsonRpcLine(line) {
+  try {
+    return JSON.parse(line);
+  } catch {
+    return null;
+  }
+}
 function getCodexNotificationErrorMessage(params) {
   const topLevelMessage = params?.message;
   if (typeof topLevelMessage === "string" && topLevelMessage.trim()) {
@@ -2726,6 +2866,246 @@ function getCodexNotificationErrorMessage(params) {
   }
   return null;
 }
+function joinReasoningText(item) {
+  const summary = Array.isArray(item.summary) ? item.summary.filter((entry) => typeof entry === "string") : [];
+  const content = Array.isArray(item.content) ? item.content.filter((entry) => typeof entry === "string") : [];
+  return [...summary, ...content].join("\n").trim();
+}
+function rawResponseItemProgressEvent(message) {
+  if (message.method !== "rawResponseItem/completed") return null;
+  const item = message.params?.item ?? message.params?.responseItem ?? message.params?.rawItem ?? message.params;
+  if (!item || typeof item !== "object") return null;
+  const itemType = typeof item.type === "string" ? item.type : void 0;
+  let payloadBytes;
+  try {
+    payloadBytes = Buffer.byteLength(JSON.stringify(item), "utf8");
+  } catch {
+    payloadBytes = void 0;
+  }
+  return {
+    kind: "internal_progress",
+    source: "codex_raw_response_item",
+    itemType,
+    payloadBytes
+  };
+}
+var CodexEventNormalizer = class {
+  mcpToolPrefix;
+  currentThreadId = null;
+  sessionAnnounced = false;
+  streamedAgentMessageIds = /* @__PURE__ */ new Set();
+  streamedReasoningIds = /* @__PURE__ */ new Set();
+  turnState = new RuntimeTurnState();
+  constructor(opts) {
+    this.mcpToolPrefix = opts.mcpToolPrefix;
+  }
+  reset(opts = {}) {
+    this.currentThreadId = opts.threadId ?? null;
+    this.turnState.reset();
+    this.sessionAnnounced = false;
+    this.streamedAgentMessageIds.clear();
+    this.streamedReasoningIds.clear();
+  }
+  get threadId() {
+    return this.currentThreadId;
+  }
+  get activeTurnId() {
+    return this.turnState.activeTurnId;
+  }
+  get canSteerBusy() {
+    return this.turnState.canSteerBusy;
+  }
+  adoptThreadId(threadId) {
+    this.currentThreadId = threadId;
+  }
+  normalizeMessage(message) {
+    const events = [];
+    if (message.result) {
+      const thread = message.result.thread;
+      if (thread && typeof thread.id === "string") {
+        return this.handleThreadReady(thread.id, events);
+      }
+      const turn = message.result.turn;
+      if (turn && typeof turn.id === "string") {
+        this.turnState.adoptTurnId(turn.id);
+        return { events };
+      }
+      if (typeof message.result.turnId === "string") {
+        this.turnState.adoptTurnId(message.result.turnId);
+        return { events };
+      }
+    }
+    if (message.error) {
+      events.push({ kind: "error", message: message.error.message || "Codex app-server request failed" });
+      return { events };
+    }
+    const telemetry = parseCodexTelemetryEvent(message);
+    if (telemetry) {
+      events.push(telemetry);
+      return { events };
+    }
+    const rawProgress = rawResponseItemProgressEvent(message);
+    if (rawProgress) {
+      events.push(rawProgress);
+      return { events };
+    }
+    switch (message.method) {
+      case "thread/started": {
+        const threadId = message.params?.thread?.id;
+        if (typeof threadId === "string") {
+          return this.handleThreadReady(threadId, events);
+        }
+        break;
+      }
+      case "turn/started": {
+        const turnId = message.params?.turn?.id;
+        this.turnState.markTurnStarted(typeof turnId === "string" ? turnId : null);
+        events.push({ kind: "thinking", text: "" });
+        break;
+      }
+      case "item/agentMessage/delta": {
+        const delta = message.params?.delta;
+        const itemId = message.params?.itemId;
+        if (typeof itemId === "string") {
+          this.streamedAgentMessageIds.add(itemId);
+        }
+        if (typeof delta === "string" && delta.length > 0) {
+          this.turnState.markProgress();
+          events.push({ kind: "text", text: delta });
+        }
+        break;
+      }
+      case "item/reasoning/summaryTextDelta":
+      case "item/reasoning/textDelta": {
+        const delta = message.params?.delta;
+        const itemId = message.params?.itemId;
+        if (typeof itemId === "string") {
+          this.streamedReasoningIds.add(itemId);
+        }
+        if (typeof delta === "string" && delta.length > 0) {
+          this.turnState.markProgress();
+          events.push({ kind: "thinking", text: delta });
+        }
+        break;
+      }
+      case "item/started":
+      case "item/completed": {
+        const item = message.params?.item;
+        if (!item || typeof item !== "object" || typeof item.type !== "string") break;
+        const itemType = item.type;
+        const isStarted = message.method === "item/started";
+        const isCompleted = message.method === "item/completed";
+        switch (itemType) {
+          case "reasoning":
+            if (isCompleted && typeof item.id === "string" && !this.streamedReasoningIds.has(item.id)) {
+              const text = joinReasoningText(item);
+              if (text) {
+                this.turnState.markProgress();
+                events.push({ kind: "thinking", text });
+              }
+            }
+            if (isCompleted && typeof item.id === "string") {
+              this.streamedReasoningIds.delete(item.id);
+            }
+            break;
+          case "agentMessage":
+            if (isCompleted && typeof item.id === "string" && !this.streamedAgentMessageIds.has(item.id) && typeof item.text === "string" && item.text.length > 0) {
+              this.turnState.markProgress();
+              events.push({ kind: "text", text: item.text });
+            }
+            if (isCompleted && typeof item.id === "string") {
+              this.streamedAgentMessageIds.delete(item.id);
+            }
+            break;
+          case "commandExecution":
+            if (isStarted && typeof item.command === "string") {
+              events.push({ kind: "tool_call", name: "shell", input: { command: item.command } });
+            }
+            if (isCompleted) {
+              events.push({ kind: "tool_output", name: "shell" });
+              this.turnState.markToolBoundary();
+            }
+            break;
+          case "contextCompaction":
+            if (isStarted) {
+              events.push({ kind: "compaction_started" });
+            }
+            if (isCompleted) {
+              events.push({ kind: "compaction_finished" });
+            }
+            break;
+          case "fileChange":
+            if (isStarted && Array.isArray(item.changes)) {
+              for (const change of item.changes) {
+                events.push({
+                  kind: "tool_call",
+                  name: "file_change",
+                  input: { path: change?.path, kind: change?.kind }
+                });
+              }
+            }
+            break;
+          case "mcpToolCall":
+            if (isStarted) {
+              const toolName = item.server === "chat" ? `${this.mcpToolPrefix}${item.tool}` : `${this.mcpToolPrefix.replace(/_$/, "")}_${item.server}_${item.tool}`;
+              events.push({ kind: "tool_call", name: toolName, input: item.arguments });
+            }
+            if (isCompleted) {
+              const toolName = item.server === "chat" ? `${this.mcpToolPrefix}${item.tool}` : `${this.mcpToolPrefix.replace(/_$/, "")}_${item.server}_${item.tool}`;
+              events.push({ kind: "tool_output", name: toolName });
+              this.turnState.markToolBoundary();
+            }
+            break;
+          case "collabAgentToolCall":
+            if (isStarted) {
+              events.push({ kind: "tool_call", name: "collab_tool_call", input: { tool: item.tool, prompt: item.prompt } });
+            }
+            if (isCompleted) {
+              this.turnState.markToolBoundary();
+            }
+            break;
+          case "webSearch":
+            if (isStarted) {
+              events.push({ kind: "tool_call", name: "web_search", input: { query: item.query } });
+            }
+            if (isCompleted) {
+              this.turnState.markToolBoundary();
+            }
+            break;
+        }
+        break;
+      }
+      case "turn/completed": {
+        const turn = message.params?.turn;
+        if (turn?.status === "failed" && turn?.error?.message) {
+          events.push({ kind: "error", message: turn.error.message });
+        }
+        this.turnState.markTurnCompleted();
+        this.streamedAgentMessageIds.clear();
+        this.streamedReasoningIds.clear();
+        events.push({ kind: "turn_end", sessionId: this.currentThreadId || void 0 });
+        break;
+      }
+      case "error":
+        events.push({
+          kind: "error",
+          message: getCodexNotificationErrorMessage(message.params) || "Unknown Codex app-server error"
+        });
+        break;
+    }
+    return { events };
+  }
+  handleThreadReady(threadId, events) {
+    this.currentThreadId = threadId;
+    if (!this.sessionAnnounced) {
+      events.push({ kind: "session_init", sessionId: threadId });
+      this.sessionAnnounced = true;
+    }
+    return { events, threadReady: threadId };
+  }
+};
+
+// src/drivers/codex.ts
 function ensureGitRepoForCodex(workingDirectory, deps = {}) {
   const existsSyncFn = deps.existsSyncFn ?? existsSync4;
   const execSyncFn = deps.execSyncFn ?? execSync;
@@ -2839,11 +3219,6 @@ function resolveCodexSpawn(commandArgs, deps = {}) {
     "Cannot resolve Codex CLI entry point on Windows. Install Codex Desktop or install @openai/codex globally via npm (npm i -g @openai/codex). Ignoring .codex/.sandbox-bin/codex-command-runner because it is a sandbox helper, not the Codex CLI."
   );
 }
-function joinReasoningText(item) {
-  const summary = Array.isArray(item.summary) ? item.summary.filter((entry) => typeof entry === "string") : [];
-  const content = Array.isArray(item.content) ? item.content.filter((entry) => typeof entry === "string") : [];
-  return [...summary, ...content].join("\n").trim();
-}
 var CodexDriver = class {
   id = "codex";
   lifecycle = {
@@ -2919,7 +3294,10 @@ var CodexDriver = class {
       cwd: ctx.workingDirectory,
       approvalPolicy: "never",
       sandbox: "danger-full-access",
-      developerInstructions: ctx.standingPrompt
+      developerInstructions: ctx.standingPrompt,
+      // Raw response items are used only as payload-free liveness signals in
+      // the daemon. They replace the previous transcript-mtime heuristic.
+      experimentalRawEvents: true
     };
     if (ctx.config.model) {
       threadParams.model = ctx.config.model;
@@ -2943,35 +3321,21 @@ var CodexDriver = class {
   }
   process = null;
   requestId = 0;
-  threadId = null;
-  activeTurnId = null;
   pendingInitialPrompt = null;
   initializeRequestId = null;
   pendingThreadRequest = null;
   initialTurnStarted = false;
-  sessionAnnounced = false;
-  streamedAgentMessageIds = /* @__PURE__ */ new Set();
-  streamedReasoningIds = /* @__PURE__ */ new Set();
-  /**
-   * Post-tool window where the app-server may not yet accept stdin steering.
-   * Gate busy-mode delivery until turn/completed or next progress.
-   */
-  steeringGateActive = false;
+  normalizer = new CodexEventNormalizer({ mcpToolPrefix: this.mcpToolPrefix });
   async spawn(ctx) {
     ensureGitRepoForCodex(ctx.workingDirectory);
     const { spawnEnv } = await prepareCliTransport(ctx, { NO_COLOR: "1" });
     this.process = null;
     this.requestId = 0;
-    this.threadId = ctx.config.sessionId || null;
-    this.activeTurnId = null;
     this.pendingInitialPrompt = ctx.prompt;
     this.initializeRequestId = null;
     this.pendingThreadRequest = null;
     this.initialTurnStarted = false;
-    this.sessionAnnounced = false;
-    this.streamedAgentMessageIds.clear();
-    this.streamedReasoningIds.clear();
-    this.steeringGateActive = false;
+    this.normalizer.reset({ threadId: ctx.config.sessionId || null });
     const args = ["app-server", "--listen", "stdio://"];
     args.push(...this.buildRuntimeActionsConfigArgs(ctx));
     const { command, args: spawnArgs } = resolveCodexSpawn(args);
@@ -2992,10 +3356,8 @@ var CodexDriver = class {
     return { process: proc };
   }
   parseLine(line) {
-    let message;
-    try {
-      message = JSON.parse(line);
-    } catch {
+    const message = parseCodexJsonRpcLine(line);
+    if (!message) {
       return [];
     }
     const events = [];
@@ -3009,194 +3371,34 @@ var CodexDriver = class {
         }
         return events;
       }
-      const thread = message.result.thread;
-      if (thread && typeof thread.id === "string") {
-        this.handleThreadReady(thread.id, events);
-        return events;
-      }
-      const turn = message.result.turn;
-      if (turn && typeof turn.id === "string") {
-        this.activeTurnId = turn.id;
-        return events;
-      }
-      if (typeof message.result.turnId === "string") {
-        this.activeTurnId = message.result.turnId;
-        return events;
-      }
     }
-    if (message.error) {
-      if (message.id === this.initializeRequestId) {
-        this.initializeRequestId = null;
-        this.pendingThreadRequest = null;
-      }
+    if (message.error && message.id === this.initializeRequestId) {
+      this.initializeRequestId = null;
+      this.pendingThreadRequest = null;
       events.push({ kind: "error", message: message.error.message || "Codex app-server request failed" });
       return events;
     }
-    switch (message.method) {
-      case "thread/started": {
-        const threadId = message.params?.thread?.id;
-        if (typeof threadId === "string") {
-          this.handleThreadReady(threadId, events);
-        }
-        break;
-      }
-      case "turn/started": {
-        const turnId = message.params?.turn?.id;
-        if (typeof turnId === "string") {
-          this.activeTurnId = turnId;
-        }
-        this.steeringGateActive = false;
-        events.push({ kind: "thinking", text: "" });
-        break;
-      }
-      case "item/agentMessage/delta": {
-        const delta = message.params?.delta;
-        const itemId = message.params?.itemId;
-        if (typeof itemId === "string") {
-          this.streamedAgentMessageIds.add(itemId);
-        }
-        if (typeof delta === "string" && delta.length > 0) {
-          this.steeringGateActive = false;
-          events.push({ kind: "text", text: delta });
-        }
-        break;
-      }
-      case "item/reasoning/summaryTextDelta":
-      case "item/reasoning/textDelta": {
-        const delta = message.params?.delta;
-        const itemId = message.params?.itemId;
-        if (typeof itemId === "string") {
-          this.streamedReasoningIds.add(itemId);
-        }
-        if (typeof delta === "string" && delta.length > 0) {
-          this.steeringGateActive = false;
-          events.push({ kind: "thinking", text: delta });
-        }
-        break;
-      }
-      case "item/started":
-      case "item/completed": {
-        const item = message.params?.item;
-        if (!item || typeof item !== "object" || typeof item.type !== "string") break;
-        const itemType = item.type;
-        const isStarted = message.method === "item/started";
-        const isCompleted = message.method === "item/completed";
-        switch (itemType) {
-          case "reasoning":
-            if (isCompleted && typeof item.id === "string" && !this.streamedReasoningIds.has(item.id)) {
-              const text = joinReasoningText(item);
-              if (text) {
-                this.steeringGateActive = false;
-                events.push({ kind: "thinking", text });
-              }
-            }
-            if (isCompleted && typeof item.id === "string") {
-              this.streamedReasoningIds.delete(item.id);
-            }
-            break;
-          case "agentMessage":
-            if (isCompleted && typeof item.id === "string" && !this.streamedAgentMessageIds.has(item.id) && typeof item.text === "string" && item.text.length > 0) {
-              this.steeringGateActive = false;
-              events.push({ kind: "text", text: item.text });
-            }
-            if (isCompleted && typeof item.id === "string") {
-              this.streamedAgentMessageIds.delete(item.id);
-            }
-            break;
-          case "commandExecution":
-            if (isStarted && typeof item.command === "string") {
-              events.push({ kind: "tool_call", name: "shell", input: { command: item.command } });
-            }
-            if (isCompleted) {
-              events.push({ kind: "tool_output", name: "shell" });
-              this.steeringGateActive = true;
-            }
-            break;
-          case "contextCompaction":
-            if (isStarted) {
-              events.push({ kind: "compaction_started" });
-            }
-            if (isCompleted) {
-              events.push({ kind: "compaction_finished" });
-            }
-            break;
-          case "fileChange":
-            if (isStarted && Array.isArray(item.changes)) {
-              for (const change of item.changes) {
-                events.push({
-                  kind: "tool_call",
-                  name: "file_change",
-                  input: { path: change?.path, kind: change?.kind }
-                });
-              }
-            }
-            break;
-          case "mcpToolCall":
-            if (isStarted) {
-              const toolName = item.server === "chat" ? `${this.mcpToolPrefix}${item.tool}` : `${this.mcpToolPrefix.replace(/_$/, "")}_${item.server}_${item.tool}`;
-              events.push({ kind: "tool_call", name: toolName, input: item.arguments });
-            }
-            if (isCompleted) {
-              const toolName = item.server === "chat" ? `${this.mcpToolPrefix}${item.tool}` : `${this.mcpToolPrefix.replace(/_$/, "")}_${item.server}_${item.tool}`;
-              events.push({ kind: "tool_output", name: toolName });
-              this.steeringGateActive = true;
-            }
-            break;
-          case "collabAgentToolCall":
-            if (isStarted) {
-              events.push({ kind: "tool_call", name: "collab_tool_call", input: { tool: item.tool, prompt: item.prompt } });
-            }
-            if (isCompleted) {
-              this.steeringGateActive = true;
-            }
-            break;
-          case "webSearch":
-            if (isStarted) {
-              events.push({ kind: "tool_call", name: "web_search", input: { query: item.query } });
-            }
-            if (isCompleted) {
-              this.steeringGateActive = true;
-            }
-            break;
-        }
-        break;
-      }
-      case "turn/completed": {
-        const turn = message.params?.turn;
-        if (turn?.status === "failed" && turn?.error?.message) {
-          events.push({ kind: "error", message: turn.error.message });
-        }
-        this.activeTurnId = null;
-        this.streamedAgentMessageIds.clear();
-        this.streamedReasoningIds.clear();
-        this.steeringGateActive = false;
-        events.push({ kind: "turn_end", sessionId: this.threadId || void 0 });
-        break;
-      }
-      case "error":
-        events.push({
-          kind: "error",
-          message: getCodexNotificationErrorMessage(message.params) || "Unknown Codex app-server error"
-        });
-        break;
+    const result = this.normalizer.normalizeMessage(message);
+    if (result.threadReady) {
+      this.startInitialTurn();
     }
-    return events;
+    return result.events;
   }
   encodeStdinMessage(text, sessionId, opts) {
-    if (!this.threadId && sessionId) {
-      this.threadId = sessionId;
+    if (!this.normalizer.threadId && sessionId) {
+      this.normalizer.adoptThreadId(sessionId);
     }
-    if (!this.threadId) return null;
+    if (!this.normalizer.threadId) return null;
     const mode = opts?.mode || "busy";
     if (mode === "busy") {
-      if (!this.activeTurnId || this.steeringGateActive) return null;
+      if (!this.normalizer.canSteerBusy) return null;
       return JSON.stringify({
         jsonrpc: "2.0",
         id: this.nextRequestId(),
         method: "turn/steer",
         params: {
-          threadId: this.threadId,
-          expectedTurnId: this.activeTurnId,
+          threadId: this.normalizer.threadId,
+          expectedTurnId: this.normalizer.activeTurnId,
           input: [{ type: "text", text }]
         }
       });
@@ -3206,7 +3408,7 @@ var CodexDriver = class {
       id: this.nextRequestId(),
       method: "turn/start",
       params: {
-        threadId: this.threadId,
+        threadId: this.normalizer.threadId,
         input: [{ type: "text", text }]
       }
     });
@@ -3226,21 +3428,13 @@ var CodexDriver = class {
     this.requestId += 1;
     return this.requestId;
   }
-  handleThreadReady(threadId, events) {
-    this.threadId = threadId;
-    if (!this.sessionAnnounced) {
-      events.push({ kind: "session_init", sessionId: threadId });
-      this.sessionAnnounced = true;
-    }
-    this.startInitialTurn();
-  }
   startInitialTurn() {
-    if (this.initialTurnStarted || !this.pendingInitialPrompt || !this.threadId) return;
+    if (this.initialTurnStarted || !this.pendingInitialPrompt || !this.normalizer.threadId) return;
     this.initialTurnStarted = true;
     const prompt = this.pendingInitialPrompt;
     this.pendingInitialPrompt = null;
     this.sendRequest("turn/start", {
-      threadId: this.threadId,
+      threadId: this.normalizer.threadId,
       input: [{ type: "text", text: prompt }]
     });
   }
@@ -5079,6 +5273,87 @@ function redactUrlQuery(value) {
   }
 }
 
+// src/runtimeProgressState.ts
+var RuntimeProgressState = class {
+  lastEventAtMs;
+  lastEventKindValue = null;
+  staleSinceMs = null;
+  constructor(nowMs = Date.now()) {
+    this.lastEventAtMs = nowMs;
+  }
+  get lastEventAt() {
+    return this.lastEventAtMs;
+  }
+  get lastEventKind() {
+    return this.lastEventKindValue;
+  }
+  get staleSince() {
+    return this.staleSinceMs;
+  }
+  get isStale() {
+    return this.staleSinceMs !== null;
+  }
+  ageMs(nowMs = Date.now()) {
+    return nowMs - this.lastEventAtMs;
+  }
+  noteRuntimeEvent(eventKind, nowMs = Date.now()) {
+    this.lastEventAtMs = nowMs;
+    this.lastEventKindValue = eventKind ?? null;
+    this.staleSinceMs = null;
+  }
+  noteInternalProgress(observedAtMs = Date.now()) {
+    this.lastEventAtMs = observedAtMs;
+    this.staleSinceMs = null;
+  }
+  markStale(nowMs = Date.now()) {
+    this.staleSinceMs ??= nowMs;
+    return this.staleSinceMs;
+  }
+};
+
+// src/runtimeNotificationState.ts
+var RuntimeNotificationState = class {
+  timerValue = null;
+  pendingCountValue = 0;
+  get pendingCount() {
+    return this.pendingCountValue;
+  }
+  get timer() {
+    return this.timerValue;
+  }
+  get hasTimer() {
+    return this.timerValue !== null;
+  }
+  add(count = 1) {
+    this.pendingCountValue += count;
+    return this.pendingCountValue;
+  }
+  clearPending() {
+    this.pendingCountValue = 0;
+  }
+  clearTimer() {
+    if (this.timerValue) {
+      clearTimeout(this.timerValue);
+      this.timerValue = null;
+    }
+  }
+  clear() {
+    this.clearPending();
+    this.clearTimer();
+  }
+  schedule(callback, delayMs) {
+    if (this.timerValue) return false;
+    this.timerValue = setTimeout(callback, delayMs);
+    return true;
+  }
+  takePendingAndClearTimer() {
+    const count = this.pendingCountValue;
+    this.pendingCountValue = 0;
+    this.clearTimer();
+    return count;
+  }
+};
+
 // src/agentProcessManager.ts
 var DEFAULT_MAX_CONCURRENT_AGENT_STARTS = 5;
 var DEFAULT_AGENT_START_INTERVAL_MS = 500;
@@ -5297,6 +5572,36 @@ function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os6.homedir(), f
   }
   return ref;
 }
+function classifySpawnFailure(error) {
+  const detail = error instanceof Error ? error.message : String(error);
+  const lower = detail.toLowerCase();
+  if (lower.includes("agent credential proxy") && lower.includes("failed to bind")) {
+    return {
+      reason: "agent_proxy_bind_failed",
+      detail,
+      userMessage: "Local agent proxy could not start. Check if another daemon or service is using the required local port."
+    };
+  }
+  if (lower.includes("runner_credential_mint") || error instanceof RunnerCredentialMintError) {
+    return {
+      reason: "runner_credential_mint_failed",
+      detail,
+      userMessage: "Runner credential mint failed. Ensure the server is deployed and the daemon binary is compatible."
+    };
+  }
+  if (lower.includes("enoent") || lower.includes("cannot resolve") || lower.includes("not found")) {
+    return {
+      reason: "runtime_not_found",
+      detail,
+      userMessage: "Runtime executable not found. Ensure the required CLI is installed and available on PATH."
+    };
+  }
+  return {
+    reason: "runtime_spawn_failed",
+    detail,
+    userMessage: `Start failed: ${detail}`
+  };
+}
 function formatSenderHandle(message) {
   return message.sender_description ? `@${message.sender_name} \u2014 ${message.sender_description}` : `@${message.sender_name}`;
 }
@@ -5945,26 +6250,29 @@ function hasDirectStdinRecoveryEvidence(ap) {
     (text) => /write_stdin failed|stdin is closed|closed for this session|session.*closed/i.test(text)
   );
 }
-function isMissingResumeSession(ap) {
-  if (!ap.sessionId) return false;
+function resumeSessionRecoveryReason(ap) {
+  if (!ap.sessionId) return null;
   const candidates = [
     ap.lastRuntimeError,
     ...ap.recentStderr
   ].filter((value) => !!value);
   if (ap.driver.id === "claude") {
-    return candidates.some((text) => /No conversation found with session ID/i.test(text));
+    return candidates.some((text) => /No conversation found with session ID/i.test(text)) ? "missing" : null;
   }
   if (ap.driver.id === "opencode") {
-    return candidates.some(
-      (text) => /Session not found/i.test(text) && text.includes(ap.sessionId)
-    );
+    if (candidates.some((text) => /Session not found/i.test(text) && text.includes(ap.sessionId))) return "missing";
+    if (candidates.some(isOpenCodeReplayRejectedByProvider)) return "provider_replay_rejected";
+    return null;
   }
   if (ap.driver.id === "gemini") {
     return candidates.some(
       (text) => /Error resuming session:\s*Invalid session identifier/i.test(text) && text.includes(ap.sessionId)
-    );
+    ) ? "missing" : null;
   }
-  return false;
+  return null;
+}
+function isOpenCodeReplayRejectedByProvider(text) {
+  return /Invalid request:\s*the message at position \d+ with role ['"]?assistant['"]? must not be empty/i.test(text);
 }
 function resumeSessionRuntimeLabel(runtimeId) {
   if (runtimeId === "opencode") return "OpenCode";
@@ -6021,7 +6329,7 @@ function buildRuntimeStallDiagnostic(ap, staleForMs, staleForMinutes) {
       launchId: ap.launchId || void 0,
       sessionIdPresent: Boolean(ap.sessionId),
       inboxCount: ap.inbox.length,
-      pendingNotificationCount: ap.pendingNotificationCount,
+      pendingNotificationCount: ap.notifications.pendingCount,
       processPidPresent: typeof ap.process.pid === "number",
       busyDeliveryMode: ap.driver.busyDeliveryMode,
       supportsStdinNotification: ap.driver.supportsStdinNotification,
@@ -6035,7 +6343,7 @@ function buildRuntimeStallDiagnostic(ap, staleForMs, staleForMinutes) {
   };
 }
 function classifyRuntimeStallReason(ap) {
-  if (ap.lastRuntimeEventKind === "tool_output" && ap.gatedSteering.outstandingToolUses === 0) {
+  if (ap.runtimeProgress.lastEventKind === "tool_output" && ap.gatedSteering.outstandingToolUses === 0) {
     return "harness_post_tool_silent_wedge";
   }
   return "no_runtime_events";
@@ -6766,16 +7074,13 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         startupUnreadSummary: unreadSummary,
         startupResumePrompt: resumePrompt,
         isIdle: false,
-        notificationTimer: null,
-        pendingNotificationCount: 0,
+        notifications: new RuntimeNotificationState(),
         activityHeartbeat: null,
         startupTimeoutTimer: null,
         startupTimedOut: false,
         compactionWatchdog: null,
         compactionStartedAt: null,
-        lastRuntimeEventAt: Date.now(),
-        lastRuntimeEventKind: null,
-        runtimeProgressStaleSince: null,
+        runtimeProgress: new RuntimeProgressState(Date.now()),
         runtimeTraceSpan: null,
         runtimeTraceCounters: createRuntimeTraceCounters(),
         lastActivity: "",
@@ -6884,7 +7189,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
           clean_exit: code === 0,
           runtime_trace_active: Boolean(current?.runtimeTraceSpan),
           inbox_count: current?.inbox.length ?? 0,
-          pending_notification_count: current?.pendingNotificationCount ?? 0,
+          pending_notification_count: current?.notifications.pendingCount ?? 0,
           ...this.processExitTraceAttrs.get(proc)
         });
         logger.info(`[Agent ${agentId}] Process exited with code ${code}${signal ? ` (signal ${signal})` : ""}`);
@@ -6893,9 +7198,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         if (this.agents.has(agentId)) {
           const ap = this.agents.get(agentId);
           if (ap.process !== proc) return;
-          if (ap.notificationTimer) {
-            clearTimeout(ap.notificationTimer);
-          }
+          ap.notifications.clearTimer();
           if (ap.pendingTrajectory?.timer) {
             clearTimeout(ap.pendingTrajectory.timer);
           }
@@ -6909,7 +7212,8 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
           const expectedTermination = Boolean(ap.expectedTerminationReason) || ap.startupTimedOut;
           const processEndedCleanly = finalCode === 0 || expectedTermination && !ap.lastRuntimeError;
           const terminalFailureDetail = processEndedCleanly ? null : classifyTerminalFailure(ap);
-          const missingResumeSession = isMissingResumeSession(ap);
+          const resumeRecoveryReason = resumeSessionRecoveryReason(ap);
+          const shouldColdStartResumeSession = resumeRecoveryReason !== null;
           const summary = summarizeCrash(finalCode, finalSignal);
           this.endRuntimeTrace(ap, processEndedCleanly ? "ok" : "error", {
             outcome: processEndedCleanly ? "process-exit" : "process-crash",
@@ -6923,20 +7227,22 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
           cleanupAgentCredentialProxy(agentId, ap.launchId);
           this.revokeManagedRunnerCredential(agentId, ap.config, ap.launchId);
           this.agents.delete(agentId);
-          if (missingResumeSession) {
+          if (shouldColdStartResumeSession) {
             const staleSessionId = ap.sessionId;
             const runtimeLabel = resumeSessionRuntimeLabel(ap.driver.id);
             const restartConfig = { ...stripManagedRunnerCredential(ap.config), sessionId: null };
+            const reasonText = resumeRecoveryReason === "provider_replay_rejected" ? "was rejected by the provider during replay" : "is unavailable locally";
+            const activityText = resumeRecoveryReason === "provider_replay_rejected" ? `Stored ${runtimeLabel} session replay rejected; cold-starting a new session\u2026` : `Stored ${runtimeLabel} session missing; cold-starting a new session\u2026`;
             logger.warn(
-              `[Agent ${agentId}] Stored ${runtimeLabel} session ${staleSessionId} is unavailable locally; falling back to cold start`
+              `[Agent ${agentId}] Stored ${runtimeLabel} session ${staleSessionId} ${reasonText}; falling back to cold start`
             );
             this.broadcastActivity(
               agentId,
               "working",
-              `Stored ${runtimeLabel} session missing; cold-starting a new session\u2026`,
+              activityText,
               [{
                 kind: "text",
-                text: `Stored ${runtimeLabel} session ${staleSessionId} was not found locally. Falling back to a cold start; earlier runtime context may not be restored.`
+                text: `Stored ${runtimeLabel} session ${staleSessionId} ${reasonText}. Falling back to a cold start; earlier runtime context may not be restored.`
               }]
             );
             this.startAgent(
@@ -7205,15 +7511,15 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   enqueueRuntimeProfileNotification(agentId, ap, message, kind, key) {
     ap.inbox.push(message);
     if (ap.driver.supportsStdinNotification && ap.sessionId) {
-      ap.pendingNotificationCount++;
+      ap.notifications.add();
       if (ap.driver.busyDeliveryMode === "gated") {
         this.recordGatedSteeringEvent(agentId, ap, "buffer", {
           reason: "runtime_profile",
           kind,
           pendingMessages: ap.inbox.length
         });
-      } else if (!ap.notificationTimer) {
-        ap.notificationTimer = setTimeout(() => {
+      } else if (!ap.notifications.hasTimer) {
+        ap.notifications.schedule(() => {
           this.sendStdinNotification(agentId);
         }, 3e3);
       }
@@ -7228,7 +7534,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       session_id_present: Boolean(ap.sessionId),
       launchId: ap.launchId || void 0,
       inbox_count: ap.inbox.length,
-      pending_notification_count: ap.pendingNotificationCount,
+      pending_notification_count: ap.notifications.pendingCount,
       busy_delivery_mode: ap.driver.busyDeliveryMode,
       supports_stdin_notification: ap.driver.supportsStdinNotification
     });
@@ -7266,9 +7572,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       }
       return;
     }
-    if (ap.notificationTimer) {
-      clearTimeout(ap.notificationTimer);
-    }
+    ap.notifications.clearTimer();
     if (ap.activityHeartbeat) {
       clearInterval(ap.activityHeartbeat);
     }
@@ -7449,11 +7753,8 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       return true;
     }
     if (ap.gatedSteering.compacting) {
-      ap.pendingNotificationCount++;
-      if (ap.notificationTimer) {
-        clearTimeout(ap.notificationTimer);
-        ap.notificationTimer = null;
-      }
+      ap.notifications.add();
+      ap.notifications.clearTimer();
       if (ap.driver.busyDeliveryMode === "gated") {
         this.recordGatedSteeringEvent(agentId, ap, "buffer", {
           reason: "compaction_boundary",
@@ -7461,7 +7762,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         });
       }
       this.recordRuntimeTraceEvent(agentId, ap, "runtime.compaction_boundary.delivery_buffered", {
-        pendingNotificationCount: ap.pendingNotificationCount,
+        pendingNotificationCount: ap.notifications.pendingCount,
         pendingMessages: ap.inbox.length,
         busyDeliveryMode: ap.driver.busyDeliveryMode
       });
@@ -7473,16 +7774,16 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         session_id_present: true,
         launchId: ap.launchId || void 0,
         inbox_count: ap.inbox.length,
-        pending_notification_count: ap.pendingNotificationCount,
+        pending_notification_count: ap.notifications.pendingCount,
         busy_delivery_mode: ap.driver.busyDeliveryMode,
         notification_timer_present: false
       }));
       return true;
     }
     if (ap.driver.busyDeliveryMode === "gated") {
-      ap.pendingNotificationCount++;
-      if (!ap.notificationTimer) {
-        ap.notificationTimer = setTimeout(() => {
+      ap.notifications.add();
+      if (!ap.notifications.hasTimer) {
+        ap.notifications.schedule(() => {
           this.sendStdinNotification(agentId);
         }, 3e3);
       }
@@ -7498,14 +7799,14 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         session_id_present: true,
         launchId: ap.launchId || void 0,
         inbox_count: ap.inbox.length,
-        pending_notification_count: ap.pendingNotificationCount,
-        notification_timer_present: Boolean(ap.notificationTimer)
+        pending_notification_count: ap.notifications.pendingCount,
+        notification_timer_present: ap.notifications.hasTimer
       }));
       return true;
     }
-    ap.pendingNotificationCount++;
-    if (!ap.notificationTimer) {
-      ap.notificationTimer = setTimeout(() => {
+    ap.notifications.add();
+    if (!ap.notifications.hasTimer) {
+      ap.notifications.schedule(() => {
         this.sendStdinNotification(agentId);
       }, 3e3);
     }
@@ -7516,8 +7817,8 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       runtime: ap.config.runtime,
       session_id_present: true,
       inbox_count: ap.inbox.length,
-      pending_notification_count: ap.pendingNotificationCount,
-      notification_timer_present: Boolean(ap.notificationTimer)
+      pending_notification_count: ap.notifications.pendingCount,
+      notification_timer_present: ap.notifications.hasTimer
     }));
     return true;
   }
@@ -8312,40 +8613,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     this.startRuntimeTrace(agentId, ap, "runtime-progress").addEvent(name, attrs);
   }
   noteRuntimeProgress(ap, eventKind) {
-    ap.lastRuntimeEventAt = Date.now();
-    ap.lastRuntimeEventKind = eventKind ?? null;
-    ap.runtimeProgressStaleSince = null;
-  }
-  observeRuntimeTranscriptProgress(agentId, ap, staleForMs, source) {
-    if (ap.config.runtime !== "codex" || !ap.sessionId) return false;
-    const ref = resolveRuntimeSessionRef(ap.config.runtime, ap.sessionId, this.runtimeSessionHomeDir);
-    if (!ref.reachable || !ref.path) return false;
-    let mtimeMs;
-    try {
-      const stats = statSync2(ref.path);
-      if (!stats.isFile()) return false;
-      mtimeMs = stats.mtimeMs;
-    } catch {
-      return false;
-    }
-    if (mtimeMs <= ap.lastRuntimeEventAt) return false;
-    const now = Date.now();
-    const transcriptAgeMs = Math.max(0, now - mtimeMs);
-    if (transcriptAgeMs >= RUNTIME_PROGRESS_STALE_MS) return false;
-    ap.lastRuntimeEventAt = mtimeMs;
-    ap.runtimeProgressStaleSince = null;
-    this.recordRuntimeTraceEvent(agentId, ap, "runtime.progress.internal_observed", {
-      turn_outcome: "held",
-      turn_subtype: "runtime_progress",
-      turn_reason: "internal_activity_observed",
-      signal: "runtime_transcript_mtime",
-      source,
-      runtime: ap.config.runtime,
-      sessionRefReachable: true,
-      transcriptAgeMs,
-      previousStaleForMs: staleForMs
-    });
-    return true;
+    ap.runtimeProgress.noteRuntimeEvent(eventKind);
   }
   recordGatedSteeringEvent(agentId, ap, event, attrs = {}) {
     if (ap.driver.busyDeliveryMode !== "gated") return;
@@ -8376,13 +8644,9 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       return this.sendStdinNotification(agentId);
     }
     const pendingMessages = ap.inbox.length;
-    const pendingNotificationCount = ap.pendingNotificationCount;
+    const pendingNotificationCount = ap.notifications.pendingCount;
     const nextMessages = ap.inbox.splice(0, ap.inbox.length);
-    ap.pendingNotificationCount = 0;
-    if (ap.notificationTimer) {
-      clearTimeout(ap.notificationTimer);
-      ap.notificationTimer = null;
-    }
+    ap.notifications.clear();
     ap.gatedSteering.lastFlushReason = reason;
     if (reason !== "turn_end") {
       ap.gatedSteering.inFlightBatch = {
@@ -8405,16 +8669,13 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     if (reason !== "turn_end") {
       ap.gatedSteering.inFlightBatch = null;
     }
-    ap.pendingNotificationCount += pendingNotificationCount || pendingMessages;
+    ap.notifications.add(pendingNotificationCount || pendingMessages);
     return false;
   }
   flushCompactionBoundaryMessages(agentId, ap) {
     if (!ap.sessionId || !ap.driver.supportsStdinNotification || ap.inbox.length === 0) return false;
-    if (ap.pendingNotificationCount > 0) {
-      if (ap.notificationTimer) {
-        clearTimeout(ap.notificationTimer);
-        ap.notificationTimer = null;
-      }
+    if (ap.notifications.pendingCount > 0) {
+      ap.notifications.clearTimer();
       this.sendStdinNotification(agentId);
       return true;
     }
@@ -8442,7 +8703,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   handleRuntimeStartupTimeout(agentId, ap, timeoutMs) {
     const current = this.agents.get(agentId);
     if (current !== ap) return;
-    if (ap.lastRuntimeEventKind) {
+    if (ap.runtimeProgress.lastEventKind) {
       this.clearRuntimeStartupTimeout(ap);
       return;
     }
@@ -8451,8 +8712,8 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     const detail = terminalFailureDetail?.detail ?? formatRuntimeStartTimeoutMessage(ap.driver.id);
     ap.startupTimedOut = true;
     ap.lastRuntimeError = detail;
-    ap.runtimeProgressStaleSince = Date.now();
-    const staleForMs = Math.max(timeoutMs, Date.now() - ap.lastRuntimeEventAt);
+    ap.runtimeProgress.markStale();
+    const staleForMs = Math.max(timeoutMs, ap.runtimeProgress.ageMs());
     const diagnostic = buildRuntimeStallDiagnostic(ap, staleForMs, Math.max(1, Math.floor(staleForMs / 6e4)));
     this.recordRuntimeTraceEvent(agentId, ap, "runtime.start.timeout", {
       turn_outcome: "failed",
@@ -8491,7 +8752,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     const batch = ap.gatedSteering.inFlightBatch;
     ap.gatedSteering.inFlightBatch = null;
     ap.inbox.unshift(...batch.messages);
-    ap.pendingNotificationCount += batch.messages.length;
+    ap.notifications.add(batch.messages.length);
     this.recordGatedSteeringEvent(agentId, ap, "requeue", {
       reason,
       originalFlushReason: batch.reason,
@@ -8503,11 +8764,10 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   }
   markRuntimeProgressStaleIfNeeded(agentId, ap) {
     if (ap.lastActivity !== "working" && ap.lastActivity !== "thinking") return false;
-    if (ap.runtimeProgressStaleSince) return true;
-    const staleForMs = Date.now() - ap.lastRuntimeEventAt;
+    if (ap.runtimeProgress.isStale) return true;
+    const staleForMs = ap.runtimeProgress.ageMs();
     if (staleForMs < RUNTIME_PROGRESS_STALE_MS) return false;
-    if (this.observeRuntimeTranscriptProgress(agentId, ap, staleForMs, "activity_heartbeat")) return false;
-    ap.runtimeProgressStaleSince = Date.now();
+    ap.runtimeProgress.markStale();
     const staleForMinutes = Math.max(1, Math.floor(staleForMs / 6e4));
     const diagnostic = buildRuntimeStallDiagnostic(ap, staleForMs, staleForMinutes);
     const turnReason = classifyRuntimeStallReason(ap);
@@ -8540,11 +8800,10 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     const canRestartDirectStdinProcess = directStdinRuntime && Boolean(ap.sessionId) && (ap.gatedSteering.outstandingToolUses === 0 || hasDirectStdinRecoveryEvidence(ap));
     const canRestartStalledProcess = !ap.driver.supportsStdinNotification || canRestartDirectStdinProcess;
     if (!canRestartStalledProcess) return false;
-    const staleForMs = Date.now() - ap.lastRuntimeEventAt;
-    if (staleForMs < RUNTIME_PROGRESS_STALE_MS && !ap.runtimeProgressStaleSince) return false;
-    if (this.observeRuntimeTranscriptProgress(agentId, ap, staleForMs, "queued_recovery")) return false;
+    const staleForMs = ap.runtimeProgress.ageMs();
+    if (staleForMs < RUNTIME_PROGRESS_STALE_MS && !ap.runtimeProgress.isStale) return false;
     const staleForMinutes = Math.max(1, Math.floor(staleForMs / 6e4));
-    ap.runtimeProgressStaleSince ??= Date.now();
+    ap.runtimeProgress.markStale();
     const diagnostic = buildRuntimeStallDiagnostic(ap, staleForMs, staleForMinutes);
     const turnReason = classifyRuntimeStallReason(ap);
     this.recordRuntimeTraceEvent(agentId, ap, "runtime.progress.stalled", {
@@ -8593,14 +8852,38 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   /** Handle a single ParsedEvent from any runtime driver */
   handleParsedEvent(agentId, event, driver) {
     const ap = this.agents.get(agentId);
+    if (event.kind === "telemetry") {
+      if (ap) this.recordRuntimeTelemetry(agentId, ap, event);
+      return;
+    }
     if (ap) {
-      const wasStalled = Boolean(ap.runtimeProgressStaleSince);
+      const wasStalled = ap.runtimeProgress.isStale;
       this.clearRuntimeStartupTimeout(ap);
       this.noteRuntimeTraceCounter(ap, event);
-      this.recordRuntimeTraceEvent(agentId, ap, "runtime.event.received", { kind: event.kind });
+      const eventAttrs = event.kind === "internal_progress" ? {
+        kind: event.kind,
+        source: event.source,
+        itemType: event.itemType,
+        payloadBytes: event.payloadBytes
+      } : { kind: event.kind };
+      this.recordRuntimeTraceEvent(agentId, ap, "runtime.event.received", eventAttrs);
       if (wasStalled) {
         this.recordRuntimeTraceEvent(agentId, ap, "runtime.progress.observed", { afterStall: true });
       }
+      if (event.kind === "internal_progress") {
+        ap.runtimeProgress.noteInternalProgress();
+        this.recordRuntimeTraceEvent(agentId, ap, "runtime.progress.internal_observed", {
+          turn_outcome: "held",
+          turn_subtype: "runtime_progress",
+          turn_reason: "internal_activity_observed",
+          signal: event.source,
+          source: "runtime_event",
+          runtime: ap.config.runtime,
+          itemType: event.itemType,
+          payloadBytes: event.payloadBytes
+        });
+        return;
+      }
       this.noteRuntimeProgress(ap, event.kind);
     }
     switch (event.kind) {
@@ -8704,11 +8987,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
           this.setGatedSteeringPhase(agentId, ap, "idle", { event: "turn_end" });
           if (ap.inbox.length > 0 && ap.driver.supportsStdinNotification && ap.sessionId) {
             const nextMessages = ap.inbox.splice(0, ap.inbox.length);
-            ap.pendingNotificationCount = 0;
-            if (ap.notificationTimer) {
-              clearTimeout(ap.notificationTimer);
-              ap.notificationTimer = null;
-            }
+            ap.notifications.clear();
             if (ap.driver.busyDeliveryMode === "gated") {
               ap.gatedSteering.lastFlushReason = "turn_end";
               this.recordGatedSteeringEvent(agentId, ap, "flush", {
@@ -8802,11 +9081,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
               }
             } else {
               ap.isIdle = true;
-              ap.pendingNotificationCount = 0;
-              if (ap.notificationTimer) {
-                clearTimeout(ap.notificationTimer);
-                ap.notificationTimer = null;
-              }
+              ap.notifications.clear();
               logger.info(`[Agent ${agentId}] Marked ${ap.driver.id} wakeable after terminal runtime error`);
             }
           }
@@ -8818,6 +9093,18 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       }
     }
   }
+  recordRuntimeTelemetry(agentId, ap, event) {
+    const attrs = {
+      agentId,
+      launchId: ap.launchId || void 0,
+      runtime: ap.config.runtime,
+      model: ap.config.model,
+      telemetry_name: event.name,
+      ...event.attrs
+    };
+    ap.runtimeTraceSpan?.addEvent(`runtime.telemetry.${event.name}`, event.attrs);
+    this.recordDaemonTrace(`daemon.runtime.telemetry.${event.name}`, attrs);
+  }
   sendAgentStatus(agentId, status, launchId) {
     this.sendToServer({ type: "agent:status", agentId, status, launchId: launchId || void 0 });
   }
@@ -8871,12 +9158,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   sendStdinNotification(agentId) {
     const ap = this.agents.get(agentId);
     if (!ap) return false;
-    const count = ap.pendingNotificationCount;
-    ap.pendingNotificationCount = 0;
-    if (ap.notificationTimer) {
-      clearTimeout(ap.notificationTimer);
-      ap.notificationTimer = null;
-    }
+    const count = ap.notifications.takePendingAndClearTimer();
     if (count === 0) return false;
     if (ap.isIdle) return false;
     if (!ap.sessionId) return false;
@@ -8886,7 +9168,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         pendingMessages: ap.inbox.length,
         busyDeliveryMode: ap.driver.busyDeliveryMode
       });
-      ap.pendingNotificationCount += count;
+      ap.notifications.add(count);
       logger.info(
         `[Agent ${agentId}] Suppressing stdin delivery until context compaction finishes; pending=${ap.inbox.length}`
       );
@@ -8912,7 +9194,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       });
       return true;
     } else {
-      ap.pendingNotificationCount += count;
+      ap.notifications.add(count);
       this.recordDaemonTrace("daemon.agent.stdin_notification", {
         agentId,
         runtime: ap.config.runtime,
@@ -8963,7 +9245,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       messages_count: messages.length,
       session_id_present: Boolean(ap.sessionId),
       inbox_count: ap.inbox.length,
-      pending_notification_count: ap.pendingNotificationCount,
+      pending_notification_count: ap.notifications.pendingCount,
       busy_delivery_mode: ap.driver.busyDeliveryMode,
       supports_stdin_notification: ap.driver.supportsStdinNotification,
       ...this.messagesTraceAttrs(messages)
@@ -10443,10 +10725,19 @@ var DaemonCore = class {
       case "agent:start":
         logger.info(`[Agent ${msg.agentId}] Start requested (runtime=${msg.config.runtime}, model=${msg.config.model}, session=${msg.config.sessionId || "new"}${msg.wakeMessage ? ", wake=true" : ""})`);
         this.startAgentFromMessage(msg).catch((err) => {
-          const reason = err instanceof Error ? err.message : String(err);
-          logger.error(`[Agent ${msg.agentId}] Start failed (${reason})`);
+          const classification = classifySpawnFailure(err);
+          logger.error(`[Agent ${msg.agentId}] Start failed (${classification.reason}): ${classification.detail}`);
+          this.recordDaemonTrace("daemon.agent.spawn.failed", {
+            agentId: msg.agentId,
+            launchId: msg.launchId,
+            runtime: msg.config.runtime,
+            model: msg.config.model,
+            failure_reason: classification.reason,
+            failure_detail: classification.detail,
+            session_id_present: Boolean(msg.config.sessionId)
+          }, "error");
           this.connection.send({ type: "agent:status", agentId: msg.agentId, status: "inactive", launchId: msg.launchId });
-          this.connection.send({ type: "agent:activity", agentId: msg.agentId, activity: "offline", detail: `Start failed: ${reason}`, launchId: msg.launchId });
+          this.connection.send({ type: "agent:activity", agentId: msg.agentId, activity: "offline", detail: classification.userMessage, launchId: msg.launchId });
         });
         break;
       case "agent:stop":