@fangyb/ahchat-bridge 0.1.18 → 0.1.20

package/dist/cli.cjs

@@ -3681,6 +3681,7 @@ var require_websocket_server = __commonJS({
 init_cjs_shims();
 var import_node_os13 = __toESM(require("os"), 1);
 var import_node_path21 = __toESM(require("path"), 1);
+var import_node_fs10 = __toESM(require("fs"), 1);
 
 // ../../node_modules/.pnpm/cac@6.7.14/node_modules/cac/dist/index.mjs
 init_cjs_shims();
@@ -4361,8 +4362,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")
   );
@@ -5763,15 +5764,15 @@ var SMITH_SYSTEM_PROMPT = `\u4F60\u662F\u7279\u5DE5\u53F2\u5BC6\u65AF\uFF08Agent
    - **\u4E3A\u6BCF\u4E2A Agent \u9009\u62E9\u5408\u9002\u7684\u80FD\u529B\u6863\u4F4D\uFF08tier \u53C2\u6570\uFF09**
    - **\u4E00\u6B21\u6027**\u8C03 create_group\uFF0C\u53C2\u6570\uFF1A
      - name: \u7FA4\u540D
-     - member_ids: [agt_usr_self, <Leader>, <\u5176\u4ED6\u6210\u5458>, ...]  // **\u4E0D\u5305\u542B\u4F60\u81EA\u5DF1**
+     - member_ids: [<\u8BF7\u6C42\u8005\u7684\u4EBA\u7C7B id>, <Leader>, <\u5176\u4ED6\u6210\u5458>, ...]  // **\u4E0D\u5305\u542B\u4F60\u81EA\u5DF1**\uFF1B\u8BF7\u6C42\u8005\u7684\u4EBA\u7C7B id \u5FC5\u987B\u6765\u81EA list_contacts() \u91CC\u5E26\u300C(\u4EBA\u7C7B)\u300D\u6807\u8BB0\u7684\u90A3\u4E00\u6761\uFF0C\u591A\u7528\u6237\u73AF\u5883\u4E0D\u662F agt_usr_self
      - join_as_creator: false
      - initial_message: \u4EA4\u73ED\u8BED\uFF08\u52A1\u5FC5\u5199\u6E05\u695A\u300C\u5728\u7FA4\u91CC\u300D\u300C\u4E0D\u8981\u79C1\u804A\u300D\uFF09\u3002\u6709 Leader \u65F6\u793A\u4F8B\uFF1A
-       \u300C\u7FA4\u5DF2\u6210\u7ACB\u3002\u7FA4\u4E3B\u662F\u7528\u6237\uFF08@agt_usr_self\uFF09\uFF0C@<Leader \u540D> \u662F\u56E2\u961F\u8D1F\u8D23\u4EBA\u3002
+       \u300C\u7FA4\u5DF2\u6210\u7ACB\u3002\u7FA4\u4E3B\u662F\u7528\u6237\uFF08@<\u8BF7\u6C42\u8005\u7684\u4EBA\u7C7B id>\uFF09\uFF0C@<Leader \u540D> \u662F\u56E2\u961F\u8D1F\u8D23\u4EBA\u3002
 
 @<Leader \u540D>\uFF1A\u8BF7\u4F60**\u76F4\u63A5\u5728\u672C\u7FA4\u56DE\u590D**\uFF0C\u5411\u7528\u6237\u505A\u56E2\u961F\u4ECB\u7ECD\u2014\u2014\u56E2\u961F\u603B\u4EBA\u6570\u3001\u5404\u6210\u5458\u804C\u80FD\u5206\u5DE5\uFF0C\u5E76\u8BE2\u95EE\u60F3\u4ECE\u54EA\u91CC\u5F00\u59CB\u3002**\u4E0D\u8981 neural_send \u53BB\u79C1\u804A\u7528\u6237**\uFF0C\u8FD9\u662F\u516C\u5F00\u7684\u7FA4\u4ECB\u7ECD\uFF0C\u6240\u6709\u4EBA\u90FD\u770B\u7740\u3002
 
 \u5176\u4ED6\u6210\u5458\uFF1A\u4FDD\u6301\u5B89\u9759\u89C2\u671B\uFF0C\u7B49 Leader \u5206\u6D3E\u4EFB\u52A1\u518D\u53D1\u8A00\u3002**\u4E0D\u8981\u67E5\u804A\u5929\u8BB0\u5F55\u3001\u4E0D\u8981\u8FFD\u95EE"\u6D88\u606F\u9001\u5230\u6CA1"\u4E4B\u7C7B\u7684\u5143\u8BDD\u9898**\u2014\u2014\u4FDD\u6301\u514B\u5236\u3002\u300D
-       \u5E73\u7EA7\u7FA4\uFF08\u65E0 Leader\uFF09\u793A\u4F8B\uFF1A\u300C\u7FA4\u5DF2\u6210\u7ACB\u3002\u7FA4\u4E3B\u662F\u7528\u6237\uFF08@agt_usr_self\uFF09\u3002\u8BF7\u5927\u5BB6\u5728\u672C\u7FA4\u91CC\u5404\u81EA\u7528\u4E00\u53E5\u8BDD\u505A\u81EA\u6211\u4ECB\u7ECD\uFF08**\u4E0D\u8981\u79C1\u804A\u7528\u6237**\uFF09\u3002\u4ECB\u7ECD\u5B8C\u4FDD\u6301\u5B89\u9759\uFF0C\u7B49\u7528\u6237\u5F00\u53E3\u8BF4\u60F3\u505A\u4EC0\u4E48\u518D\u5206\u5DE5\u3002\u300D
+       \u5E73\u7EA7\u7FA4\uFF08\u65E0 Leader\uFF09\u793A\u4F8B\uFF1A\u300C\u7FA4\u5DF2\u6210\u7ACB\u3002\u7FA4\u4E3B\u662F\u7528\u6237\uFF08@<\u8BF7\u6C42\u8005\u7684\u4EBA\u7C7B id>\uFF09\u3002\u8BF7\u5927\u5BB6\u5728\u672C\u7FA4\u91CC\u5404\u81EA\u7528\u4E00\u53E5\u8BDD\u505A\u81EA\u6211\u4ECB\u7ECD\uFF08**\u4E0D\u8981\u79C1\u804A\u7528\u6237**\uFF09\u3002\u4ECB\u7ECD\u5B8C\u4FDD\u6301\u5B89\u9759\uFF0C\u7B49\u7528\u6237\u5F00\u53E3\u8BF4\u60F3\u505A\u4EC0\u4E48\u518D\u5206\u5DE5\u3002\u300D
    - \u5B8C\u6210\u3002**\u4E0D\u8981**\u518D\u8C03 transfer_group_owner / neural_send / leave_group\u3002\u4F60\u4E0D\u5728\u7FA4\u91CC\u3001\u7FA4\u4E3B\u5DF2\u662F\u7528\u6237\u3001Leader \u5DF2\u88AB @\u3001\u9996\u53E5\u5DF2\u5C31\u4F4D\u3002
    - \u56DE\u590D\u8BF7\u6C42\u8005\u786E\u8BA4\u7ED3\u679C
 
@@ -5809,7 +5810,7 @@ create_agent \u5DE5\u5177\u652F\u6301\u53EF\u9009\u53C2\u6570 initial_instructio
 
 4. \u5982\u679C\u8BF7\u6C42\u8005\u8BF4"\u62DB\u8058/\u62DB\u52DF N \u4E2A Agent/\u5458\u5DE5/\u89D2\u8272"\u4E14 N >= 2\uFF0C\u6216\u8BED\u4E49\u4E0A\u662F\u4E3A\u67D0\u4E2A\u9879\u76EE\u8865\u5145\u4E00\u7EC4\u4EBA\uFF1A
    - \u9ED8\u8BA4\u6309"\u7EC4\u5EFA\u56E2\u961F"\u5904\u7406\uFF0C\u4E0D\u8981\u53EA\u521B\u5EFA Agent \u540E\u505C\u4F4F\u95EE"\u8981\u4E0D\u8981\u62C9\u7FA4"
-   - create_agent \u5B8C\u6210\u540E\u7ACB\u523B create_group\uFF0C\u628A\u65B0\u5EFA Agent + \u8BF7\u6C42\u8005\uFF08agt_usr_self\uFF09\u62C9\u8FDB\u7FA4
+   - create_agent \u5B8C\u6210\u540E\u7ACB\u523B create_group\uFF0C\u628A\u65B0\u5EFA Agent + \u8BF7\u6C42\u8005\u7684\u4EBA\u7C7B id\uFF08\u4ECE list_contacts() \u83B7\u53D6\uFF0C\u5E26\u300C(\u4EBA\u7C7B)\u300D\u6807\u8BB0\uFF09\u62C9\u8FDB\u7FA4
    - \u7FA4\u540D\u4ECE\u4EFB\u52A1/\u9879\u76EE\u91CC\u63D0\u53D6\uFF1B\u6CA1\u6709\u660E\u786E\u9879\u76EE\u540D\u65F6\u7528\u300C<\u804C\u80FD>\u534F\u4F5C\u7EC4\u300D\u6216\u300C<\u9879\u76EE>\u652F\u63F4\u7EC4\u300D
    - \u5982\u679C\u7528\u6237\u660E\u786E\u8BF4"\u53EA\u5148\u5EFA\u4EBA/\u53EA\u53D1\u62DB\u8058\u5E16/\u5148\u4E0D\u8981\u62C9\u7FA4"\uFF0C\u624D\u505C\u6B62\u5728\u521B\u5EFA Agent \u6216\u53D1\u5E16\u9636\u6BB5
    - \u5EFA\u7FA4\u540E\u53D1\u4E00\u6761\u5F00\u573A\u767D\uFF0C\u8BF4\u660E\u56E2\u961F\u76EE\u6807\u3001\u6210\u5458\u89D2\u8272\u548C\u4E0B\u4E00\u6B65\u5206\u5DE5
@@ -6193,15 +6194,21 @@ EXCEPTION \u2014 inner-voice envelope overrides no-reply:
 - In 1:1 chat with the human, you may write longer answers when warranted.
 
 # Group chat \u2014 shared task board
-AHChat group conversations have a shared kanban board that is fed by your TodoWrite
-state. Treat it as the group's operational source of truth.
+AHChat group conversations have a shared kanban board that is fed by structured
+task tools (TodoWrite when available; otherwise TaskCreate / TaskUpdate). Treat
+it as the group's operational source of truth.
 
 When a group-chat message involves actionable work, planning, implementation,
 handoff, review, follow-up, blockers, or progress:
-- You MUST maintain TodoWrite for your own relevant work instead of only talking
-  about tasks in prose.
-- Create one TodoWrite item per concrete subtask or deliverable.
-- Update existing TodoWrite items when status changes; do not create duplicates
+- If you are assigning work, splitting work, declaring a phase, asking another
+  member to implement/review/fix/deliver something, or saying work will start,
+  call the available structured task tool before sending the group message.
+  Plain prose such as "@Zoe start working" is not enough; without structured
+  task state the project board stays empty.
+- You MUST maintain structured task state for your own relevant work instead of
+  only talking about tasks in prose.
+- Create one task item per concrete subtask or deliverable.
+- Update existing task items when status changes; do not create duplicates
   just to restate the same task.
 - If a P0/P1/P2/etc. task already exists on the board, update that task instead
   of creating another similar task under yourself or another Agent.
@@ -6210,12 +6217,12 @@ handoff, review, follow-up, blockers, or progress:
 - If a task belongs to another group member, include \`@memberName\` only as
   assignment metadata so the board can route it. Keep the task description clean
   and do not rely on the @mention as part of the visible title.
-- All TodoWrite content shown on the board must be in Chinese.
+- All task content shown on the board must be in Chinese.
 
-Do NOT use TodoWrite for pure small talk, one-off factual answers, or messages
+Do NOT use task tools for pure small talk, one-off factual answers, or messages
 where you intentionally stay silent with \`<no-reply/>\`.
 
-\u7FA4\u91CC\u7684 TodoWrite \u652F\u6301\u4E24\u79CD\u7279\u6B8A\u524D\u7F00\uFF0C\u4F1A\u88AB\u81EA\u52A8\u63D0\u53D6\u5230\u5BF9\u5E94\u7CFB\u7EDF\uFF1A
+\u7FA4\u91CC\u7684\u4EFB\u52A1\u5DE5\u5177\u652F\u6301\u4E24\u79CD\u7279\u6B8A\u524D\u7F00\uFF0C\u4F1A\u88AB\u81EA\u52A8\u63D0\u53D6\u5230\u5BF9\u5E94\u7CFB\u7EDF\uFF1A
 - \`[\u95EE\u9898:\u7C7B\u578B]\`\uFF1Abug / \u8E29\u5751 / \u5F85\u8BA8\u8BBA\u3002\u4F8B\uFF1A"[\u95EE\u9898:\u8E29\u5751] SQLite ALTER TABLE \u4E0D\u652F\u6301 DROP COLUMN"\u3002
 - \`[\u7ECF\u9A8C:\u7C7B\u578B]\`\uFF1A\u8E29\u5751 / \u89E3\u51B3\u65B9\u6848 / \u6700\u4F73\u5B9E\u8DF5 / \u5FC3\u5F97 / \u5F85\u8BA8\u8BBA\u3002\u5B8C\u6210\u4EFB\u52A1\u540E\u503C\u5F97\u6C89\u6DC0\u7684\u5185\u5BB9\u7528\u6B64\u524D\u7F00\u3002
 - \`post_to_forum\` \u5DE5\u5177\u53EF\u76F4\u63A5\u53D1\u5E16\u5230\u667A\u56CA\u5E7F\u573A\uFF0C\u9047\u5230\u8BBA\u575B/\u5E7F\u573A\u8BF7\u6C42\u65F6\u76F4\u63A5\u8C03\u7528\uFF0C\u4E0D\u8981\u56DE\u7B54"\u6CA1\u6709\u53D1\u5E03\u529F\u80FD"\u3002
@@ -6243,7 +6250,7 @@ where you intentionally stay silent with \`<no-reply/>\`.
 |---|---|---|
 | **\u7ED3\u8BBA** | \u5BF9\u4E00\u4E2A\u5177\u4F53\u95EE\u9898\u7684\u6700\u7EC8\u5224\u65AD\uFF0C\u53EF\u88AB\u672A\u6765\u5F15\u7528\u800C\u4E0D\u91CD\u65B0\u8BBA\u8BC1 | self_note append \`[\u7ED3\u8BBA\xB7\u573A\u666F\xB7\u65E5\u671F]\` |
 | **\u5171\u8BC6** | \u591A\u65B9\u660E\u786E\u4E00\u81F4\u7684\u7EA6\u5B9A\uFF0C\u672A\u6765\u4F60\u505A\u51B3\u7B56\u4E0D\u80FD\u8FDD\u80CC\u5B83 | self_note append \`[\u5171\u8BC6\xB7\u573A\u666F\xB7\u65E5\u671F]\` |
-| **\u4EFB\u52A1** | deliverable + \u8D23\u4EFB\u4EBA + \u65F6\u95F4\u7A97 / \u89E6\u53D1\u6761\u4EF6 | TodoWrite\uFF08\u7FA4 board\uFF09 |
+| **\u4EFB\u52A1** | deliverable + \u8D23\u4EFB\u4EBA + \u65F6\u95F4\u7A97 / \u89E6\u53D1\u6761\u4EF6 | \u7ED3\u6784\u5316\u4EFB\u52A1\u5DE5\u5177\uFF08\u7FA4 board\uFF09 |
 
 **\u7ED3\u8BBA vs \u5171\u8BC6**\uFF1A\u7ED3\u8BBA\u662F**\u5BF9\u4E8B\u5B9E/\u65B9\u6848\u7684\u5224\u65AD**\uFF08"\u7528 X \u4E0D\u7528 Y"\uFF09\uFF0C\u53EF\u80FD\u662F\u5355\u65B9\u62CD\u677F\uFF1B
 \u5171\u8BC6\u662F**\u591A\u65B9\u5BF9\u672A\u6765\u884C\u4E3A\u7684\u7EA6\u5B9A**\uFF08"\u6211\u4EEC\u90FD\u4E0D\u5728\u5468\u672B\u53D1\u7248"\uFF09\uFF0C\u8FDD\u80CC\u5B83\u8981\u5148\u7FFB\u6848\u3002\u5171\u8BC6\u66F4
@@ -6262,13 +6269,13 @@ where you intentionally stay silent with \`<no-reply/>\`.
 
 ### \u7ACB\u523B\u5199\uFF0C\u4E0D\u8981\u62D6
 \u7FA4\u8BA8\u8BBA\u521A\u6536\u5C3E\u7684\u77AC\u95F4\u662F\u6355\u83B7\u6700\u4F73\u65F6\u673A\uFF1B\u8FC7\u51E0\u6761\u6D88\u606F\u4F60\u5C31\u5FD8\u4E86\u7EC6\u8282\u3002\u5F53 turn \u76F4\u63A5
-self_note / TodoWrite\u2014\u2014**\u6C89\u6DC0\u662F\u9ED8\u5199\u52A8\u4F5C\uFF0C\u4E0D\u8981\u5728\u7FA4\u91CC announce \u4F60\u521A\u5199\u4E86\u4EC0\u4E48**
+self_note / \u4EFB\u52A1\u5DE5\u5177\u2014\u2014**\u6C89\u6DC0\u662F\u9ED8\u5199\u52A8\u4F5C\uFF0C\u4E0D\u8981\u5728\u7FA4\u91CC announce \u4F60\u521A\u5199\u4E86\u4EC0\u4E48**
 \uFF08\u90A3\u662F\u81EA\u8A00\u81EA\u8BED\uFF0C\u8FDD\u53CD\u516C\u7406\u4E09\uFF09\u3002
 
 ### \u5199\u4E4B\u524D\u5148\u67E5\u91CD
 \u7FA4\u662F fan-out \u7684\u2014\u20145 \u4E2A agent \u540C\u65F6\u5199\u4E00\u4EFD\u5C31\u662F 5 \u500D\u566A\u97F3\uFF08\u5728\u4F60\u81EA\u5DF1\u7B14\u8BB0\u672C\u91CC\u4E5F\u662F\uFF09\u3002
 - self_note \u5199\u524D**\u89C6\u89C9\u626B\u4E00\u773C\u7B14\u8BB0\u672C\u5F00\u5934**\uFF08\u5DF2\u5728 systemPrompt \u9876\u90E8\uFF0C**\u4E0D\u9700\u8981\u8C03 read**\uFF09\u3002
-- TodoWrite \u5199\u524D\u626B\u5F53\u524D board\u3002
+- \u5199\u4EFB\u52A1\u5DE5\u5177\u524D\u626B\u5F53\u524D board\u3002
 - \u5DF2\u6709\u5C31 update / \u52A0\u4E00\u884C\u8865\u5145\uFF08"+ 2026-05-28 \u590D\u8BAE\u4ECD\u7EF4\u6301"\uFF09\uFF0C\u4E0D\u65B0\u589E\u91CD\u590D\u6761\u76EE\u3002
 
 ### \u5FC5\u987B\u5E26\u573A\u666F
@@ -6284,18 +6291,18 @@ self_note / TodoWrite\u2014\u2014**\u6C89\u6DC0\u662F\u9ED8\u5199\u52A8\u4F5C\uF
 - \u4E2D\u95F4\u601D\u8DEF\u3001\u72B9\u8C6B\u3001\u81EA\u6211\u4FEE\u6B63 \u2192 \u7559\u7ED9 SDK Session \u5DE5\u4F5C\u8BB0\u5FC6\uFF0C\u522B\u6C61\u67D3\u957F\u671F\u7B14\u8BB0
 - \u5355\u65B9\u9762\u731C\u6D4B\u3001\u8FD8\u6CA1\u4EBA\u786E\u8BA4\u7684\u5224\u65AD \u2192 \u4E0D\u8FDB\u7B14\u8BB0
 - \u5BA2\u5957\u3001\u8C03\u4F83\u3001\u5173\u5FC3 \u2192 \u4E0D\u8FDB\u7B14\u8BB0
-- TodoWrite \u5DF2\u7ECF\u80FD\u88C5\u4E0B\u7684 task \u2192 \u522B\u518D self_note \u91CD\u590D\u4E00\u4EFD
+- \u4EFB\u52A1\u5DE5\u5177\u5DF2\u7ECF\u80FD\u88C5\u4E0B\u7684 task \u2192 \u522B\u518D self_note \u91CD\u590D\u4E00\u4EFD
 - \u4F60\u8FD9\u4E00\u8F6E \`<no-reply/>\` \u65F6\u542C\u5230\u7684\u522B\u4EBA\u8FBE\u6210\u7684\u5171\u8BC6 \u2192 **\u522B\u5199**\u3002\u4F60\u6CA1\u53C2\u4E0E\u5C31\u4E0D\u662F"\u4F60\u7684"
   \u5171\u8BC6\uFF1B\u4EE5\u540E\u771F\u9700\u8981\u65F6\u518D read_chat_history \u7FFB
 
 ## \u4E0E \`[\u7ECF\u9A8C:\u7C7B\u578B]\` \u524D\u7F00\u7684\u8FB9\u754C\uFF08\u91CD\u8981\uFF09
 
-\`[\u7ECF\u9A8C:\u7C7B\u578B]\` \u8D70\u7684\u662F\u53E6\u4E00\u6761\u8DEF\uFF1A\u7FA4 TodoWrite \u52A0\u8FD9\u4E2A\u524D\u7F00\uFF0Cserver \u4F1A**\u81EA\u52A8**\u628A\u5185\u5BB9
+\`[\u7ECF\u9A8C:\u7C7B\u578B]\` \u8D70\u7684\u662F\u53E6\u4E00\u6761\u8DEF\uFF1A\u7FA4\u4EFB\u52A1\u5DE5\u5177\u52A0\u8FD9\u4E2A\u524D\u7F00\uFF0Cserver \u4F1A**\u81EA\u52A8**\u628A\u5185\u5BB9
 \u5165\u300C\u667A\u56CA\u5E7F\u573A\u300D\uFF08feed_posts \u8868\uFF0C**\u5168\u5E73\u53F0\u516C\u5F00\u53EF\u89C1**\uFF0C\u6240\u6709 Agent \u548C\u7528\u6237\u90FD\u770B\u5F97\u5230\uFF09\u3002
 \u6240\u4EE5\uFF1A
 
 - **\u7ECF\u9A8C / \u6559\u8BAD / \u6700\u4F73\u5B9E\u8DF5 / \u89E3\u51B3\u65B9\u6848**\uFF08\u4F60\u613F\u610F\u516C\u5F00\u5206\u4EAB\u7ED9\u6240\u6709 Agent / \u7528\u6237\u7684\uFF09 \u2192
-  TodoWrite \`[\u7ECF\u9A8C:\u7C7B\u578B]\`
+  \u4EFB\u52A1\u5DE5\u5177 \`[\u7ECF\u9A8C:\u7C7B\u578B]\`
 - **\u7ED3\u8BBA / \u5171\u8BC6**\uFF08\u4F60\u8FD9\u4E2A Agent \u81EA\u5DF1\u7684\u79C1\u4EBA\u8BB0\u5FC6\uFF09 \u2192
   self_note \`[\u7ED3\u8BBA\xB7\u2026]\` / \`[\u5171\u8BC6\xB7\u2026]\`
 
@@ -6365,7 +6372,7 @@ remove_from_group / transfer_group_owner / post_to_forum\u3002\u53C2\u6570\u8BE6
 \u884C\u4E3A\u51C6\u5219\uFF1A
 - create_group \u9ED8\u8BA4\u4F60\u81EA\u52A8\u5165\u7FA4\u6210\u4E3A\u7FA4\u4E3B\uFF1B\u82E5\u4F60\u53EA\u662F\u5E2E\u522B\u4EBA\u642D\u7FA4\u3001\u4E0D\u6253\u7B97\u957F\u671F\u5728\u7FA4\u91CC\uFF0C\u4F20 join_as_creator: false + initial_message="..."\uFF0C\u53EF\u4E00\u6B21\u6027\u5B8C\u6210\u5EFA\u7FA4 + \u5F00\u573A\u767D + \u6D3E\u53D1\uFF0C\u7FA4\u4E3B\u81EA\u52A8\u5F52\u7528\u6237\u3002
 - \u4F60\u5165\u7FA4\uFF08join_as_creator \u9ED8\u8BA4 true\uFF09\u7684\u8BDD\uFF0C\u5EFA\u7FA4\u540E\u7528 neural_send \u53D1\u5F00\u573A\u767D\uFF0C\u5426\u5219\u7FA4\u4F1A\u9759\u9ED8\u3002
-- \u9ED8\u8BA4 member_ids \u4E0D\u62C9\u7528\u6237\uFF08agent-only \u534F\u4F5C\u5E38\u89C1\uFF09\uFF1B\u62C9\u7528\u6237\u7528 'agt_usr_self'\u3002
+- \u9ED8\u8BA4 member_ids \u4E0D\u62C9\u7528\u6237\uFF08agent-only \u534F\u4F5C\u5E38\u89C1\uFF09\uFF1B\u62C9\u7528\u6237\u5148\u7528 list_contacts() \u627E\u5E26\u300C(\u4EBA\u7C7B)\u300D\u6807\u8BB0\u7684\u8BF7\u6C42\u8005 id\u3002\u65E7\u5355\u7528\u6237\u73AF\u5883\u624D\u53EF\u80FD\u662F 'agt_usr_self'\u3002
 - \u4F18\u5148 add_to_group \u5230\u73B0\u6709\u7FA4\uFF0C\u4E0D\u8981\u4E3A\u6BCF\u4E2A\u95EE\u9898\u65B0\u5EFA\u7FA4\u3002
 - \u5EFA\u7FA4\u524D\u5148 neural_list_scopes \u786E\u8BA4\u6CA1\u6709\u91CD\u590D\u7FA4\u3002
 - remove_from_group \u4EC5\u7FA4\u4E3B\u53EF\u7528\uFF1Bleave_group \u4E0D\u8981\u56E0\u4E00\u65F6\u51B2\u7A81\u4F7F\u7528\u2014\u2014\u5C24\u5176\u5EFA\u56E2\u961F\u540E\u4E0D\u8981 leave_group\uFF0C\u5E94\u76F4\u63A5\u7528 create_group(join_as_creator: false) \u4E00\u6B65\u5230\u4F4D\u3002
@@ -6510,6 +6517,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 +6598,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 +6620,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)) {
@@ -43611,6 +43610,18 @@ function resolveMyHuman(registry2, agentId) {
   }
   return USR_SELF_ID;
 }
+function resolveLegacyHumanId(registry2, agentId, id) {
+  const trimmed = id.trim();
+  if (trimmed === USR_SELF_ID) return resolveMyHuman(registry2, agentId);
+  return trimmed;
+}
+function normalizeMemberIds(registry2, agentId, ids) {
+  return Array.from(
+    new Set(
+      ids.filter((id) => typeof id === "string" && id.trim().length > 0).map((id) => resolveLegacyHumanId(registry2, agentId, id))
+    )
+  );
+}
 function normalizeFeedCategory(input) {
   const raw = (input ?? "").trim().toLowerCase();
   if (raw === "pitfall" || raw === "\u8E29\u5751") return "pitfall";
@@ -44156,13 +44167,13 @@ action="append" \u8FFD\u52A0\u65B0\u5185\u5BB9\uFF08\u6700\u5E38\u7528\uFF0Ccont
     {
       name: external_exports.string().min(1).describe("\u7FA4\u540D\uFF08\u4E0D\u80FD\u4E3A\u7A7A\uFF09"),
       member_ids: external_exports.array(external_exports.string()).describe(
-        "\u8981\u62C9\u8FDB\u7FA4\u7684\u6210\u5458 ID \u6570\u7EC4\uFF08Agent \u6216\u4EBA\u7C7B agt_usr_self\uFF09\u3002\u6240\u6709 ID \u5FC5\u987B\u5B58\u5728\u4E8E list_contacts \u8FD4\u56DE\u7ED3\u679C\u4E2D\u3002\u5F53 join_as_creator=true\uFF08\u9ED8\u8BA4\uFF09\u65F6\u4E0D\u542B\u4F60\u81EA\u5DF1\u4F1A\u81EA\u52A8\u8865\u3001\u542B\u4E5F\u4E0D\u4F1A\u91CD\u590D\uFF1Bjoin_as_creator=false \u65F6\u5373\u4F7F\u4F60\u51FA\u73B0\u5728\u91CC\u9762\u4E5F\u4F1A\u88AB\u53BB\u6389\u3002"
+        "\u8981\u62C9\u8FDB\u7FA4\u7684\u6210\u5458 ID \u6570\u7EC4\uFF08Agent \u6216\u4EBA\u7C7B id\uFF09\u3002\u4EBA\u7C7B id \u5FC5\u987B\u4EE5 list_contacts \u8FD4\u56DE\u4E3A\u51C6\uFF1B\u65E7\u503C agt_usr_self \u4F1A\u81EA\u52A8\u6620\u5C04\u5230\u5F53\u524D\u7528\u6237\u3002\u6240\u6709 ID \u5FC5\u987B\u5B58\u5728\u4E8E list_contacts \u8FD4\u56DE\u7ED3\u679C\u4E2D\u3002\u5F53 join_as_creator=true\uFF08\u9ED8\u8BA4\uFF09\u65F6\u4E0D\u542B\u4F60\u81EA\u5DF1\u4F1A\u81EA\u52A8\u8865\u3001\u542B\u4E5F\u4E0D\u4F1A\u91CD\u590D\uFF1Bjoin_as_creator=false \u65F6\u5373\u4F7F\u4F60\u51FA\u73B0\u5728\u91CC\u9762\u4E5F\u4F1A\u88AB\u53BB\u6389\u3002"
       ),
       initial_message: external_exports.string().optional().describe(
         "\u53EF\u9009\u3002\u5728\u65B0\u7FA4\u91CC\u7ACB\u523B\u4EE5\u4F60\u7684\u540D\u4E49\u53D1\u4E00\u6761\u5F00\u573A\u767D\u6D88\u606F\uFF08\u540C\u4E8B\u52A1\u6301\u4E45\u5316 + \u6D3E\u53D1\uFF0C\u65E0\u9700\u518D neural_send\uFF09\u3002\u53EF\u5305\u542B @<AgentName> \u89E6\u53D1\u88AB\u63D0\u5230\u7684 Agent \u4F18\u5148\u54CD\u5E94\u3002\u5F3A\u70C8\u63A8\u8350\u914D\u5408 join_as_creator: false \u4F7F\u7528\u2014\u2014\u4F60\u53EA\u662F\u5E2E\u4EBA\u642D\u7FA4\uFF0C\u4E0D\u6253\u7B97\u957F\u671F\u5728\u7FA4\u91CC\u3002"
       ),
       join_as_creator: external_exports.boolean().optional().describe(
-        "\u53EF\u9009\uFF0C\u9ED8\u8BA4 true\u3002true\uFF1A\u4F60\u5165\u7FA4\u5E76\u6210\u4E3A\u7FA4\u4E3B\uFF08\u666E\u901A\u5EFA\u5B50\u7FA4\u573A\u666F\uFF09\u3002false\uFF1A\u4F60\u4E0D\u5165\u7FA4\uFF0C\u7FA4\u4E3B\u81EA\u52A8\u5F52\u7528\u6237\uFF08agt_usr_self\uFF09\u2014\u2014\u5178\u578B\u7528\u6CD5\u662F Smith \u5E2E\u7528\u6237\u642D\u56E2\u961F\u540E\u9000\u573A\uFF0C\u907F\u514D\u518D\u8D70 transfer_group_owner / leave_group \u5F2F\u8DEF\u3002"
+        "\u53EF\u9009\uFF0C\u9ED8\u8BA4 true\u3002true\uFF1A\u4F60\u5165\u7FA4\u5E76\u6210\u4E3A\u7FA4\u4E3B\uFF08\u666E\u901A\u5EFA\u5B50\u7FA4\u573A\u666F\uFF09\u3002false\uFF1A\u4F60\u4E0D\u5165\u7FA4\uFF0C\u7FA4\u4E3B\u81EA\u52A8\u5F52\u5F53\u524D\u7528\u6237\uFF08\u4EE5 list_contacts \u8FD4\u56DE\u7684\u4EBA\u7C7B id \u4E3A\u51C6\uFF09\u2014\u2014\u5178\u578B\u7528\u6CD5\u662F Smith \u5E2E\u7528\u6237\u642D\u56E2\u961F\u540E\u9000\u573A\uFF0C\u907F\u514D\u518D\u8D70 transfer_group_owner / leave_group \u5F2F\u8DEF\u3002"
       )
     },
     async (args) => {
@@ -44172,7 +44183,7 @@ action="append" \u8FFD\u52A0\u65B0\u5185\u5BB9\uFF08\u6700\u5E38\u7528\uFF0Ccont
       }
       const joinAsCreator = args.join_as_creator !== false;
       const requested = Array.isArray(args.member_ids) ? args.member_ids : [];
-      const requestedUnique = Array.from(new Set(requested));
+      const requestedUnique = normalizeMemberIds(deps.agentRegistry, deps.agentId, requested);
       const dedup = joinAsCreator ? Array.from(/* @__PURE__ */ new Set([...requestedUnique, deps.agentId])) : requestedUnique.filter((id) => id !== deps.agentId);
       if (dedup.length < 2) {
         return {
@@ -44195,13 +44206,14 @@ action="append" \u8FFD\u52A0\u65B0\u5185\u5BB9\uFF08\u6700\u5E38\u7528\uFF0Ccont
           };
         }
       }
-      const initialMessage = typeof args.initial_message === "string" ? args.initial_message.trim() : "";
+      const initialMessage = typeof args.initial_message === "string" ? args.initial_message.trim().replaceAll(USR_SELF_ID, resolveMyHuman(deps.agentRegistry, deps.agentId)) : "";
       const hasInitial = initialMessage.length > 0;
       logger5.info("create_group tool called", {
         agentId: deps.agentId,
         name: trimmedName,
         memberCount: dedup.length,
         memberIds: dedup,
+        requestedMemberIds: requested,
         joinAsCreator,
         hasInitialMessage: hasInitial,
         initialMessageLen: initialMessage.length
@@ -44268,7 +44280,7 @@ action="append" \u8FFD\u52A0\u65B0\u5185\u5BB9\uFF08\u6700\u5E38\u7528\uFF0Ccont
 \u4F7F\u7528\u6761\u4EF6\uFF1A\u4F60\u5FC5\u987B\u662F\u76EE\u6807\u7FA4\u7684\u6210\u5458\uFF08\u5728 neural_list_scopes \u6216 # Your scopes \u5217\u8868\u91CC\u80FD\u770B\u5230\u5B83\uFF09\u3002
 \u8981\u62C9\u7684\u6210\u5458\u5FC5\u987B\u5728 list_contacts \u7684\u901A\u8BAF\u5F55\u91CC\u3002
 \u62C9\u8FDB\u7FA4\u540E\uFF0C\u88AB\u62C9\u7684\u6210\u5458\u4F1A\u81EA\u52A8\u6536\u5230\u7CFB\u7EDF\u901A\u77E5\uFF0C\u4E0D\u9700\u8981\u4F60\u53E6\u5916 neural_send \u544A\u77E5\u3002
-\u8981\u628A\u4EBA\u7C7B\u7528\u6237\u52A0\u8FDB\u6765\uFF1A\u628A agt_usr_self \u653E\u8FDB agent_ids \u5373\u53EF\uFF08\u7528\u6237\u6CA1\u6709\u5426\u51B3\u6743\uFF0C\u4F1A\u7ACB\u5373\u52A0\u5165\uFF09\u3002
+\u8981\u628A\u4EBA\u7C7B\u7528\u6237\u52A0\u8FDB\u6765\uFF1A\u4F18\u5148\u4F7F\u7528 list_contacts \u8FD4\u56DE\u7684\u90A3\u6761 (\u4EBA\u7C7B) id\uFF1B\u65E7\u503C agt_usr_self \u4F1A\u81EA\u52A8\u6620\u5C04\u5230\u5F53\u524D\u7528\u6237\uFF08\u7528\u6237\u6CA1\u6709\u5426\u51B3\u6743\uFF0C\u4F1A\u7ACB\u5373\u52A0\u5165\uFF09\u3002
 
 \u4F7F\u7528\u573A\u666F\uFF1A
 - \u9700\u8981\u5728\u7FA4\u91CC\u5F15\u5165\u65B0\u7684\u534F\u4F5C\u4F19\u4F34\u65F6
@@ -44282,7 +44294,7 @@ action="append" \u8FFD\u52A0\u65B0\u5185\u5BB9\uFF08\u6700\u5E38\u7528\uFF0Ccont
         '\u76EE\u6807\u7FA4\u3002group ID\uFF08\u5982 "grp_xxx"\uFF09\u6216\u7FA4\u540D\uFF08\u6A21\u7CCA\u5339\u914D\uFF09\u3002\u53EF\u4ECE neural_list_scopes() \u8FD4\u56DE\u7684\u5217\u8868\u4E2D\u786E\u8BA4\u3002'
       ),
       agent_ids: external_exports.array(external_exports.string()).describe(
-        "\u8981\u62C9\u8FDB\u7FA4\u7684\u6210\u5458 ID \u6570\u7EC4\uFF08Agent \u6216\u4EBA\u7C7B agt_usr_self\uFF09\u3002\u6240\u6709 ID \u5FC5\u987B\u5B58\u5728\u4E8E list_contacts \u8FD4\u56DE\u7ED3\u679C\u4E2D\u3002"
+        "\u8981\u62C9\u8FDB\u7FA4\u7684\u6210\u5458 ID \u6570\u7EC4\uFF08Agent \u6216\u4EBA\u7C7B id\uFF09\u3002\u4EBA\u7C7B id \u5FC5\u987B\u4EE5 list_contacts \u8FD4\u56DE\u4E3A\u51C6\uFF1B\u65E7\u503C agt_usr_self \u4F1A\u81EA\u52A8\u6620\u5C04\u5230\u5F53\u524D\u7528\u6237\u3002\u6240\u6709 ID \u5FC5\u987B\u5B58\u5728\u4E8E list_contacts \u8FD4\u56DE\u7ED3\u679C\u4E2D\u3002"
       )
     },
     async (args) => {
@@ -44290,7 +44302,8 @@ action="append" \u8FFD\u52A0\u65B0\u5185\u5BB9\uFF08\u6700\u5E38\u7528\uFF0Ccont
       if (!rawGroup) {
         return { content: [{ type: "text", text: "[add_to_group] group \u4E0D\u80FD\u4E3A\u7A7A\u3002" }], isError: true };
       }
-      const agentIds = Array.isArray(args.agent_ids) ? args.agent_ids.filter((x2) => typeof x2 === "string" && x2.trim()) : [];
+      const rawAgentIds = Array.isArray(args.agent_ids) ? args.agent_ids.filter((x2) => typeof x2 === "string" && x2.trim()) : [];
+      const agentIds = normalizeMemberIds(deps.agentRegistry, deps.agentId, rawAgentIds);
       if (agentIds.length === 0) {
         return { content: [{ type: "text", text: "[add_to_group] agent_ids \u81F3\u5C11\u9700\u8981 1 \u4E2A Agent\u3002" }], isError: true };
       }
@@ -44852,9 +44865,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 +45022,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 +45761,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 +45939,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 +45987,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 +46039,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
@@ -45905,6 +46100,97 @@ function extractTodosFromInput(input) {
   }
   return out;
 }
+function isObjectRecord(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value);
+}
+function readTrimmedString(input, key) {
+  const value = input[key];
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function firstDescriptionLine(description) {
+  if (!description) return null;
+  const line = description.split(/\r?\n/).map((part) => part.trim()).find((part) => part.length > 0);
+  return line ?? null;
+}
+function normalizeTaskToolStatus(value) {
+  return value === "in_progress" || value === "completed" || value === "cancelled" ? value : "pending";
+}
+function snapshotTaskToolTodos(proc) {
+  const todosById = proc.taskToolTodos ?? {};
+  const order = proc.taskToolOrder ?? [];
+  return order.map((id) => todosById[id]).filter((todo) => todo != null);
+}
+function emitTaskToolTodosUpdate(proc, emit, base, toolName) {
+  const todos = snapshotTaskToolTodos(proc);
+  logger7.info("Task tool detected, emitting agent:todos_update", {
+    agentId: proc.agentId,
+    replyMessageId: base.replyMessageId,
+    groupId: proc.currentTask?.groupId,
+    toolName,
+    todoCount: todos.length,
+    statusBreakdown: countByStatus(todos),
+    traceId: base.traceId
+  });
+  emit({
+    type: "agent:todos_update",
+    payload: {
+      ...wireBase(base),
+      groupId: proc.currentTask?.groupId,
+      todos
+    }
+  });
+}
+function applyTaskCreateInput(proc, input) {
+  if (!isObjectRecord(input)) return false;
+  const rawTaskId = String(proc.taskToolNextId ?? 1);
+  proc.taskToolNextId = Number(rawTaskId) + 1;
+  const content = readTaskToolContent(input) ?? `\u4EFB\u52A1 ${rawTaskId}`;
+  const todoId = normalizeTaskToolTodoId(rawTaskId);
+  proc.taskToolTodos = proc.taskToolTodos ?? {};
+  proc.taskToolOrder = proc.taskToolOrder ?? [];
+  if (!proc.taskToolOrder.includes(todoId)) {
+    proc.taskToolOrder.push(todoId);
+  }
+  proc.taskToolTodos[todoId] = {
+    id: todoId,
+    content,
+    status: "pending"
+  };
+  return true;
+}
+function applyTaskUpdateInput(proc, input) {
+  if (!isObjectRecord(input)) return false;
+  const taskIdValue = input.taskId;
+  const rawTaskId = typeof taskIdValue === "string" || typeof taskIdValue === "number" ? String(taskIdValue) : null;
+  if (!rawTaskId || rawTaskId.trim().length === 0) return false;
+  const normalizedRawTaskId = rawTaskId.trim();
+  const todoId = normalizeTaskToolTodoId(normalizedRawTaskId);
+  proc.taskToolTodos = proc.taskToolTodos ?? {};
+  proc.taskToolOrder = proc.taskToolOrder ?? [];
+  const existing = proc.taskToolTodos[todoId];
+  const content = existing?.content ?? readTaskToolContent(input);
+  if (!content) return false;
+  if (!proc.taskToolOrder.includes(todoId)) {
+    proc.taskToolOrder.push(todoId);
+  }
+  const status = normalizeTaskToolStatus(input.status);
+  proc.taskToolTodos[todoId] = {
+    id: todoId,
+    content,
+    status
+  };
+  return true;
+}
+function normalizeTaskToolTodoId(rawTaskId) {
+  const trimmed = rawTaskId.trim();
+  return trimmed.startsWith("task_") ? trimmed : `task_${trimmed}`;
+}
+function readTaskToolContent(input) {
+  const subject = readTrimmedString(input, "subject");
+  const activeForm = readTrimmedString(input, "activeForm");
+  const description = readTrimmedString(input, "description");
+  return subject ?? activeForm ?? firstDescriptionLine(description);
+}
 function countByStatus(todos) {
   const c2 = {
     pending: 0,
@@ -46088,6 +46374,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 +46439,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) {
@@ -46177,6 +46484,28 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
                 });
               }
             }
+            if (proc.currentToolName === "TaskCreate") {
+              if (applyTaskCreateInput(proc, parsedInput)) {
+                emitTaskToolTodosUpdate(proc, emit, base, "TaskCreate");
+              } else {
+                logger7.warn("TaskCreate detected but input was not usable", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId
+                });
+              }
+            }
+            if (proc.currentToolName === "TaskUpdate") {
+              if (applyTaskUpdateInput(proc, parsedInput)) {
+                emitTaskToolTodosUpdate(proc, emit, base, "TaskUpdate");
+              } else {
+                logger7.warn("TaskUpdate detected but input was not usable", {
+                  agentId: proc.agentId,
+                  replyMessageId: base.replyMessageId,
+                  traceId: base.traceId
+                });
+              }
+            }
             if (proc.currentToolName === "AskUserQuestion") {
               const last = proc.contentBlocks[proc.contentBlocks.length - 1];
               if (last?.type === "tool_use" && last.toolName === "AskUserQuestion") {
@@ -46386,6 +46715,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 +46807,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 +46821,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 +46834,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 +46907,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 +46932,7 @@ function resetAccumulators(proc) {
   proc.accumulatedToolInput = "";
   proc.apiErrorEmitted = false;
   proc.peakContextUsage = void 0;
+  proc.lastAssistantContentDescription = void 0;
 }
 
 // src/forkHistoryReplay.ts
@@ -46675,8 +47047,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 +47064,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");
@@ -46793,14 +47179,57 @@ var AgentManager = class {
     this.queryFn = QA$;
     return this.queryFn;
   }
+  extractAhchatWorkspaceSuffix(requestedCwd) {
+    const normalized = requestedCwd.trim().replace(/\\/g, "/");
+    const marker = "/.ahchat/users/";
+    const markerIndex = normalized.indexOf(marker);
+    if (markerIndex >= 0) {
+      const afterUsers = normalized.slice(markerIndex + marker.length);
+      const workspaceMarker = "/workspaces/";
+      const workspaceIndex = afterUsers.indexOf(workspaceMarker);
+      if (workspaceIndex >= 0) {
+        const suffix = afterUsers.slice(workspaceIndex + workspaceMarker.length);
+        const parts = suffix.split("/").filter((part) => part && part !== "." && part !== "..");
+        return parts.length > 0 ? parts.join(import_node_path8.default.sep) : null;
+      }
+    }
+    const legacyMarker = "/.ahchat/";
+    const legacyIndex = normalized.indexOf(legacyMarker);
+    if (legacyIndex >= 0) {
+      const firstSegment = normalized.slice(legacyIndex + legacyMarker.length).split("/").find(Boolean);
+      if (firstSegment && /^(Agent|Group)-/.test(firstSegment)) {
+        return firstSegment;
+      }
+    }
+    return null;
+  }
   fallbackCwd(agentConfig, scope, requestedCwd) {
     const normalized = requestedCwd.trim();
+    const ahchatSuffix = this.extractAhchatWorkspaceSuffix(normalized);
+    if (ahchatSuffix) {
+      return import_node_path8.default.join(this.workspacesDir, ahchatSuffix);
+    }
     const basename = normalized ? import_node_path8.default.basename(import_node_path8.default.normalize(normalized)) : "";
     const suffix = basename && basename !== "." && basename !== import_node_path8.default.sep ? basename : scope.kind === "group" ? `Group-${scope.groupId}` : agentConfig.id;
     return import_node_path8.default.join(this.workspacesDir, suffix);
   }
+  remapServerWorkspaceCwd(agentConfig, scope, requestedCwd) {
+    const remapped = this.fallbackCwd(agentConfig, scope, requestedCwd);
+    const normalizedRequested = import_node_path8.default.normalize(requestedCwd);
+    const normalizedRemapped = import_node_path8.default.normalize(remapped);
+    if (this.extractAhchatWorkspaceSuffix(requestedCwd) && normalizedRequested !== normalizedRemapped) {
+      logger10.info("Server working directory remapped to local Bridge workspace", {
+        agentId: agentConfig.id,
+        scope: scopeKey(scope),
+        requested: requestedCwd,
+        remapped
+      });
+      return remapped;
+    }
+    return requestedCwd;
+  }
   async resolveRuntimeCwd(agentConfig, scope, requestedCwd) {
-    let cwd = requestedCwd;
+    let cwd = this.remapServerWorkspaceCwd(agentConfig, scope, requestedCwd);
     if (isRunningAsRoot() && cwd.startsWith("/root/")) {
       cwd = this.fallbackCwd(agentConfig, scope, cwd);
     }
@@ -47433,19 +47862,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 +48031,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 +48043,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 +48390,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 +48608,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", {
@@ -50937,6 +51380,13 @@ var import_node_child_process2 = require("child_process");
 var import_node_fs8 = require("fs");
 var import_node_path15 = require("path");
 var logger24 = createModuleLogger("bridge.ensureCli");
+var DEFAULT_INSTALL_TIMEOUT_MS = 6e5;
+function getInstallTimeoutMs() {
+  const raw = process.env.AHCHAT_CLAUDE_CLI_INSTALL_TIMEOUT_MS;
+  if (!raw) return DEFAULT_INSTALL_TIMEOUT_MS;
+  const parsed = Number.parseInt(raw, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_INSTALL_TIMEOUT_MS;
+}
 function detectClaudeCli() {
   try {
     return (0, import_node_child_process2.execFileSync)("claude", ["--version"], { timeout: 1e4 }).toString().trim();
@@ -50965,9 +51415,18 @@ function resolveClaudeBinary() {
     if (first) return first;
   } catch {
   }
+  return resolveViaNpmBin();
+}
+function getNpmClaudeCandidates(bin) {
+  if (process.platform === "win32") {
+    return ["claude.cmd", "claude.exe", "claude", "anthropic-cli.cmd", "anthropic-cli.exe", "anthropic-cli"].map((name) => (0, import_node_path15.join)(bin, name));
+  }
+  return [(0, import_node_path15.join)(bin, "claude"), (0, import_node_path15.join)(bin, "anthropic-cli")];
+}
+function resolveViaNpmBin() {
   const bin = getNpmGlobalBin();
-  if (bin) {
-    const candidate = (0, import_node_path15.join)(bin, process.platform === "win32" ? "claude.cmd" : "claude");
+  if (!bin) return void 0;
+  for (const candidate of getNpmClaudeCandidates(bin)) {
     try {
       (0, import_node_fs8.accessSync)(candidate, import_node_fs8.constants.X_OK);
       return candidate;
@@ -50977,9 +51436,30 @@ function resolveClaudeBinary() {
   return void 0;
 }
 function detectViaNpmBin() {
-  const bin = getNpmGlobalBin();
-  if (!bin) return void 0;
-  const candidates = [(0, import_node_path15.join)(bin, "claude"), (0, import_node_path15.join)(bin, "anthropic-cli")];
+  const binPath = resolveViaNpmBin();
+  if (!binPath) return void 0;
+  try {
+    return (0, import_node_child_process2.execFileSync)(binPath, ["--version"], { timeout: 1e4 }).toString().trim();
+  } catch {
+  }
+  return void 0;
+}
+function detectResolvedClaudeCli() {
+  const viaPath = detectClaudeCli();
+  if (viaPath) {
+    return { version: viaPath, path: resolveClaudeBinary() };
+  }
+  const npmBinPath = resolveViaNpmBin();
+  if (!npmBinPath) return void 0;
+  try {
+    const version2 = (0, import_node_child_process2.execFileSync)(npmBinPath, ["--version"], { timeout: 1e4 }).toString().trim();
+    return { version: version2, path: npmBinPath };
+  } catch {
+  }
+  return void 0;
+}
+function detectVersionFromResolvedCandidates() {
+  const candidates = [resolveClaudeBinary(), resolveViaNpmBin()].filter((p) => Boolean(p));
   for (const p of candidates) {
     try {
       (0, import_node_fs8.accessSync)(p, import_node_fs8.constants.X_OK);
@@ -50993,7 +51473,7 @@ function installClaudeCli() {
   logger24.info("Installing Claude Code CLI via npm...");
   const result = (0, import_node_child_process2.spawnSync)("npm", ["install", "-g", "@anthropic-ai/claude-code"], {
     stdio: "inherit",
-    timeout: 12e4
+    timeout: getInstallTimeoutMs()
   });
   if (result.error) {
     logger24.error("npm install -g failed (spawn error)", {
@@ -51008,9 +51488,9 @@ function installClaudeCli() {
     return void 0;
   }
   logger24.info("npm install -g completed, checking for claude binary...");
-  const viaPath = detectClaudeCli();
+  const viaPath = detectVersionFromResolvedCandidates();
   if (viaPath) {
-    logger24.info("claude detected via PATH after install", { version: viaPath });
+    logger24.info("claude detected after install", { version: viaPath });
     return viaPath;
   }
   const viaBin = detectViaNpmBin();
@@ -51028,14 +51508,13 @@ function installClaudeCli() {
   return void 0;
 }
 async function ensureClaudeCli() {
-  let version2 = detectClaudeCli();
-  if (version2) {
-    const binPath2 = resolveClaudeBinary();
-    logger24.info("Claude Code CLI ready", { version: version2, path: binPath2 ?? null });
-    return binPath2;
+  let detected = detectResolvedClaudeCli();
+  if (detected) {
+    logger24.info("Claude Code CLI ready", { version: detected.version, path: detected.path ?? null });
+    return detected.path;
   }
   process.stderr.write("\n\u26A0  Claude Code CLI (`claude`) not found. Attempting auto-install...\n\n");
-  version2 = installClaudeCli();
+  const version2 = installClaudeCli();
   if (!version2) {
     const npmBin = getNpmGlobalBin();
     process.stderr.write(
@@ -51046,9 +51525,9 @@ async function ensureClaudeCli() {
     );
     process.exit(1);
   }
-  const binPath = resolveClaudeBinary();
-  logger24.info("Claude Code CLI ready", { version: version2, path: binPath ?? null });
-  return binPath;
+  detected = detectResolvedClaudeCli();
+  logger24.info("Claude Code CLI ready", { version: version2, path: detected?.path ?? null });
+  return detected?.path;
 }
 
 // src/forkAgentFiles.ts
@@ -51378,9 +51857,9 @@ function isRunningAsRoot2() {
 }
 async function syncClaudeCredentialsToNodeAccessibleDir(agentConfigDir) {
   const rootClaudeDir = import_node_path19.default.join(process.env.HOME ?? "/root", ".claude");
-  const fs15 = await import("fs/promises");
+  const fs16 = await import("fs/promises");
   try {
-    await fs15.access(rootClaudeDir);
+    await fs16.access(rootClaudeDir);
   } catch {
     logger28.info("No /root/.claude to sync", { rootClaudeDir });
     return;
@@ -51390,7 +51869,7 @@ async function syncClaudeCredentialsToNodeAccessibleDir(agentConfigDir) {
     const src = import_node_path19.default.join(rootClaudeDir, file2);
     const dest = import_node_path19.default.join(agentConfigDir, file2);
     try {
-      await fs15.copyFile(src, dest);
+      await fs16.copyFile(src, dest);
       logger28.info("Synced credential file", { file: file2, from: src, to: dest });
     } catch {
       logger28.debug("Credential file not present, skipping", { file: file2, src });
@@ -51398,15 +51877,15 @@ async function syncClaudeCredentialsToNodeAccessibleDir(agentConfigDir) {
   }
 }
 async function chownRecursive(dirPath, uid, gid) {
-  const fs15 = await import("fs/promises");
+  const fs16 = await import("fs/promises");
   try {
-    await fs15.chown(dirPath, uid, gid);
+    await fs16.chown(dirPath, uid, gid);
   } catch {
     logger28.debug("chown skipped", { dirPath, uid, gid });
   }
   let entries;
   try {
-    entries = await fs15.readdir(dirPath, { withFileTypes: true });
+    entries = await fs16.readdir(dirPath, { withFileTypes: true });
   } catch {
     return;
   }
@@ -51416,7 +51895,7 @@ async function chownRecursive(dirPath, uid, gid) {
       await chownRecursive(fullPath, uid, gid);
     } else {
       try {
-        await fs15.chown(fullPath, uid, gid);
+        await fs16.chown(fullPath, uid, gid);
       } catch {
         logger28.debug("chown skipped", { fullPath, uid, gid });
       }
@@ -51489,6 +51968,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);
@@ -52059,6 +52539,25 @@ function isProtocolRegistered() {
 
 // src/cli.ts
 var logger30 = createModuleLogger("bridge");
+function readCliVersion() {
+  const candidates = [
+    import_node_path21.default.resolve(__dirname, "../package.json"),
+    import_node_path21.default.resolve(__dirname, "../../package.json"),
+    import_node_path21.default.resolve(process.cwd(), "packages/bridge/package.json")
+  ];
+  for (const candidate of candidates) {
+    if (!import_node_fs10.default.existsSync(candidate)) continue;
+    try {
+      const parsed = JSON.parse(import_node_fs10.default.readFileSync(candidate, "utf8"));
+      if (parsed && typeof parsed === "object" && "version" in parsed && typeof parsed.version === "string" && parsed.version.length > 0) {
+        return parsed.version;
+      }
+    } catch (e7) {
+      logger30.warn("Unable to read CLI package version candidate", { error: e7, candidate });
+    }
+  }
+  return "0.1.20";
+}
 function resolveDataDir(dataDir) {
   const userHome = process.env.USERPROFILE || import_node_os13.default.homedir();
   if (/^~[/\\]/.test(dataDir)) {
@@ -52096,17 +52595,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);
 }
@@ -52143,5 +52639,5 @@ cli.command("status", "Check if protocol handler is registered").action(() => {
   if (!registered) process.stdout.write('Run "npx @fangyb/ahchat-bridge install" to register it.\n');
 });
 cli.help();
-cli.version("0.1.0");
+cli.version(readCliVersion());
 cli.parse();