wezard 1.3.16 → 1.3.18

package/dist/daemon/mirror-bridge.js

@@ -17,7 +17,7 @@ import { existsSync, readdirSync, statSync, watch, openSync, readSync, closeSync
 import { join, dirname } from "node:path";
 import { expandHome, sanitizeId } from "../shared/paths.js";
 import { activeBackends, backendForPath, projectDirFor, projectDirsFor, } from "../shared/cli-backends.js";
-import { isModalPane, isAskqSubmitPage, parseModalOptions, pickModalAnswer, pickAutoAllowAnswer, parseConfirmContext } from "../shared/modal-pane.js";
+import { isModalPane, isAskqSubmitPage, parseModalOptions, pickModalAnswer, pickAutoAllowAnswer, parseConfirmContext, looksLikePicker } from "../shared/modal-pane.js";
 import { hasMirrorAskq, runMirrorAskqFlow, hasMirrorPlan, mootMirrorPlan, runMirrorPlanFlow, hasMirrorPicker, mootMirrorPicker, runMirrorPickerFlow } from "./approval.js";
 import { isAutoWindowActive } from "./session-cache.js";
 import { dangerOf } from "./danger.js";
@@ -1049,20 +1049,37 @@ const detectModalPicker = async (target) => {
     const screen = lines.slice(-MODAL_SCAN_ROWS).join("\n");
     return { ...isModalPane(screen), screen };
 };
-// 按下确认框的第 index 号选项: 数字键即选即确认; 一拍后**同标题**的框还在才补
-// Enter (个别布局要显式确认), 标题变了说明弹的已是另一个框 —— 绝不盲按, 免得替
-// 用户确认了他没看过的东西。返回按完后的屏面 verdict, 由调用方裁决成败。
+// 按下确认框的第 index 号选项。Claude Code 的 picker 数字键即选即确认; CodeBuddy
+// 的框数字键不一定生效, 且高亮可能停在别的选项上 (实测见过默认高亮在 "Yes, and
+// don't ask again…" 上) —— 盲补 Enter 会把**高亮项**确认下去, 可能恰是那条放宽
+// 权限的选项。所以补 Enter 前必须核对高亮就在目标项; 不在就用方向键挪过去、复核
+// 后再按; 高亮读不出 / 挪不动 / 标题变了 (已是另一个框) 一律罢手, 交调用方兜底。
+// 返回按完后的屏面 verdict, 由调用方裁决成败。
 const MODAL_PRESS_SETTLE_MS = 400;
+const MODAL_ARROW_SETTLE_MS = 150;
+const highlightedIndex = (screen) => parseModalOptions(screen).find((o) => o.selected)?.index;
 const pressModalIndex = async (pane, before, index) => {
     await tmuxRun(["send-keys", "-t", pane, String(index)]);
     await sleepMs(MODAL_PRESS_SETTLE_MS);
     let after = await detectModalPicker(pane);
-    if (after.modal && after.title === before.title) {
-        await tmuxRun(["send-keys", "-t", pane, "Enter"]);
-        await sleepMs(MODAL_PRESS_SETTLE_MS);
+    if (!after.modal || after.title !== before.title)
+        return after;
+    // 数字键没关掉框: 把高亮挪到目标项。guard 上限盖过任何确认框的选项数。
+    for (let guard = 0; guard < 8; guard++) {
+        const cur = highlightedIndex(after.screen);
+        if (cur === undefined || cur === index)
+            break;
+        await tmuxRun(["send-keys", "-t", pane, cur < index ? "Down" : "Up"]);
+        await sleepMs(MODAL_ARROW_SETTLE_MS);
         after = await detectModalPicker(pane);
+        if (!after.modal || after.title !== before.title)
+            return after;
     }
-    return after;
+    if (highlightedIndex(after.screen) !== index)
+        return after; // 核不准, 绝不盲按
+    await tmuxRun(["send-keys", "-t", pane, "Enter"]);
+    await sleepMs(MODAL_PRESS_SETTLE_MS);
+    return detectModalPicker(pane);
 };
 // 「聊聊这个」收尾: 文本 inject 已把引导语贴进自定义文本行 (❯ N. <text>)。codebuddy
 // 的 AskUserQuestion 面板把自定义行和 Submit 行做成两个独立行, 光标此刻停在自定义
@@ -1785,6 +1802,13 @@ export const startMirror = (deps) => {
         clearTimeout(a.standaloneBuf.timer);
         flushStandalone(a);
     };
+    // Skill 反馈 (/model 的 "Switch model to …" 等) 是用户敲完命令正在等的回执 ——
+    // 不进 standaloneDebounceMs 防抖窗 (默认 30s, 对交互回执就是纯延迟)。先清掉
+    // 在途 debounce 缓冲保序 (同批 drain 里先到的 user 回显不能被反超), 再立即发。
+    const sendStandaloneNow = (a, content) => {
+        flushPendingStandalone(a);
+        sendStandalone(a, content);
+    };
     // Path A: a needs-approval tool_use just landed. Aggregate the buffer as one
     // standalone, send it BEFORE the approval card race, transition to AWAITING_APPR.
     const promoteToStandalone = (a) => {
@@ -1910,7 +1934,7 @@ export const startMirror = (deps) => {
         // as a standalone bubble so the user sees the result immediately.
         if (item.kind === "skill_output") {
             if (!item.quiet)
-                enqueueStandalone(a, item.body);
+                sendStandaloneNow(a, item.body);
             return;
         }
         const wasEmpty = out.buf.length === 0;
@@ -2491,9 +2515,13 @@ export const startMirror = (deps) => {
     // chat with hundreds of tool bubbles. turn_end = the goal auto-cleared and the
     // model finally stopped → leave goal mode; normal brief resumes next turn.
     const handleGoalItem = (a, item) => {
-        if (item.kind === "text" || item.kind === "skill_output") {
-            if (item.kind !== "skill_output" || !item.quiet)
-                enqueueStandalone(a, item.body);
+        if (item.kind === "text") {
+            enqueueStandalone(a, item.body);
+            return;
+        }
+        if (item.kind === "skill_output") {
+            if (!item.quiet)
+                sendStandaloneNow(a, item.body);
             return;
         }
         if (item.kind === "turn_end") {
@@ -2905,7 +2933,7 @@ export const startMirror = (deps) => {
         // an active stream so the result is independently visible.
         if (item.kind === "skill_output") {
             if (!item.quiet)
-                enqueueStandalone(a, item.body);
+                sendStandaloneNow(a, item.body);
             return;
         }
         // Assistant turn truly ended (stop_reason terminal). Finalize the live
@@ -4444,9 +4472,19 @@ export const startMirror = (deps) => {
                     continue;
                 const v = await detectModalPicker(a.tmuxPane);
                 if (!v.modal) {
-                    a.pickerSentinelFp = undefined;
                     // 审批卡在途而框已消失 = 本地先按掉了 → 作废卡等待 (无卡则 no-op)。
                     mootMirrorPicker(a.sessionId);
+                    // 诊断: 屏上有高亮编号行却没判成 modal = 布局盲区候选 (askq/plan 面板
+                    // 也长这样, 属正常)。每屏记一次日志, 供远端排查"哨兵为何没反应"。
+                    if (looksLikePicker(v.screen)) {
+                        if (a.pickerSentinelFp !== v.screen) {
+                            a.pickerSentinelFp = v.screen;
+                            log.info({ target: a.target, tail: v.screen.split("\n").slice(-8).join("\\n").slice(-600) }, "picker sentinel: numbered picker shape on pane but not judged modal");
+                        }
+                    }
+                    else {
+                        a.pickerSentinelFp = undefined;
+                    }
                     continue;
                 }
                 if (hasMirrorPicker(a.sessionId))
@@ -4496,6 +4534,11 @@ export const startMirror = (deps) => {
                     danger: danger?.rule,
                     voteTimeoutMs: cfg.approval.longPollSec * 1000,
                     press: (what) => pressNativePicker(a, ctx.toolName, what),
+                }).then((sent) => {
+                    // 卡没发出去 (WS 断/发送失败): 清指纹, 让下一 tick 对同屏重试发卡,
+                    // 否则这只框会被指纹永久静默。
+                    if (!sent)
+                        a.pickerSentinelFp = undefined;
                 }).catch((e) => log.warn({ err: e.message, target: a.target }, "mirror picker flow failed"));
             }
         }