@fangyb/ahchat-bridge 0.1.35 → 0.1.37

package/dist/index.js

@@ -3635,6 +3635,8 @@ var DEFAULT_QUERY_CONFIG = {
   maxActive: 5040,
   idleTimeoutMs: 6e5,
   workingSilenceTimeoutMs: 12e5,
+  replyStallTimeoutMs: 3e5,
+  busySilenceTimeoutMs: 18e5,
   evictionIntervalMs: 6e4,
   statusReportIntervalMs: 6e4,
   allowBuiltinWebSearch: false,
@@ -3692,6 +3694,14 @@ function mergeQueryConfig(file2) {
       "AHCHAT_BRIDGE_WORKING_SILENCE_TIMEOUT_MS",
       q?.workingSilenceTimeoutMs ?? DEFAULT_QUERY_CONFIG.workingSilenceTimeoutMs
     ),
+    replyStallTimeoutMs: readEnvInt(
+      "AHCHAT_BRIDGE_REPLY_STALL_TIMEOUT_MS",
+      q?.replyStallTimeoutMs ?? DEFAULT_QUERY_CONFIG.replyStallTimeoutMs
+    ),
+    busySilenceTimeoutMs: readEnvInt(
+      "AHCHAT_BRIDGE_BUSY_SILENCE_TIMEOUT_MS",
+      q?.busySilenceTimeoutMs ?? DEFAULT_QUERY_CONFIG.busySilenceTimeoutMs ?? 18e5
+    ),
     evictionIntervalMs: readEnvInt(
       "AHCHAT_BRIDGE_EVICTION_INTERVAL_MS",
       q?.evictionIntervalMs ?? DEFAULT_QUERY_CONFIG.evictionIntervalMs
@@ -3772,7 +3782,11 @@ function loadBridgeConfig(opts) {
     ) || null,
     logUploadIntervalMs: readEnvInt(
       "AHCHAT_LOG_UPLOAD_INTERVAL_MS",
-      fileConfig.logUploadIntervalMs ?? 24 * 60 * 60 * 1e3
+      // Flush every 60s instead of once a day. Daily flushing let logs pile up for hours,
+      // then dumped tens of thousands of entries in one cycle on the next process start,
+      // blowing past the server's per-minute upload quota (3000 entries / 3MB) and getting
+      // 429'd. Small frequent batches stay well under that ceiling.
+      fileConfig.logUploadIntervalMs ?? 6e4
     ),
     queryConfig: mergeQueryConfig(fileConfig)
   };
@@ -4485,8 +4499,32 @@ ${entry.error.stack}` : ""}`
   return `${ts} ${level} ${scope} ${entry.msg}${data}${trace}${errPart}`;
 };
 
+// ../logger/src/fallback.ts
+function logFallback(logger43, event) {
+  const payload = {
+    ...event.traceId ? { traceId: event.traceId } : {},
+    fallback: {
+      fallbackId: event.fallbackId,
+      type: event.type,
+      phase: event.phase,
+      expected: event.expected,
+      ...event.context ? { context: event.context } : {},
+      ...event.outcome ? { outcome: event.outcome } : {}
+    }
+  };
+  const msg = `[FALLBACK] ${event.type}:${event.phase}`;
+  const useDebug = event.expected && event.phase !== "outcome";
+  if (useDebug) {
+    logger43.debug(msg, payload);
+  } else {
+    logger43.warn(msg, payload);
+  }
+}
+
 // ../logger/src/transports/console.ts
 var protectedStreams = /* @__PURE__ */ new WeakSet();
+function ignoreWriteError(_error) {
+}
 function defaultStream(kind) {
   const maybeGlobal = globalThis;
   return maybeGlobal.process?.[kind];
@@ -4499,12 +4537,13 @@ function safeWriteLine(stream, line, fallback) {
   if (stream.destroyed || stream.writableEnded) return;
   if (typeof stream === "object" && typeof stream.on === "function" && !protectedStreams.has(stream)) {
     protectedStreams.add(stream);
-    stream.on("error", () => void 0);
+    stream.on("error", ignoreWriteError);
   }
   try {
     stream.write(`${line}
-`, () => void 0);
-  } catch {
+`, ignoreWriteError);
+  } catch (e) {
+    ignoreWriteError(e);
   }
 }
 function consoleTransport(opts) {
@@ -5137,8 +5176,31 @@ function parseSize(maxSize) {
   return trimmed;
 }
 var streamCache = /* @__PURE__ */ new Map();
+var droppedEntryCount = 0;
+var lastReportedDroppedTotal = 0;
+function buildLogDroppedSentinel(fmt, source, droppedTotal) {
+  const entry = {
+    ts: (/* @__PURE__ */ new Date()).toISOString(),
+    level: "WARN",
+    source,
+    module: "logger.file",
+    msg: "log_dropped",
+    data: { droppedTotal }
+  };
+  return fmt(entry);
+}
+function writeWithDroppedSentinel(stream, fmt, line, source) {
+  stream.write(`${line}
+`);
+  if (droppedEntryCount > lastReportedDroppedTotal) {
+    lastReportedDroppedTotal = droppedEntryCount;
+    stream.write(`${buildLogDroppedSentinel(fmt, source, droppedEntryCount)}
+`);
+  }
+}
 function fileTransport(opts) {
   const fmt = opts.formatter ?? jsonFormatter;
+  const logSource = opts.source ?? "server";
   const resolved = path2.resolve(opts.path);
   let cached2 = streamCache.get(resolved);
   if (!cached2) {
@@ -5153,11 +5215,14 @@ function fileTransport(opts) {
     streamCache.set(resolved, cached2);
   }
   return (entry) => {
-    if (cached2.closed || cached2.stream.destroyed || cached2.stream.writableEnded) return;
+    if (cached2.closed || cached2.stream.destroyed || cached2.stream.writableEnded) {
+      droppedEntryCount += 1;
+      return;
+    }
     try {
-      cached2.stream.write(`${fmt(entry)}
-`);
+      writeWithDroppedSentinel(cached2.stream, fmt, fmt(entry), logSource);
     } catch {
+      droppedEntryCount += 1;
     }
   };
 }
@@ -5907,6 +5972,9 @@ function createMessageId() {
 function createTraceId() {
   return `tr_${Date.now().toString(36)}_${nanoid(6)}`;
 }
+function createFallbackId() {
+  return `flb_${Date.now().toString(36)}_${nanoid(6)}`;
+}
 function createRequestId() {
   return `req_${Date.now().toString(36)}_${nanoid(6)}`;
 }
@@ -5916,6 +5984,12 @@ function createCronReplyMessageId() {
 function createInboxFlushReplyMessageId() {
   return `msg_inbox_${Date.now().toString(36)}_${nanoid(6)}`;
 }
+function createNeuralSendReplyMessageId() {
+  return `msg_nsend_${Date.now().toString(36)}_${nanoid(6)}`;
+}
+function createScopeNoticeReplyMessageId() {
+  return `msg_scopenotice_${Date.now().toString(36)}_${nanoid(6)}`;
+}
 function createCronTraceId() {
   return `tr_cron_${Date.now().toString(36)}_${nanoid(6)}`;
 }
@@ -5974,6 +6048,10 @@ function assertStringPayloadOneOf(type, payload, field, allowed) {
     throw invalidWsMessage(type, field);
   }
 }
+function assertOptionalStringPayloadOneOf(type, payload, field, allowed) {
+  if (payload[field] === void 0) return;
+  assertStringPayloadOneOf(type, payload, field, allowed);
+}
 function assertArrayPayloadField(type, payload, field) {
   if (!Array.isArray(payload[field])) {
     throw invalidWsMessage(type, field);
@@ -6054,6 +6132,7 @@ function validateWSMessageShape(msg) {
     case "agent:error": {
       assertPayloadRecord(type, payload);
       validateRequiredStrings(type, payload, ["ackId", "agentId", "conversationId", "error", "traceId"]);
+      assertOptionalStringPayloadOneOf(type, payload, "reason", ["user_quota_exceeded", "company_quota_exceeded"]);
       return;
     }
     case "directory:register": {
@@ -7641,6 +7720,60 @@ var readpageScrapeTool = {
   enabled: true,
   permissionPolicy: "always_allow"
 };
+var seedreamGenerateImageTool = {
+  name: "generate_image",
+  displayName: "Seedream \u751F\u56FE",
+  description: "\u4F7F\u7528\u706B\u5C71\u65B9\u821F Seedream \u751F\u6210\u5355\u5F20\u56FE\u7247\uFF0C\u652F\u6301\u6587\u672C\u751F\u56FE\u4E0E\u53C2\u8003\u56FE\u751F\u56FE\uFF0C\u4F1A\u4EA7\u751F\u516C\u53F8 Ark \u8D26\u53F7\u7528\u91CF\u3002",
+  category: "media",
+  riskLevel: "medium",
+  enabled: true,
+  permissionPolicy: "always_ask"
+};
+var seedreamEditImageTool = {
+  name: "edit_image",
+  displayName: "Seedream \u6539\u56FE",
+  description: "\u4F7F\u7528\u706B\u5C71\u65B9\u821F Seedream \u6839\u636E\u53C2\u8003\u56FE\u548C\u63D0\u793A\u8BCD\u7F16\u8F91\u6216\u91CD\u7ED8\u5355\u5F20\u56FE\u7247\uFF0C\u4F1A\u4EA7\u751F\u516C\u53F8 Ark \u8D26\u53F7\u7528\u91CF\u3002",
+  category: "media",
+  riskLevel: "medium",
+  enabled: true,
+  permissionPolicy: "always_ask"
+};
+var seedreamGenerateImageGroupTool = {
+  name: "generate_image_group",
+  displayName: "Seedream \u5355\u56FE",
+  description: "\u517C\u5BB9\u65E7\u540D\u79F0\u7684 Seedream \u5355\u56FE\u751F\u6210\u5DE5\u5177\uFF0C\u4F1A\u4EA7\u751F\u516C\u53F8 Ark \u8D26\u53F7\u7528\u91CF\u3002\u5F53\u524D\u6BCF\u6B21\u8BF7\u6C42\u53EA\u751F\u6210 1 \u5F20\u56FE\u7247\u3002",
+  category: "media",
+  riskLevel: "medium",
+  enabled: true,
+  permissionPolicy: "always_ask"
+};
+var seedanceUsageGuideTool = {
+  name: "seedance_usage_guide",
+  displayName: "Seedance \u4F7F\u7528\u8BF4\u660E",
+  description: "\u67E5\u770B Seedance \u89C6\u9891\u751F\u6210\u6D41\u7A0B\u4E0E\u53C2\u6570\u8BF4\u660E\uFF0C\u4E0D\u521B\u5EFA\u65B0\u7684\u751F\u6210\u4EFB\u52A1\u3002",
+  category: "media",
+  riskLevel: "low",
+  enabled: true,
+  permissionPolicy: "always_allow"
+};
+var seedanceCreateTaskTool = {
+  name: "seedance_create_task",
+  displayName: "Seedance \u751F\u89C6\u9891",
+  description: "\u4F7F\u7528\u706B\u5C71\u65B9\u821F Seedance \u521B\u5EFA\u5355\u4E2A\u89C6\u9891\u751F\u6210\u4EFB\u52A1\uFF0C\u4F1A\u4EA7\u751F\u516C\u53F8 Ark \u8D26\u53F7\u7528\u91CF\u3002\u5F53\u524D\u6BCF\u6B21\u8BF7\u6C42\u53EA\u751F\u6210 1 \u4E2A\u89C6\u9891\u3002",
+  category: "media",
+  riskLevel: "high",
+  enabled: true,
+  permissionPolicy: "always_ask"
+};
+var seedanceCheckTaskTool = {
+  name: "seedance_check_task",
+  displayName: "Seedance \u67E5\u7ED3\u679C",
+  description: "\u67E5\u8BE2 Seedance \u89C6\u9891\u751F\u6210\u4EFB\u52A1\u72B6\u6001\u4E0E\u89C6\u9891 URL\uFF0C\u4E0D\u521B\u5EFA\u65B0\u7684\u751F\u6210\u4EFB\u52A1\u3002",
+  category: "media",
+  riskLevel: "low",
+  enabled: true,
+  permissionPolicy: "always_allow"
+};
 var context7ResolveLibraryTool = {
   name: "resolve-library-id",
   displayName: "\u89E3\u6790\u6587\u6863\u5E93",
@@ -7947,8 +8080,56 @@ var ALIYUN_IQS_MCP_PROVIDERS = [
     tools: [readpageBasicTool, readpageScrapeTool]
   }
 ];
+var VOLCENGINE_SEEDREAM_MCP_PROVIDER = {
+  providerId: "volcengine_seedream",
+  name: "Volcengine Seedream",
+  summary: "\u706B\u5C71\u65B9\u821F Seedream \u56FE\u7247\u751F\u6210/\u7F16\u8F91 MCP\uFF0C\u4F7F\u7528\u516C\u53F8\u7EDF\u4E00 Ark Key\uFF0C\u5E76\u8FDB\u5165 AHChat \u8C03\u7528\u5BA1\u8BA1\u3002",
+  serverName: "seedream",
+  transport: "stdio",
+  url: null,
+  command: "ahchat-builtin",
+  args: ["seedream-mcp"],
+  env: {
+    ARK_API_KEY: "",
+    ARK_BASE_URL: "https://ark.cn-beijing.volces.com/api/v3"
+  },
+  authType: "x_api_key",
+  customHeaders: [],
+  enabled: true,
+  alwaysLoad: true,
+  tools: [
+    seedreamGenerateImageTool,
+    seedreamEditImageTool,
+    seedreamGenerateImageGroupTool
+  ]
+};
+var VOLCENGINE_SEEDANCE_MCP_PROVIDER = {
+  providerId: "volcengine_seedance",
+  name: "Volcengine Seedance",
+  summary: "\u706B\u5C71\u65B9\u821F Seedance \u89C6\u9891\u751F\u6210 MCP\uFF0C\u4F7F\u7528\u516C\u53F8\u7EDF\u4E00 Ark Key\uFF0C\u5E76\u8FDB\u5165 AHChat \u8C03\u7528\u5BA1\u8BA1\u3002",
+  serverName: "seedance",
+  transport: "stdio",
+  url: null,
+  command: "ahchat-builtin",
+  args: ["seedance-mcp"],
+  env: {
+    ARK_API_KEY: "",
+    ARK_BASE_URL: "https://ark.cn-beijing.volces.com/api/v3"
+  },
+  authType: "x_api_key",
+  customHeaders: [],
+  enabled: true,
+  alwaysLoad: true,
+  tools: [
+    seedanceUsageGuideTool,
+    seedanceCreateTaskTool,
+    seedanceCheckTaskTool
+  ]
+};
 var OFFICIAL_MCP_PROVIDERS = [
-  ...ALIYUN_IQS_MCP_PROVIDERS
+  ...ALIYUN_IQS_MCP_PROVIDERS,
+  VOLCENGINE_SEEDREAM_MCP_PROVIDER,
+  VOLCENGINE_SEEDANCE_MCP_PROVIDER
 ];
 var MCP_STORE_PROVIDERS = [
   {
@@ -8790,8 +8971,7 @@ var AskQuestionRegistry = class {
       questionId,
       agentId: entry.agentId,
       waitedMs: Date.now() - entry.askedAt,
-      answerLen: answerText2.length,
-      answerSample: answerText2.slice(0, 200)
+      answerLen: answerText2.length
     });
     entry.resolve(answerText2);
     return true;
@@ -8932,7 +9112,7 @@ function makeAskUserQuestionGuard(deps) {
         bundleIndex,
         bundleSize,
         replyMessageId: task.replyMessageId,
-        question: q.question.slice(0, 200),
+        questionLen: q.question.length,
         optionCount: options.length,
         multiSelect,
         traceId: task.traceId
@@ -9031,7 +9211,7 @@ function makeAskUserQuestionGuard(deps) {
       bundleId,
       bundleSize,
       replyMessageId: task.replyMessageId,
-      combinedSample: combined.slice(0, 200),
+      combinedLen: combined.length,
       traceId: task.traceId
     });
     return { behavior: "deny", message: combined };
@@ -24054,6 +24234,17 @@ var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
   ".yaml",
   ".yml"
 ]);
+var OFFICE_DOCUMENT_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".docx",
+  ".xlsx",
+  ".pptx",
+  ".pdf",
+  ".odt",
+  ".ods",
+  ".odp",
+  ".rtf"
+]);
+var PLAIN_TEXT_BINARY_SNIFF_BYTES = 8192;
 var DEFAULT_MAX_CHARS = 5e5;
 var DEFAULT_TIMEOUT_MS = 45e3;
 function isReadableDocumentPath(filePath) {
@@ -24073,9 +24264,6 @@ function resolveDocumentPath(inputPath, cwd) {
 async function readDocumentAsMarkdown(inputPath, opts = {}) {
   const resolvedPath = opts.cwd ? resolveDocumentPath(inputPath, opts.cwd) : path9.resolve(resolveUserPath(inputPath));
   const ext = path9.extname(resolvedPath).toLowerCase();
-  if (!isReadableDocumentPath(resolvedPath)) {
-    throw new Error(`unsupported document type: ${ext || "(no extension)"}`);
-  }
   const stat3 = await fs4.stat(resolvedPath);
   if (!stat3.isFile()) throw new Error("path is not a file");
   const warnings = [];
@@ -24084,8 +24272,10 @@ async function readDocumentAsMarkdown(inputPath, opts = {}) {
     markdown = await fs4.readFile(resolvedPath, "utf-8");
   } else if (ext === ".xls") {
     markdown = await convertLegacyExcelDocument(resolvedPath);
-  } else {
+  } else if (OFFICE_DOCUMENT_EXTENSIONS.has(ext)) {
     markdown = await convertOfficeDocument(resolvedPath, opts.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+  } else {
+    markdown = await readPlainTextDocument(resolvedPath, ext);
   }
   markdown = normalizeDocumentText(markdown);
   const maxChars = opts.maxChars ?? DEFAULT_MAX_CHARS;
@@ -24224,6 +24414,14 @@ async function convertDocxWithOfficeCli(filePath, timeoutMs) {
   });
   return text;
 }
+async function readPlainTextDocument(filePath, ext) {
+  const buffer = await fs4.readFile(filePath);
+  const sample = buffer.subarray(0, Math.min(buffer.length, PLAIN_TEXT_BINARY_SNIFF_BYTES));
+  if (sample.includes(0)) {
+    throw new Error(`unsupported document type: ${ext || "(no extension)"}`);
+  }
+  return buffer.toString("utf-8");
+}
 async function convertLegacyExcelDocument(filePath) {
   const XLSX = await import("./xlsx-E4ZR5JHK.js");
   const workbook = XLSX.readFile(filePath, { cellDates: true });
@@ -24693,8 +24891,7 @@ async function createNeuralMcpServer(deps) {
         agentId: deps.agentId,
         fromScope: currentScopeKey,
         rawTargetScope: args.target_scope,
-        messageLen: args.message.length,
-        messageSample: args.message.slice(0, 120)
+        messageLen: args.message.length
       });
       const trimmed = args.message.trim();
       if (!trimmed) {
@@ -24788,7 +24985,7 @@ async function createNeuralMcpServer(deps) {
           toScope: resolvedKey,
           repeatsInWindow: sendHistory.length,
           windowMs: NEURAL_DEDUP_WINDOW_MS,
-          messageSample: trimmed.slice(0, 120)
+          messageLen: trimmed.length
         });
         return {
           content: [{
@@ -24815,8 +25012,7 @@ async function createNeuralMcpServer(deps) {
           agentId: deps.agentId,
           fromScope: currentScopeKey,
           toScope: resolvedKey,
-          messageLen: trimmed.length,
-          messageSample: trimmed.slice(0, 120)
+          messageLen: trimmed.length
         });
         return {
           content: [{ type: "text", text: `[neural_send] \u5DF2\u9001\u8FBE\u5230\u300C${toLabel}\u300D(scope: ${resolvedKey})\u3002` }]
@@ -25173,6 +25369,7 @@ action="append" \u8FFD\u52A0\u65B0\u5185\u5BB9\uFF08\u6700\u5E38\u7528\uFF0Ccont
     `Read a document from the current working directory and return extracted Markdown text.
 Use this instead of the built-in Read tool for binary documents such as .docx, .xls, .xlsx, .pptx, .pdf, .odt, .ods, .odp, or .rtf.
 Also supports text-like files such as .csv, .md, .txt, .json, .xml, .yaml, and .html.
+Plain-text and source/config files (e.g. .py, .ts, Makefile, Dockerfile, and other extension-less text files) are read as-is; only true binaries are rejected.
 Pass either a relative path from the current working directory or an absolute path inside it.`,
     {
       path: external_exports.string().min(1).describe("Document path, relative to the current working directory or absolute inside it."),
@@ -27890,9 +28087,12 @@ function isAuthFailureText(text, sdkError) {
 function isProviderApiErrorText(text) {
   return /^API Error:\s*\d+/i.test(text.trim());
 }
-function isNoReplyText(text) {
+function isSdkSyntheticNoResponseText(normalizedText) {
+  return normalizedText.replace(/[.!。]+$/g, "") === "no response requested";
+}
+function isNoReplyText(text, opts) {
   const normalized = text.trim().replace(/^`+|`+$/g, "").trim().toLowerCase();
-  return normalized === NO_REPLY_TOKEN || normalized === "<no-reply>" || normalized === "no-reply" || normalized === "no_reply" || normalized === "no reply";
+  return normalized === NO_REPLY_TOKEN || normalized === "<no-reply>" || normalized === "no-reply" || normalized === "no_reply" || normalized === "no reply" || opts?.allowSdkSyntheticNoResponse === true && isSdkSyntheticNoResponseText(normalized);
 }
 function decodeJsonStringFragment(raw) {
   let out = "";
@@ -28230,6 +28430,9 @@ function emitUsageReported(proc, emit, base, usage, messageId) {
 function isGroupTask(proc) {
   return proc.currentTask?.groupId != null;
 }
+function shouldStreamInternals(proc) {
+  return !isGroupTask(proc) || proc.spectating === true;
+}
 function extractTodosFromInput(input) {
   if (!input || typeof input !== "object") return null;
   const raw = input.todos;
@@ -28361,7 +28564,6 @@ function emitGroupSegment(proc, emit, base, content, contentBlocks, isSilent = f
     contentLen: content.length,
     blockCount: contentBlocks.length,
     blockTypes: contentBlocks.map((b) => b.type),
-    contentSample: content.slice(0, 200),
     traceId: base.traceId,
     isAuditOnly: content.length === 0,
     isSilent
@@ -28380,7 +28582,7 @@ function emitGroupSegment(proc, emit, base, content, contentBlocks, isSilent = f
 }
 function flushTextSegmentOnBlockStop(proc, emit, base) {
   const trimmed = proc.segmentBuffer.trim();
-  const isSilent = isNoReplyText(trimmed);
+  const isSilent = isNoReplyText(trimmed, { allowSdkSyntheticNoResponse: true });
   const isEmpty = trimmed.length === 0;
   if (!isEmpty) {
     const blocksForSegment = [...proc.contentBlocks, { type: "text", content: proc.segmentBuffer }];
@@ -28417,9 +28619,24 @@ function flushTextSegmentOnBlockStop(proc, emit, base) {
   }
   proc.segmentBuffer = "";
 }
+function describeSdkEvent(message) {
+  const rec = message;
+  const str = (v) => typeof v === "string" && v.length > 0 ? v : void 0;
+  return {
+    type: str(rec.type) ?? "unknown",
+    subtype: str(rec.subtype),
+    toolName: str(rec.last_tool_name),
+    subagentType: str(rec.subagent_type),
+    toolUseId: str(rec.tool_use_id),
+    taskId: str(rec.task_id),
+    at: Date.now()
+  };
+}
 function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProviderApiError) {
   const emit = rawEmit;
   proc.lastSdkEventAt = Date.now();
+  proc.lastSdkEventInfo = describeSdkEvent(message);
+  proc.stallWarned = false;
   switch (message.type) {
     case "system": {
       const sysMsg = message;
@@ -28458,11 +28675,29 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
           sessionId: proc.ccSessionId
         });
       } else {
+        const sysRec = sysMsg;
+        const pick2 = (k) => typeof sysRec[k] === "string" || typeof sysRec[k] === "number" ? sysRec[k] : void 0;
+        const descriptionLen = typeof sysRec.description === "string" ? sysRec.description.length : void 0;
+        const subagentTaskId = typeof sysRec.task_id === "string" ? sysRec.task_id : void 0;
+        if (subagentTaskId) {
+          if (sysMsg.subtype === "task_started") {
+            (proc.activeSubagentTaskIds ??= /* @__PURE__ */ new Set()).add(subagentTaskId);
+          } else if (sysMsg.subtype === "task_notification") {
+            proc.activeSubagentTaskIds?.delete(subagentTaskId);
+          }
+        }
         logger10.info("SDK system subtype unhandled", {
           agentId: proc.agentId,
           scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
           subtype: sysMsg.subtype ?? "(none)",
-          keys: Object.keys(sysMsg).slice(0, 12)
+          taskId: pick2("task_id"),
+          toolUseId: pick2("tool_use_id"),
+          subagentType: pick2("subagent_type"),
+          taskType: pick2("task_type"),
+          lastToolName: pick2("last_tool_name"),
+          hasDescription: descriptionLen != null,
+          descriptionLen,
+          keys: Object.keys(sysMsg).slice(0, 16)
         });
       }
       break;
@@ -28488,13 +28723,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
           } else if (block.type === "tool_use") {
             proc.currentBlockType = "tool_use";
             proc.currentToolName = block.name ?? "unknown";
+            proc.activeToolUseStartedAt = Date.now();
             proc.accumulatedToolInput = "";
             const toolName = block.name ?? "unknown";
             proc.suppressCurrentToolUse = proc.officialMediaGenerationSatisfied === true && isOfficialMediaGenerationToolName(toolName);
             const isMcpTool = parseMcpRuntimeToolName(toolName) != null;
             proc.currentMcpInvocationId = isMcpTool ? createMcpToolInvocationId() : null;
             proc.currentMcpInvocationStartedAt = isMcpTool ? (/* @__PURE__ */ new Date()).toISOString() : null;
-            if (!isGroupTask(proc) && !proc.suppressCurrentToolUse && toolName !== "ExitPlanMode" && !isAskUserQuestionToolName(toolName)) {
+            if (shouldStreamInternals(proc) && !proc.suppressCurrentToolUse && toolName !== "ExitPlanMode" && !isAskUserQuestionToolName(toolName)) {
               emit({
                 type: "agent:tool_use",
                 payload: {
@@ -28519,7 +28755,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
           if (delta.type === "thinking_delta" && typeof delta.thinking === "string") {
             if (proc.suppressCurrentThinking) break;
             proc.accumulatedThinking += delta.thinking;
-            if (!isGroupTask(proc)) {
+            if (shouldStreamInternals(proc)) {
               emit({
                 type: "agent:thinking_chunk",
                 payload: { ...wireBase(base), chunk: delta.thinking }
@@ -28530,7 +28766,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
             if (typeof partial2 === "string") {
               proc.accumulatedToolInput += partial2;
               const liveInput = extractLiveToolInput(proc.currentToolName, proc.accumulatedToolInput);
-              if (!isGroupTask(proc) && liveInput && proc.currentToolName != null) {
+              if (shouldStreamInternals(proc) && liveInput && proc.currentToolName != null) {
                 emit({
                   type: "agent:tool_input_update",
                   payload: {
@@ -28564,7 +28800,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
         }
         case "content_block_stop": {
           if (proc.currentBlockType === "thinking") {
-            if (!isGroupTask(proc) && !proc.suppressCurrentThinking) {
+            if (shouldStreamInternals(proc) && !proc.suppressCurrentThinking) {
               emit({
                 type: "agent:thinking_done",
                 payload: wireBase(getTaskBase(proc))
@@ -28589,8 +28825,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
                   error: error51,
                   agentId: proc.agentId,
                   toolName: proc.currentToolName,
-                  inputLen: proc.accumulatedToolInput.length,
-                  sample: proc.accumulatedToolInput.slice(0, 200)
+                  inputLen: proc.accumulatedToolInput.length
                 });
               }
             }
@@ -28599,7 +28834,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
               if (lastToolUse && lastToolUse.type === "tool_use") {
                 lastToolUse.input = parsedInput;
               }
-              if (!isGroupTask(proc) && proc.currentToolName != null && LIVE_INPUT_PREVIEW_TOOLS.has(proc.currentToolName) && Object.keys(parsedInput).length > 0) {
+              if (shouldStreamInternals(proc) && proc.currentToolName != null && LIVE_INPUT_PREVIEW_TOOLS.has(proc.currentToolName) && Object.keys(parsedInput).length > 0) {
                 emit({
                   type: "agent:tool_input_update",
                   payload: {
@@ -28723,7 +28958,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
           blockTypes,
           hasToolResult,
           hasPlainText,
-          contentSample: typeof content === "string" ? content.slice(0, 200) : JSON.stringify(content).slice(0, 200)
+          contentLen: typeof content === "string" ? content.length : JSON.stringify(content).length
         });
         break;
       }
@@ -28732,7 +28967,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
           agentId: proc.agentId,
           scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
           blockTypes,
-          contentSample: JSON.stringify(content).slice(0, 300),
+          contentLen: JSON.stringify(content).length,
           replyMessageId: base.replyMessageId
         });
       }
@@ -28753,6 +28988,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
               });
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
+              proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
               continue;
             }
@@ -28760,6 +28996,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
               proc.officialMediaGenerationSatisfied = true;
             }
             if (isAskUserQuestionToolName(toolName)) {
+              proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
               continue;
             }
@@ -28787,7 +29024,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
             }
-            if (!isGroupTask(proc)) {
+            if (shouldStreamInternals(proc)) {
               emit({
                 type: "agent:tool_result",
                 payload: {
@@ -28811,6 +29048,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
                 }
               }
             }
+            proc.activeToolUseStartedAt = void 0;
           }
         }
       }
@@ -28867,7 +29105,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
         const groupMode = groupId != null;
         const usage = extractUsage(successMsg);
         const watermarkUsage = proc.peakContextUsage ?? usage;
-        if (isNoReplyText(trimmed)) {
+        if (isNoReplyText(trimmed, { allowSdkSyntheticNoResponse: groupMode })) {
           checkInputTokenWatermark(proc, watermarkUsage, base.traceId);
           emitUsageReported(proc, emit, base, usage);
           if (groupMode && proc.contentBlocks.length > 0) {
@@ -28889,7 +29127,6 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
             groupId,
             compactScheduled: proc.compactRequested === true,
             fullTextLen: proc.accumulatedText.length,
-            fullTextSample: proc.accumulatedText.slice(0, 200),
             accumulatedBlockCount: proc.contentBlocks.length,
             accumulatedBlockTypes: proc.contentBlocks.map((b) => b.type),
             silentSegmentEmitted: groupMode
@@ -28933,7 +29170,6 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
             segmentCount: proc.segmentCount,
             compactScheduled: proc.compactRequested === true,
             fullTextLen: proc.accumulatedText.length,
-            fullTextSample: proc.accumulatedText.slice(0, 200),
             traceId: base.traceId
           });
           emit({
@@ -28984,7 +29220,6 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
           ackId: base.replyMessageId,
           messageId: carrierMessageId,
           textLen: proc.accumulatedText.length,
-          textSample: proc.accumulatedText.slice(0, 200),
           tokenCount: usage.tokenCount,
           traceId: base.traceId
         });
@@ -29177,8 +29412,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onProv
           logger10.info("Captured non-streamed assistant message", {
             agentId: proc.agentId,
             scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
-            textLen: text.length,
-            textSample: text.slice(0, 100)
+            textLen: text.length
           });
         } else {
           proc.lastAssistantContentDescription = describeAssistantContent(am.message?.content);
@@ -29202,6 +29436,7 @@ function resetAccumulators(proc) {
   proc.currentToolName = null;
   proc.currentMcpInvocationId = null;
   proc.currentMcpInvocationStartedAt = null;
+  proc.activeToolUseStartedAt = void 0;
   proc.segmentBuffer = "";
   proc.segmentCount = 0;
   proc.accumulatedToolInput = "";
@@ -29211,6 +29446,7 @@ function resetAccumulators(proc) {
   proc.officialMediaGenerationSatisfied = false;
   proc.suppressCurrentThinking = false;
   proc.suppressCurrentToolUse = false;
+  proc.activeSubagentTaskIds?.clear();
 }
 
 // src/forkHistoryReplay.ts
@@ -29398,7 +29634,7 @@ function missingSubscriptionMessage(subscriptionId) {
 }
 var NODE_USER_UID = 1e3;
 var POST_MERGE_CONTINUATION_ROUTE_MS = 15e3;
-var SCOPE_PROMPT_FINGERPRINT_REVISION = "workdir-scope-prompt-v2";
+var SCOPE_PROMPT_FINGERPRINT_REVISION = "workdir-scope-mcp-abi-prompt-v4";
 var BINARY_ATTACHMENT_EXT_RE = /\.(?:7z|bmp|csv|doc|docx|gif|jpeg|jpg|m4a|mov|mp3|mp4|pdf|png|ppt|pptx|rar|rtf|wav|webm|webp|xls|xlsx|zip)$/i;
 var DOCUMENT_READING_RULES = `DOCUMENT READING:
 - The built-in Read tool cannot read binary office documents such as .docx, .xls, .xlsx, .pptx, .pdf, .odt, .ods, .odp, or .rtf.
@@ -29413,6 +29649,16 @@ var MEDIA_GENERATION_RULES = `MEDIA GENERATION:
 - Keep media replies short. Do not print raw media URLs, request_id, task_id, polling logs, or "let me check again" narration unless the user explicitly asks for diagnostics.
 - When a media task is submitted or completed, write only a natural one-line note such as "\u5DF2\u5F00\u59CB\u751F\u6210\uFF0C\u6211\u4F1A\u5728\u8FD9\u91CC\u66F4\u65B0\u7ED3\u679C\u3002" or "\u751F\u6210\u597D\u4E86\uFF0C\u53EF\u4EE5\u5728\u5361\u7247\u91CC\u67E5\u770B\u3002"; let the media card show status, preview, download, copy, and regenerate actions.
 - If the user asks whether a Seedance task is ready, call mcp__seedance__seedance_check_task once and answer from that result. Do not loop, sleep, or invent external Seedance API endpoints.`;
+function stableFingerprintValue(value) {
+  if (Array.isArray(value)) return value.map(stableFingerprintValue);
+  if (!value || typeof value !== "object") return value;
+  const out = {};
+  for (const key of Object.keys(value).sort()) {
+    const normalized = stableFingerprintValue(value[key]);
+    if (normalized !== void 0) out[key] = normalized;
+  }
+  return out;
+}
 function isRecoveryDispatchTask(task) {
   return task.dispatchKind === "manual_continue" || task.dispatchKind === "regenerate";
 }
@@ -29670,13 +29916,15 @@ var AgentManager = class {
   agents = /* @__PURE__ */ new Map();
   lastUsedAt = /* @__PURE__ */ new Map();
   /** Scopes 被 zombie_watchdog 关闭后的"入睡"标记，acquire 重建时清除并 emit awake。 */
-  dormantScopes = /* @__PURE__ */ new Set();
+  dormantScopes = /* @__PURE__ */ new Map();
   /**
    * zombie_watchdog 拆 runtime 时，把该 (agentId, scope) 的 groupInbox 快照到这里，
    * 让下一次 getOrCreate 重建 runtime 时可以恢复未读消息。仅 in-memory；
    * bridge 进程崩溃 / shutdownAll 时丢失，与现有 inbox 内存语义一致。
    */
   dormantGroupInboxes = /* @__PURE__ */ new Map();
+  /** Spectate requested before runtime existed; value = activatedAt epoch ms. */
+  pendingSpectate = /* @__PURE__ */ new Map();
   sessionStore;
   dispatchMemory = new GroupDispatchMemoryStore();
   dataDir;
@@ -29842,6 +30090,7 @@ var AgentManager = class {
   }
   async resolveRuntimeCwd(agentConfig, scope, requestedCwd) {
     let cwd = this.remapServerWorkspaceCwd(agentConfig, scope, requestedCwd);
+    let fallbackForensicsId;
     if (!isFullyQualifiedAbsolutePath(cwd)) {
       const fallback = path13.join(this.workspacesDir, this.localScopeDirName(agentConfig, scope));
       logger13.error(
@@ -29856,6 +30105,23 @@ var AgentManager = class {
           error: new Error("workdir_not_usable_on_this_machine")
         }
       );
+      fallbackForensicsId = createFallbackId();
+      logFallback(logger13, {
+        fallbackId: fallbackForensicsId,
+        type: "cwd_sandbox",
+        phase: "applied",
+        expected: false,
+        context: {
+          agentId: agentConfig.id,
+          scope: scopeKey(scope),
+          platform: process.platform,
+          requested: requestedCwd,
+          resolved: cwd,
+          reason: "not_fully_qualified",
+          fallback
+        },
+        outcome: { result: "sandbox_fallback" }
+      });
       cwd = fallback;
     }
     if (isRunningAsRoot() && cwd.startsWith("/root/")) {
@@ -29874,6 +30140,21 @@ var AgentManager = class {
         fallback,
         error: e
       });
+      const fbId = fallbackForensicsId ?? createFallbackId();
+      logFallback(logger13, {
+        fallbackId: fbId,
+        type: "cwd_sandbox",
+        phase: "applied",
+        expected: false,
+        context: {
+          agentId: agentConfig.id,
+          scope: scopeKey(scope),
+          reason: "mkdir_failed",
+          requested: cwd,
+          fallback
+        },
+        outcome: { result: "second_layer_fallback" }
+      });
       await fs6.mkdir(fallback, { recursive: true });
       return fallback;
     }
@@ -30096,17 +30377,24 @@ var AgentManager = class {
     });
     return null;
   }
-  scopePromptFingerprint(agentConfig, scope, agentCwd, scopesSection) {
-    return createHash("sha256").update(SCOPE_PROMPT_FINGERPRINT_REVISION).update("\0").update(agentConfig.id).update("\0").update(agentConfig.name).update("\0").update(scopeKey(scope)).update("\0").update(path13.normalize(agentCwd)).update("\0").update(scopesSection).digest("hex");
+  scopePromptFingerprint(agentConfig, scope, agentCwd, scopesSection, externalMcpFingerprint) {
+    return createHash("sha256").update(SCOPE_PROMPT_FINGERPRINT_REVISION).update("\0").update(agentConfig.id).update("\0").update(agentConfig.name).update("\0").update(scopeKey(scope)).update("\0").update(path13.normalize(agentCwd)).update("\0").update(scopesSection).update("\0").update(externalMcpFingerprint).digest("hex");
   }
-  discardSessionIfScopePromptChanged(agentConfig, scope, sessionId, fingerprint) {
+  externalMcpFingerprint(externalMcp) {
+    const serverNames = Object.keys(externalMcp.mcpServers).sort();
+    const allowedTools = [...externalMcp.allowedTools].sort();
+    const toolAbi = [...externalMcp.toolAbi ?? []].sort((a, b) => a.serverName.localeCompare(b.serverName)).map(stableFingerprintValue);
+    if (serverNames.length === 0 && allowedTools.length === 0 && toolAbi.length === 0) return "";
+    return JSON.stringify({ serverNames, allowedTools, toolAbi });
+  }
+  discardSessionIfScopePromptChanged(agentConfig, scope, sessionId, fingerprint, options = {}) {
     const previous = this.sessionStore.getPromptFingerprint(agentConfig.id, scope);
     if (!sessionId) {
       this.sessionStore.setPromptFingerprint(agentConfig.id, scope, fingerprint);
       return null;
     }
     if (previous === fingerprint) return sessionId;
-    if (!previous && scope.kind === "single") {
+    if (!previous && scope.kind === "single" && options.clearLegacySingleSession !== true) {
       this.sessionStore.setPromptFingerprint(agentConfig.id, scope, fingerprint);
       logger13.info("Retaining legacy single-scope session while recording prompt fingerprint", {
         agentId: agentConfig.id,
@@ -30126,7 +30414,8 @@ var AgentManager = class {
       sessionId,
       previousFingerprint: previous,
       nextFingerprint: fingerprint,
-      revision: SCOPE_PROMPT_FINGERPRINT_REVISION
+      revision: SCOPE_PROMPT_FINGERPRINT_REVISION,
+      reason: options.reason ?? "scope_prompt_changed"
     });
     return null;
   }
@@ -30175,6 +30464,7 @@ var AgentManager = class {
     logger13.info("Evicting idle Agent query", { agentId: proc.agentId, scope: scopeKey(proc.scope) });
     const runtime = this.asRuntime(proc);
     this.clearQuietFlushTimer(runtime);
+    this.teardownSpectate(runtime);
     try {
       runtime.inputController.close();
       await this.awaitQueryReturn(runtime.query, 5e3, proc.agentId);
@@ -30194,6 +30484,7 @@ var AgentManager = class {
     const runtime = this.asRuntime(proc);
     const key = runtimeKey(proc.agentId, proc.scope);
     this.clearQuietFlushTimer(runtime);
+    this.teardownSpectate(runtime);
     runtime.currentTask = null;
     runtime.injectedTasks = [];
     runtime.mergedTasks = [];
@@ -30230,6 +30521,7 @@ var AgentManager = class {
   evictIdle() {
     const now = Date.now();
     const { idleTimeoutMs, workingSilenceTimeoutMs } = this.queryConfig;
+    const stallWarnAfterMs = Math.min(9e4, this.queryConfig.replyStallTimeoutMs);
     for (const [key, proc] of this.agents) {
       if (!this.isEvictable(proc)) continue;
       const runtime = this.asRuntime(proc);
@@ -30240,26 +30532,62 @@ var AgentManager = class {
     for (const [, proc] of this.agents) {
       if (proc.status !== "working") continue;
       const runtime = this.asRuntime(proc);
+      if (runtime.currentTask) {
+        const sinceEventMs = now - proc.lastSdkEventAt;
+        if (sinceEventMs > stallWarnAfterMs && !proc.stallWarned) {
+          proc.stallWarned = true;
+          const openTool = this.latestOpenToolUse(proc);
+          logger13.warn("Reply stall onset: in-flight reply silent", {
+            agentId: proc.agentId,
+            scope: scopeKey(proc.scope),
+            sinceEventMs,
+            replyStallTimeoutMs: this.queryConfig.replyStallTimeoutMs,
+            workingSilenceTimeoutMs,
+            busySilenceTimeoutMs: this.queryConfig.busySilenceTimeoutMs ?? null,
+            replyMessageId: runtime.currentTask.replyMessageId,
+            model: proc.model ?? "(unknown)",
+            lastSdkEvent: proc.lastSdkEventInfo,
+            hasActiveToolUse: runtime.activeToolUseStartedAt != null || openTool != null,
+            activeToolUseAgeMs: runtime.activeToolUseStartedAt != null ? now - runtime.activeToolUseStartedAt : null,
+            openToolName: openTool?.toolName ?? proc.currentToolName ?? null,
+            openMcpInvocationId: proc.currentMcpInvocationId ?? null,
+            subagentInFlight: (runtime.activeSubagentTaskIds?.size ?? 0) > 0,
+            activeSubagentCount: runtime.activeSubagentTaskIds?.size ?? 0,
+            busyReason: this.busyReason(proc)
+          });
+        }
+      }
+      const busyReason = this.busyReason(runtime);
+      const busy = busyReason !== null;
+      if (runtime.currentTask && !busy && now - proc.lastSdkEventAt > this.queryConfig.replyStallTimeoutMs) {
+        void this.recoverStalledReply(proc, now - proc.lastSdkEventAt);
+        continue;
+      }
       const hasInjectedBacklog = runtime.injectedTasks.length > 0;
-      const effectiveTimeoutMs = hasInjectedBacklog ? workingSilenceTimeoutMs * 2 : workingSilenceTimeoutMs;
+      const baseCeilingMs = busy ? Math.max(workingSilenceTimeoutMs, this.queryConfig.busySilenceTimeoutMs ?? 0) : workingSilenceTimeoutMs;
+      const effectiveTimeoutMs = hasInjectedBacklog ? baseCeilingMs * 2 : baseCeilingMs;
       const silentMs = now - proc.lastSdkEventAt;
       if (silentMs <= effectiveTimeoutMs) {
-        if (hasInjectedBacklog && silentMs > workingSilenceTimeoutMs) {
-          logger13.warn(
-            "Zombie watchdog: working runtime silent past base timeout but has queued tasks; granting extended grace",
-            {
-              agentId: proc.agentId,
-              scope: scopeKey(proc.scope),
-              silentMs,
-              baseTimeoutMs: workingSilenceTimeoutMs,
-              effectiveTimeoutMs,
-              injectedTaskCount: runtime.injectedTasks.length,
-              replyMessageId: proc.currentTask?.replyMessageId
-            }
-          );
+        if (silentMs > workingSilenceTimeoutMs) {
+          logger13.warn("Zombie watchdog: working runtime silent past base timeout; granting extended grace", {
+            agentId: proc.agentId,
+            scope: scopeKey(proc.scope),
+            silentMs,
+            baseTimeoutMs: workingSilenceTimeoutMs,
+            baseCeilingMs,
+            busySilenceTimeoutMs: this.queryConfig.busySilenceTimeoutMs ?? null,
+            effectiveTimeoutMs,
+            busy,
+            busyReason,
+            injectedTaskCount: runtime.injectedTasks.length,
+            replyMessageId: proc.currentTask?.replyMessageId
+          });
         }
         continue;
       }
+      const zombieOpenTool = this.latestOpenToolUse(proc);
+      const watchdogDetectedAt = Date.now();
+      const watchdogFallbackId = createFallbackId();
       logger13.warn("Zombie watchdog: working runtime silent too long, tearing down", {
         agentId: proc.agentId,
         scope: scopeKey(proc.scope),
@@ -30267,12 +30595,46 @@ var AgentManager = class {
         lastSdkEventAt: new Date(proc.lastSdkEventAt).toISOString(),
         workingSilenceTimeoutMs,
         effectiveTimeoutMs,
+        baseCeilingMs,
+        busy,
+        busySilenceTimeoutMs: this.queryConfig.busySilenceTimeoutMs ?? null,
         replyMessageId: proc.currentTask?.replyMessageId,
         injectedTaskCount: runtime.injectedTasks.length,
         hadInjectedBacklog: hasInjectedBacklog,
-        inboxSize: proc.groupInbox.length
+        inboxSize: proc.groupInbox.length,
+        fallbackId: watchdogFallbackId,
+        // Breadcrumb: what the turn was waiting on when it timed out. A hung subagent
+        // (open `Task` tool_use) lands here now that the fast path skips active tools.
+        model: proc.model ?? "(unknown)",
+        lastSdkEvent: proc.lastSdkEventInfo,
+        openToolName: zombieOpenTool?.toolName ?? proc.currentToolName ?? null,
+        activeToolUseAgeMs: runtime.activeToolUseStartedAt != null ? now - runtime.activeToolUseStartedAt : null,
+        openMcpInvocationId: proc.currentMcpInvocationId ?? null,
+        subagentInFlight: (runtime.activeSubagentTaskIds?.size ?? 0) > 0,
+        activeSubagentCount: runtime.activeSubagentTaskIds?.size ?? 0,
+        busyReason: this.busyReason(proc)
+      });
+      logFallback(logger13, {
+        fallbackId: watchdogFallbackId,
+        type: "zombie_watchdog",
+        phase: "detected",
+        expected: false,
+        traceId: proc.currentTask?.traceId,
+        context: {
+          agentId: proc.agentId,
+          scope: scopeKey(proc.scope),
+          silentMs,
+          replyMessageId: proc.currentTask?.replyMessageId ?? null,
+          openToolName: zombieOpenTool?.toolName ?? proc.currentToolName ?? null,
+          lastSdkEventType: proc.lastSdkEventInfo?.type ?? null,
+          injectedTaskCount: runtime.injectedTasks.length,
+          inboxSize: proc.groupInbox.length
+        }
+      });
+      void this.closeRuntime(proc, "zombie_watchdog", {
+        fallbackId: watchdogFallbackId,
+        detectedAt: watchdogDetectedAt
       });
-      void this.closeRuntime(proc, "zombie_watchdog");
     }
   }
   /**
@@ -30519,7 +30881,7 @@ ${cfg.instructions.trim()}` : "";
       agentId: agentConfig.id,
       capabilityTier: cfg.capabilityTier,
       isSmith: smithAgent
-    }) ?? { mcpServers: {}, allowedTools: [] };
+    }) ?? { mcpServers: {}, allowedTools: [], toolAbi: [] };
     logger13.info("External MCP resolved for runtime", {
       agentId: agentConfig.id,
       scope: scopeKey(scope),
@@ -30536,11 +30898,16 @@ ${cfg.instructions.trim()}` : "";
     }
     const notebookSection = this.buildNotebookSection(agentConfig.id);
     const scopesSection = this.buildScopesSection(agentConfig, scope, agentCwd);
+    const externalMcpFingerprint = this.externalMcpFingerprint(externalMcp);
     savedSessionId = this.discardSessionIfScopePromptChanged(
       agentConfig,
       scope,
       savedSessionId,
-      this.scopePromptFingerprint(agentConfig, scope, agentCwd, scopesSection)
+      this.scopePromptFingerprint(agentConfig, scope, agentCwd, scopesSection, externalMcpFingerprint),
+      {
+        clearLegacySingleSession: externalMcpFingerprint.length > 0,
+        reason: externalMcpFingerprint.length > 0 ? "external_mcp_abi_changed" : "scope_prompt_changed"
+      }
     );
     let forkHistorySection = "";
     if (!savedSessionId && scope.kind === "single") {
@@ -30561,6 +30928,8 @@ ${cfg.instructions.trim()}` : "";
       }
     }
     const cronLockSnapshot = readCronLockSnapshot();
+    const builtinWebSearchAllowed = this.queryConfig.allowBuiltinWebSearch;
+    const disallowedToolsForRuntime = builtinWebSearchAllowed ? [] : ["WebSearch"];
     logger13.info("Creating Agent query", {
       agentId: agentConfig.id,
       scope: scopeKey(scope),
@@ -30569,6 +30938,8 @@ ${cfg.instructions.trim()}` : "";
       sessionId: savedSessionId,
       forkHistoryReplay: forkHistorySection.length > 0,
       model: cfg.model ?? "(default)",
+      builtinWebSearchAllowed,
+      disallowedTools: disallowedToolsForRuntime,
       // Diagnostic: who currently owns Claude's global cron lock (~/.claude/scheduled_tasks.lock).
       // Cron is process-internal but the binary uses this singleton lock to elect ONE scheduler
       // among concurrent claude subprocesses. If lock is held by another session at spawn time,
@@ -30580,7 +30951,6 @@ ${cfg.instructions.trim()}` : "";
     });
     const planModeRef = { active: false, denyCount: 0 };
     const mediaGenerationTurnGuard = createOfficialMediaGenerationTurnGuard();
-    const builtinWebSearchAllowed = this.queryConfig.allowBuiltinWebSearch;
     const options = {
       cwd: agentCwd,
       systemPrompt: {
@@ -30647,6 +31017,8 @@ ${cfg.instructions.trim()}` : "";
         ] : [],
         ...externalMcp.allowedTools
       ],
+      // Server-side WebSearch bypasses canUseTool; disallowedTools removes it from model context.
+      disallowedTools: disallowedToolsForRuntime,
       mcpServers: { ...externalMcp.mcpServers, neural: neuralServer },
       includePartialMessages: true,
       // Plan mode custom workflow instructions. When setPermissionMode('plan') is
@@ -30973,6 +31345,7 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       currentTask: null,
       currentTaskStartedAt: 0,
       lastSdkEventAt: Date.now(),
+      model: (typeof options.model === "string" ? options.model : cfg.model) ?? null,
       compactRequested: false,
       compactInProgress: false,
       contextOverflowLockedUntil: 0,
@@ -30984,13 +31357,18 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       currentToolName: null,
       currentMcpInvocationId: null,
       currentMcpInvocationStartedAt: null,
+      activeSubagentTaskIds: /* @__PURE__ */ new Set(),
       mcpAuditRecorder: this.mcpAuditRecorder,
       segmentBuffer: "",
       segmentCount: 0,
       accumulatedToolInput: "",
       planModeRef,
       mediaGenerationTurnGuard,
-      groupInbox: []
+      groupInbox: [],
+      spectating: false,
+      spectateActivatedAt: 0,
+      spectateViewing: false,
+      spectateTtlExpired: false
     };
     const runtime = Object.assign(proc, {
       query: agentQuery,
@@ -31002,7 +31380,8 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       createdAt: Date.now(),
       supportsVision: modelInputMode === "vision" && cfg.supportsVision !== false,
       modelInputMode,
-      quietFlushTimer: null
+      quietFlushTimer: null,
+      spectateRevertTimer: null
     });
     logger13.info("Agent model input mode resolved", {
       agentId: agentConfig.id,
@@ -31027,6 +31406,7 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
     } else {
       this.dormantGroupInboxes.delete(key);
     }
+    const dormantMeta = this.dormantScopes.get(key);
     if (this.dormantScopes.delete(key)) {
       this.emit({
         type: "agent:awake",
@@ -31038,7 +31418,44 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       });
       logger13.info("Agent scope awakened after dormant", {
         agentId: agentConfig.id,
-        scope: scopeKey(scope)
+        scope: scopeKey(scope),
+        ...dormantMeta ? {
+          fallbackId: dormantMeta.fallbackId,
+          dormantDurationMs: Date.now() - dormantMeta.detectedAt,
+          dataLossSuspected: dormantMeta.droppedTaskCount > 0
+        } : {}
+      });
+      if (dormantMeta) {
+        logFallback(logger13, {
+          fallbackId: dormantMeta.fallbackId,
+          type: "zombie_watchdog",
+          phase: "outcome",
+          expected: false,
+          context: {
+            agentId: agentConfig.id,
+            scope: scopeKey(scope)
+          },
+          outcome: {
+            result: "recovered_rebuilt",
+            durationMs: Date.now() - dormantMeta.detectedAt,
+            dataLossSuspected: dormantMeta.droppedTaskCount > 0
+          }
+        });
+      }
+    }
+    const pendingSpectateAt = this.pendingSpectate.get(key);
+    if (pendingSpectateAt != null) {
+      this.pendingSpectate.delete(key);
+      runtime.spectating = true;
+      runtime.spectateViewing = false;
+      runtime.spectateActivatedAt = pendingSpectateAt;
+      runtime.spectateTtlExpired = false;
+      this.armSpectateTimer(runtime);
+      this.emitSpectateState(runtime, true, "started");
+      logger13.info("Applied pending spectate on runtime create", {
+        agentId: agentConfig.id,
+        scope: scopeKey(scope),
+        activatedAt: pendingSpectateAt
       });
     }
     if (proc.groupInbox.length > 0 && this.isRuntimeIdleForInboxFlush(runtime)) {
@@ -32176,7 +32593,6 @@ ${lines.join("\n")}`;
         compactTrigger: "context_watermark",
         injectedTasksWaiting: runtime.injectedTasks.length,
         compactPromptLen: compactPrompt.length,
-        promptSample: compactPrompt.slice(0, 80),
         traceId: compactTraceId
       });
       runtime.inputController.push(compactPrompt, runtime.ccSessionId ?? "");
@@ -32458,7 +32874,7 @@ ${lines.join("\n")}`;
     const enveloped = buildInnerVoiceEnvelope(payloadWithTrigger, ctx);
     const task = {
       content: enveloped,
-      replyMessageId: createMessageId(),
+      replyMessageId: createNeuralSendReplyMessageId(),
       conversationId: payload.conversationId,
       traceId: createTraceId(),
       groupId: payload.groupId
@@ -32704,7 +33120,7 @@ ${lines.join("\n")}`;
       this.dormantScopes.delete(key);
       this.dormantGroupInboxes.delete(key);
     }
-    for (const key of [...this.dormantScopes].filter(
+    for (const key of [...this.dormantScopes.keys()].filter(
       (k) => k === agentId || k.startsWith(`${agentId}::`)
     )) {
       this.dormantScopes.delete(key);
@@ -32752,7 +33168,7 @@ ${lines.join("\n")}`;
   async reloadAgentScopes(agentId, reason) {
     this.sessionStore.deleteAllForAgent(agentId);
     this.dispatchMemory.deleteAllForAgent(agentId);
-    for (const key of [...this.dormantScopes].filter(
+    for (const key of [...this.dormantScopes.keys()].filter(
       (k) => k === agentId || k.startsWith(`${agentId}::`)
     )) {
       this.dormantScopes.delete(key);
@@ -32904,6 +33320,125 @@ ${lines.join("\n")}`;
       void this.terminateScope(proc.agentId, proc.scope);
     }
   }
+  /** Control spectate capture/push for one scoped runtime. */
+  async setSpectate(agentId, scope, action) {
+    const key = runtimeKey(agentId, scope);
+    const proc = this.agents.get(key);
+    if (!proc || proc.status === "dead") {
+      if (action === "start") {
+        this.pendingSpectate.set(key, Date.now());
+        logger13.info("setSpectate: runtime missing, pending start", { agentId, scope: scopeKey(scope) });
+      }
+      return;
+    }
+    const runtime = this.asRuntime(proc);
+    switch (action) {
+      case "start":
+        runtime.spectating = true;
+        runtime.spectateViewing = true;
+        runtime.spectateActivatedAt = Date.now();
+        runtime.spectateTtlExpired = false;
+        this.pendingSpectate.delete(key);
+        this.armSpectateTimer(runtime);
+        this.emitSpectateState(runtime, true, "started");
+        logger13.info("Spectate started", { agentId, scope: scopeKey(scope) });
+        break;
+      case "enter_view":
+        runtime.spectateViewing = true;
+        logger13.info("Spectate enter_view", { agentId, scope: scopeKey(scope) });
+        break;
+      case "leave_view":
+        runtime.spectateViewing = false;
+        logger13.info("Spectate leave_view", {
+          agentId,
+          scope: scopeKey(scope),
+          ttlExpired: runtime.spectateTtlExpired
+        });
+        if (runtime.spectateTtlExpired) {
+          this.stopSpectate(runtime, "ttl_expired");
+        }
+        break;
+      case "stop":
+        this.stopSpectate(runtime, "stopped");
+        this.pendingSpectate.delete(key);
+        logger13.info("Spectate stopped", { agentId, scope: scopeKey(scope) });
+        break;
+      default:
+        break;
+    }
+  }
+  spectateTtlMs() {
+    return Number(process.env.AHCHAT_BRIDGE_SPECTATE_TTL_MS) || 36e5;
+  }
+  armSpectateTimer(runtime) {
+    this.clearSpectateTimer(runtime);
+    if (!runtime.spectating || runtime.spectateActivatedAt <= 0) return;
+    const ttlMs = this.spectateTtlMs();
+    const elapsed = Date.now() - runtime.spectateActivatedAt;
+    const delay = Math.max(0, ttlMs - elapsed);
+    runtime.spectateRevertTimer = setTimeout(() => {
+      runtime.spectateRevertTimer = null;
+      runtime.spectateTtlExpired = true;
+      logger13.info("Spectate TTL expired", {
+        agentId: runtime.agentId,
+        scope: scopeKey(runtime.scope),
+        viewing: runtime.spectateViewing
+      });
+      if (!runtime.spectateViewing) {
+        this.stopSpectate(runtime, "ttl_expired");
+      }
+    }, delay);
+  }
+  clearSpectateTimer(runtime) {
+    if (runtime.spectateRevertTimer != null) {
+      clearTimeout(runtime.spectateRevertTimer);
+      runtime.spectateRevertTimer = null;
+    }
+  }
+  stopSpectate(runtime, reason) {
+    const wasActive = runtime.spectating;
+    this.clearSpectateTimer(runtime);
+    runtime.spectating = false;
+    runtime.spectateViewing = false;
+    runtime.spectateTtlExpired = false;
+    runtime.spectateActivatedAt = 0;
+    if (wasActive) {
+      this.emitSpectateState(runtime, false, reason);
+      logger13.info("Spectate deactivated", {
+        agentId: runtime.agentId,
+        scope: scopeKey(runtime.scope),
+        reason
+      });
+    }
+  }
+  emitSpectateState(runtime, active, reason) {
+    const scopePayload = runtime.scope.kind === "single" ? { kind: "single" } : { kind: "group", groupId: runtime.scope.groupId };
+    this.emit({
+      type: "spectate:state",
+      payload: {
+        agentId: runtime.agentId,
+        scope: scopePayload,
+        active,
+        expiresAt: active ? runtime.spectateActivatedAt + this.spectateTtlMs() : void 0,
+        reason,
+        traceId: createTraceId()
+      }
+    });
+    logger13.info("Spectate state emitted", {
+      agentId: runtime.agentId,
+      scope: scopeKey(runtime.scope),
+      active,
+      reason,
+      expiresAt: active ? runtime.spectateActivatedAt + this.spectateTtlMs() : void 0
+    });
+  }
+  teardownSpectate(runtime) {
+    if (runtime.spectating) {
+      this.stopSpectate(runtime, "runtime_gone");
+    } else {
+      this.clearSpectateTimer(runtime);
+    }
+  }
   /** Stop one scoped SDK runtime (workdir change). */
   async terminateScope(agentId, scope) {
     const key = runtimeKey(agentId, scope);
@@ -32912,6 +33447,7 @@ ${lines.join("\n")}`;
       logger13.info("terminateScope: no active runtime", { agentId, scope: scopeKey(scope) });
       this.dormantScopes.delete(key);
       this.dormantGroupInboxes.delete(key);
+      this.pendingSpectate.delete(key);
       this.sessionStore.delete(agentId, scope);
       this.dispatchMemory.deleteScope(agentId, scope);
       return;
@@ -32934,7 +33470,7 @@ ${lines.join("\n")}`;
     this.dispatchMemory.deleteScope(agentId, scope);
     logger13.info("terminateScope: scoped query removed", { agentId, scope: scopeKey(scope) });
   }
-  async closeRuntime(proc, reason) {
+  async closeRuntime(proc, reason, watchdogForensics) {
     const key = runtimeKey(proc.agentId, proc.scope);
     if (proc.status === "dead") return;
     const runtime = this.asRuntime(proc);
@@ -33011,12 +33547,13 @@ ${lines.join("\n")}`;
     runtime.currentTask = null;
     if (isWatchdog) {
       const preservedInbox = proc.groupInbox;
-      if (preservedInbox.length > 0) {
+      const preservedInboxSize = preservedInbox.length;
+      if (preservedInboxSize > 0) {
         this.dormantGroupInboxes.set(key, [...preservedInbox]);
         logger13.info("Preserving groupInbox for dormant agent", {
           agentId,
           scope: scopeKey(proc.scope),
-          preservedInboxSize: preservedInbox.length,
+          preservedInboxSize,
           preservedEntries: preservedInbox.map((e) => ({
             ackId: e.ackId,
             sender: e.senderName,
@@ -33025,7 +33562,26 @@ ${lines.join("\n")}`;
           }))
         });
       }
-      this.dormantScopes.add(key);
+      const effectiveFallbackId = watchdogForensics?.fallbackId ?? createFallbackId();
+      logFallback(logger13, {
+        fallbackId: effectiveFallbackId,
+        type: "zombie_watchdog",
+        phase: "applied",
+        expected: false,
+        traceId: dormantTraceId,
+        context: {
+          agentId,
+          scope: scopeKey(proc.scope),
+          droppedTaskCount: droppedAckIds.length,
+          preservedInboxSize,
+          sessionDeleted: false
+        }
+      });
+      this.dormantScopes.set(key, {
+        fallbackId: effectiveFallbackId,
+        detectedAt: watchdogForensics?.detectedAt ?? Date.now(),
+        droppedTaskCount: droppedAckIds.length
+      });
       this.emit({
         type: "agent:dormant",
         payload: {
@@ -33040,13 +33596,15 @@ ${lines.join("\n")}`;
         agentId,
         scope: scopeKey(proc.scope),
         droppedTaskCount: droppedAckIds.length,
-        preservedInboxSize: this.dormantGroupInboxes.get(key)?.length ?? 0
+        preservedInboxSize: this.dormantGroupInboxes.get(key)?.length ?? 0,
+        fallbackId: effectiveFallbackId
       });
     }
     proc.status = "dead";
     this.agents.delete(key);
     this.lastUsedAt.delete(key);
     this.clearQuietFlushTimer(runtime);
+    this.teardownSpectate(runtime);
     try {
       runtime.inputController.close();
       await this.awaitQueryReturn(runtime.query, 5e3, agentId);
@@ -33063,6 +33621,165 @@ ${lines.join("\n")}`;
       cwd: proc.cwd
     });
   }
+  /**
+   * Emit `agent:error` for the active reply and every queued/merged/buffered task,
+   * then clear those queues. Used by both the SDK stream-crash path and the
+   * reply-stall watchdog so a torn-down runtime never leaves a carrier reply
+   * stuck in-flight on the server (which would keep absorbing new user messages
+   * as steers of a dead turn).
+   */
+  failPendingTasksWithError(runtime, errorText, fallbackId) {
+    const pending = [];
+    if (runtime.currentTask) pending.push(runtime.currentTask);
+    pending.push(...runtime.injectedTasks, ...runtime.mergedTasks, ...runtime.planModeBuffer);
+    runtime.currentTask = null;
+    runtime.injectedTasks = [];
+    runtime.mergedTasks = [];
+    runtime.planModeBuffer = [];
+    if (pending.length === 0) return { pendingCount: 0 };
+    const carrier = pending[0];
+    const mergedTasks = pending.slice(1);
+    logger13.warn("Pending tasks failure consolidated", {
+      agentId: runtime.agentId,
+      scope: scopeKey(runtime.scope),
+      pendingCount: pending.length,
+      carrierAckId: carrier.replyMessageId,
+      mergedAckIds: mergedTasks.map((t) => t.replyMessageId),
+      traceId: carrier.traceId,
+      ...fallbackId ? { fallbackId } : {}
+    });
+    this.emit({
+      type: "agent:error",
+      payload: {
+        agentId: runtime.agentId,
+        conversationId: carrier.conversationId,
+        ackId: carrier.replyMessageId,
+        traceId: carrier.traceId,
+        error: errorText
+      }
+    });
+    for (const task of mergedTasks) {
+      this.emit({
+        type: "agent:merged",
+        payload: {
+          agentId: runtime.agentId,
+          conversationId: task.conversationId,
+          ackId: task.replyMessageId,
+          mergedIntoAckId: carrier.replyMessageId,
+          groupId: task.groupId,
+          traceId: task.traceId
+        }
+      });
+    }
+    return { pendingCount: pending.length };
+  }
+  /**
+   * Recover an in-flight reply that started but went silent past
+   * `replyStallTimeoutMs` (see the reply-stall fast path in `evictIdle`). The
+   * underlying SDK turn is wedged with no observable progress and no error, so:
+   *   1. clear the (likely interrupted/dangling) session so the next dispatch
+   *      starts fresh instead of resuming the same wedged transcript;
+   *   2. release the carrier reply + queued steers via `agent:error` so the
+   *      client stops waiting and the next user message starts a brand-new reply;
+   *   3. tear the wedged runtime down.
+   */
+  async recoverStalledReply(proc, silentMs) {
+    if (proc.status === "dead") return;
+    const runtime = this.asRuntime(proc);
+    const key = runtimeKey(proc.agentId, proc.scope);
+    const replyStallFallbackId = createFallbackId();
+    const stallTraceId = proc.currentTask?.traceId;
+    logger13.warn("Reply stall watchdog: in-flight reply silent too long, recovering", {
+      agentId: proc.agentId,
+      scope: scopeKey(proc.scope),
+      silentMs,
+      replyStallTimeoutMs: this.queryConfig.replyStallTimeoutMs,
+      replyMessageId: proc.currentTask?.replyMessageId,
+      injectedTaskCount: runtime.injectedTasks.length,
+      lastSdkEventAt: new Date(proc.lastSdkEventAt).toISOString(),
+      fallbackId: replyStallFallbackId,
+      // Breadcrumb: what the wedged turn was doing the instant it went silent.
+      // (subagent Task call? mid tool_use? which provider?) — the difference
+      // between a one-off and a systemic provider/tool stall.
+      model: proc.model ?? "(unknown)",
+      lastSdkEvent: proc.lastSdkEventInfo,
+      currentBlockType: proc.currentBlockType,
+      currentToolName: proc.currentToolName,
+      openMcpInvocationId: proc.currentMcpInvocationId ?? null
+    });
+    logFallback(logger13, {
+      fallbackId: replyStallFallbackId,
+      type: "reply_stall",
+      phase: "detected",
+      expected: false,
+      traceId: stallTraceId,
+      context: {
+        agentId: proc.agentId,
+        scope: scopeKey(proc.scope),
+        silentMs,
+        model: proc.model ?? "(unknown)",
+        replyMessageId: proc.currentTask?.replyMessageId ?? null,
+        currentToolName: proc.currentToolName ?? null,
+        lastSdkEventType: proc.lastSdkEventInfo?.type ?? null,
+        injectedTaskCount: runtime.injectedTasks.length,
+        mergedTaskCount: runtime.mergedTasks.length,
+        planModeBufferCount: runtime.planModeBuffer.length
+      }
+    });
+    this.sessionStore.delete(proc.agentId, proc.scope);
+    this.dispatchMemory.deleteScope(proc.agentId, proc.scope);
+    const failSummary = this.failPendingTasksWithError(
+      runtime,
+      "\u56DE\u590D\u957F\u65F6\u95F4\u65E0\u54CD\u5E94\uFF0C\u5DF2\u91CD\u7F6E\u8BE5\u4F1A\u8BDD\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u6D88\u606F\u3002",
+      replyStallFallbackId
+    );
+    proc.status = "dead";
+    this.agents.delete(key);
+    this.lastUsedAt.delete(key);
+    this.clearQuietFlushTimer(runtime);
+    let queryCloseOk = true;
+    try {
+      runtime.inputController.close();
+      await this.awaitQueryReturn(runtime.query, 5e3, proc.agentId);
+    } catch (e) {
+      queryCloseOk = false;
+      logger13.error("reply_stall: close query failed", {
+        agentId: proc.agentId,
+        scope: scopeKey(proc.scope),
+        error: e
+      });
+    }
+    logFallback(logger13, {
+      fallbackId: replyStallFallbackId,
+      type: "reply_stall",
+      phase: "applied",
+      expected: false,
+      traceId: stallTraceId,
+      context: {
+        agentId: proc.agentId,
+        scope: scopeKey(proc.scope),
+        sessionDeleted: true,
+        failedTaskCount: failSummary.pendingCount,
+        queryClosed: queryCloseOk
+      }
+    });
+    logFallback(logger13, {
+      fallbackId: replyStallFallbackId,
+      type: "reply_stall",
+      phase: "outcome",
+      expected: false,
+      traceId: stallTraceId,
+      context: {
+        agentId: proc.agentId,
+        scope: scopeKey(proc.scope),
+        failedTaskCount: failSummary.pendingCount
+      },
+      outcome: {
+        result: "session_reset_awaiting_user",
+        dataLossSuspected: failSummary.pendingCount > 0
+      }
+    });
+  }
   async recoverFromRestart(agents) {
     const lockSnapshot = readCronLockSnapshot();
     logger13.info("Recovering Agent sessions after restart", {
@@ -33185,58 +33902,7 @@ ${lines.join("\n")}`;
       this.lastUsedAt.delete(key);
       const errorText = isResumeFail ? `\u4F1A\u8BDD\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u6D88\u606F\uFF08${errMsg}\uFF09` : `Agent query crashed: ${errMsg}`;
       const emittedErrorText = isUnsupportedVisionInput ? "Current model/backend does not support image multimodal input. This image message failed; AHChat has cleared this scope session and future messages will send attachments as paths/text references." : errorText;
-      if (runtime.currentTask) {
-        this.emit({
-          type: "agent:error",
-          payload: {
-            agentId: runtime.agentId,
-            conversationId: runtime.currentTask.conversationId,
-            ackId: runtime.currentTask.replyMessageId,
-            traceId: runtime.currentTask.traceId,
-            error: emittedErrorText
-          }
-        });
-        runtime.currentTask = null;
-      }
-      for (const task of runtime.injectedTasks) {
-        this.emit({
-          type: "agent:error",
-          payload: {
-            agentId: runtime.agentId,
-            conversationId: task.conversationId,
-            ackId: task.replyMessageId,
-            traceId: task.traceId,
-            error: emittedErrorText
-          }
-        });
-      }
-      runtime.injectedTasks = [];
-      for (const task of runtime.mergedTasks) {
-        this.emit({
-          type: "agent:error",
-          payload: {
-            agentId: runtime.agentId,
-            conversationId: task.conversationId,
-            ackId: task.replyMessageId,
-            traceId: task.traceId,
-            error: emittedErrorText
-          }
-        });
-      }
-      runtime.mergedTasks = [];
-      for (const task of runtime.planModeBuffer) {
-        this.emit({
-          type: "agent:error",
-          payload: {
-            agentId: runtime.agentId,
-            conversationId: task.conversationId,
-            ackId: task.replyMessageId,
-            traceId: task.traceId,
-            error: emittedErrorText
-          }
-        });
-      }
-      runtime.planModeBuffer = [];
+      this.failPendingTasksWithError(runtime, emittedErrorText);
     }
   }
   getStatus(agentId, scope = { kind: "single" }) {
@@ -33250,6 +33916,18 @@ ${lines.join("\n")}`;
     }
     return [...ids];
   }
+  /** Unified signal: is the turn legitimately waiting on a live external call that emits no
+   *  parent heartbeat? Used by BOTH the reply-stall fast path and the zombie watchdog so neither
+   *  tears down a turn that is merely slow. Returns the reason for diagnostics, or null when idle.
+   *  - open_tool: regular tool, MCP tool, AskUserQuestion wait, or ExitPlanMode (tool_use open).
+   *  - subagent: Task/Agent in flight (its inner tool_results clear activeToolUseStartedAt).
+   *  - compact:  bridge-injected /compact running. */
+  busyReason(proc) {
+    if (proc.activeToolUseStartedAt != null || this.latestOpenToolUse(proc) != null) return "open_tool";
+    if ((proc.activeSubagentTaskIds?.size ?? 0) > 0) return "subagent";
+    if (proc.compactInProgress === true) return "compact";
+    return null;
+  }
   latestOpenToolUse(proc) {
     for (let i = proc.contentBlocks.length - 1; i >= 0; i -= 1) {
       const block = proc.contentBlocks[i];
@@ -33398,7 +34076,7 @@ ${lines.join("\n")}`;
         }
         const task = {
           content: notice,
-          replyMessageId: createMessageId(),
+          replyMessageId: createScopeNoticeReplyMessageId(),
           conversationId,
           traceId: createTraceId(),
           groupId: proc.scope.kind === "group" ? proc.scope.groupId : void 0
@@ -34480,6 +35158,7 @@ var HttpMcpRegistry = class {
   buildForAgent(ctx) {
     const mcpServers = {};
     const allowedTools = [];
+    const toolAbi = [];
     const usedNames = /* @__PURE__ */ new Set();
     for (const connection of this.allConnections()) {
       if (!this.connectionAppliesToAgent(connection, ctx)) continue;
@@ -34488,12 +35167,18 @@ var HttpMcpRegistry = class {
       const serverName = uniqueServerName(normalizeMcpServerName(connection.serverName), usedNames);
       usedNames.add(serverName);
       mcpServers[serverName] = sdkConfig;
-      for (const tool2 of connection.tools) {
-        if (!tool2.enabled || tool2.permissionPolicy !== "always_allow") continue;
-        allowedTools.push(mcpRuntimeToolName(serverName, tool2.name));
-      }
+      const visibleTools = connection.tools.filter((tool2) => tool2.enabled && tool2.permissionPolicy !== "always_deny");
+      for (const tool2 of visibleTools) allowedTools.push(mcpRuntimeToolName(serverName, tool2.name));
+      toolAbi.push({
+        serverName,
+        providerId: connection.providerId,
+        transport: connection.transport,
+        alwaysLoad: connection.alwaysLoad,
+        isBuiltin: connection.isBuiltin,
+        tools: visibleTools.map((tool2) => runtimeToolAbi(serverName, tool2)).sort((a, b) => a.runtimeToolName.localeCompare(b.runtimeToolName))
+      });
     }
-    return { mcpServers, allowedTools };
+    return { mcpServers, allowedTools, toolAbi };
   }
   allConnections() {
     return [...this.serverConnections.values(), ...this.localConnections.values()];
@@ -34679,6 +35364,18 @@ function uniqueServerName(serverName, usedNames) {
   while (usedNames.has(`${serverName}_${idx}`)) idx += 1;
   return `${serverName}_${idx}`;
 }
+function runtimeToolAbi(serverName, tool2) {
+  return {
+    name: tool2.name,
+    runtimeToolName: mcpRuntimeToolName(serverName, tool2.name),
+    displayName: tool2.displayName,
+    description: tool2.description,
+    category: tool2.category,
+    riskLevel: tool2.riskLevel,
+    permissionPolicy: tool2.permissionPolicy,
+    ...tool2.inputSchema !== void 0 ? { inputSchema: tool2.inputSchema } : {}
+  };
+}
 function buildHeaders(authType, authSecret, customHeaders) {
   const headers = {};
   for (const header of customHeaders) {
@@ -35330,6 +36027,7 @@ var ServerConnector = class {
       case "agent:terminate":
       case "agent:runtime_reload":
       case "agent:terminate_scope":
+      case "spectate:set":
       case "agent:created":
       case "agent:updated":
       case "agent:workdir-updated":
@@ -36305,24 +37003,6 @@ function normalizeLocalPath(targetPath) {
   const expanded = trimmed === "~" || trimmed.startsWith("~/") || trimmed.startsWith("~\\") ? path18.join(os10.homedir(), trimmed.slice(2)) : trimmed;
   return path18.normalize(path18.resolve(expanded));
 }
-function isAbsoluteLocalPathCandidate(value) {
-  if (process.platform === "win32") {
-    return /^[a-zA-Z]:[\\/]/.test(value) || /^\\\\[^\\]/.test(value);
-  }
-  return value.startsWith("/");
-}
-function clipboardTextToPathCandidates(value) {
-  return value.replace(/\0/g, "\n").split(/\r?\n/).map((line) => line.trim().replace(/^"(.+)"$/, "$1")).map((line) => {
-    if (!line.toLowerCase().startsWith("file://")) return line;
-    try {
-      const url2 = new URL(line);
-      return decodeURIComponent(url2.pathname.replace(/^\/([a-zA-Z]:\/)/, "$1"));
-    } catch (e) {
-      logger24.debug("Failed to parse clipboard file URL", { error: e });
-      return "";
-    }
-  }).filter((line) => line.length > 0 && isAbsoluteLocalPathCandidate(line));
-}
 function normalizeClipboardIdentityKey(value) {
   return process.platform === "win32" ? value.toLowerCase() : value;
 }
@@ -36360,18 +37040,15 @@ function mimeTypeForFileName(fileName) {
 }
 function parseWindowsClipboardResult(stdout) {
   const raw = stdout.trim();
-  if (!raw) return { files: [], text: "" };
+  if (!raw) return { files: [] };
   try {
     const parsed = JSON.parse(raw);
-    if (!isRecord5(parsed)) return { files: [], text: "" };
+    if (!isRecord5(parsed)) return { files: [] };
     const files = Array.isArray(parsed.files) ? parsed.files.filter((item) => typeof item === "string") : [];
-    return {
-      files,
-      text: typeof parsed.text === "string" ? parsed.text : ""
-    };
+    return { files };
   } catch (e) {
     logger24.debug("Windows clipboard JSON parse skipped", { error: e });
-    return { files: clipboardTextToPathCandidates(stdout), text: "" };
+    return { files: [] };
   }
 }
 async function readWindowsClipboardPathCandidates() {
@@ -36384,9 +37061,7 @@ async function readWindowsClipboardPathCandidates() {
     "  $drop = [System.Windows.Forms.Clipboard]::GetFileDropList();",
     "  foreach ($file in $drop) { $files += [string]$file }",
     "} catch {}",
-    '$text = "";',
-    "try { $text = [System.Windows.Forms.Clipboard]::GetText() } catch {}",
-    "[pscustomobject]@{ files = $files; text = $text } | ConvertTo-Json -Compress;"
+    "[pscustomobject]@{ files = $files } | ConvertTo-Json -Compress;"
   ].join(" ");
   try {
     const { stdout } = await execFileAsync2("powershell.exe", [
@@ -36404,7 +37079,7 @@ async function readWindowsClipboardPathCandidates() {
       maxBuffer: 1024 * 1024
     });
     const result = parseWindowsClipboardResult(stdout);
-    return [...result.files, ...clipboardTextToPathCandidates(result.text)];
+    return result.files;
   } catch (e) {
     logger24.debug("Windows clipboard file read skipped", { error: e });
     return [];
@@ -36807,7 +37482,7 @@ async function readStreamText(filePath, start) {
 function parseProcessedLines(raw, cursor, fileName, fingerprint) {
   const lastNewline = raw.lastIndexOf("\n");
   if (lastNewline < 0) {
-    return { entries: [], nextCursor: cursor, advanced: false };
+    return { entries: [], nextCursor: cursor, advanced: false, reason: "partial_line" };
   }
   const processed = raw.slice(0, lastNewline + 1);
   const lines = processed.split(/\r?\n/);
@@ -36833,7 +37508,8 @@ function parseProcessedLines(raw, cursor, fileName, fingerprint) {
       lineNum,
       ...fingerprint ? { fingerprint } : {}
     },
-    advanced: true
+    advanced: true,
+    reason: "advanced"
   };
 }
 function chunkEntries(entries, size) {
@@ -36891,24 +37567,55 @@ var BridgeLogUploader = class {
   async flushOnce() {
     if (this.running || this.stopped) return;
     this.running = true;
+    const startedAt = Date.now();
+    const summary = {
+      targetCount: 0,
+      advancedTargetCount: 0,
+      missingTargetCount: 0,
+      idleTargetCount: 0,
+      partialLineTargetCount: 0,
+      failedTargetCount: 0,
+      parsedEntryCount: 0,
+      bridgeEntryCount: 0,
+      uploadedChunkCount: 0,
+      accepted: 0,
+      skipped: 0
+    };
     try {
       const targets = await this.resolveTargets();
+      summary.targetCount = targets.length;
       for (const target of targets) {
         try {
           const cursor = await readCursor(target.cursorFile);
           const batch = await this.readNewEntries(target, cursor);
-          if (!batch.advanced) continue;
+          if (!batch.advanced) {
+            summary.idleTargetCount += 1;
+            if (batch.reason === "missing_file") summary.missingTargetCount += 1;
+            if (batch.reason === "partial_line") summary.partialLineTargetCount += 1;
+            continue;
+          }
+          summary.advancedTargetCount += 1;
+          summary.parsedEntryCount += batch.entries.length;
           if (batch.entries.length > 0) {
-            await this.uploadEntries(batch.entries);
+            const result = await this.uploadEntries(batch.entries);
+            summary.bridgeEntryCount += result.bridgeEntryCount;
+            summary.uploadedChunkCount += result.uploadedChunkCount;
+            summary.accepted += result.accepted;
+            summary.skipped += result.skipped;
           }
           await writeCursor(target.cursorFile, batch.nextCursor);
         } catch (e) {
+          summary.failedTargetCount += 1;
           logger27.warn("Bridge log upload target failed", { error: e, logFile: target.logFile });
         }
       }
     } catch (e) {
       logger27.warn("Bridge log upload cycle failed", { error: e });
     } finally {
+      logger27.info("Bridge log upload cycle summary", {
+        ...summary,
+        durationMs: Date.now() - startedAt
+      });
       this.running = false;
     }
   }
@@ -36931,7 +37638,7 @@ var BridgeLogUploader = class {
     } catch (e) {
       if (e instanceof Error && "code" in e && e.code === "ENOENT") {
         logger27.debug("Bridge log file not found for upload yet", { logFile: target.logFile });
-        return { entries: [], nextCursor: cursor, advanced: false };
+        return { entries: [], nextCursor: cursor, advanced: false, reason: "missing_file" };
       }
       throw e;
     }
@@ -36939,13 +37646,19 @@ var BridgeLogUploader = class {
     const samePhysicalFile = !fingerprint || !cursor.fingerprint || cursor.fingerprint === fingerprint;
     const normalizedCursor = stat3.size < cursor.offset || !samePhysicalFile ? { offset: 0, lineNum: 0, ...fingerprint ? { fingerprint } : {} } : { ...cursor, ...fingerprint ? { fingerprint } : {} };
     if (stat3.size <= normalizedCursor.offset) {
-      return { entries: [], nextCursor: normalizedCursor, advanced: false };
+      return { entries: [], nextCursor: normalizedCursor, advanced: false, reason: "no_new_entries" };
     }
     const raw = await readStreamText(target.logFile, normalizedCursor.offset);
     return parseProcessedLines(raw, normalizedCursor, target.uploadedFileName, fingerprint);
   }
   async uploadEntries(entries) {
     const bridgeEntries = entries.filter((entry) => entry.source === "bridge");
+    const result = {
+      bridgeEntryCount: bridgeEntries.length,
+      uploadedChunkCount: 0,
+      accepted: 0,
+      skipped: 0
+    };
     for (const chunk of chunkEntries(bridgeEntries, this.options.batchSize)) {
       const res = await fetch(`${this.options.serverApiUrl}/api/logs/upload`, {
         method: "POST",
@@ -36960,14 +37673,18 @@ var BridgeLogUploader = class {
         })
       });
       if (!res.ok) {
-        const body = await res.text().catch((e) => {
+        const body2 = await res.text().catch((e) => {
           logger27.debug("Failed to read log upload error body", { error: e });
           return "";
         });
-        throw new Error(`upload failed HTTP ${res.status}: ${body.slice(0, 160)}`);
+        throw new Error(`upload failed HTTP ${res.status}: ${body2.slice(0, 160)}`);
       }
-      await res.json();
+      const body = await res.json();
+      result.uploadedChunkCount += 1;
+      result.accepted += typeof body.accepted === "number" ? body.accepted : 0;
+      result.skipped += typeof body.skipped === "number" ? body.skipped : 0;
     }
+    return result;
   }
 };
 
@@ -38052,8 +38769,10 @@ function resolvePnpmRuntimeBinary(sdkDir, target) {
   } catch {
     return void 0;
   }
+  const matches = [];
   for (const entry of entries) {
     if (!entry.startsWith(`${encodedName}@`)) continue;
+    const version2 = entry.slice(encodedName.length + 1);
     const candidate = path27.join(
       pnpmStoreDir,
       entry,
@@ -38061,9 +38780,22 @@ function resolvePnpmRuntimeBinary(sdkDir, target) {
       ...target.packageName.split("/"),
       target.binaryName
     );
-    if (existsSync2(candidate)) return candidate;
+    if (existsSync2(candidate)) matches.push({ version: version2, candidate });
   }
-  return void 0;
+  if (matches.length === 0) return void 0;
+  matches.sort((a, b) => compareRuntimeVersion(b.version, a.version));
+  return matches[0].candidate;
+}
+function compareRuntimeVersion(a, b) {
+  const parse3 = (v) => v.split(/[.+_-]/).map((n) => Number.parseInt(n, 10));
+  const pa = parse3(a);
+  const pb = parse3(b);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i += 1) {
+    const da = Number.isFinite(pa[i]) ? pa[i] : 0;
+    const db = Number.isFinite(pb[i]) ? pb[i] : 0;
+    if (da !== db) return da - db;
+  }
+  return 0;
 }
 function resolveSdkRuntimeBinary(target) {
   const directPath = safeResolve(`${target.packageName}/${target.binaryName}`);
@@ -39222,6 +39954,32 @@ function syncLocalRuntimeSkills(skillStore, localSkills, options = {}) {
   ]);
 }
 
+// src/processOutput.ts
+var protectedStreams2 = /* @__PURE__ */ new WeakSet();
+var reportedErrors = /* @__PURE__ */ new WeakSet();
+function reportWriteError(error51, onError) {
+  if (typeof error51 === "object" && error51 !== null) {
+    if (reportedErrors.has(error51)) return;
+    reportedErrors.add(error51);
+  }
+  onError(error51);
+}
+function safeWriteProcessOutput(stream, text, onError) {
+  if (!stream) return;
+  if (stream.destroyed || stream.writableEnded) return;
+  if (typeof stream === "object" && typeof stream.on === "function" && !protectedStreams2.has(stream)) {
+    protectedStreams2.add(stream);
+    stream.on("error", (e) => reportWriteError(e, onError));
+  }
+  try {
+    stream.write(text, (error51) => {
+      if (error51) reportWriteError(error51, onError);
+    });
+  } catch (e) {
+    reportWriteError(e, onError);
+  }
+}
+
 // src/start.ts
 var logger41 = createModuleLogger("bridge");
 var NODE_USER_UID2 = 1e3;
@@ -39308,14 +40066,16 @@ async function startBridge(config2) {
   const claudeRuntime = resolveClaudeRuntime();
   logClaudeRuntimeResolution(claudeRuntime);
   if (!claudeRuntime.ok || !claudeRuntime.path) {
-    process.stderr.write(
+    safeWriteProcessOutput(
+      process.stderr,
       `
 Claude runtime is unavailable.
 
 ${claudeRuntime.error ?? "Install Claude Code manually or use the bundled desktop runtime."}
 
 Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE to a valid Claude Code binary path, install Claude Code, or use ALL-CAN Desktop with its bundled runtime.
-`
+`,
+      (e) => logger41.error("Bridge process stderr write failed", { error: e })
     );
     process.exit(1);
   }
@@ -39372,12 +40132,14 @@ Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUD
     claudeRuntimeVersion: claudeRuntime.version ?? null
   });
   const shouldPrintRawBridgeToken = process.stdout.isTTY && process.env.AHCHAT_SUPPRESS_BRIDGE_TOKEN_STDOUT !== "1";
-  process.stdout.write(
+  safeWriteProcessOutput(
+    process.stdout,
     `
 Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\u673A\u5668):
   ${shouldPrintRawBridgeToken ? config2.bridgeToken : "***"}
 
-`
+`,
+    (e) => logger41.error("Bridge process stdout write failed", { error: e })
   );
   wsMetrics.start(5e3);
   const sessionStore = new SessionStore(config2.dataDir);
@@ -40176,6 +40938,19 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
           });
           await agentManager.terminateScope(msg.payload.agentId, msg.payload.scope);
           break;
+        case "spectate:set":
+          logger41.info("spectate:set received", {
+            agentId: msg.payload.agentId,
+            scope: msg.payload.scope,
+            action: msg.payload.action,
+            traceId: msg.payload.traceId
+          });
+          await agentManager.setSpectate(
+            msg.payload.agentId,
+            msg.payload.scope,
+            msg.payload.action
+          );
+          break;
         case "agent:created":
           agentRegistry.upsert(msg.payload.agent);
           ensureLocalWorkdirPath(msg.payload.agent.workingDirectory, "agent:created", {
@@ -40392,8 +41167,12 @@ function writeAlreadyRunningMessage(error51) {
     `  ${buildStopCommand(error51.pid)}`,
     ""
   ];
-  process.stdout.write(`${lines.join("\n")}
-`);
+  safeWriteProcessOutput(
+    process.stdout,
+    `${lines.join("\n")}
+`,
+    (e) => logger42.error("Bridge already-running message write failed", { error: e })
+  );
 }
 function handleBridgeStartError(e, message) {
   if (isBridgeAlreadyRunningError(e)) {