cc-viewer 1.6.268 → 1.6.270

package/lib/terminal-env.js

@@ -54,7 +54,17 @@ export function prepareEmbeddedShellSpawn(shell, env, options = {}) {
       'if [[ "$__ccv_original_zdotdir" != "$__ccv_wrapper_zdotdir" && -r "$__ccv_original_zdotdir/.zshenv" ]]; then',
       '  source "$__ccv_original_zdotdir/.zshenv"',
       'fi',
-      'export CCV_EFFECTIVE_ZDOTDIR="${ZDOTDIR:-$__ccv_original_zdotdir}"',
+      '# ZDOTDIR was set to the wrapper dir by prepareEmbeddedShellSpawn before zsh',
+      "# started, so the previous form `${ZDOTDIR:-$__ccv_original_zdotdir}` always",
+      "# selected the wrapper dir; the later .zshrc then compared wrapper==wrapper",
+      "# and silently skipped sourcing the user's real ~/.zshrc. Compare against",
+      '# __ccv_wrapper_zdotdir instead: only treat the current ZDOTDIR as',
+      "# user-overridden when the user's .zshenv (sourced above) actually changed it.",
+      'if [[ "$ZDOTDIR" != "$__ccv_wrapper_zdotdir" ]]; then',
+      '  export CCV_EFFECTIVE_ZDOTDIR="$ZDOTDIR"',
+      'else',
+      '  export CCV_EFFECTIVE_ZDOTDIR="$__ccv_original_zdotdir"',
+      'fi',
       'export ZDOTDIR="$__ccv_wrapper_zdotdir"',
       'unset __ccv_original_zdotdir __ccv_wrapper_zdotdir',
       '',

package/lib/voice-pack-events.js

@@ -10,11 +10,13 @@
 // Adding a 6th event meant editing 5+ files and any miss silently dropped audio
 //(). All consumers now import from here.
 
+// 注：timeoutWarning5min / timeoutWarning60s 已删除。AskUserQuestion 实质 24h 无超时后
+// 倒计时不再渲染（AskTimeoutCountdown.jsx isInfiniteTimeout → null），剩余时间预警事件失去意义。
+// 老用户 preferences.json 含这两个 key 由 lib/approval-modal-prefs.js _filterEvents 白名单
+// 自动 strip，零迁移工作量。孤儿 audio 文件留待 cleanup CLI（backlog）。
 export const EVENT_KEYS = [
   'planApproval',
   'askQuestion',
-  'timeoutWarning5min',
-  'timeoutWarning60s',
   'turnEnd',
 ];
 
@@ -26,7 +28,5 @@ export const EVENT_KEYS = [
 export const DEFAULT_BINDINGS = Object.freeze({
   planApproval: 'default',
   askQuestion: 'default',
-  timeoutWarning5min: 'default',
-  timeoutWarning60s: 'default',
   turnEnd: null,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.6.268",
+  "version": "1.6.270",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",

package/server.js

@@ -10,6 +10,8 @@ import { execFile, exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import { Worker } from 'node:worker_threads';
 import { isPathContained, ERROR_STATUS_MAP, validateImportDir } from './lib/file-api.js';
+import { loadAskStore, setEntry as askStoreSetEntry, deleteEntry as askStoreDeleteEntry, pruneStale as askStorePruneStale, markAnswered as askStoreMarkAnswered, markCancelled as askStoreMarkCancelled, consumeIfFinal as askStoreConsumeIfFinal } from './lib/ask-store.js';
+import { ASK_TIMEOUT_MS } from './lib/ask-constants.js';
 import { isReadAllowed, reasonToStatus, bumpWorkspacesVersion } from './lib/file-access-policy.js';
 
 const execFileAsync = promisify(execFile);
@@ -140,7 +142,66 @@ let _workspaceLaunched = false; // 工作区是否已经启动了会话
 // Map supports concurrent ask requests (sub-agents / teammates) so a stale unanswered
 // ask never blocks the next one. Keyed by server-generated id.
 const pendingAskHooks = new Map(); // Map<id, { questions, res, timer, createdAt }>
-const ASK_HOOK_MAP_MAX = 50;
+// 1000 远超任何合理并发场景；保留 LRU 仅作为防恶意/bug 撑爆内存的兜底，
+// 不再用于"正常使用时的容量上限"——用户的 ask 不应该因为 50 个 cap 被强行 evict。
+const ASK_HOOK_MAP_MAX = 1000;
+// 单一来源的"无超时"实质上限——延伸至 24h 兼顾防 entry 泄漏；
+// 任何引用此值的地方（HOOK_TIMEOUT / REPLAY_HOOK_TIMEOUT / 广播 timeoutMs）都从这里取。
+// 实际常量定义在 lib/ask-constants.js（hook 路径 + SDK 路径同源）。
+const ASK_HOOK_TIMEOUT_MS = ASK_TIMEOUT_MS;
+
+// 内存 Map 是权威源；ask-store 是镜像（best-effort）。崩溃时只丢"未落盘窗口"内的最新一次变更。
+// 任何 pendingAskHooks.set(...) 后必须调 _persistAskEntry；.delete(...) 后必须调 _persistAskDelete。
+function _persistAskEntry(id, entry) {
+  if (!entry || !Array.isArray(entry.questions)) return;
+  // 异步触发：磁盘 IO 不阻塞 ask 主流程（落盘失败不影响业务）
+  setImmediate(() => {
+    try { askStoreSetEntry(id, { questions: entry.questions, createdAt: entry.createdAt }); } catch {}
+  });
+}
+function _persistAskDelete(id) {
+  setImmediate(() => {
+    try { askStoreDeleteEntry(id); } catch {}
+  });
+}
+
+// Phase 3: short-poll listener registry. Hangs GET /api/ask-hook/:id/result responses
+// until either an answer/cancel arrives or wait ms elapses (then 204).
+const shortPollListeners = new Map(); // id -> Set<{ res, tid, finished }>
+
+function _notifyShortPollAnswer(id, answers) {
+  const set = shortPollListeners.get(id);
+  if (!set) return;
+  for (const listener of set) {
+    if (listener.finished) continue;
+    listener.finished = true;
+    clearTimeout(listener.tid);
+    try {
+      if (!listener.res.headersSent) {
+        listener.res.writeHead(200, { 'Content-Type': 'application/json' });
+        listener.res.end(JSON.stringify({ answers }));
+      }
+    } catch {}
+  }
+  shortPollListeners.delete(id);
+}
+
+function _notifyShortPollCancel(id, reason) {
+  const set = shortPollListeners.get(id);
+  if (!set) return;
+  for (const listener of set) {
+    if (listener.finished) continue;
+    listener.finished = true;
+    clearTimeout(listener.tid);
+    try {
+      if (!listener.res.headersSent) {
+        listener.res.writeHead(200, { 'Content-Type': 'application/json' });
+        listener.res.end(JSON.stringify({ cancelled: true, reason: reason || '' }));
+      }
+    } catch {}
+  }
+  shortPollListeners.delete(id);
+}
 
 // Permission hook bridge state (for PreToolUse permission approval)
 // Map supports concurrent sub-agent/teammate requests (keyed by request id)
@@ -1690,7 +1751,18 @@ async function handleRequest(req, res) {
       const entries = readdirSync(targetDir, { withFileTypes: true });
       const items = entries
         .filter(e => !IGNORED_PATTERNS.has(e.name))
-        .map(e => ({ name: e.name, type: e.isDirectory() ? 'directory' : 'file' }))
+        .map(e => {
+          // Dirent.isDirectory() 不解引用 symlink —— 对指向目录的 symlink 也返回 false。
+          // 需要对 symlink 单独 statSync（follow link）才能拿到真实类型，否则前端会把
+          // symlink-to-dir 当成文件渲染，不可展开。断链时 fallback 到 file，避免单个
+          // 坏链接让整个目录返回 404。
+          let type = e.isDirectory() ? 'directory' : 'file';
+          if (e.isSymbolicLink()) {
+            try { type = statSync(join(targetDir, e.name)).isDirectory() ? 'directory' : 'file'; }
+            catch { type = 'file'; }
+          }
+          return { name: e.name, type };
+        })
         .sort((a, b) => {
           if (a.type !== b.type) return a.type === 'directory' ? -1 : 1;
           return a.name.localeCompare(b.name);
@@ -2644,6 +2716,35 @@ async function handleRequest(req, res) {
     return;
   }
 
+  // Ask 持久化恢复：浏览器 WS reconnect 后用来"补"那些 ws 断开期间到达的 pending ask
+  // （server.js 已有 ws reconnect replay 路径，但该路径仅 broadcast 内存 Map 中存活的 entry；
+  // server 自身重启过会丢内存态——此端点从磁盘 ask-store 镜像恢复 disk superset 列表）。
+  if (url === '/api/pending-asks' && method === 'GET') {
+    try {
+      // 优先内存 Map（含活跃 res / timer 的真实状态），用 createdAt 排序；
+      // 再 union disk（hydrate 已死 entry 或本进程未持有的孤儿 entry，用于恢复 UI 列表，
+      // 答案投递仍由 WS ask-hook-answer 路径走 server 端 first-write-wins）。
+      const memEntries = [...pendingAskHooks.entries()].map(([id, e]) => ({
+        id, questions: e.questions, createdAt: e.createdAt, source: 'memory',
+      }));
+      const memIds = new Set(memEntries.map(e => e.id));
+      const diskAll = loadAskStore();
+      // 只暴露 status === 'pending' 的 disk entry —— markAnswered 创建的 questions=[] 终态占位
+      // 也会被 loadAskStore 返回，但它不是真"待回答"，前端 inject 会渲染空 ghost ask。
+      // 另外过滤 questions 数组非空（防御性）。
+      const diskOnly = Object.values(diskAll)
+        .filter(e => !memIds.has(e.id) && e.status === 'pending' && Array.isArray(e.questions) && e.questions.length > 0)
+        .map(e => ({ id: e.id, questions: e.questions, createdAt: e.createdAt, source: 'disk' }));
+      const all = [...memEntries, ...diskOnly].sort((a, b) => a.createdAt - b.createdAt);
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ pendingAsks: all, askProtocolVersion: 1 }));
+    } catch (err) {
+      res.writeHead(500, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'failed to read pending asks', detail: String(err?.message || err) }));
+    }
+    return;
+  }
+
   // Ask hook bridge: long-poll endpoint for PreToolUse AskUserQuestion hook
   if (url === '/api/ask-hook' && method === 'POST') {
     let body = '';
@@ -2655,6 +2756,10 @@ async function handleRequest(req, res) {
         req.destroy();
       }
     });
+    // Phase 3: ask-bridge 用 `X-Ask-Poll-Mode: short` 头声明走短轮询。新 server 看到后
+    // 立即返 { id, capability: 'short-poll' }（不挂 res），client 之后 GET /api/ask-hook/:id/result 取答案。
+    // 老 server 不识别此头 → 按长轮询走（仍挂 res 直到答案/24h 超时）→ 完全向后兼容。
+    const shortPollMode = (req.headers['x-ask-poll-mode'] || '').toLowerCase() === 'short';
     req.on('end', async () => {
       if (bodyTooLarge) {
         try { if (!res.headersSent) { res.writeHead(413, { 'Content-Type': 'application/json' }); res.end(JSON.stringify({ error: 'Request body too large' })); } } catch {}
@@ -2688,6 +2793,7 @@ async function handleRequest(req, res) {
             clearTimeout(oldest.timer);
             try { if (!oldest.res.headersSent) { oldest.res.writeHead(429, { 'Content-Type': 'application/json' }); oldest.res.end(JSON.stringify({ error: 'Too many concurrent requests' })); } } catch {}
             pendingAskHooks.delete(oldestId);
+            _persistAskDelete(oldestId);
             if (terminalWss) {
               const tmsg = JSON.stringify({ type: 'ask-hook-timeout', id: oldestId });
               terminalWss.clients.forEach((c) => {
@@ -2698,8 +2804,9 @@ async function handleRequest(req, res) {
           }
         }
 
-        const HOOK_TIMEOUT = 60 * 60 * 1000; // 60 minutes — 等价 terminal Claude Code 的"无超时"体验
-        // (terminal interactiveHandler 本身无 timeout，hook 子进程层 10min；这里 60min 远超人类响应时间)
+        // 实质等同"无超时"，仍保留兜底防 entry 泄漏（plugin throw / OOM 等异常路径）。
+        // ask-bridge 不设客户端 timeout，由 server 单向控制 response 终止。
+        const HOOK_TIMEOUT = ASK_HOOK_TIMEOUT_MS;
         // toolUseId 路由策略：
         //  - char whitelist + ≤256 长度 防恶意 1MB key 撑大 Map
         //  - 已存在同 id 但旧 res 已断（writableEnded/destroyed）→ 复用槽位（ask-bridge 重试场景）
@@ -2717,6 +2824,7 @@ async function handleRequest(req, res) {
             // 旧 res 已断（包含占位 res:null 残留）— ask-bridge 重试同 toolUseId 合理，复用槽位
             if (existing.timer) clearTimeout(existing.timer);
             pendingAskHooks.delete(toolUseId);
+            _persistAskDelete(toolUseId);
             id = toolUseId;
           } else {
             res.writeHead(409, { 'Content-Type': 'application/json' });
@@ -2734,14 +2842,19 @@ async function handleRequest(req, res) {
         // TOCTOU 防御：占位 id 之前先注册 res.on('close')，否则 await runWaterfallHook 期间 client
         // abort 的 close 事件落空 → entry 残 5min。占位 set 提前到 await 之前防两条同 ms 并发
         // POST 的 do-while 都通过 collision check 后 set 互相覆盖（first res 永泄漏到 5min）。
-        pendingAskHooks.set(id, { questions, res, timer: null, createdAt: Date.now() });
+        const _placeholderEntry = { questions, res, timer: null, createdAt: Date.now(), shortPoll: shortPollMode };
+        pendingAskHooks.set(id, _placeholderEntry);
+        _persistAskEntry(id, _placeholderEntry);
 
         // res.on('close') 提前注册：handler 用 entry.timer 守卫（占位期 timer:null → 仅 delete Map）
+        // Phase 3: short-poll 模式下 res 主动 end，close 不视为 client cancel；entry 由 24h timer 兜底清理。
         res.on('close', () => {
           const entry = pendingAskHooks.get(id);
           if (entry) {
+            if (entry.shortPoll) return;
             if (entry.timer) clearTimeout(entry.timer);
             pendingAskHooks.delete(id);
+            _persistAskDelete(id);
             if (terminalWss) {
               const tmsg = JSON.stringify({ type: 'ask-hook-timeout', id });
               terminalWss.clients.forEach((c) => {
@@ -2757,8 +2870,15 @@ async function handleRequest(req, res) {
           const hookResult = await runWaterfallHook('onAskRequest', { id, questions, mode: 'hook' });
           if (hookResult.answers) {
             pendingAskHooks.delete(id); // 释放占位 — plugin 直接答了
-            res.writeHead(200, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify({ answers: hookResult.answers }));
+            _persistAskDelete(id);
+            // race: plugin 执行期间 client 主动断开 → res.on('close') 已清 entry，
+            // 但本闭包仍持着 res 引用；guard 防 writeHead 抛 ERR_STREAM_WRITE_AFTER_END
+            if (!res.writableEnded && !res.destroyed && !res.headersSent) {
+              try {
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ answers: hookResult.answers }));
+              } catch {}
+            }
             return;
           }
         } catch {}
@@ -2767,6 +2887,7 @@ async function handleRequest(req, res) {
           const entry = pendingAskHooks.get(id);
           if (entry) {
             pendingAskHooks.delete(id);
+            _persistAskDelete(id);
             try {
               // null guard：plugin throw + outer body-parse race 极端下占位残留时 fire 防 TypeError
               if (entry.res && !entry.res.headersSent) {
@@ -2785,7 +2906,19 @@ async function handleRequest(req, res) {
         }, HOOK_TIMEOUT);
 
         const askStartedAt = Date.now();
-        pendingAskHooks.set(id, { questions, res, timer, createdAt: askStartedAt });
+        const _liveEntry = { questions, res, timer, createdAt: askStartedAt, shortPoll: shortPollMode };
+        pendingAskHooks.set(id, _liveEntry);
+        _persistAskEntry(id, _liveEntry);
+
+        // Phase 3: short-poll 模式立即返 ack，让 client 改走 GET 轮询；entry 留在内存等 ws answer。
+        if (shortPollMode) {
+          try {
+            if (!res.headersSent) {
+              res.writeHead(200, { 'Content-Type': 'application/json' });
+              res.end(JSON.stringify({ id, capability: 'short-poll' }));
+            }
+          } catch {}
+        }
 
         // Broadcast to all terminal WS clients — 附 startedAt + timeoutMs 让前端渲染倒计时
         if (terminalWss) {
@@ -2805,6 +2938,75 @@ async function handleRequest(req, res) {
     return;
   }
 
+  // Phase 3: short-poll handoff endpoint. ask-bridge GET /api/ask-hook/:id/result?wait=30000
+  // 在 wait ms 内若答案/cancel 到达 → 立即返；否则返 204 让 client 重发。
+  // 内存有 entry → 注册 listener；内存无 → 查 disk consume（server 重启场景）。
+  if (url.startsWith('/api/ask-hook/') && url.includes('/result') && method === 'GET') {
+    try {
+      // URL 形如 /api/ask-hook/<id>/result?wait=30000；id 受白名单约束（与 POST 同源）
+      const m = url.match(/^\/api\/ask-hook\/([^/?]+)\/result(?:\?(.*))?$/);
+      if (!m) { res.writeHead(400); res.end(); return; }
+      const id = decodeURIComponent(m[1]);
+      if (!id || id.length > 256 || !/^[a-zA-Z0-9_-]+$/.test(id)) {
+        res.writeHead(400, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'invalid id' }));
+        return;
+      }
+      const qs = new URLSearchParams(m[2] || '');
+      const wait = Math.max(1000, Math.min(60000, parseInt(qs.get('wait') || '30000', 10)));
+
+      // 1) disk 命中 answered/cancelled：浏览器答得早过 GET 到达 → 立即返并消费（一次性）
+      // 用 consumeIfFinal 单次 withLock 内判 status 决定是否 delete —— 旧设计的
+      // "consume + 若 pending 再 setEntry 写回" 两段是 race window：中间被 markAnswered 命中后，
+      // setEntry 走 status guard 已经不会覆盖；但不删的 pending 也无须重写一遍。
+      const diskEntry = askStoreConsumeIfFinal(id);
+      if (diskEntry && diskEntry.status === 'answered') {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ answers: diskEntry.answers || {} }));
+        return;
+      }
+      if (diskEntry && diskEntry.status === 'cancelled') {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ cancelled: true, reason: diskEntry.cancelReason || '' }));
+        return;
+      }
+      // diskEntry.status === 'pending' → consumeIfFinal 已保留它，无须重写
+
+      // 2) entry 仍 pending：注册 listener 等 wait ms。内存或 disk 至少一个有就允许注册——
+      //    server 重启后 disk 是 pending，但内存无 entry，仍要让 GET 挂等（浏览器答案到达时
+      //    会走 ws ask-hook-answer handler 路径，handler 内 markAnswered 落 disk + _notifyShortPollAnswer 直推 listener）。
+      const memEntry = pendingAskHooks.get(id);
+      if (!memEntry && !diskEntry) {
+        res.writeHead(404, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'no such ask' }));
+        return;
+      }
+      const listener = { res, finished: false, tid: null };
+      if (!shortPollListeners.has(id)) shortPollListeners.set(id, new Set());
+      shortPollListeners.get(id).add(listener);
+      listener.tid = setTimeout(() => {
+        if (listener.finished) return;
+        listener.finished = true;
+        shortPollListeners.get(id)?.delete(listener);
+        try { if (!res.headersSent) { res.writeHead(204); res.end(); } } catch {}
+      }, wait);
+      res.on('close', () => {
+        if (listener.finished) return;
+        listener.finished = true;
+        clearTimeout(listener.tid);
+        shortPollListeners.get(id)?.delete(listener);
+      });
+    } catch (err) {
+      try {
+        if (!res.headersSent) {
+          res.writeHead(500, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: String(err?.message || err) }));
+        }
+      } catch {}
+    }
+    return;
+  }
+
   // Permission hook bridge: receive tool permission request from perm-bridge.js, long-poll for user decision
   if (url === '/api/perm-hook' && method === 'POST') {
     let body = '';
@@ -4121,6 +4323,18 @@ export async function startViewer() {
   // 清理过期解压缓存（fire-and-forget；任何错误吞掉）
   setImmediate(() => { try { cleanupExtractCache(); } catch { /* ignore */ } });
 
+  // 启动时清理磁盘上 ASK_HOOK_TIMEOUT_MS 之前的 ask 条目（兜底防泄漏）。
+  // 内存 Map 不 hydrate：旧 res 已死、新 ask-bridge 重连同 toolUseId 会自动复用槽位
+  // （server.js 已有"旧 res 已断 → 复用"分支），无需在这里主动重建内存态。
+  // 留下来的 disk 镜像供 /api/pending-asks 端点查询，让浏览器重连后仍能看见 pending 列表。
+  setImmediate(() => { try { askStorePruneStale(ASK_HOOK_TIMEOUT_MS); } catch {} });
+  // 长跑进程兜底：短轮询路径下 markAnswered 标的终态 entry 若 ask-bridge 已死（GET 不再来 consume），
+  // 仅靠启动 prune 永远清不掉。1h 周期触发一次，.unref() 不阻塞进程退出。
+  const _pruneAskStoreInterval = setInterval(() => {
+    try { askStorePruneStale(ASK_HOOK_TIMEOUT_MS); } catch {}
+  }, 60 * 60 * 1000);
+  _pruneAskStoreInterval.unref();
+
   // 通过插件 hook 获取 HTTPS 证书选项
   let httpsOptions = null;
   try {
@@ -4244,6 +4458,7 @@ export async function startViewer() {
                 const { res: hookRes, timer } = entry;
                 clearTimeout(timer);
                 pendingAskHooks.delete(id);
+                _persistAskDelete(id);
                 try {
                   if (!hookRes.headersSent) {
                     hookRes.writeHead(200, { 'Content-Type': 'application/json' });
@@ -4423,8 +4638,8 @@ async function setupTerminalWebSocket(httpServer) {
       // Replay pending ask-hook 请求：浏览器关 tab 再开（或 ws 重连）时，
       // 让新 ws 立即收到当前 server-side 仍 long-poll 的 ask 列表 + startedAt + 剩余 timeoutMs，
       // 否则前端 askMetaMap 空 → 倒计时不渲染 + lastPendingAskId 派生错。
-      // ASK_HOOK_TIMEOUT 在闭包外（line 2425 const HOOK_TIMEOUT），不直接可见 — 用 60min 字面量同源。
-      const REPLAY_HOOK_TIMEOUT = 60 * 60 * 1000;
+      // 与上方 HOOK_TIMEOUT 同源（实质无超时）。
+      const REPLAY_HOOK_TIMEOUT = ASK_HOOK_TIMEOUT_MS;
       const now = Date.now();
       for (const [id, entry] of pendingAskHooks) {
         const elapsed = now - (entry.createdAt || now);
@@ -4530,6 +4745,7 @@ async function setupTerminalWebSocket(httpServer) {
             // 老协议 fallback（取最老）已废弃 — 多 pending 时会"答错对象"造成串答；
             // 缺 id 直接 WARN 并丢弃，让前端在 console 里看到为什么答案没生效。
             let askAnswered = false;
+            let alreadyAnswered = false; // first-write-wins 抢答失败信号
             let askId = msg.id;
             let askEntry = null;
             if (askId) {
@@ -4541,12 +4757,58 @@ async function setupTerminalWebSocket(httpServer) {
               const { res: hookRes, timer } = askEntry;
               clearTimeout(timer);
               pendingAskHooks.delete(askId);
-              askAnswered = true;
-              try {
-                if (!hookRes.headersSent) {
-                  hookRes.writeHead(200, { 'Content-Type': 'application/json' });
-                  hookRes.end(JSON.stringify({ answers: msg.answers }));
+              // Phase 3: short-poll 模式不立即删 disk —— 落 answered 让 GET listener / disk consume 拿
+              if (askEntry.shortPoll) {
+                let wrote = false;
+                try { wrote = askStoreMarkAnswered(askId, msg.answers); } catch {}
+                if (wrote) {
+                  _notifyShortPollAnswer(askId, msg.answers);
+                  askAnswered = true;
+                } else {
+                  // race 边角：进入 handler 时内存 entry 还在，但 disk 已被另一进程 / 之前的 cancel 写过终态。
+                  // 不广播 answer，让发起方知道被抢答；hookRes 也按 cancelled 返回让 ask-bridge 走 deny 路径。
+                  alreadyAnswered = true;
+                  try {
+                    if (!hookRes.headersSent) {
+                      hookRes.writeHead(200, { 'Content-Type': 'application/json' });
+                      hookRes.end(JSON.stringify({ cancelled: true, reason: 'Already answered by another client' }));
+                    }
+                  } catch {}
                 }
+              } else {
+                _persistAskDelete(askId);
+                askAnswered = true;
+              }
+              if (askAnswered) {
+                try {
+                  if (!hookRes.headersSent) {
+                    hookRes.writeHead(200, { 'Content-Type': 'application/json' });
+                    hookRes.end(JSON.stringify({ answers: msg.answers }));
+                  }
+                } catch {}
+              }
+            } else if (askId) {
+              // server 重启 / 内存 entry 已被清，但 ask-bridge 可能仍在短轮询 disk —— 落 answered。
+              // first-write-wins：如果 disk 已被其他 client 抢答（markAnswered 返 false），
+              // 不唤醒 listener（让 listener 等到 GET hit disk 拿到真实抢答者答案）—— 自然 idempotent。
+              // 给当前 ws 发 ack-already-answered 让前端关 modal、不误覆盖灰态。
+              let wrote = false;
+              try { wrote = askStoreMarkAnswered(askId, msg.answers); } catch {}
+              if (wrote) {
+                _notifyShortPollAnswer(askId, msg.answers);
+                askAnswered = true;
+              } else {
+                alreadyAnswered = true;
+              }
+            }
+            // first-write-wins 抢答失败 → 仅 ack 发起方让其关 modal；不广播给其他 client 防覆盖真实 answer。
+            if (alreadyAnswered && askId && ws && ws.readyState === 1) {
+              try {
+                ws.send(JSON.stringify({
+                  type: 'ask-hook-already-answered',
+                  id: askId,
+                  reason: 'Another client answered first (first-write-wins)',
+                }));
               } catch {}
             }
             // Broadcast resolved to other clients so they clear their ask panel
@@ -4639,6 +4901,13 @@ async function setupTerminalWebSocket(httpServer) {
                 const { res: hookRes, timer } = askEntry;
                 if (timer) clearTimeout(timer);
                 pendingAskHooks.delete(cancelId);
+                // Phase 3: short-poll 同样要让 disk + listener 知道，否则 ask-bridge 永远收不到 cancelled
+                if (askEntry.shortPoll) {
+                  try { askStoreMarkCancelled(cancelId, cancelReason); } catch {}
+                  _notifyShortPollCancel(cancelId, cancelReason);
+                } else {
+                  _persistAskDelete(cancelId);
+                }
                 handled = true;
                 try {
                   if (hookRes && !hookRes.headersSent) {
@@ -4646,6 +4915,26 @@ async function setupTerminalWebSocket(httpServer) {
                     hookRes.end(JSON.stringify({ cancelled: true, reason: cancelReason }));
                   }
                 } catch {}
+              } else {
+                // 内存无 entry，但 disk 可能有 pending（server 重启后 ask-bridge 重 POST 之前，
+                // 浏览器从 /api/pending-asks 看到 disk-only ask 并 Cancel 它）。
+                // first-wins：disk 已是终态（如另一 client 抢先 answer）时 markCancelled 返 false，
+                // 不能唤醒 listener 用 cancel 覆盖真实 answer —— 让 listener 下次 GET consumeIfFinal
+                // 拿到真实 disk 终态自然投递。
+                const wrote = askStoreMarkCancelled(cancelId, cancelReason);
+                if (wrote) {
+                  _notifyShortPollCancel(cancelId, cancelReason);
+                  handled = true;
+                } else if (ws && ws.readyState === 1) {
+                  // 抢答失败 ack：只给发起方关 modal，不广播防覆盖其他 client 真实 answer。
+                  try {
+                    ws.send(JSON.stringify({
+                      type: 'ask-hook-already-answered',
+                      id: cancelId,
+                      reason: 'Already resolved by another client',
+                    }));
+                  } catch {}
+                }
               }
             }
             // ack 广播分两档：

package/dist/assets/index-_4BCXKKF.css

@@ -1 +0,0 @@
-:root,[data-theme=dark]{--bg-base: #0a0a0a;--bg-base-pure: #000;--bg-base-alt: #0d0d0d;--bg-container: #111;--bg-elevated: #1e1e1e;--bg-surface: #2a2a2a;--bg-code: #14141F;--bg-code-dark: #0d1117;--bg-code-system: #060f2a;--border-primary: #2a2a2a;--border-secondary: #303030;--border-hover: #3a3a3a;--border-light: #444;--border-code: #2a2a3e;--border-code-system: #0b2a5c;--text-primary: #e5e5e5;--text-secondary: #ccc;--text-tertiary: #888;--text-muted: #666;--text-disabled: #555;--text-disabled-faint: rgba(255, 255, 255, .45);--text-white: #fff;--text-gray: #6b7280;--text-light: #aaa;--color-primary: #1668dc;--color-primary-light: #3b82f6;--color-primary-lighter: #60a5fa;--color-primary-pale: #4a9eff;--color-primary-dark: #165bbe;--color-primary-dark-bg: #1e3a5f;--color-primary-bg-light: rgba(22, 104, 220, .15);--color-primary-bg-lighter: rgba(22, 104, 220, .2);--color-primary-bg-medium: rgba(22, 104, 220, .35);--color-primary-bg-faint: rgba(22, 104, 220, .1);--color-primary-shadow: rgba(22, 104, 220, .6);--color-success: #22c55e;--color-success-light: #4ade80;--color-success-dark: #2ea043;--color-success-bg-light: rgba(34, 197, 94, .15);--color-success-bg-medium: rgba(34, 197, 94, .3);--color-error: #ef4444;--color-error-rgb: 239, 68, 68;--color-error-light: #f87171;--color-error-muted: #a33;--color-error-dark-bg: #220000;--color-error-bg-light: rgba(239, 68, 68, .15);--color-error-bg-faint: rgba(239, 68, 68, .1);--color-error-bg-medium: rgba(239, 68, 68, .3);--color-warning: #f59e0b;--color-warning-light: #fbbf24;--color-warning-dark-bg: #2a2000;--color-warning-dark-border: #5c4d00;--color-warning-bg-light: rgba(245, 158, 11, .15);--color-warning-bg-medium: rgba(245, 158, 11, .3);--color-selection-bg: #1a2332;--color-selection-alt: #264f78;--color-green-bg: #1a3a1a;--color-green-dark-bg: #162312;--color-diff-add: #73c991;--color-diff-delete: #ef4444;--color-diff-add-bg: rgba(115, 201, 145, .15);--color-diff-delete-bg: rgba(239, 68, 68, .11);--color-tree-selected: #532f00;--color-accent-yellow: #e2c08d;--color-info-light: #7dd3fc;--color-code-purple: #a78bfa;--color-code-orange: #d97757;--code-keyword: #f87171;--code-string: #7dd3fc;--code-comment: #888;--code-number: #7dd3fc;--code-text: #e5e5e5;--code-inline-color: #aeafff;--code-inline-bg: #14141F;--code-error: #e06c75;--color-purple-bg: rgba(139, 92, 246, .18);--color-purple-border: rgba(139, 92, 246, .3);--color-primary-outline: rgba(22, 104, 220, .75);--color-primary-bg-extra-faint: rgba(74, 159, 255, .05);--color-primary-pale-shadow: rgba(74, 159, 255, .5);--color-error-border: rgba(239, 68, 68, .25);--color-error-border-light: rgba(239, 68, 68, .2);--color-warning-bg-faint: rgba(234, 179, 8, .1);--color-warning-border-light: rgba(234, 179, 8, .2);--color-success-bg-faint: rgba(34, 197, 94, .11);--color-diff-delete-text: #fca5a5;--color-green-border: #2a5a3a;--color-green-dark-border: #274916;--color-red-dark-bg: #8b1a1a;--color-red-dark-border: #2a1a1a;--color-thinking-bg: #111108;--color-thinking-border: #2a2a1e;--color-code-orange-border: rgba(217, 119, 87, .27);--color-code-orange-bg: rgba(217, 119, 87, .07);--bg-container-alt: #161616;--bg-model-avatar: #000;--bg-sub-avatar: #3a3a3a;--avatar-bg-0: #5b6abf;--avatar-bg-1: #2a9d8f;--avatar-bg-2: #6366f1;--avatar-bg-3: #d97706;--avatar-bg-4: #3b82f6;--avatar-bg-5: #8b5cf6;--avatar-bg-6: #0e7490;--avatar-bg-7: #ea580c;--avatar-bg-8: #059669;--avatar-bg-9: #e11d48;--avatar-bg-10: #0284c7;--avatar-bg-11: #dc2626;--avatar-bg-12: #65a30d;--avatar-bg-13: #ca8a04;--avatar-bg-14: #9333ea;--avatar-bg-15: #db2777;--avatar-bg-16: #6b7280;--avatar-bg-17: #1d4ed8;--avatar-bg-18: #b45309;--avatar-bg-19: #047857;--model-logo-mono: #fff;--bg-input-bar: rgba(0, 0, 0, .5);--bg-sticky-btn: rgba(0, 0, 0, .5);--chat-boxer-gradient-dir: to top;--chat-boxer-bg-from: var(--bg-surface);--chat-boxer-bg-to: var(--border-secondary);--chat-boxer-hover-from: var(--border-secondary);--chat-boxer-hover-to: var(--border-hover);--shadow-approval-heavy: rgba(0, 0, 0, .6);--shadow-approval-glow: rgba(245, 158, 11, .15);--color-approval-border: #f59e0b;--color-approval-label: #fbbf24;--color-gray-bg-light: rgba(107, 114, 128, .15);--color-gray-bg-medium: rgba(107, 114, 128, .3);--overlay-light-faint: rgba(255, 255, 255, .04);--overlay-light-medium: rgba(255, 255, 255, .1);--overlay-light-strong: rgba(255, 255, 255, .2);--overlay-light-half: rgba(255, 255, 255, .5);--overlay-light-bright: rgba(255, 255, 255, .7);--overlay-dark: rgba(0, 0, 0, .75);--overlay-dark-medium: rgba(0, 0, 0, .6);--overlay-dark-light: rgba(0, 0, 0, .5);--overlay-dark-strong: rgba(0, 0, 0, .88)}[data-theme=light]{--bg-base: #FAFAFA;--bg-base-pure: #FFFFFF;--bg-base-alt: #F5F5F5;--bg-container: #FFFFFF;--bg-elevated: #F9F9F9;--bg-surface: #F0F0F0;--bg-code: #F5F5F5;--bg-code-dark: #F5F5F5;--bg-code-system: #EFF1F3;--border-primary: #E0E0E0;--border-secondary: #EBEBEB;--border-hover: #C0C0C0;--border-light: #D4D4D4;--border-code: #D4D4D4;--border-code-system: #C0D0E0;--text-primary: #1a1a1a;--text-secondary: #333;--text-tertiary: #666;--text-muted: #888;--text-disabled: #AAA;--text-disabled-faint: rgba(0, 0, 0, .35);--text-white: #1a1a1a;--text-gray: #6b7280;--text-light: #555;--color-primary: #0969DA;--color-primary-light: #0969DA;--color-primary-lighter: #0969DA;--color-primary-pale: #2A7DE1;--color-primary-dark: #0550AE;--color-primary-dark-bg: #DDF4FF;--color-primary-bg-light: rgba(9, 105, 218, .1);--color-primary-bg-lighter: rgba(9, 105, 218, .12);--color-primary-bg-medium: rgba(9, 105, 218, .2);--color-primary-bg-faint: rgba(9, 105, 218, .06);--color-primary-shadow: rgba(9, 105, 218, .3);--color-success: #1A7F37;--color-success-light: #2DA44E;--color-success-dark: #116329;--color-success-bg-light: rgba(26, 127, 55, .08);--color-success-bg-medium: rgba(26, 127, 55, .15);--color-error: #CF222E;--color-error-rgb: 207, 34, 46;--color-error-light: #DA3633;--color-error-muted: #82071E;--color-error-dark-bg: #FFEBE9;--color-error-bg-light: rgba(207, 34, 46, .08);--color-error-bg-faint: rgba(207, 34, 46, .06);--color-error-bg-medium: rgba(207, 34, 46, .15);--color-warning: #9A6700;--color-warning-light: #BF8700;--color-warning-dark-bg: #FFF8E1;--color-warning-dark-border: #D4A72C;--color-warning-bg-light: rgba(154, 103, 0, .08);--color-warning-bg-medium: rgba(154, 103, 0, .15);--color-selection-bg: #B4D7FF;--color-selection-alt: #ADD6FF;--color-green-bg: #DAFBE1;--color-green-dark-bg: #DAFBE1;--color-diff-add: #116329;--color-diff-delete: #82071E;--color-diff-add-bg: #DAFBE1;--color-diff-delete-bg: #FFEBE9;--color-tree-selected: #FFF3D5;--color-accent-yellow: #CB7C5E;--color-info-light: #0969DA;--color-code-purple: #8250DF;--color-code-orange: #953800;--code-keyword: #0000FF;--code-string: #A31515;--code-comment: #6A9955;--code-number: #098658;--code-text: #383838;--code-inline-color: #0969DA;--code-inline-bg: #EFF1F3;--code-error: #CF222E;--color-purple-bg: rgba(130, 80, 223, .1);--color-purple-border: rgba(130, 80, 223, .2);--color-primary-outline: rgba(9, 105, 218, .5);--color-primary-bg-extra-faint: rgba(9, 105, 218, .04);--color-primary-pale-shadow: rgba(9, 105, 218, .3);--color-error-border: rgba(207, 34, 46, .2);--color-error-border-light: rgba(207, 34, 46, .15);--color-warning-bg-faint: rgba(154, 103, 0, .06);--color-warning-border-light: rgba(154, 103, 0, .15);--color-success-bg-faint: rgba(26, 127, 55, .08);--color-diff-delete-text: #DA3633;--color-green-border: #2DA44E;--color-green-dark-border: #1A7F37;--color-red-dark-bg: #FFEBE9;--color-red-dark-border: #FFCECB;--color-thinking-bg: #FAFAF5;--color-thinking-border: #E8E8D0;--color-code-orange-border: rgba(149, 56, 0, .2);--color-code-orange-bg: rgba(149, 56, 0, .06);--bg-container-alt: #F5F5F5;--bg-model-avatar: transparent;--bg-sub-avatar: #E5E5E5;--avatar-bg-0: #ced0db;--avatar-bg-1: #9abcb8;--avatar-bg-2: #edeef5;--avatar-bg-3: #cfb99f;--avatar-bg-4: #d6deea;--avatar-bg-5: #efecf5;--avatar-bg-6: #78a8b5;--avatar-bg-7: #d6bcaf;--avatar-bg-8: #72b8a2;--avatar-bg-9: #d6b7be;--avatar-bg-10: #8fb5c8;--avatar-bg-11: #d6bbbb;--avatar-bg-12: #a4bc83;--avatar-bg-13: #cab893;--avatar-bg-14: #d6cae2;--avatar-bg-15: #d6bbc7;--avatar-bg-16: #bbbcbf;--avatar-bg-17: #b2bad2;--avatar-bg-18: #c2a28a;--avatar-bg-19: #5ead97;--model-logo-mono: #000;--bg-input-bar: #ffffff;--bg-sticky-btn: rgba(255, 255, 255, .85);--chat-boxer-gradient-dir: to bottom;--chat-boxer-bg-from: #F7F7F7;--chat-boxer-bg-to: #F0F0F0;--chat-boxer-hover-from: #EEEEEE;--chat-boxer-hover-to: #E8E8E8;--shadow-approval-heavy: rgba(0, 0, 0, .1);--shadow-approval-glow: rgba(245, 158, 11, .08);--color-approval-border: #1f1f1f;--color-approval-label: #1f1f1f;--color-gray-bg-light: rgba(107, 114, 128, .1);--color-gray-bg-medium: rgba(107, 114, 128, .2);--overlay-light-faint: rgba(0, 0, 0, .03);--overlay-light-medium: rgba(0, 0, 0, .06);--overlay-light-strong: rgba(0, 0, 0, .1);--overlay-light-half: rgba(0, 0, 0, .3);--overlay-light-bright: rgba(0, 0, 0, .5);--overlay-dark: rgba(0, 0, 0, .5);--overlay-dark-medium: rgba(0, 0, 0, .4);--overlay-dark-light: rgba(0, 0, 0, .3);--overlay-dark-strong: rgba(0, 0, 0, .6)}body{margin:0;background-color:var(--bg-base-alt);overflow-x:hidden;-webkit-tap-highlight-color:transparent}html,body{overscroll-behavior:none}::selection{background-color:var(--color-selection-alt);color:inherit}*{scrollbar-width:thin;scrollbar-color:var(--border-hover) var(--bg-base-alt)}@media(pointer:coarse){*{scrollbar-width:auto;scrollbar-color:auto}}@media(pointer:fine){*::-webkit-scrollbar{width:6px;height:6px}*::-webkit-scrollbar-track{background:var(--bg-base-alt)}*::-webkit-scrollbar-thumb{background:var(--border-hover);border-radius:3px}*::-webkit-scrollbar-thumb:hover{background:var(--text-disabled)}}.code-highlight{color:var(--code-text)}.hl-keyword{color:var(--code-keyword)}.hl-string{color:var(--code-string)}.hl-comment{color:var(--code-comment);font-style:italic}.hl-number{color:var(--code-number)}.hl-linenum{color:var(--text-disabled);-webkit-user-select:none;user-select:none}.chat-md pre{background:var(--bg-code-dark);border:1px solid var(--border-primary);border-radius:6px;padding:12px;overflow-x:auto;font-size:13px;line-height:1.5}.chat-md code{background:var(--code-inline-bg);padding:2px 6px;border-radius:4px;font-size:13px;color:var(--code-inline-color)}.chat-md pre code{background:none;padding:0}.chat-md p{margin:6px 0}.chat-md ul,.chat-md ol{padding-left:20px;margin:6px 0}.chat-md li{margin:2px 0}.chat-md h1,.chat-md h2,.chat-md h3{margin:12px 0 6px;color:var(--text-white)}.chat-md h1{font-size:1.3em}.chat-md h2{font-size:1.15em}.chat-md h3{font-size:1.05em}.chat-md blockquote{border-left:3px solid var(--color-primary-light);margin:8px 0;padding:4px 12px;color:var(--text-tertiary)}.chat-md table{border-collapse:collapse;margin:8px 0;font-size:13px}.chat-md th,.chat-md td{border:1px solid var(--text-gray);padding:6px 10px}.chat-md th{background:var(--bg-elevated);color:var(--text-white)}.chat-md a{color:var(--color-primary-lighter)}.chat-md img{cursor:pointer;max-width:100%;height:auto;border-radius:6px}.chat-md hr{border:none;border-top:1px solid var(--border-primary);margin:12px 0}.chat-md .chat-boxer hr,.chat-boxer .chat-md hr{border-top-color:var(--border-light);margin:8px 0}.chat-md strong,.chat-md em{color:var(--text-primary)}.mermaid-diagram{display:flex;justify-content:center;margin:12px 0;padding:16px;background:var(--bg-code-dark);border:1px solid var(--border-primary);border-radius:6px;overflow-x:auto}.mermaid-diagram svg{max-width:100%;height:auto}*:focus{outline:none!important;box-shadow:none!important}*:focus-visible{outline:none!important;box-shadow:none!important}.chat-boxer{background:linear-gradient(var(--chat-boxer-gradient-dir),var(--chat-boxer-bg-from),var(--chat-boxer-bg-to));color:var(--text-white);border-radius:6px;padding:2px 10px;margin-bottom:6px;border:1px solid var(--text-muted);box-sizing:border-box}.chat-boxer:hover{background:linear-gradient(var(--chat-boxer-gradient-dir),var(--chat-boxer-hover-from),var(--chat-boxer-hover-to))}.chat-boxer .chat-md tbody{background:var(--bg-base-pure)}.ant-dropdown .logo-dropdown-menu.logo-dropdown-menu{border:1px solid var(--border-hover);border-radius:4px}.ant-dropdown .logo-dropdown-menu.logo-dropdown-menu .ant-dropdown-menu-item,.ant-dropdown .logo-dropdown-menu.logo-dropdown-menu .ant-dropdown-menu-submenu-title{font-size:12px;padding:8px 12px}.ant-dropdown-menu-submenu-popup .ant-dropdown-menu{border:1px solid var(--border-hover);border-radius:4px}.ant-tooltip .ant-tooltip-inner{background-color:var(--bg-base-alt);color:var(--text-primary)}.ant-tooltip .ant-tooltip-arrow:before,.ant-tooltip .ant-tooltip-arrow:after{background:var(--bg-base-alt)}.ant-popover .ant-popover-arrow:before,.ant-popover .ant-popover-arrow:after{background:var(--border-secondary)}[data-theme=light] .ant-popover .ant-popover-arrow:before,[data-theme=light] .ant-popover .ant-popover-arrow:after{background:var(--bg-base-pure)}.ant-typography{font-size:12px}.ant-modal-confirm .ant-modal-content{background-color:var(--bg-elevated);border:1px solid var(--border-primary)}.ant-modal-confirm .ant-modal-confirm-title{color:var(--text-primary)}.ant-modal-confirm .ant-modal-confirm-content{color:var(--text-light)}.ant-modal-confirm .ant-btn-default{background-color:transparent;border-color:var(--border-light);color:var(--text-secondary)}.ant-modal-confirm .ant-btn-default.ant-btn-default:hover,.ant-modal-confirm .ant-btn-default.ant-btn-default:focus{background-color:var(--bg-surface);border-color:var(--text-muted);color:var(--text-white)}.ant-modal-confirm .ant-btn-primary,.ant-modal-confirm .ant-btn-primary:hover{background-color:var(--color-primary);border-color:var(--color-primary)}.ant-tabs .ant-tabs-nav:before{border-bottom-color:var(--border-primary)}[data-theme=light] .hljs{background:var(--bg-code);color:#383838}[data-theme=light] .hljs-keyword{color:#00f}[data-theme=light] .hljs-string{color:#a31515}[data-theme=light] .hljs-comment{color:#6a9955}[data-theme=light] .hljs-number{color:#098658}[data-theme=light] .hljs-title{color:#795e26}[data-theme=light] .hljs-type,[data-theme=light] .hljs-built_in{color:#267f99}[data-theme=light] .hljs-literal{color:#00f}[data-theme=light] .hljs-attr{color:#e50000}[data-theme=light] .hljs-variable{color:#001080}[data-theme=light] .hljs-name,[data-theme=light] .hljs-tag{color:maroon}[data-theme=light] .hljs-attribute{color:red}[data-theme=light] .hljs-symbol{color:#098658}[data-theme=light] .hljs-meta{color:#6a9955}[data-theme=light] .hljs-selector-tag{color:maroon}[data-theme=light] .hljs-selector-class,[data-theme=light] .hljs-selector-id{color:#267f99}