@fangyb/ahchat-bridge 0.1.18 → 0.1.19

package/dist/cli.cjs

@@ -4361,8 +4361,8 @@ function resolveAgentConfigDir(dataDir) {
   }
   return newPath;
 }
-function loadBridgeConfig() {
-  const dataDir = readEnvString(
+function loadBridgeConfig(opts) {
+  const dataDir = opts?.dataDir ?? readEnvString(
     "AHCHAT_DATA_DIR",
     import_node_path.default.join(import_node_os.default.homedir(), ".ahchat")
   );
@@ -6510,6 +6510,9 @@ var LOG_LEVEL_VALUE2 = {
 
 // ../shared/src/types/onboarding.ts
 init_cjs_shims();
+function isCapabilityTier(v9) {
+  return v9 === "smart" || v9 === "balanced" || v9 === "fast";
+}
 
 // ../shared/src/utils.ts
 init_cjs_shims();
@@ -6588,18 +6591,6 @@ function parseWSMessage(raw) {
 
 // ../shared/src/utils/workdir.ts
 init_cjs_shims();
-var SLUG_MAX_LEN = 32;
-function slugifyForFs(name) {
-  const trimmed = name.trim();
-  if (!trimmed) return "unnamed";
-  const slug = trimmed.replace(/[^\w\u4e00-\u9fa5 \-]/gu, "_").replace(/\s+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "");
-  const base = slug.length > 0 ? slug : "unnamed";
-  return base.length > SLUG_MAX_LEN ? base.slice(0, SLUG_MAX_LEN) : base;
-}
-function defaultGroupWorkdir(home, name, id) {
-  const slug = slugifyForFs(name);
-  return `${home}/.ahchat/Group-${slug}-${id}`;
-}
 
 // ../shared/src/utils/groupAuto.ts
 init_cjs_shims();
@@ -6622,6 +6613,7 @@ function parseAgentConfig(raw) {
       const out = {};
       const obj = v9;
       if (typeof obj.model === "string" && obj.model.trim()) out.model = obj.model.trim();
+      if (isCapabilityTier(obj.capabilityTier)) out.capabilityTier = obj.capabilityTier;
       if (typeof obj.subscriptionId === "string") {
         const trimmed = obj.subscriptionId.trim();
         if (/^sub_[A-Za-z0-9_-]{1,64}$/.test(trimmed)) {
@@ -44852,9 +44844,12 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
           const tierRes = await fetch(tierUrl);
           if (tierRes.ok) {
             const tiers = await tierRes.json();
-            const tierConfig = tiers.find((t2) => t2.tier === tier);
+            const self2 = deps.agentRegistry?.getById(deps.agentId);
+            const preferredSubscriptionId = parseAgentConfig(self2?.config).subscriptionId;
+            const tierConfig = tiers.find((t2) => t2.tier === tier && t2.subscriptionId === preferredSubscriptionId) ?? tiers.find((t2) => t2.tier === tier);
             if (tierConfig) {
               agentConfig = JSON.stringify({
+                capabilityTier: tier,
                 subscriptionId: tierConfig.subscriptionId,
                 model: tierConfig.modelName
               });
@@ -45006,9 +45001,11 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
           const tierRes = await fetch(tierUrl);
           if (tierRes.ok) {
             const tiers = await tierRes.json();
-            const tierConfig = tiers.find((t2) => t2.tier === tier);
+            const preferredSubscriptionId = parseAgentConfig(existing.config).subscriptionId;
+            const tierConfig = tiers.find((t2) => t2.tier === tier && t2.subscriptionId === preferredSubscriptionId) ?? tiers.find((t2) => t2.tier === tier);
             if (tierConfig) {
               agentConfig = JSON.stringify({
+                capabilityTier: tier,
                 subscriptionId: tierConfig.subscriptionId,
                 model: tierConfig.modelName
               });
@@ -45743,11 +45740,117 @@ init_cjs_shims();
 var logger7 = createModuleLogger("sdk.mapper");
 var HIGH_WATERMARK_INPUT_TOKENS = 12e4;
 var WARN_THRESHOLD_INPUT_TOKENS = 1e5;
+var LIVE_INPUT_PREVIEW_TOOLS = /* @__PURE__ */ new Set(["Write", "Edit"]);
 var CONTEXT_OVERFLOW_LOCK_MS = 6e4;
 function isContextOverflowText(text) {
   const trimmed = text.trim();
   return /^prompt is too long\b/i.test(trimmed) || /context length .* exceed/i.test(trimmed);
 }
+function isAuthFailureText(text, sdkError) {
+  return sdkError === "authentication_failed" || /not logged in|please run \/login/i.test(text);
+}
+function buildAuthFailureMessage(errorText) {
+  return `Claude Code SDK \u672A\u767B\u5F55\uFF08${errorText}\uFF09\u3002\u8BF7\u5728 bridge \u4E3B\u673A\u4E0A\u914D\u7F6E\u8BA4\u8BC1\uFF1A\u82E5\u8BE5 Agent \u7528 system \u8BA2\u9605\uFF0C\u5C06\u5176 subscriptionType \u8BBE\u4E3A "system"\uFF08\u8D70 ~/.claude\uFF09\uFF1B\u5426\u5219\u5728 ~/.ahchat/claude-config \u4E0B\u767B\u5F55\uFF0C\u6216\u5728 Agent config \u4E2D\u63D0\u4F9B apiKey / apiBaseUrl\u3002`;
+}
+function decodeJsonStringFragment(raw) {
+  let out = "";
+  for (let i = 0; i < raw.length; i++) {
+    const ch2 = raw[i];
+    if (ch2 !== "\\") {
+      out += ch2;
+      continue;
+    }
+    const next = raw[i + 1];
+    if (next === void 0) break;
+    i += 1;
+    switch (next) {
+      case '"':
+      case "\\":
+      case "/":
+        out += next;
+        break;
+      case "b":
+        out += "\b";
+        break;
+      case "f":
+        out += "\f";
+        break;
+      case "n":
+        out += "\n";
+        break;
+      case "r":
+        out += "\r";
+        break;
+      case "t":
+        out += "	";
+        break;
+      case "u": {
+        const hex3 = raw.slice(i + 1, i + 5);
+        if (!/^[0-9a-fA-F]{4}$/.test(hex3)) return out;
+        out += String.fromCharCode(Number.parseInt(hex3, 16));
+        i += 4;
+        break;
+      }
+      default:
+        out += next;
+    }
+  }
+  return out;
+}
+function extractJsonStringPrefix(source, key) {
+  const keyToken = `"${key}"`;
+  const keyIndex = source.indexOf(keyToken);
+  if (keyIndex < 0) return null;
+  let i = keyIndex + keyToken.length;
+  while (i < source.length && /\s/.test(source[i] ?? "")) i += 1;
+  if (source[i] !== ":") return null;
+  i += 1;
+  while (i < source.length && /\s/.test(source[i] ?? "")) i += 1;
+  if (source[i] !== '"') return null;
+  i += 1;
+  let raw = "";
+  let escaped = false;
+  for (; i < source.length; i++) {
+    const ch2 = source[i];
+    if (ch2 === void 0) break;
+    if (escaped) {
+      raw += `\\${ch2}`;
+      escaped = false;
+      continue;
+    }
+    if (ch2 === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (ch2 === '"') {
+      return decodeJsonStringFragment(raw);
+    }
+    raw += ch2;
+  }
+  if (escaped) raw += "\\";
+  return decodeJsonStringFragment(raw);
+}
+function extractLiveToolInput(toolName, inputJson) {
+  if (toolName === "Write") {
+    const content = extractJsonStringPrefix(inputJson, "content");
+    if (content == null) return null;
+    const filePath = extractJsonStringPrefix(inputJson, "file_path");
+    return filePath == null ? { content } : { file_path: filePath, content };
+  }
+  if (toolName === "Edit") {
+    const newString = extractJsonStringPrefix(inputJson, "new_string");
+    if (newString == null) return null;
+    const oldString = extractJsonStringPrefix(inputJson, "old_string");
+    const filePath = extractJsonStringPrefix(inputJson, "file_path");
+    const input = {
+      new_string: newString
+    };
+    if (filePath != null) input.file_path = filePath;
+    if (oldString != null) input.old_string = oldString;
+    return input;
+  }
+  return null;
+}
 function recordAssistantContextUsage(proc, am2) {
   const u = am2.message?.usage;
   if (!u) return;
@@ -45815,6 +45918,45 @@ function cleanupPlanMode(proc, emit, base, reason) {
   });
   proc.planModeActive = false;
 }
+function extractAssistantTextParts(content, depth = 0) {
+  if (depth > 4) return [];
+  if (typeof content === "string") return [content];
+  if (Array.isArray(content)) {
+    return content.flatMap((item) => extractAssistantTextParts(item, depth + 1));
+  }
+  if (typeof content !== "object" || content === null) return [];
+  const block = content;
+  const type = typeof block.type === "string" ? block.type : null;
+  if (type === "tool_use" || type === "tool_result") return [];
+  if (type === "text" || type === "output_text" || type == null) {
+    const textParts = extractAssistantTextParts(block.text, depth + 1);
+    if (textParts.length > 0) return textParts;
+    return extractAssistantTextParts(block.content, depth + 1);
+  }
+  return [];
+}
+function describeAssistantContent(content) {
+  if (Array.isArray(content)) {
+    return {
+      contentShape: "array",
+      blockTypes: content.map((item) => {
+        if (typeof item !== "object" || item === null) return typeof item;
+        const type = item.type;
+        return typeof type === "string" ? type : "(no-type)";
+      }).slice(0, 12)
+    };
+  }
+  if (typeof content === "object" && content !== null) {
+    return {
+      contentShape: "object",
+      contentKeys: Object.keys(content).slice(0, 12)
+    };
+  }
+  return { contentShape: typeof content };
+}
+function scopeLogLabel(scope) {
+  return scope.kind === "single" ? "single" : scope.groupId;
+}
 function getTaskBase(proc) {
   if (proc.currentTask) {
     return {
@@ -45824,10 +45966,42 @@ function getTaskBase(proc) {
       replyMessageId: proc.currentTask.replyMessageId
     };
   }
+  const continuation = proc.postMergeContinuationTask;
+  const continuationUntil = proc.postMergeContinuationUntil ?? 0;
+  if (continuation) {
+    if (Date.now() <= continuationUntil) {
+      proc.currentTask = continuation;
+      proc.status = "working";
+      proc.currentTaskStartedAt = Date.now();
+      delete proc.postMergeContinuationTask;
+      delete proc.postMergeContinuationUntil;
+      logger7.info("SDK post-merge continuation routed to merged task", {
+        agentId: proc.agentId,
+        scope: scopeLogLabel(proc.scope),
+        replyMessageId: continuation.replyMessageId,
+        conversationId: continuation.conversationId,
+        traceId: continuation.traceId
+      });
+      return {
+        agentId: proc.agentId,
+        conversationId: continuation.conversationId,
+        traceId: continuation.traceId,
+        replyMessageId: continuation.replyMessageId
+      };
+    }
+    logger7.info("SDK post-merge continuation route expired", {
+      agentId: proc.agentId,
+      scope: scopeLogLabel(proc.scope),
+      replyMessageId: continuation.replyMessageId,
+      routeUntil: new Date(continuationUntil).toISOString()
+    });
+    delete proc.postMergeContinuationTask;
+    delete proc.postMergeContinuationUntil;
+  }
   if (!proc.cachedConversationId) {
     logger7.warn("SDK self-initiated turn without cachedConversationId; dropping", {
       agentId: proc.agentId,
-      scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId
+      scope: scopeLogLabel(proc.scope)
     });
     return null;
   }
@@ -45844,7 +46018,7 @@ function getTaskBase(proc) {
   proc.currentTaskStartedAt = Date.now();
   logger7.info("Cron-initiated turn detected, synthesized task", {
     agentId: proc.agentId,
-    scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
+    scope: scopeLogLabel(proc.scope),
     replyMessageId,
     conversationId: proc.cachedConversationId,
     traceId
@@ -46088,6 +46262,17 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             const partial2 = delta.partial_json;
             if (typeof partial2 === "string") {
               proc.accumulatedToolInput += partial2;
+              const liveInput = extractLiveToolInput(proc.currentToolName, proc.accumulatedToolInput);
+              if (liveInput && proc.currentToolName != null) {
+                emit({
+                  type: "agent:tool_input_update",
+                  payload: {
+                    ...wireBase(base),
+                    toolName: proc.currentToolName,
+                    input: liveInput
+                  }
+                });
+              }
             }
           } else if (delta.type === "text_delta" && typeof delta.text === "string") {
             if (proc.accumulatedText.length === 0) {
@@ -46142,6 +46327,16 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             if (lastToolUse && lastToolUse.type === "tool_use") {
               lastToolUse.input = parsedInput;
             }
+            if (proc.currentToolName != null && LIVE_INPUT_PREVIEW_TOOLS.has(proc.currentToolName) && Object.keys(parsedInput).length > 0) {
+              emit({
+                type: "agent:tool_input_update",
+                payload: {
+                  ...wireBase(base),
+                  toolName: proc.currentToolName,
+                  input: parsedInput
+                }
+              });
+            }
             if (proc.currentToolName === "TodoWrite") {
               const todos = extractTodosFromInput(parsedInput);
               if (todos) {
@@ -46386,6 +46581,29 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
           onCompleted();
           break;
         }
+        if (proc.accumulatedText.length === 0 && proc.contentBlocks.length === 0) {
+          cleanupPlanMode(proc, emit, base, "error");
+          logger7.warn("SDK success produced empty assistant output; emitting agent:error", {
+            agentId: proc.agentId,
+            ackId: base.replyMessageId,
+            tokenCount: usage.tokenCount,
+            inputTokens: usage.inputTokens,
+            cacheReadTokens: usage.cacheReadTokens,
+            cacheCreationTokens: usage.cacheCreationTokens,
+            assistantContent: proc.lastAssistantContentDescription,
+            traceId: base.traceId
+          });
+          emit({
+            type: "agent:error",
+            payload: {
+              ...wireBase(base),
+              error: "Agent \u8FD4\u56DE\u4E86\u7A7A\u7ED3\u679C\uFF0C\u5DF2\u963B\u6B62\u7A7A\u6D88\u606F\u8986\u76D6\u601D\u8003\u6C14\u6CE1\u3002\u8BF7\u91CD\u8BD5\uFF1B\u5982\u679C\u53CD\u590D\u51FA\u73B0\uFF0C\u8BF7\u68C0\u67E5 Claude Code \u767B\u5F55\u72B6\u6001\u6216\u6A21\u578B\u914D\u7F6E\u3002"
+            }
+          });
+          resetAccumulators(proc);
+          onCompleted();
+          break;
+        }
         if (proc.accumulatedText) {
           proc.contentBlocks.push({ type: "text", content: proc.accumulatedText });
         }
@@ -46455,14 +46673,9 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
       if (am2.isApiErrorMessage === true) {
         const base = getTaskBase(proc);
         if (!base) break;
-        const errorTexts = [];
-        for (const block of am2.message?.content ?? []) {
-          if (block?.type === "text" && typeof block.text === "string") {
-            errorTexts.push(block.text);
-          }
-        }
+        const errorTexts = extractAssistantTextParts(am2.message?.content);
         const errorText = errorTexts.join("\n").trim() || `SDK ${am2.error ?? "api_error"}`;
-        const isAuthFail = am2.error === "authentication_failed" || /not logged in|please run \/login/i.test(errorText);
+        const isAuthFail = isAuthFailureText(errorText, am2.error);
         if (isAuthFail) {
           sessionStore.delete(proc.agentId, proc.scope);
         }
@@ -46474,7 +46687,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
           isAuthFail,
           traceId: base.traceId
         });
-        const friendlyError = isAuthFail ? `Claude Code SDK \u672A\u767B\u5F55\uFF08${errorText}\uFF09\u3002\u8BF7\u5728 bridge \u4E3B\u673A\u4E0A\u914D\u7F6E\u8BA4\u8BC1\uFF1A\u82E5\u8BE5 Agent \u7528 system \u8BA2\u9605\uFF0C\u5C06\u5176 subscriptionType \u8BBE\u4E3A "system"\uFF08\u8D70 ~/.claude\uFF09\uFF1B\u5426\u5219\u5728 ~/.ahchat/claude-config \u4E0B\u767B\u5F55\uFF0C\u6216\u5728 Agent config \u4E2D\u63D0\u4F9B apiKey / apiBaseUrl\u3002` : errorText;
+        const friendlyError = isAuthFail ? buildAuthFailureMessage(errorText) : errorText;
         emit({
           type: "agent:error",
           payload: { ...wireBase(base), error: friendlyError }
@@ -46487,14 +46700,36 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
         break;
       }
       if (proc.accumulatedText.length === 0 && proc.contentBlocks.length === 0) {
-        const captured = [];
-        for (const block of am2.message?.content ?? []) {
-          if (block?.type === "text" && typeof block.text === "string") {
-            captured.push(block.text);
-          }
-        }
+        const captured = extractAssistantTextParts(am2.message?.content);
         if (captured.length > 0) {
           const text = captured.join("");
+          if (isAuthFailureText(text, am2.error)) {
+            const base = getTaskBase(proc);
+            logger7.warn("SDK auth failure assistant detected without api-error flag, emitting agent:error", {
+              agentId: proc.agentId,
+              scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
+              sdkError: am2.error,
+              errorText: text.slice(0, 200),
+              traceId: base?.traceId,
+              hasCurrentTask: base != null
+            });
+            if (base) {
+              sessionStore.delete(proc.agentId, proc.scope);
+              emit({
+                type: "agent:error",
+                payload: {
+                  ...wireBase(base),
+                  error: buildAuthFailureMessage(text)
+                }
+              });
+              proc.apiErrorEmitted = true;
+            }
+            proc.contentBlocks = [];
+            proc.accumulatedText = "";
+            proc.accumulatedThinking = "";
+            proc.segmentBuffer = "";
+            break;
+          }
           if (isContextOverflowText(text)) {
             const base = getTaskBase(proc);
             logger7.warn("SDK reported context overflow; auto-compact already failed inside SDK", {
@@ -46538,6 +46773,8 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             textLen: text.length,
             textSample: text.slice(0, 100)
           });
+        } else {
+          proc.lastAssistantContentDescription = describeAssistantContent(am2.message?.content);
         }
       }
       break;
@@ -46561,6 +46798,7 @@ function resetAccumulators(proc) {
   proc.accumulatedToolInput = "";
   proc.apiErrorEmitted = false;
   proc.peakContextUsage = void 0;
+  proc.lastAssistantContentDescription = void 0;
 }
 
 // src/forkHistoryReplay.ts
@@ -46675,8 +46913,15 @@ var wsMetrics = new WsMetrics();
 // src/agentManager.ts
 var logger10 = createModuleLogger("agent.manager");
 var NODE_USER_UID = 1e3;
+var POST_MERGE_CONTINUATION_ROUTE_MS = 15e3;
 function isSmithAgent(agent) {
-  return agent.id === SMITH_AGENT_ID || agent.systemPrompt === SMITH_SYSTEM_PROMPT;
+  if (agent.id === SMITH_AGENT_ID) return true;
+  if (agent.systemPrompt === SMITH_SYSTEM_PROMPT) return true;
+  const prompt = agent.systemPrompt ?? "";
+  if (prompt.includes("\u4F60\u662F\u7279\u5DE5\u53F2\u5BC6\u65AF") && prompt.includes("create_agent")) return true;
+  const name = agent.name?.toLowerCase() ?? "";
+  const role = agent.role?.toLowerCase() ?? "";
+  return role === "system" && (name.includes("\u53F2\u5BC6\u65AF") || name.includes("smith"));
 }
 function isRunningAsRoot() {
   try {
@@ -46685,6 +46930,13 @@ function isRunningAsRoot() {
     return false;
   }
 }
+async function chownForRootSpawn(targetPath, target) {
+  try {
+    await import_promises8.default.chown(targetPath, NODE_USER_UID, NODE_USER_UID);
+  } catch (error51) {
+    logger10.error("Best-effort root chown failed", { error: error51, target, path: targetPath });
+  }
+}
 function readCronLockSnapshot() {
   try {
     const lockPath2 = import_node_path8.default.join(import_node_os5.default.homedir(), ".claude", "scheduled_tasks.lock");
@@ -47433,19 +47685,10 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       options.resume = savedSessionId;
     }
     if (isRunningAsRoot()) {
-      try {
-        await import_promises8.default.chown(effectiveConfigDir, NODE_USER_UID, NODE_USER_UID);
-      } catch {
-      }
-      try {
-        await import_promises8.default.chown(agentCwd, NODE_USER_UID, NODE_USER_UID);
-      } catch {
-      }
+      await chownForRootSpawn(effectiveConfigDir, "configDir");
+      await chownForRootSpawn(agentCwd, "agentCwd");
       const settingsFilePath = import_node_path8.default.join(effectiveConfigDir, "settings.json");
-      try {
-        await import_promises8.default.chown(settingsFilePath, NODE_USER_UID, NODE_USER_UID);
-      } catch {
-      }
+      await chownForRootSpawn(settingsFilePath, "settingsFile");
       options.spawnClaudeCodeProcess = (spawnOptions) => {
         const env2 = { ...spawnOptions.env, HOME: "/home/node" };
         return (0, import_node_child_process.spawn)(spawnOptions.command, spawnOptions.args, {
@@ -47611,7 +47854,7 @@ ${trimmed}`;
       lines.push(`    workdir: ${currentCwd}`);
     } else {
       const a = this.agentRegistry?.getById(agentId);
-      const singleCwd = a?.workingDirectory || import_node_path8.default.join(import_node_os5.default.homedir(), ".ahchat", `Agent-${a?.name ?? agentId}-${agentId}`);
+      const singleCwd = a?.workingDirectory || import_node_path8.default.join(this.workspacesDir, agentId);
       lines.push(`    workdir: ${singleCwd}`);
     }
     let rosterCount = 0;
@@ -47623,7 +47866,7 @@ ${trimmed}`;
       if (key === curKey) {
         lines.push(`    workdir: ${currentCwd}`);
       } else {
-        const groupCwd = defaultGroupWorkdir(import_node_os5.default.homedir(), g2.name, g2.groupId);
+        const groupCwd = g2.workingDirectory || import_node_path8.default.join(this.workspacesDir, g2.groupId);
         lines.push(`    workdir: ${groupCwd}`);
       }
       const others = g2.members.filter((id) => id !== agentId).map((id) => {
@@ -47970,6 +48213,16 @@ ${lines.join("\n")}`;
     }
   }
   async dispatchToSDK(runtime, task) {
+    if (runtime.postMergeContinuationTask) {
+      logger10.info("Clearing stale post-merge continuation route before explicit dispatch", {
+        agentId: runtime.agentId,
+        staleReplyMessageId: runtime.postMergeContinuationTask.replyMessageId,
+        nextReplyMessageId: task.replyMessageId,
+        traceId: task.traceId
+      });
+      delete runtime.postMergeContinuationTask;
+      delete runtime.postMergeContinuationUntil;
+    }
     await this.applyEffortMode(runtime, "high", {
       source: "dispatchToSDK",
       replyMessageId: task.replyMessageId
@@ -48178,6 +48431,19 @@ ${lines.join("\n")}`;
           }
         });
       }
+      const continuationTask = mergedBatch.at(-1);
+      if (continuationTask) {
+        proc.postMergeContinuationTask = continuationTask;
+        proc.postMergeContinuationUntil = Date.now() + POST_MERGE_CONTINUATION_ROUTE_MS;
+        logger10.info("Armed SDK post-merge continuation routing", {
+          agentId: proc.agentId,
+          carrierReplyMessageId: completedTask.replyMessageId,
+          continuationReplyMessageId: continuationTask.replyMessageId,
+          mergedCount: mergedBatch.length,
+          routeUntil: new Date(proc.postMergeContinuationUntil).toISOString(),
+          traceId: completedTask.traceId
+        });
+      }
       runtime.mergedTasks = [];
     } else if (runtime.mergedTasks.length > 0) {
       logger10.warn("mergedTasks non-empty but no currentTask; dropping", {
@@ -51489,6 +51755,7 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
     agentRegistry,
     subscriptionRegistry,
     serverApiUrl: config2.serverApiUrl,
+    bridgeToken: config2.bridgeToken,
     dataDir: config2.dataDir
   });
   const taskDispatchHandler = createTaskDispatchHandler(agentManager, agentRegistry, emit);
@@ -52096,17 +52363,14 @@ function parseAhchatUrl(url2) {
   }
 }
 async function run(args) {
-  let config2 = loadBridgeConfig();
+  const dataDir = args.dataDir ? resolveDataDir(args.dataDir) : void 0;
+  let config2 = loadBridgeConfig(dataDir ? { dataDir } : void 0);
   if (args.serverUrl) {
     const wsUrl = new URL(args.serverUrl);
     const httpBase = `${wsUrl.protocol === "wss:" ? "https" : "http"}://${wsUrl.host}`;
     config2 = { ...config2, serverUrl: args.serverUrl, serverApiUrl: httpBase };
   }
   if (args.token) config2 = { ...config2, bridgeToken: args.token };
-  if (args.dataDir) {
-    const resolved = resolveDataDir(args.dataDir);
-    config2 = { ...config2, dataDir: resolved };
-  }
   if (args.logLevel) config2 = { ...config2, logLevel: args.logLevel };
   await startBridge(config2);
 }

package/dist/index.js

@@ -3746,8 +3746,8 @@ function resolveAgentConfigDir(dataDir) {
   }
   return newPath;
 }
-function loadBridgeConfig() {
-  const dataDir = readEnvString(
+function loadBridgeConfig(opts) {
+  const dataDir = opts?.dataDir ?? readEnvString(
     "AHCHAT_DATA_DIR",
     path.join(os.homedir(), ".ahchat")
   );
@@ -5851,6 +5851,11 @@ var LOG_LEVEL_VALUE2 = {
   FATAL: 5
 };
 
+// ../shared/src/types/onboarding.ts
+function isCapabilityTier(v9) {
+  return v9 === "smart" || v9 === "balanced" || v9 === "fast";
+}
+
 // ../../node_modules/.pnpm/nanoid@5.1.11/node_modules/nanoid/index.js
 import { webcrypto as crypto2 } from "crypto";
 
@@ -5921,20 +5926,6 @@ function parseWSMessage(raw) {
   return parsed;
 }
 
-// ../shared/src/utils/workdir.ts
-var SLUG_MAX_LEN = 32;
-function slugifyForFs(name) {
-  const trimmed = name.trim();
-  if (!trimmed) return "unnamed";
-  const slug = trimmed.replace(/[^\w\u4e00-\u9fa5 \-]/gu, "_").replace(/\s+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "");
-  const base = slug.length > 0 ? slug : "unnamed";
-  return base.length > SLUG_MAX_LEN ? base.slice(0, SLUG_MAX_LEN) : base;
-}
-function defaultGroupWorkdir(home, name, id) {
-  const slug = slugifyForFs(name);
-  return `${home}/.ahchat/Group-${slug}-${id}`;
-}
-
 // ../shared/src/utils/subscription.ts
 function isSubscriptionType(v9) {
   return v9 === "system" || v9 === "project";
@@ -5949,6 +5940,7 @@ function parseAgentConfig(raw) {
       const out = {};
       const obj = v9;
       if (typeof obj.model === "string" && obj.model.trim()) out.model = obj.model.trim();
+      if (isCapabilityTier(obj.capabilityTier)) out.capabilityTier = obj.capabilityTier;
       if (typeof obj.subscriptionId === "string") {
         const trimmed = obj.subscriptionId.trim();
         if (/^sub_[A-Za-z0-9_-]{1,64}$/.test(trimmed)) {
@@ -44055,9 +44047,12 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
           const tierRes = await fetch(tierUrl);
           if (tierRes.ok) {
             const tiers = await tierRes.json();
-            const tierConfig = tiers.find((t2) => t2.tier === tier);
+            const self2 = deps.agentRegistry?.getById(deps.agentId);
+            const preferredSubscriptionId = parseAgentConfig(self2?.config).subscriptionId;
+            const tierConfig = tiers.find((t2) => t2.tier === tier && t2.subscriptionId === preferredSubscriptionId) ?? tiers.find((t2) => t2.tier === tier);
             if (tierConfig) {
               agentConfig = JSON.stringify({
+                capabilityTier: tier,
                 subscriptionId: tierConfig.subscriptionId,
                 model: tierConfig.modelName
               });
@@ -44209,9 +44204,11 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
           const tierRes = await fetch(tierUrl);
           if (tierRes.ok) {
             const tiers = await tierRes.json();
-            const tierConfig = tiers.find((t2) => t2.tier === tier);
+            const preferredSubscriptionId = parseAgentConfig(existing.config).subscriptionId;
+            const tierConfig = tiers.find((t2) => t2.tier === tier && t2.subscriptionId === preferredSubscriptionId) ?? tiers.find((t2) => t2.tier === tier);
             if (tierConfig) {
               agentConfig = JSON.stringify({
+                capabilityTier: tier,
                 subscriptionId: tierConfig.subscriptionId,
                 model: tierConfig.modelName
               });
@@ -44943,11 +44940,117 @@ function buildGroupInboxPrompt(entries, opts = {}) {
 var logger7 = createModuleLogger("sdk.mapper");
 var HIGH_WATERMARK_INPUT_TOKENS = 12e4;
 var WARN_THRESHOLD_INPUT_TOKENS = 1e5;
+var LIVE_INPUT_PREVIEW_TOOLS = /* @__PURE__ */ new Set(["Write", "Edit"]);
 var CONTEXT_OVERFLOW_LOCK_MS = 6e4;
 function isContextOverflowText(text) {
   const trimmed = text.trim();
   return /^prompt is too long\b/i.test(trimmed) || /context length .* exceed/i.test(trimmed);
 }
+function isAuthFailureText(text, sdkError) {
+  return sdkError === "authentication_failed" || /not logged in|please run \/login/i.test(text);
+}
+function buildAuthFailureMessage(errorText) {
+  return `Claude Code SDK \u672A\u767B\u5F55\uFF08${errorText}\uFF09\u3002\u8BF7\u5728 bridge \u4E3B\u673A\u4E0A\u914D\u7F6E\u8BA4\u8BC1\uFF1A\u82E5\u8BE5 Agent \u7528 system \u8BA2\u9605\uFF0C\u5C06\u5176 subscriptionType \u8BBE\u4E3A "system"\uFF08\u8D70 ~/.claude\uFF09\uFF1B\u5426\u5219\u5728 ~/.ahchat/claude-config \u4E0B\u767B\u5F55\uFF0C\u6216\u5728 Agent config \u4E2D\u63D0\u4F9B apiKey / apiBaseUrl\u3002`;
+}
+function decodeJsonStringFragment(raw) {
+  let out = "";
+  for (let i = 0; i < raw.length; i++) {
+    const ch2 = raw[i];
+    if (ch2 !== "\\") {
+      out += ch2;
+      continue;
+    }
+    const next = raw[i + 1];
+    if (next === void 0) break;
+    i += 1;
+    switch (next) {
+      case '"':
+      case "\\":
+      case "/":
+        out += next;
+        break;
+      case "b":
+        out += "\b";
+        break;
+      case "f":
+        out += "\f";
+        break;
+      case "n":
+        out += "\n";
+        break;
+      case "r":
+        out += "\r";
+        break;
+      case "t":
+        out += "	";
+        break;
+      case "u": {
+        const hex3 = raw.slice(i + 1, i + 5);
+        if (!/^[0-9a-fA-F]{4}$/.test(hex3)) return out;
+        out += String.fromCharCode(Number.parseInt(hex3, 16));
+        i += 4;
+        break;
+      }
+      default:
+        out += next;
+    }
+  }
+  return out;
+}
+function extractJsonStringPrefix(source, key) {
+  const keyToken = `"${key}"`;
+  const keyIndex = source.indexOf(keyToken);
+  if (keyIndex < 0) return null;
+  let i = keyIndex + keyToken.length;
+  while (i < source.length && /\s/.test(source[i] ?? "")) i += 1;
+  if (source[i] !== ":") return null;
+  i += 1;
+  while (i < source.length && /\s/.test(source[i] ?? "")) i += 1;
+  if (source[i] !== '"') return null;
+  i += 1;
+  let raw = "";
+  let escaped = false;
+  for (; i < source.length; i++) {
+    const ch2 = source[i];
+    if (ch2 === void 0) break;
+    if (escaped) {
+      raw += `\\${ch2}`;
+      escaped = false;
+      continue;
+    }
+    if (ch2 === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (ch2 === '"') {
+      return decodeJsonStringFragment(raw);
+    }
+    raw += ch2;
+  }
+  if (escaped) raw += "\\";
+  return decodeJsonStringFragment(raw);
+}
+function extractLiveToolInput(toolName, inputJson) {
+  if (toolName === "Write") {
+    const content = extractJsonStringPrefix(inputJson, "content");
+    if (content == null) return null;
+    const filePath = extractJsonStringPrefix(inputJson, "file_path");
+    return filePath == null ? { content } : { file_path: filePath, content };
+  }
+  if (toolName === "Edit") {
+    const newString = extractJsonStringPrefix(inputJson, "new_string");
+    if (newString == null) return null;
+    const oldString = extractJsonStringPrefix(inputJson, "old_string");
+    const filePath = extractJsonStringPrefix(inputJson, "file_path");
+    const input = {
+      new_string: newString
+    };
+    if (filePath != null) input.file_path = filePath;
+    if (oldString != null) input.old_string = oldString;
+    return input;
+  }
+  return null;
+}
 function recordAssistantContextUsage(proc, am2) {
   const u = am2.message?.usage;
   if (!u) return;
@@ -45015,6 +45118,45 @@ function cleanupPlanMode(proc, emit, base, reason) {
   });
   proc.planModeActive = false;
 }
+function extractAssistantTextParts(content, depth = 0) {
+  if (depth > 4) return [];
+  if (typeof content === "string") return [content];
+  if (Array.isArray(content)) {
+    return content.flatMap((item) => extractAssistantTextParts(item, depth + 1));
+  }
+  if (typeof content !== "object" || content === null) return [];
+  const block = content;
+  const type = typeof block.type === "string" ? block.type : null;
+  if (type === "tool_use" || type === "tool_result") return [];
+  if (type === "text" || type === "output_text" || type == null) {
+    const textParts = extractAssistantTextParts(block.text, depth + 1);
+    if (textParts.length > 0) return textParts;
+    return extractAssistantTextParts(block.content, depth + 1);
+  }
+  return [];
+}
+function describeAssistantContent(content) {
+  if (Array.isArray(content)) {
+    return {
+      contentShape: "array",
+      blockTypes: content.map((item) => {
+        if (typeof item !== "object" || item === null) return typeof item;
+        const type = item.type;
+        return typeof type === "string" ? type : "(no-type)";
+      }).slice(0, 12)
+    };
+  }
+  if (typeof content === "object" && content !== null) {
+    return {
+      contentShape: "object",
+      contentKeys: Object.keys(content).slice(0, 12)
+    };
+  }
+  return { contentShape: typeof content };
+}
+function scopeLogLabel(scope) {
+  return scope.kind === "single" ? "single" : scope.groupId;
+}
 function getTaskBase(proc) {
   if (proc.currentTask) {
     return {
@@ -45024,10 +45166,42 @@ function getTaskBase(proc) {
       replyMessageId: proc.currentTask.replyMessageId
     };
   }
+  const continuation = proc.postMergeContinuationTask;
+  const continuationUntil = proc.postMergeContinuationUntil ?? 0;
+  if (continuation) {
+    if (Date.now() <= continuationUntil) {
+      proc.currentTask = continuation;
+      proc.status = "working";
+      proc.currentTaskStartedAt = Date.now();
+      delete proc.postMergeContinuationTask;
+      delete proc.postMergeContinuationUntil;
+      logger7.info("SDK post-merge continuation routed to merged task", {
+        agentId: proc.agentId,
+        scope: scopeLogLabel(proc.scope),
+        replyMessageId: continuation.replyMessageId,
+        conversationId: continuation.conversationId,
+        traceId: continuation.traceId
+      });
+      return {
+        agentId: proc.agentId,
+        conversationId: continuation.conversationId,
+        traceId: continuation.traceId,
+        replyMessageId: continuation.replyMessageId
+      };
+    }
+    logger7.info("SDK post-merge continuation route expired", {
+      agentId: proc.agentId,
+      scope: scopeLogLabel(proc.scope),
+      replyMessageId: continuation.replyMessageId,
+      routeUntil: new Date(continuationUntil).toISOString()
+    });
+    delete proc.postMergeContinuationTask;
+    delete proc.postMergeContinuationUntil;
+  }
   if (!proc.cachedConversationId) {
     logger7.warn("SDK self-initiated turn without cachedConversationId; dropping", {
       agentId: proc.agentId,
-      scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId
+      scope: scopeLogLabel(proc.scope)
     });
     return null;
   }
@@ -45044,7 +45218,7 @@ function getTaskBase(proc) {
   proc.currentTaskStartedAt = Date.now();
   logger7.info("Cron-initiated turn detected, synthesized task", {
     agentId: proc.agentId,
-    scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
+    scope: scopeLogLabel(proc.scope),
     replyMessageId,
     conversationId: proc.cachedConversationId,
     traceId
@@ -45288,6 +45462,17 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             const partial2 = delta.partial_json;
             if (typeof partial2 === "string") {
               proc.accumulatedToolInput += partial2;
+              const liveInput = extractLiveToolInput(proc.currentToolName, proc.accumulatedToolInput);
+              if (liveInput && proc.currentToolName != null) {
+                emit({
+                  type: "agent:tool_input_update",
+                  payload: {
+                    ...wireBase(base),
+                    toolName: proc.currentToolName,
+                    input: liveInput
+                  }
+                });
+              }
             }
           } else if (delta.type === "text_delta" && typeof delta.text === "string") {
             if (proc.accumulatedText.length === 0) {
@@ -45342,6 +45527,16 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             if (lastToolUse && lastToolUse.type === "tool_use") {
               lastToolUse.input = parsedInput;
             }
+            if (proc.currentToolName != null && LIVE_INPUT_PREVIEW_TOOLS.has(proc.currentToolName) && Object.keys(parsedInput).length > 0) {
+              emit({
+                type: "agent:tool_input_update",
+                payload: {
+                  ...wireBase(base),
+                  toolName: proc.currentToolName,
+                  input: parsedInput
+                }
+              });
+            }
             if (proc.currentToolName === "TodoWrite") {
               const todos = extractTodosFromInput(parsedInput);
               if (todos) {
@@ -45586,6 +45781,29 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
           onCompleted();
           break;
         }
+        if (proc.accumulatedText.length === 0 && proc.contentBlocks.length === 0) {
+          cleanupPlanMode(proc, emit, base, "error");
+          logger7.warn("SDK success produced empty assistant output; emitting agent:error", {
+            agentId: proc.agentId,
+            ackId: base.replyMessageId,
+            tokenCount: usage.tokenCount,
+            inputTokens: usage.inputTokens,
+            cacheReadTokens: usage.cacheReadTokens,
+            cacheCreationTokens: usage.cacheCreationTokens,
+            assistantContent: proc.lastAssistantContentDescription,
+            traceId: base.traceId
+          });
+          emit({
+            type: "agent:error",
+            payload: {
+              ...wireBase(base),
+              error: "Agent \u8FD4\u56DE\u4E86\u7A7A\u7ED3\u679C\uFF0C\u5DF2\u963B\u6B62\u7A7A\u6D88\u606F\u8986\u76D6\u601D\u8003\u6C14\u6CE1\u3002\u8BF7\u91CD\u8BD5\uFF1B\u5982\u679C\u53CD\u590D\u51FA\u73B0\uFF0C\u8BF7\u68C0\u67E5 Claude Code \u767B\u5F55\u72B6\u6001\u6216\u6A21\u578B\u914D\u7F6E\u3002"
+            }
+          });
+          resetAccumulators(proc);
+          onCompleted();
+          break;
+        }
         if (proc.accumulatedText) {
           proc.contentBlocks.push({ type: "text", content: proc.accumulatedText });
         }
@@ -45655,14 +45873,9 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
       if (am2.isApiErrorMessage === true) {
         const base = getTaskBase(proc);
         if (!base) break;
-        const errorTexts = [];
-        for (const block of am2.message?.content ?? []) {
-          if (block?.type === "text" && typeof block.text === "string") {
-            errorTexts.push(block.text);
-          }
-        }
+        const errorTexts = extractAssistantTextParts(am2.message?.content);
         const errorText = errorTexts.join("\n").trim() || `SDK ${am2.error ?? "api_error"}`;
-        const isAuthFail = am2.error === "authentication_failed" || /not logged in|please run \/login/i.test(errorText);
+        const isAuthFail = isAuthFailureText(errorText, am2.error);
         if (isAuthFail) {
           sessionStore.delete(proc.agentId, proc.scope);
         }
@@ -45674,7 +45887,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
           isAuthFail,
           traceId: base.traceId
         });
-        const friendlyError = isAuthFail ? `Claude Code SDK \u672A\u767B\u5F55\uFF08${errorText}\uFF09\u3002\u8BF7\u5728 bridge \u4E3B\u673A\u4E0A\u914D\u7F6E\u8BA4\u8BC1\uFF1A\u82E5\u8BE5 Agent \u7528 system \u8BA2\u9605\uFF0C\u5C06\u5176 subscriptionType \u8BBE\u4E3A "system"\uFF08\u8D70 ~/.claude\uFF09\uFF1B\u5426\u5219\u5728 ~/.ahchat/claude-config \u4E0B\u767B\u5F55\uFF0C\u6216\u5728 Agent config \u4E2D\u63D0\u4F9B apiKey / apiBaseUrl\u3002` : errorText;
+        const friendlyError = isAuthFail ? buildAuthFailureMessage(errorText) : errorText;
         emit({
           type: "agent:error",
           payload: { ...wireBase(base), error: friendlyError }
@@ -45687,14 +45900,36 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
         break;
       }
       if (proc.accumulatedText.length === 0 && proc.contentBlocks.length === 0) {
-        const captured = [];
-        for (const block of am2.message?.content ?? []) {
-          if (block?.type === "text" && typeof block.text === "string") {
-            captured.push(block.text);
-          }
-        }
+        const captured = extractAssistantTextParts(am2.message?.content);
         if (captured.length > 0) {
           const text = captured.join("");
+          if (isAuthFailureText(text, am2.error)) {
+            const base = getTaskBase(proc);
+            logger7.warn("SDK auth failure assistant detected without api-error flag, emitting agent:error", {
+              agentId: proc.agentId,
+              scope: proc.scope.kind === "single" ? "single" : proc.scope.groupId,
+              sdkError: am2.error,
+              errorText: text.slice(0, 200),
+              traceId: base?.traceId,
+              hasCurrentTask: base != null
+            });
+            if (base) {
+              sessionStore.delete(proc.agentId, proc.scope);
+              emit({
+                type: "agent:error",
+                payload: {
+                  ...wireBase(base),
+                  error: buildAuthFailureMessage(text)
+                }
+              });
+              proc.apiErrorEmitted = true;
+            }
+            proc.contentBlocks = [];
+            proc.accumulatedText = "";
+            proc.accumulatedThinking = "";
+            proc.segmentBuffer = "";
+            break;
+          }
           if (isContextOverflowText(text)) {
             const base = getTaskBase(proc);
             logger7.warn("SDK reported context overflow; auto-compact already failed inside SDK", {
@@ -45738,6 +45973,8 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             textLen: text.length,
             textSample: text.slice(0, 100)
           });
+        } else {
+          proc.lastAssistantContentDescription = describeAssistantContent(am2.message?.content);
         }
       }
       break;
@@ -45761,6 +45998,7 @@ function resetAccumulators(proc) {
   proc.accumulatedToolInput = "";
   proc.apiErrorEmitted = false;
   proc.peakContextUsage = void 0;
+  proc.lastAssistantContentDescription = void 0;
 }
 
 // src/forkHistoryReplay.ts
@@ -45873,8 +46111,15 @@ var wsMetrics = new WsMetrics();
 // src/agentManager.ts
 var logger10 = createModuleLogger("agent.manager");
 var NODE_USER_UID = 1e3;
+var POST_MERGE_CONTINUATION_ROUTE_MS = 15e3;
 function isSmithAgent(agent) {
-  return agent.id === SMITH_AGENT_ID || agent.systemPrompt === SMITH_SYSTEM_PROMPT;
+  if (agent.id === SMITH_AGENT_ID) return true;
+  if (agent.systemPrompt === SMITH_SYSTEM_PROMPT) return true;
+  const prompt = agent.systemPrompt ?? "";
+  if (prompt.includes("\u4F60\u662F\u7279\u5DE5\u53F2\u5BC6\u65AF") && prompt.includes("create_agent")) return true;
+  const name = agent.name?.toLowerCase() ?? "";
+  const role = agent.role?.toLowerCase() ?? "";
+  return role === "system" && (name.includes("\u53F2\u5BC6\u65AF") || name.includes("smith"));
 }
 function isRunningAsRoot() {
   try {
@@ -45883,6 +46128,13 @@ function isRunningAsRoot() {
     return false;
   }
 }
+async function chownForRootSpawn(targetPath, target) {
+  try {
+    await fs4.chown(targetPath, NODE_USER_UID, NODE_USER_UID);
+  } catch (error51) {
+    logger10.error("Best-effort root chown failed", { error: error51, target, path: targetPath });
+  }
+}
 function readCronLockSnapshot() {
   try {
     const lockPath2 = path8.join(os5.homedir(), ".claude", "scheduled_tasks.lock");
@@ -46631,19 +46883,10 @@ Do NOT use "..." as content \u2014 write specific, project-relevant content.`;
       options.resume = savedSessionId;
     }
     if (isRunningAsRoot()) {
-      try {
-        await fs4.chown(effectiveConfigDir, NODE_USER_UID, NODE_USER_UID);
-      } catch {
-      }
-      try {
-        await fs4.chown(agentCwd, NODE_USER_UID, NODE_USER_UID);
-      } catch {
-      }
+      await chownForRootSpawn(effectiveConfigDir, "configDir");
+      await chownForRootSpawn(agentCwd, "agentCwd");
       const settingsFilePath = path8.join(effectiveConfigDir, "settings.json");
-      try {
-        await fs4.chown(settingsFilePath, NODE_USER_UID, NODE_USER_UID);
-      } catch {
-      }
+      await chownForRootSpawn(settingsFilePath, "settingsFile");
       options.spawnClaudeCodeProcess = (spawnOptions) => {
         const env2 = { ...spawnOptions.env, HOME: "/home/node" };
         return nodeSpawn(spawnOptions.command, spawnOptions.args, {
@@ -46809,7 +47052,7 @@ ${trimmed}`;
       lines.push(`    workdir: ${currentCwd}`);
     } else {
       const a = this.agentRegistry?.getById(agentId);
-      const singleCwd = a?.workingDirectory || path8.join(os5.homedir(), ".ahchat", `Agent-${a?.name ?? agentId}-${agentId}`);
+      const singleCwd = a?.workingDirectory || path8.join(this.workspacesDir, agentId);
       lines.push(`    workdir: ${singleCwd}`);
     }
     let rosterCount = 0;
@@ -46821,7 +47064,7 @@ ${trimmed}`;
       if (key === curKey) {
         lines.push(`    workdir: ${currentCwd}`);
       } else {
-        const groupCwd = defaultGroupWorkdir(os5.homedir(), g2.name, g2.groupId);
+        const groupCwd = g2.workingDirectory || path8.join(this.workspacesDir, g2.groupId);
         lines.push(`    workdir: ${groupCwd}`);
       }
       const others = g2.members.filter((id) => id !== agentId).map((id) => {
@@ -47168,6 +47411,16 @@ ${lines.join("\n")}`;
     }
   }
   async dispatchToSDK(runtime, task) {
+    if (runtime.postMergeContinuationTask) {
+      logger10.info("Clearing stale post-merge continuation route before explicit dispatch", {
+        agentId: runtime.agentId,
+        staleReplyMessageId: runtime.postMergeContinuationTask.replyMessageId,
+        nextReplyMessageId: task.replyMessageId,
+        traceId: task.traceId
+      });
+      delete runtime.postMergeContinuationTask;
+      delete runtime.postMergeContinuationUntil;
+    }
     await this.applyEffortMode(runtime, "high", {
       source: "dispatchToSDK",
       replyMessageId: task.replyMessageId
@@ -47376,6 +47629,19 @@ ${lines.join("\n")}`;
           }
         });
       }
+      const continuationTask = mergedBatch.at(-1);
+      if (continuationTask) {
+        proc.postMergeContinuationTask = continuationTask;
+        proc.postMergeContinuationUntil = Date.now() + POST_MERGE_CONTINUATION_ROUTE_MS;
+        logger10.info("Armed SDK post-merge continuation routing", {
+          agentId: proc.agentId,
+          carrierReplyMessageId: completedTask.replyMessageId,
+          continuationReplyMessageId: continuationTask.replyMessageId,
+          mergedCount: mergedBatch.length,
+          routeUntil: new Date(proc.postMergeContinuationUntil).toISOString(),
+          traceId: completedTask.traceId
+        });
+      }
       runtime.mergedTasks = [];
     } else if (runtime.mergedTasks.length > 0) {
       logger10.warn("mergedTasks non-empty but no currentTask; dropping", {
@@ -50665,6 +50931,7 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
     agentRegistry,
     subscriptionRegistry,
     serverApiUrl: config2.serverApiUrl,
+    bridgeToken: config2.bridgeToken,
     dataDir: config2.dataDir
   });
   const taskDispatchHandler = createTaskDispatchHandler(agentManager, agentRegistry, emit);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fangyb/ahchat-bridge",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "files": [
     "dist"
   ],