@yeaft/webchat-agent 0.1.809 → 0.1.811

package/claude.js

@@ -102,15 +102,19 @@ export async function startClaudeQuery(conversationId, workDir, resumeSessionId)
   // 配置 SDK query 选项
   const options = {
     cwd: workDir,
-    permissionMode: 'bypassPermissions', // Auto-approve all tool uses
+    // 不显式设 permissionMode（让它走 SDK 默认 'default'）。
+    // bypassPermissions 会让 CLI 跳过整个 permission 通道，但我们注册了
+    // canCallTool（→ --permission-prompt-tool stdio）来拦截
+    // AskUserQuestion；新版 Claude CLI 在 bypass+stdio 同时存在时会
+    // 卡在 init 握手 / message_start 后死等。改用 default mode +
+    // canCallTool 自动放行，是新 CLI 期望的形态。
     abort: abortController.signal,
-    // 拦截 AskUserQuestion 工具调用，转发到 Web UI
+    // 拦截 AskUserQuestion 工具调用，转发到 Web UI；其他工具自动放行
     canCallTool: async (toolName, input, toolCtx) => {
       if (toolName === 'AskUserQuestion') {
         return await handleAskUserQuestion(conversationId, input, toolCtx);
       }
-      // 其他工具自动批准
-      return input;
+      return { behavior: 'allow', updatedInput: input };
     }
   };
 

package/crew/role-query.js

@@ -160,7 +160,10 @@ async function _createRoleQueryInner(session, roleName) {
 
   const queryOptions = {
     cwd: roleCwd,
-    permissionMode: 'bypassPermissions',
+    // 不设 permissionMode（走 SDK 默认 'default'）。bypassPermissions +
+    // canCallTool 在新版 Claude CLI 会卡死 init 握手 / message_start。
+    // canCallTool 在 default 模式下能正常工作，并对非 AskUserQuestion
+    // 工具返回 { behavior:'allow', updatedInput } 等同放行。
     abort: abortController.signal,
     model: role.model || undefined,
     appendSystemPrompt: systemPrompt,
@@ -177,7 +180,7 @@ async function _createRoleQueryInner(session, roleName) {
     if (toolName === 'AskUserQuestion') {
       return await handleAskUserQuestion(session.id, input, toolCtx);
     }
-    return input;
+    return { behavior: 'allow', updatedInput: input };
   };
 
   if (savedSessionId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.809",
+  "version": "0.1.811",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/unify/web-bridge.js

@@ -1653,6 +1653,10 @@ function maybeTransitionVpStatus(hctx, state) {
  * @param {object} event — engine event (text_delta / tool_call / …)
  * @param {{assistantTextParts:string[], toolCallsAccum:Array, toolResultsAccum:Array, thinkingBlocksAccum?:Array, resetQueryTimer:Function, groupId?:string, vpId?:string, turnId?:string}} hctx
  */
+export function __testHandleEngineEvent(event, hctx) {
+  return handleEngineEvent(event, hctx);
+}
+
 function handleEngineEvent(event, hctx) {
   hctx.resetQueryTimer();
   const envelope = {
@@ -1773,14 +1777,39 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'turn_end':
-      // turn_end variants are handled by the outer loop (result /
-      // end_turn semantics). PR #793 removed the `group_handoff`
-      // wire event that the frontend used to render a "↪ 已转交给"
-      // pill — the Route tool chip (rendered from the tool_call
-      // envelope already on the wire) is the single source of truth
-      // for hand-off UX. If a future feature (notification toast,
-      // typing-chain animation, …) needs the structured payload,
-      // re-emit a wire event here from `event.detail`.
+      // Most engine turn_end events are internal loop boundaries. A normal
+      // tool_use stop means "run tools, then call the adapter again", so it
+      // must NOT end the VP's visible turn. route_forward is different: the
+      // tool has handed control to another VP and Engine.query will not
+      // stream more text for this VP. Settle the current VP immediately so
+      // the roster row does not sit on "thinking" until later result cleanup.
+      if (event.stopReason === 'tool_handoff' && event.detail?.kind === 'route_forward') {
+        try {
+          if (hctx.thread) {
+            hctx.thread.status = 'idle';
+            hctx.thread.updatedAt = Date.now();
+          }
+          getVpStatusBroker().settleIdle({
+            groupId: hctx.groupId || null,
+            vpId: hctx.vpId,
+            threadId: hctx.threadId || 'main',
+            title: hctx.thread?.title || '',
+            messageCount: hctx.thread?.messageIds?.length || 0,
+          });
+        } catch (err) {
+          console.warn('[Unify] vp-status settleIdle (route_forward) failed:', err?.message || err);
+        }
+        sendUnifyEvent({
+          type: 'vp_turn_end',
+          groupId: hctx.groupId,
+          vpId: hctx.vpId,
+          threadId: hctx.threadId || event.threadId || 'main',
+          turnId: hctx.turnId,
+          stopReason: event.stopReason,
+          detail: event.detail || null,
+          ts: Date.now(),
+        }, envelope);
+      }
       break;
 
     case 'usage':