wezard 2.1.0 → 2.1.2

package/dist/daemon/mirror-bridge.js

@@ -29,12 +29,12 @@ import { selectModel } from "./model-select.js";
 import { hasRegistry, markTranscript, probeOf, sessionOnPane, sessionPanes, submittedSince } from "./cc-session.js";
 import { wizardStore } from "./wizard.js";
 import { startSubagentWatch } from "./subagent-tail.js";
-import { recordTool, recordToolResult, recordMark, recordTurnStart, recordTurnItem, recordTurnUsage, recordTurnClose, recordCloseOpenTurns, buildDetailUrl, buildChatUrl } from "./detail.js";
+import { recordTool, recordToolResult, recordMark, recordTurnStart, recordTurnItem, recordTurnUsage, recordTurnClose, recordCloseOpenTurns, lastChannelOf, buildDetailUrl, buildChatUrl, roleUniq } from "./detail.js";
 import { labelFor, tagOfKey, baseOfKey, keyOf, stripSigil, displayName, withTagHeader, withLinkedTagHeader, linkedTagHead, linkTags, parseTagHeader, MAX_BODY_LINKS } from "../shared/session-label.js";
 import { splitMarkdown } from "../shared/md-chunk.js";
 import { randomTip } from "./tips.js";
 import { chatBaseOf, chatNameOf, listChatNames, parsePeerRef, peerAddress } from "./chat-name.js";
-import { stripAnsi, paneIsBusy, paneIsStalled, transcriptStalled, summarizeTail, lastAssistantText, lastReply, unwrapPasted, lastContextTokens, keepaliveStamps, openKeepalivePing, talkRounds, openToolUses, renderDialog } from "./peers.js";
+import { stripAnsi, paneIsBusy, transcriptStalled, summarizeTail, lastAssistantText, lastReply, unwrapPasted, lastContextTokens, keepaliveStamps, openKeepalivePing, keepalivePingSigs, isKeepalivePingText, talkRounds, openToolUses, 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
@@ -686,8 +686,9 @@ const renderLine = (raw, deps) => {
 // fenced block or table in a way that breaks rendering — see splitMarkdown.
 // Room reserved in every chunk for the `emoji \`#tag\` \`2/5\`` header line and
 // the chat-detail links linkTags hangs on it and on up to MAX_BODY_LINKS body
-// mentions — each `(url)` runs ~200-250 bytes.
-const TAG_HEADER_BUDGET = 256 * (1 + MAX_BODY_LINKS);
+// mentions — each `(url)` runs ~200-250 bytes. 头里最多两条: 自己的, 以及公开 peer 轮
+// 的 `→ .对方`。
+const TAG_HEADER_BUDGET = 256 * (2 + MAX_BODY_LINKS);
 export const startMirrorTail = (deps) => {
     const { log } = deps;
     // A single logical tail follows ONE sessionId whose transcript file may move
@@ -1669,16 +1670,11 @@ export const startMirror = (deps) => {
     // renderLine, the tick and the transcript parser all agree on what counts
     // as a ping. Content is the source of truth for the swallow: timers and
     // echo-TTLs lose it across reloads/replays.
-    const keepalivePingSigs = [cfg.wrc.mirror.keepalive.ping, cfg.wrc.mirror.keepalive.resumePing]
-        .map((p) => normAssistant(p).slice(0, 40))
-        .filter((s) => s.length > 0);
+    const pingSigs = keepalivePingSigs(cfg.wrc.mirror.keepalive.ping, cfg.wrc.mirror.keepalive.resumePing);
     // The warmer alone — what the peer readers (peek / wait / roster summary) strip.
     // `resumePing` is excluded on purpose: the turn it opens is real work resumed.
-    const warmerSigs = [normAssistant(cfg.wrc.mirror.keepalive.ping).slice(0, 40)].filter(Boolean);
-    const isKeepalivePing = (text) => {
-        const n = normAssistant(text);
-        return n.toLowerCase() === "ping" || keepalivePingSigs.some((sig) => n.includes(sig));
-    };
+    const warmerSigs = keepalivePingSigs(cfg.wrc.mirror.keepalive.ping);
+    const isKeepalivePing = (text) => isKeepalivePingText(text, pingSigs);
     // ── Typewriter stream lifecycle ────────────────────────────────────
     // WeCom spec: server polls us for stream refreshes for up to 6 min from the
     // original inbound. SDK queues replyStream calls per req_id, sends serially
@@ -1832,9 +1828,10 @@ export const startMirror = (deps) => {
     // 头挂 chat 详情页的票据: 本轮那条 turn。没有活 turn 可挂 → undefined, 头退回裸
     // `emoji #tag` (withLinkedTagHeader 自己兜)。
     const chatTurnUrl = (target, turnId) => turnId
-        ? buildChatUrl(cfg.daemon.detailPublicBase, cfg.daemon.host, cfg.daemon.port, turnId, stripPrincipalPrefix(target))
+        ? buildChatUrl(cfg.daemon.detailPublicBase, cfg.daemon.host, cfg.daemon.port, turnId, roleUniq(target))
         : undefined;
-    const withLinkedTag = (a, content, seq, turnId) => withLinkedTagHeader(a.target, content, chatTurnUrl(a.target, turnId ?? a.briefTurnId), seq);
+    // `[mirror]` / `[wezard]` 系统提示不是答给谁的话, 不标方向。
+    const withLinkedTag = (a, content, seq, turnId) => withLinkedTagHeader(a.target, content, chatTurnUrl(a.target, turnId ?? a.briefTurnId), seq, /^\[(mirror|wezard)\]/.test(content.trim()) ? undefined : a.replyTo);
     // 空正文一票否决 (近源拦截): 剥掉可能存在的路由头 (`🦊 #tag` / `[🧙](url)`)
     // 后没有可见内容就不发。中央 chat-gate (last-response 的 SDK 包装) 是最后一道
     // 防线; 这里拦在源头 —— 空内容不进 standalonePending FIFO、不占防抖 buf、
@@ -2188,8 +2185,8 @@ export const startMirror = (deps) => {
     };
     // 链接落到 chat 视图: 默认选中本 turn 所属的 #tag, 贴底显示整条会话。turnId 依旧
     // 是凭据 (不可枚举), 只是页面从"一个 turn"扩成"这个 chat 的全部会话"。
-    // target 作为 ww_uniq 传下去, 让同 chat 的所有 turn 详情都复用一个 WeCom 窗口。
-    const briefDetailLink = (turnId, target) => linkedTagHead(target, buildChatUrl(cfg.daemon.detailPublicBase, cfg.daemon.host, cfg.daemon.port, turnId, stripPrincipalPrefix(target)));
+    // wizard 名字作为 ww_uniq 传下去, 让同一个 wizard 的所有 turn 详情都复用一个 WeCom 窗口。
+    const briefDetailLink = (turnId, target) => linkedTagHead(target, buildChatUrl(cfg.daemon.detailPublicBase, cfg.daemon.host, cfg.daemon.port, turnId, roleUniq(target)));
     // ── 出处门 (chatOriginOnly) ───────────────────────────────────────────
     // 人在 CLI 里手敲的一轮, 镜像只发生在两处: 他眼前的终端, 和 chat 详情页 (turn
     // store 全量记录 + SSE 实时刷新)。聊天里不再下发它的气泡 —— 那份内容他本来就
@@ -2265,18 +2262,40 @@ export const startMirror = (deps) => {
         a.pendingFrom = undefined;
         return p && Date.now() - p.at <= ORIGIN_TTL_MS ? p.from : undefined;
     };
+    /** 公开派活的那个同伴 —— 回复的头要标给它 (见 AttachState.replyTo)。 */
+    const publicPeer = (from) => from?.kind === "peer" && from.public ? from.from : undefined;
     /** 频道印章: 有新印章就换频道; 没有则 `reset` (CLI 手敲 / 人从聊天发起) 回到
-     *  home, 其余续写 (收口后的补写) 沿用上一轮。 */
-    const consumeChannel = (a, reset) => {
+     *  home, 其余续写 (收口后的补写) 沿用上一轮。`from` = 本轮的出处, 答给谁跟着频道走。 */
+    const consumeChannel = (a, reset, from) => {
         const p = a.pendingChannel;
         a.pendingChannel = undefined;
+        const seeded = a.channelSeeded;
+        a.channelSeeded = true;
         if (p && Date.now() - p.at <= ORIGIN_TTL_MS) {
             a.channel = p.channel === baseOfKey(a.target) ? undefined : p.channel;
             a.speaker = p.speaker;
+            a.replyTo = publicPeer(from);
+            a.convFrom = from;
         }
         else if (reset) {
             a.channel = undefined;
             a.speaker = undefined;
+            a.replyTo = undefined;
+            a.convFrom = undefined;
+        }
+        else if (from) {
+            a.convFrom = from;
+        }
+        else if (!seeded) {
+            // reload 后的第一轮续写: 内存里的频道随进程没了, 缺省 = home 会把一段私聊的
+            // 后续记成群里公开说的 (rolepage 上私聊窗口从此不再更新)。接回最近一轮的印章。
+            const last = lastChannelOf(a.target);
+            if (last) {
+                a.channel = last.channel === baseOfKey(a.target) ? undefined : last.channel;
+                a.speaker = last.speaker;
+                a.replyTo = publicPeer(last.from);
+                a.convFrom = last.from;
+            }
         }
     };
     /** 本轮落 turn 记录的频道字段。 */
@@ -2295,8 +2314,9 @@ export const startMirror = (deps) => {
         a.queryEpoch = (a.queryEpoch ?? 0) + 1; // WeCom 侧的新一轮同样是 query 边界
         a.turnFromChat = true; // 出处确凿: 这一轮有 frame, 群里就是它的主场
         a.pendingFromCli = false; // 人改从聊天里说话了, 之前那条 CLI 输入不再是出处
-        consumeChannel(a, true);
-        recordTurnStart({ id: turnId, target: a.target, sessionId: a.sessionId, cli: cliOf(a), cwd: a.runningCwd || undefined, userQuery: userQuery.trim() || undefined, origin: consumeOrigin(a), from: consumeFrom(a), ...channelFields(a) });
+        const from = consumeFrom(a);
+        consumeChannel(a, true, from);
+        recordTurnStart({ id: turnId, target: a.target, sessionId: a.sessionId, cli: cliOf(a), cwd: a.runningCwd || undefined, userQuery: userQuery.trim() || undefined, origin: consumeOrigin(a), from, ...channelFields(a) });
         // hardTimer 兜底: turn 若无终句 / turn_end 收口 (卡死/漏收), 到点仍收气泡。
         const bubble = { frame, streamId, hardTimer: undefined, done: false };
         const q = { turnId, bubble, isSlash };
@@ -2342,8 +2362,10 @@ export const startMirror = (deps) => {
         const fromCli = a.pendingFromCli === true;
         a.pendingFromCli = false;
         a.turnFromChat = fromCli ? false : a.turnFromChat ?? true;
-        consumeChannel(a, fromCli);
-        recordTurnStart({ id: turnId, target: a.target, sessionId: a.sessionId, cli: cliOf(a), cwd: a.runningCwd || undefined, userQuery: query || undefined, origin: consumeOrigin(a), from: consumeFrom(a), ...channelFields(a) });
+        const fresh = consumeFrom(a);
+        consumeChannel(a, fromCli, fresh);
+        const from = fresh ?? a.convFrom;
+        recordTurnStart({ id: turnId, target: a.target, sessionId: a.sessionId, cli: cliOf(a), cwd: a.runningCwd || undefined, userQuery: query || undefined, origin: consumeOrigin(a), from, ...channelFields(a) });
         a.briefTurnId = turnId;
         a.briefBubble = undefined;
         a.briefIsSlash = false;
@@ -2899,7 +2921,7 @@ export const startMirror = (deps) => {
         // transcript, not on the word alone: a real answer that mentions pong has a
         // real question in front of it.
         if (item.kind === "text" && !a.keepaliveQuiet && !a.keepaliveByContent && PONG_RE.test(item.body)) {
-            const ping = openKeepalivePing(a.jsonlPath, keepalivePingSigs);
+            const ping = openKeepalivePing(a.jsonlPath, pingSigs);
             if (ping)
                 beginKeepaliveByContent(a, ping);
         }
@@ -4807,11 +4829,12 @@ export const startMirror = (deps) => {
                     continue; // cache already cold — a ping would cold-rewrite for nothing
                 if (k.round >= kc.rounds)
                     continue; // budget spent — let it go cold
-                // Stall recovery, decided by RULE only (no model self-judgment): the last
-                // transcript turn is a synthetic API-error/limit line, or the idle pane
-                // still shows an error banner ⇒ a turn died mid-work. Send the resume
+                // Stall recovery, decided by RULE only (no model self-judgment) and from
+                // the transcript's structure only — never the screen: the turn is still
+                // unfinished (died on a synthetic API error, or a tool result nobody
+                // answered) and has been quiet for the whole idle window. Send the resume
                 // instruction instead of the plain warmer.
-                const stalled = kc.resumeOnStall && (transcriptStalled(a.jsonlPath) || paneIsStalled(paneTail));
+                const stalled = kc.resumeOnStall && transcriptStalled(a.jsonlPath, keepalivePingSigs(kc.ping, kc.resumePing), idleTriggerMs, now);
                 k.pinging = true;
                 k.pingMtime = k.lastMs; // settles when a newer turn (the ping's own) appears
                 await fireKeepalive(a, stalled);