wezard 1.2.18 → 1.2.21

package/dist/daemon/mirror-bridge.js

@@ -21,9 +21,10 @@ import { isModalPane, parseModalOptions, pickModalAnswer } from "../shared/modal
 import { hasMirrorAskq, runMirrorAskqFlow, hasMirrorPlan, mootMirrorPlan, runMirrorPlanFlow } from "./approval.js";
 import { runTmux as runTmuxCmd, spawnTmuxClaude } from "./spawn-tmux.js";
 import { recordTool, recordToolResult, recordTurnStart, recordTurnItem, recordTurnUsage, recordTurnClose, recordCloseOpenTurns, buildDetailUrl, buildChatUrl } from "./detail.js";
-import { labelFor, tagOfKey, baseOfKey, withTagHeader } from "../shared/session-label.js";
+import { labelFor, tagOfKey, baseOfKey, keyOf, withTagHeader } from "../shared/session-label.js";
 import { splitMarkdown } from "../shared/md-chunk.js";
 import { randomTip } from "./tips.js";
+import { chatBaseOf, chatNameOf, listChatNames, normChatName, parsePeerRef, peerAddress } from "./chat-name.js";
 import { stripAnsi, compactPane, paneIsBusy, paneIsStalled, transcriptStalled, summarizeTail, lastAssistantText, lastContextTokens, keepaliveStamps, tailTurns, renderDialog } from "./peers.js";
 // Same PATH augmentation logic as cc-bridge: launchd / systemd start the daemon
 // with a stripped PATH that often lacks nvm / homebrew, breaking spawn(claudeBin).
@@ -2116,73 +2117,39 @@ export const startMirror = (deps) => {
         clearTimeout(a.keepaliveQuiet);
         a.keepaliveQuiet = undefined;
     };
-    // A reply is still a heartbeat while its letters remain a prefix of "pong"
-    // (covers streamed partials "p"/"po"/"pon" and trailing punctuation). Anything
-    // else means the model ignored the ping and resumed real work.
-    const pongPrefix = (s) => "pong".startsWith(s.replace(/[^a-zA-Z]/g, "").toLowerCase());
-    // Stop swallowing the in-flight ping turn: close its heartbeat detail turn,
-    // lift the quiet window, and re-anchor the clocks to "real activity now" so the
-    // resumed work resets the round budget. The caller then falls through to the
-    // normal onItem path, letting this and the rest of the turn reach chat.
-    const releaseKeepalive = (a) => {
-        if (a.keepaliveTurnId) {
-            recordTurnClose(a.keepaliveTurnId);
-            a.keepaliveTurnId = undefined;
-        }
-        endKeepaliveQuiet(a);
-        a.keepalivePongBuf = undefined;
-        if (a.keepalive) {
-            a.keepalive.round = 0;
-            a.keepalive.pinging = false;
-            a.keepalive.settledAt = 0;
-            a.keepalive.lastRealMs = Date.now();
-        }
-        log.info({ target: a.target, sessionId: a.sessionId }, "keepalive: reply diverged from pong — un-swallowing resumed turn");
-    };
+    // A keepalive ping turn is swallowed wholesale — the reply content doesn't
+    // matter (model may add extra commentary beyond "pong", that's fine).
     const onItem = (a, item) => {
         // 新 spawn 的 pane 在首次 inject 落地前吞掉所有初始输出 (greeting/system)。
         if (a.muteUntilInject)
             return;
         // Keepalive ping turns are cache-warmers: swallow every item from the WeCom
         // paths so the ping/pong never reaches chat. But record the REAL exchange
-        // into its chat-detail turn — the actual assistant reply (expected: just
-        // "pong"), the tool calls if any, and the usage (proof it was a cheap
-        // cache-read) — so the detail page shows the genuine heartbeat, not a
-        // synthetic summary. Closed on the terminal signal (hard or soft turn_end).
+        // into its chat-detail turn — the actual assistant reply, the tool calls if
+        // any, and the usage (proof it was a cheap cache-read) — so the detail page
+        // shows the genuine heartbeat, not a synthetic summary.
         if (a.keepaliveQuiet) {
-            // Swallow only while the reply is consistent with a bare "pong". A text
-            // whose accumulated letters leave the "pong" prefix, or ANY tool_use (a
-            // heartbeat never calls tools), means the model resumed real work → release
-            // and fall through so the turn reaches chat instead of being hidden.
-            const nextBuf = item.kind === "text" ? (a.keepalivePongBuf ?? "") + item.body : (a.keepalivePongBuf ?? "");
-            const divergent = item.kind === "tool_use" || (item.kind === "text" && !pongPrefix(nextBuf));
-            if (!divergent) {
-                if (item.kind === "text")
-                    a.keepalivePongBuf = nextBuf;
-                const id = a.keepaliveTurnId;
-                if (id) {
-                    const now = Date.now();
-                    if (item.kind === "text") {
-                        recordTurnItem(id, { t: "text", body: item.body, ts: now, final: item.final === true });
-                    }
-                    else if (item.kind === "tool_result") {
-                        recordTurnItem(id, { t: "tool_result", toolUseId: item.toolUseId, body: item.full, ts: now });
-                    }
-                    else if (item.kind === "turn_usage") {
-                        recordTurnUsage(id, { model: item.model, messageId: item.messageId, usage: item.usage });
-                    }
-                    else if (item.kind === "turn_end") {
-                        recordTurnClose(id);
-                        a.keepaliveTurnId = undefined;
-                    }
+            const id = a.keepaliveTurnId;
+            if (id) {
+                const now = Date.now();
+                if (item.kind === "text") {
+                    recordTurnItem(id, { t: "text", body: item.body, ts: now, final: item.final === true });
                 }
-                if (item.kind === "turn_end") {
-                    endKeepaliveQuiet(a);
-                    a.keepalivePongBuf = undefined;
+                else if (item.kind === "tool_result") {
+                    recordTurnItem(id, { t: "tool_result", toolUseId: item.toolUseId, body: item.full, ts: now });
                 }
-                return;
+                else if (item.kind === "turn_usage") {
+                    recordTurnUsage(id, { model: item.model, messageId: item.messageId, usage: item.usage });
+                }
+                else if (item.kind === "turn_end") {
+                    recordTurnClose(id);
+                    a.keepaliveTurnId = undefined;
+                }
+            }
+            if (item.kind === "turn_end") {
+                endKeepaliveQuiet(a);
             }
-            releaseKeepalive(a); // fall through to normal handling for this item
+            return;
         }
         // 任何新 item 到达 = 上一条"消息写完了"并不代表这一轮结束 → 撤销待确认的软收口。
         // 硬信号 (end_turn / turn_duration) 的后端永远不会走到这里。
@@ -3420,10 +3387,95 @@ export const startMirror = (deps) => {
     // untagged default plus every `#tag`. Live attachments are the truth; the
     // persisted store fills in cold bindings so a peer nobody has talked to since
     // the last reload is still discoverable (and revivable) rather than invisible.
+    const allTargets = () => {
+        const keys = new Set([...byTarget.keys(), ...Object.keys(deps.store.all())]);
+        return Array.from(keys).sort();
+    };
     const chatTargets = (target) => {
         const base = basePrincipalOf(target);
-        const keys = new Set([...byTarget.keys(), ...Object.keys(deps.store.all())]);
-        return Array.from(keys).filter((k) => basePrincipalOf(k) === base).sort();
+        return allTargets().filter((k) => basePrincipalOf(k) === base);
+    };
+    // 名字解析:`daily` / `chat:wrxxx` → base principal。认不出就把已知名字一并回给
+    // 调用方 —— 跨 chat 出错时"我该写什么"比"你写错了"有用得多。
+    const resolveChatRef = (ref) => {
+        const base = chatBaseOf(cfg, ref);
+        if (base)
+            return { ok: true, base };
+        const known = listChatNames(cfg).map((c) => c.name);
+        return {
+            ok: false,
+            reason: `unknown chat '${ref}' — give that chat a name first (\`/name ${normChatName(ref) || "<name>"}\` inside it)`,
+            candidates: known,
+        };
+    };
+    // peer 寻址。地址是两级的(见 chat-name.ts):
+    //   ""            本 chat 的 default —— 自身语义不变;
+    //   `fix`         本 chat 优先,本 chat 没有再全局兜底(全 host 唯一才认)——
+    //                 命名之前唯一的跨 chat 路子,老调用方不能因为引入命名而断掉;
+    //   `daily#fix`   daily 这个 chat 里的 `#fix`,精确到点,不问 tag 全不全局唯一;
+    //   `daily#`      daily 的 default 会话;
+    //   `chat:wr…#fix` 全量 key 同理(list_peers 吐的就是它)。
+    // 裸 tag 的 0 命中 / ≥2 命中依旧拒绝,但出路从"回去改 tag 名"变成"用带 chat 名
+    // 的全称地址"——后者不需要动别人的会话。
+    const resolvePeerTag = (self, ref) => {
+        const { chat, tag } = parsePeerRef(ref ?? "");
+        const t = tag.trim();
+        if (chat) {
+            const c = resolveChatRef(chat);
+            if (!c.ok)
+                return c;
+            const target = keyOf(c.base, t);
+            if (allTargets().includes(target)) {
+                return { ok: true, target, foreign: c.base !== basePrincipalOf(self) };
+            }
+            return {
+                ok: false,
+                reason: `chat '${chat}' has no ${t ? `'#${t}'` : "default"} session — create it with new_claude_session({ chat: '${chat}'${t ? `, tag: '${t}'` : ""}, cwd })`,
+                candidates: allTargets().filter((k) => basePrincipalOf(k) === c.base),
+            };
+        }
+        const local = keyOf(basePrincipalOf(self), t);
+        if (!t)
+            return { ok: true, target: local, foreign: false };
+        const all = allTargets();
+        if (all.includes(local))
+            return { ok: true, target: local, foreign: false };
+        const foreignMatches = all.filter((k) => tagOfKey(k) === t && basePrincipalOf(k) !== basePrincipalOf(self));
+        if (foreignMatches.length === 1)
+            return { ok: true, target: foreignMatches[0], foreign: true };
+        if (foreignMatches.length === 0) {
+            // 裸 token 正好是个 chat 名字 —— 用户/agent 想说的是"那个群",不是"那个 tag"。
+            // 直接给出它的会话地址,比让人再查一次 list_chats 快。
+            const asChat = chatBaseOf(cfg, t);
+            if (asChat) {
+                return {
+                    ok: false,
+                    reason: `'${t}' is a CHAT, not a tag — address one of its sessions, e.g. '${t}#' for its default`,
+                    candidates: allTargets().filter((k) => basePrincipalOf(k) === asChat).map((k) => peerAddress(cfg, self, k)),
+                };
+            }
+            return { ok: false, reason: `no peer with tag '#${t}' — create one with new_claude_session, or address it in full as 'chatName#${t}' (list_chats shows the names)` };
+        }
+        return {
+            ok: false,
+            reason: `tag '#${t}' exists in ${foreignMatches.length} chats — address it in full as 'chatName#${t}' (list_chats shows the names)`,
+            candidates: foreignMatches.map((k) => peerAddress(cfg, self, k)),
+        };
+    };
+    /** 已知的每个 chat:命名的 + 有会话在跑的。`name` 为空即"还没起名",那就是
+     *  它暂时只能靠全局唯一 tag 被找到的原因。 */
+    const chatRoster = (self) => {
+        const bases = new Set([
+            ...listChatNames(cfg).map((c) => c.base),
+            ...allTargets().map(basePrincipalOf),
+            basePrincipalOf(self),
+        ]);
+        return [...bases].filter(Boolean).sort().map((base) => ({
+            base,
+            name: chatNameOf(cfg, base),
+            self: base === basePrincipalOf(self),
+            targets: allTargets().filter((k) => basePrincipalOf(k) === base),
+        }));
     };
     const paneOf = (target) => byTarget.get(target)?.tmuxPane || deps.store.get(target)?.tmuxPane || "";
     const jsonlOf = (target) => expandHome(byTarget.get(target)?.jsonlPath || deps.store.get(target)?.jsonlPath || "");
@@ -3436,38 +3488,52 @@ export const startMirror = (deps) => {
         const p = jsonlOf(target);
         return p ? lastAssistantText(p) : "";
     };
-    const peers = async (target) => {
-        const list = await Promise.all(chatTargets(target).map(async (t) => {
-            const a = byTarget.get(t);
-            const rec = deps.store.get(t);
-            const jsonlPath = jsonlOf(t);
-            const pane = paneOf(t);
-            const paneAlive = pane ? await tmuxPaneAlive(pane) : false;
-            const tag = tagOfTarget(t);
-            let lastActivity = 0;
-            try {
-                if (jsonlPath)
-                    lastActivity = statSync(jsonlPath).mtimeMs;
-            }
-            catch { /* not written yet */ }
-            return {
-                target: t,
-                tag,
-                label: tag ? labelFor(tag) : "🧙",
-                sessionId: a?.sessionId || rec?.sessionId || "",
-                jsonlPath,
-                cwd: a?.runningCwd || rec?.cwd || expandedDefaultCwd,
-                cli: jsonlPath ? backendForPath(jsonlPath).name : (activeBackends()[0]?.name ?? "claude"),
-                tmuxPane: pane,
-                attached: !!a,
-                paneAlive,
-                busy: paneAlive ? paneIsBusy(await capturePaneTail(pane, 12)) : false,
-                lastActivity,
-                summary: jsonlPath ? summarizeTail(jsonlPath) : "(未绑定会话)",
-                self: t === target,
-            };
-        }));
-        return list.sort((x, y) => y.lastActivity - x.lastActivity);
+    // 一个 target 的完整画像。本 chat 的兄弟和外 chat 的 peer 走同一条,只有
+    // `self` / `address` 因观察者而异 —— 地址本来就是相对调用方说的话。
+    const peerInfoOf = async (t, self) => {
+        const a = byTarget.get(t);
+        const rec = deps.store.get(t);
+        const jsonlPath = jsonlOf(t);
+        const pane = paneOf(t);
+        const paneAlive = pane ? await tmuxPaneAlive(pane) : false;
+        const tag = tagOfTarget(t);
+        let lastActivity = 0;
+        try {
+            if (jsonlPath)
+                lastActivity = statSync(jsonlPath).mtimeMs;
+        }
+        catch { /* not written yet */ }
+        return {
+            target: t,
+            tag,
+            chat: chatNameOf(cfg, t),
+            address: peerAddress(cfg, self, t),
+            label: tag ? labelFor(tag) : "🧙",
+            sessionId: a?.sessionId || rec?.sessionId || "",
+            jsonlPath,
+            cwd: a?.runningCwd || rec?.cwd || expandedDefaultCwd,
+            cli: jsonlPath ? backendForPath(jsonlPath).name : (activeBackends()[0]?.name ?? "claude"),
+            tmuxPane: pane,
+            attached: !!a,
+            paneAlive,
+            busy: paneAlive ? paneIsBusy(await capturePaneTail(pane, 12)) : false,
+            lastActivity,
+            summary: jsonlPath ? summarizeTail(jsonlPath) : "(未绑定会话)",
+            self: t === self,
+        };
+    };
+    const byRecent = (x, y) => y.lastActivity - x.lastActivity;
+    const peers = async (target) => (await Promise.all(chatTargets(target).map((t) => peerInfoOf(t, target)))).sort(byRecent);
+    // list_peers 的跨 chat 补充:其他 chat 里**当前调用方叫得动**的 session。两条
+    // 入选路径 —— tag 全局唯一(裸 tag 就能命中),或者它所在的 chat 有名字(全称
+    // `daily#fix` 命中)。后者是命名带来的新增量:同名 tag 不再互相遮蔽,想被找到
+    // 只要给群起个名,不必回去改别人的 tag。
+    const foreignPeers = async (self) => {
+        const selfBase = basePrincipalOf(self);
+        const foreign = allTargets().filter((k) => tagOfKey(k) && basePrincipalOf(k) !== selfBase);
+        const tagCount = foreign.reduce((acc, k) => acc.set(tagOfKey(k), (acc.get(tagOfKey(k)) ?? 0) + 1), new Map());
+        const reachable = foreign.filter((k) => tagCount.get(tagOfKey(k)) === 1 || chatNameOf(cfg, k));
+        return (await Promise.all(reachable.map((t) => peerInfoOf(t, self)))).sort(byRecent);
     };
     // Capture a few extra rows then compact away the TUI's blank padding, so
     // `rows` counts lines the user actually cares about.
@@ -3533,7 +3599,6 @@ export const startMirror = (deps) => {
         // buys a deterministic reply. keepaliveStamps matches every form, so none
         // reads as real activity. (round is incremented below, after the inject lands.)
         const text = stalled ? kc.resumePing : kc.ping;
-        a.keepalivePongBuf = ""; // fresh reply accumulator for the swallow/release gate
         // Suppress the pane→WeCom echo of the ping user line, then swallow the whole
         // ping turn (reply included). The 60s fail-safe clears the quiet window if
         // the turn somehow never emits turn_end, so a later real turn is never muted;
@@ -3678,7 +3743,11 @@ export const startMirror = (deps) => {
     const keepaliveTimer = setInterval(() => void keepaliveTick(), 15_000);
     return {
         attach,
+        chatTargets,
         peers,
+        foreignPeers,
+        resolvePeerTag,
+        chatRoster,
         peekPane,
         peekTurns,
         isBusy,