@fangyb/ahchat-bridge 0.1.39 → 0.1.41

package/dist/cli.cjs

@@ -94678,6 +94678,25 @@ Transform tasks into verifiable goals:
 - "Refactor X" \u2192 ensure tests pass before and after.
 For multi-step tasks, state a brief plan with verification checks.
 `.trim();
+var GROUP_ONLY_SECTION_HEADERS = [
+  "# \u7FA4\u804A\u516C\u7406\uFF08Group Chat Axiom \u2014 \u6700\u9AD8\u4F18\u5148\u7EA7\uFF09",
+  "# Runtime payload \u2014 how to read unread messages",
+  "# Group chat \u2014 when to speak",
+  "# Group chat \u2014 recency & commitment",
+  "# Length & conciseness in group chat",
+  "# Group chat \u2014 shared task board",
+  "# Group chat \u2014 batched inbox handling",
+  "# \u7FA4\u804A\u4EA7\u7269\u7EAA\u5F8B\uFF08What to capture in group chats\uFF09",
+  "# When a user joins or leaves your group"
+];
+function stripGroupOnlySections(full, headers) {
+  const headerSet = new Set(headers);
+  return full.split(/\n(?=# )/).filter((section) => !headerSet.has(section.split("\n", 1)[0].trim())).join("\n").trim();
+}
+var PLATFORM_AGENT_RULES_SINGLE = stripGroupOnlySections(
+  PLATFORM_AGENT_RULES,
+  GROUP_ONLY_SECTION_HEADERS
+);
 var FAN_OUT_TRACE_TTL_MS = 10 * 6e4;
 var MAX_FILE_SIZE = 20 * 1024 * 1024;
 var MAX_IMAGE_SIZE = 10 * 1024 * 1024;
@@ -94849,6 +94868,14 @@ function assertArrayPayloadField(type, payload, field) {
     throw invalidWsMessage(type, field);
   }
 }
+function assertWorkdirSignalsPayloadField(type, payload, field) {
+  assertArrayPayloadField(type, payload, field);
+  for (const [index, item] of payload[field].entries()) {
+    if (!isPlainRecord(item) || typeof item.toolName !== "string") {
+      throw invalidWsMessage(type, `${field}[${index}].toolName`);
+    }
+  }
+}
 function assertRecordPayloadField(type, payload, field) {
   if (!isPlainRecord(payload[field])) {
     throw invalidWsMessage(type, field);
@@ -94929,6 +94956,9 @@ function validateWSMessageShape(msg) {
         "traceId"
       ]);
       assertArrayPayloadField(type, payload, "contentBlocks");
+      if ("workdirSignals" in payload && payload.workdirSignals !== void 0) {
+        assertWorkdirSignalsPayloadField(type, payload, "workdirSignals");
+      }
       return;
     }
     case "agent:turn_complete": {
@@ -115629,7 +115659,7 @@ nextOffset=${json2.nextOffset}\uFF08\u7EE7\u7EED\u67E5\u8BE2\u65F6\u4F20 offset=
       system_prompt: external_exports.string().describe("\u8BE5 Agent \u7684 system prompt\uFF0C\u5B9A\u4E49\u4EBA\u683C\u3001\u4E13\u957F\u3001\u884C\u4E3A\u51C6\u5219\u3002\u4E0D\u80FD\u4E3A\u7A7A\u3002"),
       tier: external_exports.enum(["smart", "balanced", "fast"]).describe("\u80FD\u529B\u6863\u4F4D\uFF1Asmart\uFF08\u65D7\u8230\uFF0C\u590D\u6742\u4EFB\u52A1\uFF09\u3001balanced\uFF08\u6807\u51C6\uFF0C\u5E38\u89C4\u4EFB\u52A1\uFF09\u3001fast\uFF08\u8F7B\u91CF\uFF0C\u7B80\u5355\u4EFB\u52A1\uFF09\u3002"),
       avatar: external_exports.string().optional().describe(
-        "\u5934\u50CF key\uFF0C\u4ECE\u4EE5\u4E0B\u9009\u4E00\u4E2A\u6700\u5339\u914D\u89D2\u8272\u7684\uFF1Aavatar_dev\uFF08\u5F00\u53D1\uFF09, avatar_pm\uFF08\u4EA7\u54C1/\u7BA1\u7406\uFF09, avatar_designer\uFF08\u8BBE\u8BA1\uFF09, avatar_qa\uFF08\u6D4B\u8BD5/QA\uFF09, avatar_writer\uFF08\u5199\u4F5C/\u6587\u6863\uFF09, avatar_analyst\uFF08\u5206\u6790/\u6570\u636E\uFF09, avatar_coach\uFF08\u654F\u6377\u6559\u7EC3/\u5E26\u6559\uFF09, avatar_scientist\uFF08\u7814\u7A76/\u7B97\u6CD5\uFF09, avatar_lawyer\uFF08\u6CD5\u52A1/\u5408\u89C4\uFF09, avatar_human_man\uFF08\u901A\u7528\u7537\u6027\uFF09, avatar_human_woman\uFF08\u901A\u7528\u5973\u6027\uFF09, avatar_human_nerd\uFF08\u6781\u5BA2\uFF09, avatar_human_cool\uFF08\u9177\uFF09, avatar_human_cowboy\uFF08\u72C2\u91CE\uFF09, avatar_human_artist\uFF08\u827A\u672F\u5BB6\uFF09\u3002\u7559\u7A7A\u5219\u7528\u9ED8\u8BA4 avatar_default\uFF08\u{1F916}\uFF09\u3002"
+        "\u53EF\u9009\u5934\u50CF key\u3002\u901A\u5E38\u7559\u7A7A\uFF0C\u7531\u7CFB\u7EDF\u6839\u636E Agent \u540D\u5B57\u3001\u89D2\u8272\u548C\u63D0\u793A\u8BCD\u81EA\u52A8\u5206\u914D\u673A\u5668\u4EBA\u5934\u50CF\u5E76\u5F02\u6B65\u751F\u6210\u6700\u7EC8\u5934\u50CF\u3002\u4E0D\u8981\u7ED9 Agent \u4F7F\u7528 avatar_human_*\uFF0C\u8FD9\u4E9B\u53EA\u7ED9\u771F\u5B9E\u4EBA\u7C7B\u7528\u6237\u4F7F\u7528\u3002"
       ),
       initial_instruction: external_exports.string().optional().describe(
         '\u53EF\u9009\u3002\u521B\u5EFA\u540E\u7ACB\u5373\u4E0B\u53D1\u7ED9\u65B0 Agent \u7684\u4E00\u53E5\u8BDD\u6307\u4EE4\u3002\u5178\u578B\uFF1A"\u8BF7\u7528 1-2 \u53E5\u8BDD\u5411\u7528\u6237\u505A\u81EA\u6211\u4ECB\u7ECD\uFF0C\u8BF4\u660E\u4F60\u7684\u4E13\u957F"\u3002\u53EA\u5728\u7528\u6237\u660E\u786E\u8981"\u521B\u5EFA\u4E00\u4E2A\u5355 Agent"\u4E14\u5E0C\u671B\u8BE5 Agent \u7ACB\u5373\u9732\u9762\u65F6\u4F20\u3002\u56E2\u961F\u573A\u666F\u8BF7\u52FF\u4F20\u2014\u2014\u7531 Leader \u5728\u7FA4\u91CC\u6253\u62DB\u547C\u3002'
@@ -115972,7 +116002,7 @@ nextOffset=${json2.nextOffset}\uFF08\u7EE7\u7EED\u67E5\u8BE2\u65F6\u4F20 offset=
       system_prompt: external_exports.string().optional().describe("\u65B0\u7684 system prompt\uFF08\u5B9A\u4E49\u4EBA\u683C\u3001\u4E13\u957F\u3001\u884C\u4E3A\u51C6\u5219\uFF09\u3002"),
       tier: external_exports.enum(["smart", "balanced", "fast"]).optional().describe("\u80FD\u529B\u6863\u4F4D\u3002\u4F20\u6B64\u53C2\u6570\u4F1A\u66F4\u65B0\u8BE5 Agent \u4F7F\u7528\u7684\u6A21\u578B\u3002"),
       avatar: external_exports.string().optional().describe(
-        "\u5934\u50CF key\uFF08\u5982 avatar_dev / avatar_pm / avatar_human_man \u7B49\uFF09\u3002"
+        "\u5934\u50CF key\uFF08\u5982 avatar_dev / avatar_pm / avatar_default \u7B49\uFF09\u3002\u4E0D\u8981\u7ED9 Agent \u4F7F\u7528 avatar_human_*\uFF0C\u8FD9\u4E9B\u53EA\u7ED9\u771F\u5B9E\u4EBA\u7C7B\u7528\u6237\u4F7F\u7528\u3002"
       ),
       machine_bridge_key: external_exports.string().optional().describe(
         '\u53EF\u9009\u3002\u65B0\u7684\u8FD0\u884C\u673A\u5668 bridgeKey\uFF0C\u6765\u81EA list_contacts \u7684"\u53EF\u7528\u673A\u5668"\u3002\u7701\u7565\u8868\u793A\u4E0D\u6539\uFF1B\u4F20 auto \u6216\u7A7A\u5B57\u7B26\u4E32\u6E05\u9664\u673A\u5668\u504F\u597D\u3002'
@@ -116974,9 +117004,11 @@ function buildGroupInboxPrompt(entries, opts = {}) {
 // src/sdkEventMapper.ts
 init_cjs_shims();
 var logger12 = createModuleLogger("sdk.mapper");
+var DEBUG_ONLY_SYSTEM_SUBTYPES = /* @__PURE__ */ new Set(["status", "thinking_tokens"]);
 var HIGH_WATERMARK_INPUT_TOKENS = 12e4;
 var WARN_THRESHOLD_INPUT_TOKENS = 1e5;
 var LIVE_INPUT_PREVIEW_TOOLS = /* @__PURE__ */ new Set(["Write", "Edit"]);
+var WORKDIR_MUTATION_TOOL_NAMES = /* @__PURE__ */ new Set(["write", "edit", "multiedit", "notebookedit", "bash"]);
 var CONTEXT_OVERFLOW_LOCK_MS = 6e4;
 function parseJsonRecord(text) {
   try {
@@ -116998,6 +117030,17 @@ function isSuccessfulOfficialMediaOutput(toolName, output) {
   if (!["succeeded", "success", "completed", "done"].includes(state)) return false;
   return Array.isArray(parsed.images) && parsed.images.length > 0 || typeof parsed.video_url === "string" || typeof parsed.videoUrl === "string";
 }
+function isWorkdirMutationToolName(toolName) {
+  return WORKDIR_MUTATION_TOOL_NAMES.has(toolName.trim().toLowerCase());
+}
+function recordWorkdirSignal(proc, toolName, isError) {
+  if (isError || !isGroupTask(proc) || !isWorkdirMutationToolName(toolName)) return;
+  const signals = proc.workdirSignals ?? [];
+  if (!signals.some((signal) => signal.toolName === toolName)) {
+    signals.push({ toolName });
+  }
+  proc.workdirSignals = signals;
+}
 function isContextOverflowText(text) {
   const trimmed = text.trim();
   return /^prompt is too long\b/i.test(trimmed) || /context length .* exceed/i.test(trimmed);
@@ -117502,6 +117545,7 @@ function countByStatus(todos) {
 function emitGroupSegment(proc, emit, base, content, contentBlocks, isSilent = false) {
   const groupId = proc.currentTask?.groupId;
   if (!groupId) return;
+  const workdirSignals = proc.workdirSignals?.length ? [...proc.workdirSignals] : void 0;
   proc.segmentCount += 1;
   logger12.info("Group segment emitted", {
     agentId: base.agentId,
@@ -117511,6 +117555,7 @@ function emitGroupSegment(proc, emit, base, content, contentBlocks, isSilent = f
     contentLen: content.length,
     blockCount: contentBlocks.length,
     blockTypes: contentBlocks.map((b) => b.type),
+    workdirSignalCount: workdirSignals?.length ?? 0,
     traceId: base.traceId,
     isAuditOnly: content.length === 0,
     isSilent
@@ -117523,9 +117568,11 @@ function emitGroupSegment(proc, emit, base, content, contentBlocks, isSilent = f
       groupId,
       content,
       contentBlocks: [...contentBlocks],
+      ...workdirSignals ? { workdirSignals } : {},
       ...isSilent ? { isSilent: true } : {}
     }
   });
+  proc.workdirSignals = [];
 }
 function flushTextSegmentOnBlockStop(proc, emit, base) {
   const trimmed = proc.segmentBuffer.trim();
@@ -117544,7 +117591,7 @@ function flushTextSegmentOnBlockStop(proc, emit, base) {
         traceId: base.traceId
       });
     }
-  } else if (proc.contentBlocks.length > 0) {
+  } else if (proc.contentBlocks.length > 0 || (proc.workdirSignals?.length ?? 0) > 0) {
     const blockCount = proc.contentBlocks.length;
     emitGroupSegment(proc, emit, base, "", proc.contentBlocks, true);
     proc.contentBlocks = [];
@@ -117634,7 +117681,8 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             proc.activeSubagentTaskIds?.delete(subagentTaskId);
           }
         }
-        logger12.info("SDK system subtype unhandled", {
+        const logUnhandledSystemSubtype = DEBUG_ONLY_SYSTEM_SUBTYPES.has(String(sysMsg.subtype ?? "")) ? logger12.debug.bind(logger12) : logger12.info.bind(logger12);
+        logUnhandledSystemSubtype("SDK system subtype unhandled", {
           agentId: proc.agentId,
           scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
           subtype: sysMsg.subtype ?? "(none)",
@@ -117680,6 +117728,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             const isMcpTool = parseMcpRuntimeToolName(toolName) != null;
             proc.currentMcpInvocationId = isMcpTool ? createMcpToolInvocationId() : null;
             proc.currentMcpInvocationStartedAt = isMcpTool ? (/* @__PURE__ */ new Date()).toISOString() : null;
+            proc.currentMcpInvocationToolUseId = isMcpTool ? toolUseId ?? null : null;
             if (shouldStreamInternals(proc) && !proc.suppressCurrentToolUse && toolName !== "ExitPlanMode" && !isAskUserQuestionToolName(toolName)) {
               emit({
                 type: "agent:tool_use",
@@ -117690,6 +117739,8 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                   input: {}
                 }
               });
+            }
+            if (shouldStreamInternals(proc) && !proc.suppressCurrentToolUse && toolName !== "ExitPlanMode" && !isAskUserQuestionToolName(toolName)) {
               proc.contentBlocks.push({
                 type: "tool_use",
                 ...toolUseId ? { toolUseId } : {},
@@ -117866,6 +117917,14 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             }
             if (proc.currentToolName && !proc.suppressCurrentToolUse && proc.currentMcpInvocationId && proc.currentMcpInvocationStartedAt && parseMcpRuntimeToolName(proc.currentToolName)) {
               try {
+                logger12.info("MCP audit start paired with tool_use", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId,
+                  toolUseId: proc.currentMcpInvocationToolUseId ?? null,
+                  runtimeToolName: proc.currentToolName,
+                  mcpInvocationId: proc.currentMcpInvocationId
+                });
                 proc.mcpAuditRecorder?.recordStart({
                   id: proc.currentMcpInvocationId,
                   runtimeToolName: proc.currentToolName,
@@ -117946,6 +118005,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               });
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
+              proc.currentMcpInvocationToolUseId = null;
               proc.activeToolUseStartedAt = void 0;
               proc.currentToolName = null;
               proc.currentToolUseId = null;
@@ -117962,6 +118022,16 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             }
             if (proc.currentMcpInvocationId && parseMcpRuntimeToolName(toolName)) {
               try {
+                logger12.info("MCP audit result paired with tool_result", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId,
+                  toolUseId,
+                  startedToolUseId: proc.currentMcpInvocationToolUseId ?? null,
+                  runtimeToolName: toolName,
+                  mcpInvocationId: proc.currentMcpInvocationId,
+                  isError
+                });
                 proc.mcpAuditRecorder?.recordResult({
                   id: proc.currentMcpInvocationId,
                   runtimeToolName: toolName,
@@ -117983,6 +118053,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               }
               proc.currentMcpInvocationId = null;
               proc.currentMcpInvocationStartedAt = null;
+              proc.currentMcpInvocationToolUseId = null;
             }
             if (shouldStreamInternals(proc)) {
               emit({
@@ -118010,6 +118081,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
                 }
               }
             }
+            recordWorkdirSignal(proc, toolName, isError);
             proc.activeToolUseStartedAt = void 0;
             proc.currentToolUseId = null;
           }
@@ -118071,7 +118143,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
         if (isNoReplyText(trimmed, { allowSdkSyntheticNoResponse: groupMode })) {
           checkInputTokenWatermark(proc, watermarkUsage, base.traceId);
           emitUsageReported(proc, emit, base, usage);
-          if (groupMode && proc.contentBlocks.length > 0) {
+          if (groupMode && (proc.contentBlocks.length > 0 || (proc.workdirSignals?.length ?? 0) > 0)) {
             emitGroupSegment(
               proc,
               emit,
@@ -118116,11 +118188,12 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
             proc.segmentBuffer = proc.accumulatedText;
             flushTextSegmentOnBlockStop(proc, emit, base);
           }
-          if (proc.contentBlocks.length > 0) {
+          if (proc.contentBlocks.length > 0 || (proc.workdirSignals?.length ?? 0) > 0) {
             logger12.info("Group turn trailing audit segment", {
               agentId: proc.agentId,
               replyMessageId: base.replyMessageId,
               blockCount: proc.contentBlocks.length,
+              workdirSignalCount: proc.workdirSignals?.length ?? 0,
               traceId: base.traceId
             });
             emitGroupSegment(proc, emit, base, "", proc.contentBlocks, true);
@@ -118265,6 +118338,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
           payload: { ...wireBase(base), error: errorText }
         });
         proc.contentBlocks = [];
+        proc.workdirSignals = [];
         proc.accumulatedText = "";
         proc.accumulatedThinking = "";
         proc.segmentBuffer = "";
@@ -118297,6 +118371,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               proc.apiErrorEmitted = true;
             }
             proc.contentBlocks = [];
+            proc.workdirSignals = [];
             proc.accumulatedText = "";
             proc.accumulatedThinking = "";
             proc.segmentBuffer = "";
@@ -118323,6 +118398,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               proc.apiErrorEmitted = true;
             }
             proc.contentBlocks = [];
+            proc.workdirSignals = [];
             proc.accumulatedText = "";
             proc.accumulatedThinking = "";
             proc.segmentBuffer = "";
@@ -118359,6 +118435,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted, onPost
               });
             }
             proc.contentBlocks = [];
+            proc.workdirSignals = [];
             proc.accumulatedText = "";
             proc.accumulatedThinking = "";
             proc.segmentBuffer = "";
@@ -118396,9 +118473,11 @@ function resetAccumulators(proc) {
   proc.currentToolUseId = null;
   proc.currentMcpInvocationId = null;
   proc.currentMcpInvocationStartedAt = null;
+  proc.currentMcpInvocationToolUseId = null;
   proc.activeToolUseStartedAt = void 0;
   proc.segmentBuffer = "";
   proc.segmentCount = 0;
+  proc.workdirSignals = [];
   proc.accumulatedToolInput = "";
   proc.apiErrorEmitted = false;
   proc.peakContextUsage = void 0;
@@ -118598,7 +118677,7 @@ function missingSubscriptionMessage(subscriptionId) {
 }
 var NODE_USER_UID = 1e3;
 var POST_MERGE_CONTINUATION_ROUTE_MS = 15e3;
-var SCOPE_PROMPT_FINGERPRINT_REVISION = "workdir-scope-mcp-abi-prompt-v4";
+var SCOPE_PROMPT_FINGERPRINT_REVISION = "workdir-scope-mcp-abi-prompt-v6";
 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 IMAGE_READ_EXT_RE = /\.(?:bmp|gif|jpeg|jpg|png|webp)$/i;
 var DOCUMENT_READING_RULES = `DOCUMENT READING:
@@ -118614,6 +118693,31 @@ 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.`;
+var SMITH_ALLOWED_TOOLS = [
+  // creation / configuration (Smith-only)
+  "mcp__neural__create_agent",
+  "mcp__neural__update_agent_profile",
+  "mcp__neural__recommend_agent_skills",
+  "mcp__neural__read_skill",
+  // diagnostics (log detective)
+  "mcp__neural__fetch_logs",
+  // friend approval (Smith-only)
+  "mcp__neural__list_friends",
+  "mcp__neural__accept_friend",
+  "mcp__neural__add_friend",
+  // team assembly
+  "mcp__neural__list_contacts",
+  "mcp__neural__create_group",
+  "mcp__neural__add_to_group",
+  "mcp__neural__transfer_group_owner",
+  "mcp__neural__leave_group",
+  // neural bridge — cross-scope coordination when Smith is pulled into a group
+  "mcp__neural__neural_send",
+  "mcp__neural__neural_list_scopes",
+  // interaction / planning
+  "AskUserQuestion",
+  "Write"
+];
 function resolveVisionMcpToolHints(externalMcp) {
   let describe3 = null;
   let ocr = null;
@@ -119878,7 +119982,7 @@ ${cfg.instructions.trim()}` : "";
         } catch (error51) {
           logger15.error("Failed to read existing API-key agent settings; starting fresh", {
             agentId: agentConfig.id,
-            settingsPath,
+            settingsFile: "settings.json",
             error: error51
           });
         }
@@ -119891,7 +119995,7 @@ ${cfg.instructions.trim()}` : "";
       await import_promises3.default.writeFile(settingsPath, JSON.stringify(mergedSettings, null, 2), "utf-8");
       logger15.info("API-key agent using isolated config dir", {
         agentId: agentConfig.id,
-        dir: effectiveConfigDir,
+        configDirKind: "api-key-agent",
         isNew,
         hasBaseUrl: !!cfg.apiBaseUrl,
         settingsWritten: Object.keys(envEntries)
@@ -119985,12 +120089,21 @@ ${cfg.instructions.trim()}` : "";
         });
       }
     }
-    const externalMcp = this.mcpRegistry?.buildForAgent({
+    const resolvedExternalMcp = this.mcpRegistry?.buildForAgent({
       agentId: agentConfig.id,
       capabilityTier: cfg.capabilityTier,
       isSmith: smithAgent,
       cwd: agentCwd
     }) ?? { mcpServers: {}, allowedTools: [], toolAbi: [] };
+    const externalMcp = smithAgent ? { mcpServers: {}, allowedTools: [], toolAbi: [] } : resolvedExternalMcp;
+    if (smithAgent && (Object.keys(resolvedExternalMcp.mcpServers).length > 0 || resolvedExternalMcp.allowedTools.length > 0 || (resolvedExternalMcp.toolAbi?.length ?? 0) > 0)) {
+      logger15.info("Smith external MCP ignored by fixed tool whitelist", {
+        agentId: agentConfig.id,
+        scope: scopeKey(scope),
+        serverNames: Object.keys(resolvedExternalMcp.mcpServers),
+        allowedToolCount: resolvedExternalMcp.allowedTools.length
+      });
+    }
     const visionMcpTools = resolveVisionMcpToolHints(externalMcp);
     logger15.info("External MCP resolved for runtime", {
       agentId: agentConfig.id,
@@ -120063,6 +120176,7 @@ ${cfg.instructions.trim()}` : "";
     logger15.info("Creating Agent query", {
       agentId: agentConfig.id,
       scope: scopeKey(scope),
+      systemPromptMode: smithAgent ? "string" : "preset",
       cwd: agentCwd,
       resume: !!savedSessionId,
       sessionId: savedSessionId,
@@ -120083,71 +120197,63 @@ ${cfg.instructions.trim()}` : "";
     });
     const planModeRef = { active: false, denyCount: 0 };
     const mediaGenerationTurnGuard = createOfficialMediaGenerationTurnGuard();
+    const platformRules = scope.kind === "group" ? PLATFORM_AGENT_RULES : PLATFORM_AGENT_RULES_SINGLE;
+    const appendText = [
+      platformRules,
+      nativeReadToolDisabled ? buildNativeReadDisabledRules(visionMcpTools) : "",
+      DOCUMENT_READING_RULES,
+      MEDIA_GENERATION_RULES,
+      agentConfig.systemPrompt,
+      scopedInstructions,
+      notebookSection,
+      forkHistorySection,
+      scopesSection
+    ].filter((s) => typeof s === "string" && s.trim().length > 0).join("\n\n");
+    const systemPrompt = smithAgent ? appendText : { type: "preset", preset: "claude_code", append: appendText };
+    const universalAllowedTools = [
+      ...nativeReadToolDisabled ? [] : ["Read"],
+      "Edit",
+      "Write",
+      "Bash",
+      "Glob",
+      "Grep",
+      ...builtinWebSearchAllowed ? ["WebSearch"] : [],
+      "WebFetch",
+      "TodoWrite",
+      "TaskCreate",
+      "TaskUpdate",
+      "AskUserQuestion",
+      "mcp__neural__neural_send",
+      "mcp__neural__neural_list_scopes",
+      "mcp__neural__self_note",
+      "mcp__neural__list_contacts",
+      "mcp__neural__create_group",
+      "mcp__neural__add_to_group",
+      "mcp__neural__leave_group",
+      "mcp__neural__remove_from_group",
+      "mcp__neural__create_group_issue",
+      "mcp__neural__resolve_group_issue",
+      "mcp__neural__list_group_tasks",
+      "mcp__neural__update_group_task",
+      "mcp__neural__transfer_group_owner",
+      "mcp__neural__post_to_moments",
+      "mcp__neural__post_to_forum",
+      "mcp__neural__read_moments",
+      "mcp__neural__read_chat_history",
+      "mcp__neural__read_document",
+      "mcp__neural__list_available_skills",
+      "mcp__neural__list_skill_index"
+    ];
     const options = {
       cwd: agentCwd,
-      systemPrompt: {
-        type: "preset",
-        preset: "claude_code",
-        append: [
-          PLATFORM_AGENT_RULES,
-          nativeReadToolDisabled ? buildNativeReadDisabledRules(visionMcpTools) : "",
-          DOCUMENT_READING_RULES,
-          MEDIA_GENERATION_RULES,
-          agentConfig.systemPrompt,
-          scopedInstructions,
-          notebookSection,
-          forkHistorySection,
-          scopesSection
-        ].filter((s) => typeof s === "string" && s.trim().length > 0).join("\n\n")
-      },
+      systemPrompt,
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
       // allowedTools is the visibility whitelist passed to Claude Code. MCP tools
       // with always_ask must still be included here so the model can request them;
       // the MCP server policy/permission layer decides whether execution asks.
       allowedTools: [
-        ...nativeReadToolDisabled ? [] : ["Read"],
-        "Edit",
-        "Write",
-        "Bash",
-        "Glob",
-        "Grep",
-        ...builtinWebSearchAllowed ? ["WebSearch"] : [],
-        "WebFetch",
-        "TodoWrite",
-        "TaskCreate",
-        "TaskUpdate",
-        "AskUserQuestion",
-        "mcp__neural__neural_send",
-        "mcp__neural__neural_list_scopes",
-        "mcp__neural__self_note",
-        "mcp__neural__list_contacts",
-        "mcp__neural__create_group",
-        "mcp__neural__add_to_group",
-        "mcp__neural__leave_group",
-        "mcp__neural__remove_from_group",
-        "mcp__neural__create_group_issue",
-        "mcp__neural__resolve_group_issue",
-        "mcp__neural__list_group_tasks",
-        "mcp__neural__update_group_task",
-        "mcp__neural__transfer_group_owner",
-        "mcp__neural__post_to_moments",
-        "mcp__neural__post_to_forum",
-        "mcp__neural__read_moments",
-        "mcp__neural__read_chat_history",
-        "mcp__neural__read_document",
-        "mcp__neural__list_available_skills",
-        "mcp__neural__list_skill_index",
-        ...isSmithAgent2(agentConfig) ? [
-          "mcp__neural__create_agent",
-          "mcp__neural__update_agent_profile",
-          "mcp__neural__recommend_agent_skills",
-          "mcp__neural__read_skill",
-          "mcp__neural__list_friends",
-          "mcp__neural__accept_friend",
-          "mcp__neural__add_friend",
-          "mcp__neural__fetch_logs"
-        ] : [],
+        ...smithAgent ? SMITH_ALLOWED_TOOLS : universalAllowedTools,
         ...externalMcp.allowedTools
       ],
       // Server-side WebSearch bypasses canUseTool; disallowedTools removes it from model context.
@@ -120159,7 +120265,7 @@ ${cfg.instructions.trim()}` : "";
       // instructions as the workflow body (replacing the default code-implementation
       // phases). The SDK wraps it with read-only enforcement + ExitPlanMode protocol.
       planModeInstructions: (() => {
-        const planTools = [
+        const planTools = (smithAgent ? ["AskUserQuestion", "Write (plan file only)"] : [
           ...nativeReadToolDisabled ? [] : ["Read"],
           "Glob",
           "Grep",
@@ -120167,19 +120273,19 @@ ${cfg.instructions.trim()}` : "";
           "WebFetch",
           "AskUserQuestion",
           "Write (plan file only)"
-        ].join(", ");
-        const researchTools = [
+        ]).join(", ");
+        const researchTools = (smithAgent ? ["AskUserQuestion"] : [
           ...nativeReadToolDisabled ? [] : ["Read"],
           "Grep",
           ...builtinWebSearchAllowed ? ["WebSearch"] : []
-        ].join(", ");
-        const unavailableTools = [
+        ]).join(", ");
+        const unavailableTools = (smithAgent ? ["Read", "Edit", "Bash", "Glob", "Grep", "WebFetch", "TodoWrite", "ExitPlanMode"] : [
           "Edit",
           "Bash",
           "TodoWrite",
           "ExitPlanMode",
           ...nativeReadToolDisabled ? ["Read"] : []
-        ].join(", ");
+        ]).join(", ");
         const smithTools = smithAgent ? "\nSMITH-SPECIFIC TOOLS (available in plan mode): mcp__neural__recommend_agent_skills, mcp__neural__read_skill, mcp__neural__fetch_logs, mcp__neural__create_agent, mcp__neural__update_agent_profile \u2014 use these to recommend initial skill sets, research existing skills, check logs, plan agent creation, and adjust Agent profiles." : "";
         return `You are a PLANNER, NOT an executor. The user will execute your plan later.
 
@@ -120409,17 +120515,17 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       }
     };
     const userPromptTrimmed = (agentConfig.systemPrompt ?? "").trim();
-    const appendStr = options.systemPrompt.append;
     logger15.info("Platform rules attached", {
       agentId: agentConfig.id,
       scope: scopeKey(scope),
-      platformRulesLen: PLATFORM_AGENT_RULES.length,
+      systemPromptMode: smithAgent ? "string" : "preset",
+      platformRulesLen: platformRules.length,
       userPromptLen: userPromptTrimmed.length,
       hasUserPrompt: userPromptTrimmed.length > 0,
       notebookLen: notebookSection.length,
       forkHistoryLen: forkHistorySection.length,
       scopesLen: scopesSection.length,
-      appendLen: appendStr.length,
+      appendLen: appendText.length,
       hasCreateAgentTool: smithAgent,
       hasLogDetectiveTools: smithAgent && this.skillStore !== null
     });
@@ -120489,6 +120595,7 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       mcpAuditRecorder: this.mcpAuditRecorder,
       segmentBuffer: "",
       segmentCount: 0,
+      workdirSignals: [],
       accumulatedToolInput: "",
       planModeRef,
       mediaGenerationTurnGuard,
@@ -121522,6 +121629,7 @@ ${lines.join("\n")}`;
     proc.currentToolName = null;
     proc.segmentBuffer = "";
     proc.segmentCount = 0;
+    proc.workdirSignals = [];
   }
   clearPostMergeContinuationTimer(runtime) {
     if (runtime.postMergeContinuationTimer) {
@@ -124297,6 +124405,7 @@ var HttpMcpRegistry = class {
   localStore;
   serverConnections = /* @__PURE__ */ new Map();
   localConnections = /* @__PURE__ */ new Map();
+  missingSecretWarnedKeys = /* @__PURE__ */ new Set();
   lastRefreshCount = null;
   apiUrl(suffix) {
     const base = this.serverApiUrl.replace(/\/$/, "");
@@ -124397,13 +124506,19 @@ var HttpMcpRegistry = class {
       return false;
     });
   }
+  warnMissingSecretOnce(connection) {
+    const key = `${connection.id}:${connection.providerId}:${connection.serverName}`;
+    if (this.missingSecretWarnedKeys.has(key)) return;
+    this.missingSecretWarnedKeys.add(key);
+    logger20.warn("Skipping MCP connection without required secret", {
+      id: connection.id,
+      providerId: connection.providerId,
+      serverName: connection.serverName
+    });
+  }
   toSdkServerConfig(connection, ctx) {
     if (mcpConnectionRequiresSecret(connection) && !connection.hasAuthSecret) {
-      logger20.warn("Skipping MCP connection without required secret", {
-        id: connection.id,
-        providerId: connection.providerId,
-        serverName: connection.serverName
-      });
+      this.warnMissingSecretOnce(connection);
       return null;
     }
     const policies = toolPolicies(connection);
@@ -126600,8 +126715,47 @@ var import_node_fs11 = __toESM(require("fs"), 1);
 var import_promises7 = __toESM(require("fs/promises"), 1);
 var import_node_path21 = __toESM(require("path"), 1);
 var logger29 = createModuleLogger("bridge.logUploader");
+var STALE_RATE_LIMIT_SKIP_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
 var DEFAULT_LOG_UPLOAD_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 var DEFAULT_BATCH_SIZE = 200;
+var MAX_UPLOAD_CHUNK_BODY_BYTES = 448 * 1024;
+var MAX_UPLOAD_RETRY_AFTER_MS = 24 * 60 * 60 * 1e3;
+var LogUploadHttpError = class extends Error {
+  status;
+  scope;
+  retryAfterMs;
+  constructor(status, bodyText) {
+    const parsed = parseUploadErrorBody(bodyText);
+    const summary = parsed.error ?? bodyText;
+    super(`upload failed HTTP ${status}: ${summary.slice(0, 160)}`);
+    this.name = "LogUploadHttpError";
+    this.status = status;
+    if (parsed.scope) this.scope = parsed.scope;
+    if (parsed.retryAfterMs !== void 0) this.retryAfterMs = parsed.retryAfterMs;
+  }
+};
+function normalizeRetryAfterMs(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return void 0;
+  return Math.min(Math.ceil(value), MAX_UPLOAD_RETRY_AFTER_MS);
+}
+function parseUploadErrorBody(bodyText) {
+  try {
+    const parsed = JSON.parse(bodyText);
+    if (typeof parsed !== "object" || parsed === null) return {};
+    const body = parsed;
+    return {
+      ...typeof body.error === "string" && body.error.length > 0 ? { error: body.error } : {},
+      ...typeof body.scope === "string" && body.scope.length > 0 ? { scope: body.scope } : {},
+      ...(() => {
+        const retryAfterMs = normalizeRetryAfterMs(body.retryAfterMs);
+        return retryAfterMs === void 0 ? {} : { retryAfterMs };
+      })()
+    };
+  } catch (e) {
+    logger29.debug("Failed to parse log upload error body", { error: e });
+    return {};
+  }
+}
 function defaultLogFile(dataDir) {
   return import_node_path21.default.join(dataDir, "logs", "bridge.log");
 }
@@ -126691,26 +126845,38 @@ function parseProcessedLines(raw, cursor, fileName, fingerprint) {
     return { entries: [], nextCursor: cursor, advanced: false, reason: "partial_line" };
   }
   const processed = raw.slice(0, lastNewline + 1);
-  const lines = processed.split(/\r?\n/);
+  const linePattern = /.*?\n/g;
   const entries = [];
   let lineNum = cursor.lineNum;
-  for (let i = 0; i < lines.length - 1; i += 1) {
-    const line = lines[i] ?? "";
+  let offset = cursor.offset;
+  let match;
+  while ((match = linePattern.exec(processed)) !== null) {
+    const rawLine = match[0];
+    const line = rawLine.endsWith("\r\n") ? rawLine.slice(0, -2) : rawLine.slice(0, -1);
     lineNum += 1;
+    offset += Buffer.byteLength(rawLine, "utf8");
+    const cursorAfter = {
+      offset,
+      lineNum,
+      ...fingerprint ? { fingerprint } : {}
+    };
     if (line.length === 0) continue;
     const parsed = parseLogLine(line);
     if (!parsed) continue;
     entries.push({
-      ...parsed,
-      raw: line,
-      file: fileName,
-      lineNum
+      entry: {
+        ...parsed,
+        raw: line,
+        file: fileName,
+        lineNum
+      },
+      cursorAfter
     });
   }
   return {
     entries,
     nextCursor: {
-      offset: cursor.offset + Buffer.byteLength(processed, "utf8"),
+      offset,
       lineNum,
       ...fingerprint ? { fingerprint } : {}
     },
@@ -126718,15 +126884,35 @@ function parseProcessedLines(raw, cursor, fileName, fingerprint) {
     reason: "advanced"
   };
 }
-function chunkEntries(entries, size) {
-  const chunks = [];
-  for (let i = 0; i < entries.length; i += size) {
-    chunks.push(entries.slice(i, i + size));
+function logEntryTimeRange(entries) {
+  let minTime = Number.POSITIVE_INFINITY;
+  let maxTime = Number.NEGATIVE_INFINITY;
+  let minTs = "";
+  let maxTs = "";
+  for (const entry of entries) {
+    const parsed = Date.parse(entry.ts);
+    if (!Number.isFinite(parsed)) return null;
+    if (parsed < minTime) {
+      minTime = parsed;
+      minTs = entry.ts;
+    }
+    if (parsed > maxTime) {
+      maxTime = parsed;
+      maxTs = entry.ts;
+    }
   }
-  return chunks;
+  if (!minTs || !maxTs) return null;
+  return { minTs, maxTs, maxTime };
+}
+function isStaleRateLimitedChunk(entries, nowMs) {
+  const range = logEntryTimeRange(entries);
+  if (!range) return null;
+  if (nowMs - range.maxTime <= STALE_RATE_LIMIT_SKIP_AGE_MS) return null;
+  return { minTs: range.minTs, maxTs: range.maxTs };
 }
 var BridgeLogUploader = class {
   options;
+  retryAfterByTarget = /* @__PURE__ */ new Map();
   timer = null;
   running = false;
   stopped = false;
@@ -126743,7 +126929,7 @@ var BridgeLogUploader = class {
       bridgeId: options.bridgeId,
       hostname: options.hostname,
       intervalMs: options.intervalMs ?? DEFAULT_LOG_UPLOAD_INTERVAL_MS,
-      batchSize: options.batchSize ?? DEFAULT_BATCH_SIZE,
+      batchSize: Math.max(1, Math.floor(options.batchSize ?? DEFAULT_BATCH_SIZE)),
       primaryTarget,
       extraTargets: (options.extraLogFiles ?? []).map((file2) => normalizeTarget(file2, options.dataDir)),
       includeRotatedBridgeLogs: options.includeRotatedBridgeLogs ?? true
@@ -126785,13 +126971,26 @@ var BridgeLogUploader = class {
       bridgeEntryCount: 0,
       uploadedChunkCount: 0,
       accepted: 0,
-      skipped: 0
+      skipped: 0,
+      dropped: 0
     };
     try {
       const targets = await this.resolveTargets();
       summary.targetCount = targets.length;
       for (const target of targets) {
+        const targetKey = this.targetKey(target);
         try {
+          const retryUntil = this.retryAfterByTarget.get(targetKey);
+          const now = Date.now();
+          if (retryUntil && retryUntil > now) {
+            summary.idleTargetCount += 1;
+            logger29.debug("Bridge log upload target backoff active", {
+              logFile: target.logFile,
+              retryAfterMs: retryUntil - now
+            });
+            continue;
+          }
+          if (retryUntil) this.retryAfterByTarget.delete(targetKey);
           const cursor = await readCursor(target.cursorFile);
           const batch = await this.readNewEntries(target, cursor);
           if (!batch.advanced) {
@@ -126803,28 +127002,45 @@ var BridgeLogUploader = class {
           summary.advancedTargetCount += 1;
           summary.parsedEntryCount += batch.entries.length;
           if (batch.entries.length > 0) {
-            const result = await this.uploadEntries(batch.entries);
+            const result = await this.uploadEntries(batch.entries, target.cursorFile, batch.nextCursor);
             summary.bridgeEntryCount += result.bridgeEntryCount;
             summary.uploadedChunkCount += result.uploadedChunkCount;
             summary.accepted += result.accepted;
             summary.skipped += result.skipped;
+            summary.dropped += result.dropped;
+          } else {
+            await writeCursor(target.cursorFile, batch.nextCursor);
           }
-          await writeCursor(target.cursorFile, batch.nextCursor);
+          this.retryAfterByTarget.delete(targetKey);
         } catch (e) {
           summary.failedTargetCount += 1;
-          logger29.warn("Bridge log upload target failed", { error: e, logFile: target.logFile });
+          if (e instanceof LogUploadHttpError && e.retryAfterMs !== void 0) {
+            this.retryAfterByTarget.set(targetKey, Date.now() + e.retryAfterMs);
+            logger29.warn("Bridge log upload target failed", {
+              error: e,
+              logFile: target.logFile,
+              status: e.status,
+              quotaScope: e.scope,
+              retryAfterMs: e.retryAfterMs
+            });
+          } else {
+            logger29.warn("Bridge log upload target failed", { error: e, logFile: target.logFile });
+          }
         }
       }
     } catch (e) {
       logger29.warn("Bridge log upload cycle failed", { error: e });
     } finally {
-      logger29.info("Bridge log upload cycle summary", {
+      logger29.debug("Bridge log upload cycle summary", {
         ...summary,
         durationMs: Date.now() - startedAt
       });
       this.running = false;
     }
   }
+  targetKey(target) {
+    return `${target.logFile}\0${target.cursorFile}`;
+  }
   async resolveTargets() {
     const bridgeTargets = this.options.includeRotatedBridgeLogs ? await listRotatedBridgeTargets(this.options.primaryTarget, this.options.dataDir) : [this.options.primaryTarget];
     const seen = /* @__PURE__ */ new Set();
@@ -126857,15 +127073,40 @@ var BridgeLogUploader = class {
     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");
+  uploadBodyBytes(entries) {
+    return Buffer.byteLength(JSON.stringify({
+      bridgeId: this.options.bridgeId,
+      hostname: this.options.hostname,
+      entries
+    }), "utf8");
+  }
+  chunkUploadEntries(entries) {
+    const chunks = [];
+    let current = [];
+    for (const entry of entries) {
+      const next = [...current, entry];
+      const nextBodyBytes = this.uploadBodyBytes(next.map((item) => item.entry));
+      if (current.length > 0 && (current.length >= this.options.batchSize || nextBodyBytes > MAX_UPLOAD_CHUNK_BODY_BYTES)) {
+        chunks.push(current);
+        current = [entry];
+      } else {
+        current = next;
+      }
+    }
+    if (current.length > 0) chunks.push(current);
+    return chunks;
+  }
+  async uploadEntries(entries, cursorFile, finalCursor) {
+    const bridgeEntries = entries.filter((item) => item.entry.source === "bridge");
     const result = {
       bridgeEntryCount: bridgeEntries.length,
       uploadedChunkCount: 0,
       accepted: 0,
-      skipped: 0
+      skipped: 0,
+      dropped: 0
     };
-    for (const chunk of chunkEntries(bridgeEntries, this.options.batchSize)) {
+    for (const chunk of this.chunkUploadEntries(bridgeEntries)) {
+      const payloadEntries = chunk.map((item) => item.entry);
       const res = await fetch(`${this.options.serverApiUrl}/api/logs/upload`, {
         method: "POST",
         headers: {
@@ -126875,7 +127116,7 @@ var BridgeLogUploader = class {
         body: JSON.stringify({
           bridgeId: this.options.bridgeId,
           hostname: this.options.hostname,
-          entries: chunk
+          entries: payloadEntries
         })
       });
       if (!res.ok) {
@@ -126883,13 +127124,27 @@ var BridgeLogUploader = class {
           logger29.debug("Failed to read log upload error body", { error: e });
           return "";
         });
-        throw new Error(`upload failed HTTP ${res.status}: ${body2.slice(0, 160)}`);
+        const staleChunk = res.status === 429 ? isStaleRateLimitedChunk(payloadEntries, Date.now()) : null;
+        if (staleChunk) {
+          result.dropped += chunk.length;
+          logger29.warn("Skipping stale bridge log upload chunk after rate limit", {
+            status: res.status,
+            entryCount: chunk.length,
+            minEntryTs: staleChunk.minTs,
+            maxEntryTs: staleChunk.maxTs
+          });
+          continue;
+        }
+        throw new LogUploadHttpError(res.status, body2);
       }
       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;
+      const last = chunk[chunk.length - 1];
+      if (last) await writeCursor(cursorFile, last.cursorAfter);
     }
+    await writeCursor(cursorFile, finalCursor);
     return result;
   }
 };
@@ -126973,7 +127228,7 @@ var SkillStore = class {
       if (!isNotFoundError(e)) logger30.warn("Skill seed existing read failed", { name, filePath, error: e });
     }
     if (existing === content) {
-      logger30.info("Skill already in sync", { name, bytes: content.length });
+      logger30.debug("Skill already in sync", { name, bytes: content.length });
       return;
     }
     import_node_fs12.default.writeFileSync(tmpPath, content, "utf-8");