wezard 2.0.2 → 2.0.4

package/dist/daemon/mirror-bridge.js

@@ -25,6 +25,7 @@ import { isAutoWindowActive } from "./session-cache.js";
 import { noticeSuffixFor } from "./notices.js";
 import { dangerOf } from "./danger.js";
 import { runTmux, spawnTmuxClaude } from "./spawn-tmux.js";
+import { selectModel } from "./model-select.js";
 import { hasRegistry, markTranscript, probeOf, sessionOnPane, submittedSince } from "./cc-session.js";
 import { wizardStore } from "./wizard.js";
 import { startSubagentWatch } from "./subagent-tail.js";
@@ -33,7 +34,7 @@ import { labelFor, tagOfKey, baseOfKey, keyOf, stripSigil, displayName, withTagH
 import { splitMarkdown } from "../shared/md-chunk.js";
 import { randomTip } from "./tips.js";
 import { chatBaseOf, chatNameOf, listChatNames, parsePeerRef, peerAddress } from "./chat-name.js";
-import { stripAnsi, compactPane, paneIsBusy, paneIsStalled, transcriptStalled, summarizeTail, lastAssistantText, lastContextTokens, keepaliveStamps, tailTurns, renderDialog } from "./peers.js";
+import { stripAnsi, compactPane, paneIsBusy, paneIsStalled, transcriptStalled, summarizeTail, lastAssistantText, lastReply, unwrapPasted, lastContextTokens, keepaliveStamps, tailTurns, renderDialog } from "./peers.js";
 // PATH augmentation: launchd / systemd start the daemon
 // with a stripped PATH that often lacks nvm / homebrew, breaking spawn(claudeBin).
 // Backend resolution is per-transcript, not global: `backendForPath` recovers
@@ -294,7 +295,11 @@ const renderTaskNotification = (block) => {
     const icon = status === "completed" ? "✅" : status === "failed" || status === "error" ? "❌" : "🏁";
     return `${icon} ${summary || `后台任务 ${status || "完成"}`}`;
 };
-const cleanUserText = (raw) => {
+const cleanUserText = (wrapped) => {
+    // 多行注入落盘时被 CLI 包了一层 `<pasted_content>` (见 peers.unwrapPasted) —— 先剥,
+    // 否则回显去重对不上, 我们自己注入的那一行会被认成「人在 CLI 里敲的」, 整轮回复
+    // 因此被 chatOriginOnly 挡在群外 (公开的 send_peer / 定时任务的多行提示全中)。
+    const raw = unwrapPasted(wrapped);
     const nameMatch = raw.match(SLASH_TAG_RE);
     const slashCmd = nameMatch?.[1]?.trim() ?? "";
     const argsMatch = raw.match(SLASH_ARGS_RE);
@@ -1326,7 +1331,10 @@ const injectViaTmuxText = async (target, text, log, freshSpawn, witness = NO_WIT
     // end can take 4-7s to be honored on a cold TUI. Only the fresh-spawn path
     // pays the latency cost.
     const PASTE_VERIFY_MS = freshSpawn ? 6000 : 2500;
+    // 粘贴落定的等待**上限**, 不是固定 sleep: 框认得出来时按 SETTLE_POLL_MS 轮询
+    // 「内容已落进输入框且不再变」, 一满足就回车 (见 pasteSettled)。
     const POST_PASTE_SETTLE_MS = freshSpawn ? 1500 : 400;
+    const SETTLE_POLL_MS = 50;
     const POST_PASTE_SETTLE_FALLBACK_MS = freshSpawn ? 2500 : 700;
     const CLEARED_TIMEOUT_MS = freshSpawn ? 4000 : 1500;
     const RETRY_SETTLE_MS = freshSpawn ? 1500 : 800;
@@ -1417,10 +1425,28 @@ const injectViaTmuxText = async (target, text, log, freshSpawn, witness = NO_WIT
             pasteSeen = await sawLanded(PASTE_VERIFY_MS);
         }
     }
-    // Bracketed-paste end + TUI catch-up. Warm pane: 400ms is invisible.
-    // Fresh respawn: 1500ms+ — claude --resume is still loading the transcript.
-    if (!alreadyTyped)
-        await sleep(pasteSeen ? POST_PASTE_SETTLE_MS : POST_PASTE_SETTLE_FALLBACK_MS);
+    // 粘贴落定 = 框里是我们的内容, 且连续两次读到同一个样子 —— TUI 已把整段粘贴
+    // (bracketed-paste end 在内) 消化完, 紧跟的回车不会被并进粘贴。实测冷启动的
+    // pane 上粘贴 40–210ms 即落定, 此前这里固定睡 1500ms。到上限仍没等到就照旧
+    // 回车 (与原先睡满等价), 回车被吞由下面的证人 + 补回车兜底。
+    const pasteSettled = async (maxMs, prev, t0 = Date.now()) => {
+        if (Date.now() - t0 >= maxMs)
+            return false;
+        const box = await readInputBox(target);
+        const body = box.known && !boxIntact(box) ? box.body : undefined;
+        if (body !== undefined && body === prev)
+            return true;
+        await sleep(SETTLE_POLL_MS);
+        return pasteSettled(maxMs, body, t0);
+    };
+    // Bracketed-paste end + TUI catch-up. 框认不出来 / 粘贴没被看见时没有条件可查,
+    // 维持固定等待 (fresh respawn: claude --resume is still loading the transcript)。
+    if (!alreadyTyped) {
+        if (pasteSeen && boxVerify)
+            await pasteSettled(POST_PASTE_SETTLE_MS);
+        else
+            await sleep(pasteSeen ? POST_PASTE_SETTLE_MS : POST_PASTE_SETTLE_FALLBACK_MS);
+    }
     const sendEnter = async () => {
         const e = await runTmux(["send-keys", "-t", target, "Enter"]);
         return e.ok ? { ok: true } : { ok: false, reason: `tmux send-keys failed: ${e.stderr.slice(-200)}` };
@@ -1566,7 +1592,9 @@ export const startMirror = (deps) => {
     const INJECT_TTL_MS = 60_000;
     const recentInjects = [];
     const rememberInject = (text) => {
-        const t = text.trim();
+        // 与 tail 侧同一个规范形 (cleanUserText): 注入时挂在尾巴上的 system-reminder
+        // (信封 / 名册增量 / mention hint) 在那边是被剥掉之后才来比对的。
+        const t = cleanUserText(text);
         if (!t)
             return;
         recentInjects.push({ text: t, ts: Date.now() });
@@ -1655,6 +1683,9 @@ export const startMirror = (deps) => {
     // for >60s mid-turn and we don't want to drop the bubble while it's chewing.
     const FLUSH_MS = 250;
     const HARD_TIMEOUT_MS = 350_000;
+    /** hard cap 到点时的中间结束语: 气泡必须 finish=true, 但 turn 还在跑 —— 明说
+     *  「没完, 去链接看」, 而不是让气泡停在一句看似说完的话 / 一行过期的进度上。 */
+    const STILL_WORKING = "⏳ 仍在处理中, 点击链接查看详情…";
     /** 软收口静默期。后端只能说"这条消息写完了"(codebuddy) 时, 等这么久没有新 item
      *  才认定一轮结束。取值只需盖住"叙述消息落盘 → 紧随其后的 function_call 落盘"
      *  这一段, 与模型思考/工具执行时长无关。
@@ -1721,7 +1752,7 @@ export const startMirror = (deps) => {
             return;
         s.flushTimer = setTimeout(() => void flushStream(s), FLUSH_MS);
     };
-    const finalizeStream = async (a, s) => {
+    const finalizeStream = async (a, s, timedOut = false) => {
         if (s.closed)
             return;
         s.closed = true;
@@ -1743,17 +1774,20 @@ export const startMirror = (deps) => {
         // 没正文不写: finish=true 是整条覆盖, 空正文只会把 "…" ack 覆盖成光秃秃的
         // 链接头, 结束处理自己制造错发。气泡保持现有内容, 由 WeCom 6min 窗口自然
         // 到期。dead 流同理只做本地清理。
-        if (!s.dead && s.acc.trim()) {
+        // 例外是 hard cap 超时: turn 还在跑, 收口时缀上中间结束语 —— 这时即使没正文
+        // 也有话可说, 不算空覆盖。
+        const body = timedOut ? [s.acc, STILL_WORKING].filter((x) => x.trim()).join("\n\n") : s.acc;
+        if (!s.dead && body.trim()) {
             const card = detailCardFor(s, a.target);
             try {
                 if (card) {
                     s.cardSent = true;
-                    await client.replyStreamWithCard(s.frame, s.streamId, withLinkedTag(a, s.acc, undefined, s.turnId), true, { templateCard: card });
+                    await client.replyStreamWithCard(s.frame, s.streamId, withLinkedTag(a, body, undefined, s.turnId), true, { templateCard: card });
                 }
                 else {
-                    await client.replyStream(s.frame, s.streamId, withLinkedTag(a, s.acc, undefined, s.turnId), true);
+                    await client.replyStream(s.frame, s.streamId, withLinkedTag(a, body, undefined, s.turnId), true);
                 }
-                log.info({ sessionId: a.sessionId, turnId: s.turnId, accLen: s.acc.length, tools: s.tools.length, withCard: !!card }, "stream finalize");
+                log.info({ sessionId: a.sessionId, turnId: s.turnId, accLen: s.acc.length, tools: s.tools.length, withCard: !!card, timedOut }, "stream finalize");
             }
             catch (e) {
                 log.warn({ sessionId: a.sessionId, turnId: s.turnId, err: e.message }, "stream finalize failed");
@@ -1783,7 +1817,7 @@ export const startMirror = (deps) => {
             capped: false, closed: false, dead: false, cardSent: false,
             tools: [], sawTool: false,
         };
-        s.hardTimer = setTimeout(() => void finalizeStream(a, s), HARD_TIMEOUT_MS);
+        s.hardTimer = setTimeout(() => void finalizeStream(a, s, true), HARD_TIMEOUT_MS);
         log.info({ sessionId: a.sessionId, turnId: s.turnId, streamId }, "stream open");
         return s;
     };
@@ -2261,11 +2295,11 @@ export const startMirror = (deps) => {
         const bubble = { frame, streamId, hardTimer: undefined, done: false };
         const q = { turnId, bubble, isSlash };
         bubble.hardTimer = setTimeout(() => {
-            // WeCom ~6min stream 窗口快到, 必须 finish=true 收口。没正文时不能拿光链接
-            // 覆盖 —— finish 是整条替换, 会把屏幕上的 CoT 进度行抹成光秃秃的链接; 改用
-            // 最新进度行定格 (a 上的 CoT 只在气泡仍是本轮活跃气泡时才可信, 换轮后归新轮)。
-            const cot = a.briefBubble === bubble && !a.briefConcluded ? a.cotText ?? a.cotLastSent : undefined;
-            void finishBubble(a, bubble, `${briefDetailLink(turnId, a.target)}${cot ? ` \`${cot}\`` : ""}`, true);
+            // WeCom ~6min stream 窗口快到, 必须 finish=true 收口。finish 是整条替换 ——
+            // 定格在一行过期的 CoT 进度上看着像卡死, 光链接又像说完了; 气泡仍是本轮活跃
+            // 气泡 (turn 还在跑) 就明说「仍在处理中」, 已被顶替的旧轮只留链接。
+            const live = a.briefBubble === bubble && !a.briefConcluded;
+            void finishBubble(a, bubble, `${briefDetailLink(turnId, a.target)}${live ? ` ${STILL_WORKING}` : ""}`, true);
         }, HARD_TIMEOUT_MS);
         // 新消息 = 对话边界: 立刻收掉上一 turn, 新 turn 直接激活、不排队。收口语义见
         // closeBriefTurn: 有正文收入旧气泡, 没正文不写一个字 (绝不因边界结束凭空新发/
@@ -4450,6 +4484,10 @@ export const startMirror = (deps) => {
         const p = jsonlOf(target);
         return p ? lastAssistantText(p) : "";
     };
+    const replySince = (target, sinceMs = 0) => {
+        const p = jsonlOf(target);
+        return p ? lastReply(p, sinceMs) : "";
+    };
     // ── 未收口气泡的引用判定 ────────────────────────────────────────────
     // tag 会话的 last stream 未收口时, 群里最新那条气泡是瞬态的: 详情链接 URL +
     // 最新一条实时 CoT/工具行 (brief) 或累积中的 acc (非 brief)。引用它要的是路由,
@@ -4911,7 +4949,21 @@ export const startMirror = (deps) => {
         peekPane,
         peekTurns,
         isBusy,
+        setModel: async (target, wanted, scope) => {
+            const a = byTarget.get(target);
+            if (!a?.tmuxPane || !(await tmuxPaneAlive(a.tmuxPane)))
+                return { ok: false, reason: "它没有活着的 pane —— 模型是在 pane 里切的, 先叫醒它" };
+            const r = await selectModel(a.tmuxPane, wanted, log.child({ sub: "set-model", target }), scope);
+            if (r.ok && r.applied) {
+                a.model = r.applied;
+                const rec = deps.store.get(target);
+                if (rec)
+                    deps.store.set(target, { ...rec, model: r.applied });
+            }
+            return r;
+        },
         lastText,
+        lastReply: replySince,
         isOpenBubbleQuote,
         status: () => {
             const list = Array.from(bySessionId.values()).map((a) => ({
@@ -5086,7 +5138,10 @@ export const startMirror = (deps) => {
             // 名册增量搭这趟车进去 —— 同伴派活 / 定时任务 / graph 步骤都走这里, 所以
             // 一个从不被人直接说话的分身也能知道群里多了谁、少了谁。人说的话那一条
             // 路径在 inbound.send 上挂 (dispatch 有自己的 inject)。
-            const full = text + noticeSuffixFor(target, text);
+            // 信封 (谁说的、私聊还是公开、回执怎么交) 同理挂在尾巴上; slash 命令按行解析,
+            // 多挂一段就不再是命令, 跳过。`pendingBriefQuery` 记的仍是不带信封的原话。
+            const envelope = text.trimStart().startsWith("/") ? "" : opts?.envelope ?? "";
+            const full = text + envelope + noticeSuffixFor(target, text);
             // Pre-record so the tail's user-line emission is suppressed by the
             // recentInjects dedupe (otherwise the user sees their own demo prompt
             // echoed back as a quoted bubble).