cc-viewer 1.7.0 → 1.7.2

package/src/utils/askPortalMatcher.js

@@ -0,0 +1,54 @@
+/**
+ * Portal 决策：判断 inline AskQuestionForm（在 ChatMessage 里渲染的某条 tool_use）
+ * 是否应该 createPortal 到 ApprovalModal 的 askSlot。
+ *
+ * activeAskId 三种合法形态（与 server 端协议绑定，改一边必须改另一边）：
+ *
+ *   1. `toolu_xxx` — SDK 模式 / 新版 Claude Code 透传的真实 tool_use_id
+ *      → 走 strict 匹配：activeAskId === toolId
+ *
+ *   2. `__ask__` — LEGACY 老 server（pre-Map 协议）的单槽占位
+ *      → 走 owner 通配：仅 owner-idx 锁定的那条 ChatMessage（lastPendingAskId === toolId）命中
+ *
+ *   3. `ask_${ts}_${rnd}` — 老 Claude Code PreToolUse hook payload 不带 tool_use_id 时
+ *      server.js 自生成的 fallback id（修复 modal 标题在但内容空白的根因）
+ *      → 走 owner 通配：与 __ask__ 同语义
+ *
+ * 协议锚点：
+ *   - server 端 fallback id 生成：server.js（搜索 `ask_${Date.now()}` 定位）
+ *   - server 端 LEGACY 占位推送：server.js 推送 ask-hook-pending 事件时 id 为 '__ask__'
+ *   - 前端 setState pendingAsk：src/components/chat/ChatView.jsx
+ *
+ * 改 server 端 fallback id 格式时，必须同步更新此文件的 isFallbackId 检测。
+ */
+
+const FALLBACK_ID_PREFIX = 'ask_';
+const LEGACY_PLACEHOLDER_ID = '__ask__';
+
+/**
+ * True when the given pending-ask id is a placeholder that can never equal a real
+ * tool_use id: the LEGACY single-slot '__ask__' or a server-generated 'ask_<ts>_<rnd>'
+ * fallback id. Consumers (e.g. resolveAskQuestions) use this to apply the same
+ * owner-wildcard semantics as shouldPortalAskForm on the legacy paths.
+ */
+export function isPlaceholderAskId(id) {
+  return id === LEGACY_PLACEHOLDER_ID
+    || (typeof id === 'string' && id.startsWith(FALLBACK_ID_PREFIX));
+}
+
+/**
+ * @param {*} activeAskId   ApprovalPortalContext.Consumer 提供的 activeAskId（modal 当前 active ask 的 id）
+ * @param {*} toolId        当前 ChatMessage 里 tool_use 块的 id（toolu_xxx）
+ * @param {*} lastPendingAskId  ChatMessage 收到的 owner-idx 派生信号；非 owner 永远为 null
+ * @returns {boolean} true 表示当前 ChatMessage 应该 portal 到 askSlot
+ */
+export function shouldPortalAskForm(activeAskId, toolId, lastPendingAskId) {
+  if (activeAskId == null) return false;
+  // strict：SDK / 新 Claude Code 真实 tool_use_id
+  if (String(activeAskId) === String(toolId)) return true;
+  // owner 通配：__ask__（LEGACY 老 server）∪ ask_*（server fallback）
+  // 必须同时满足 owner-idx 锁定（lastPendingAskId === toolId），否则会让历史所有真实 toolId
+  // 都被通配命中，重现旧的双份 portal bug
+  if (isPlaceholderAskId(activeAskId) && lastPendingAskId === toolId) return true;
+  return false;
+}

package/src/utils/autoApproveOptions.js

@@ -0,0 +1,27 @@
+// 自动审批档位唯一事实源 —— 全部消费点共用同一组档位,防止各处字面量发散:
+//   1. TerminalPanel 终端工具栏四芒星快捷菜单（权限/Plan 两行级联档位）
+//   2. ChatInputBar 对话输入框四芒星快捷菜单（隐藏终端时,同款两行）
+//   3. AppHeader 设置抽屉的权限/Plan 两个 Select
+//   4. Mobile 设置面板的权限/Plan 两个 Select
+// 三态语义(持久化于 preferences.autoApproveSeconds / approvalModal.planAutoApproveSeconds):
+//   0   = 关闭(手动审批)
+//   > 0 = 倒计时该秒数后自动批准
+//   -1  = 免审批(AUTO_APPROVE_INSTANT):请求到达即放行,从源头绕过审批面板
+// 本模块不依赖 helpers.js(它带 .svg?raw 等 Vite 专属 import),保持 node --test 可直接引用。
+export const AUTO_APPROVE_INSTANT = -1;
+
+export const PERM_AUTO_APPROVE_OPTIONS = [0, 3, 5, 10, AUTO_APPROVE_INSTANT];
+export const PLAN_AUTO_APPROVE_OPTIONS = [0, 10, 30, 60, AUTO_APPROVE_INSTANT];
+
+// 单个档位值 -> 显示文案;t 由调用方注入,避免本模块依赖前端 i18n。
+// 档位之外的历史值(如 Plan 旧 3/5)同样落在 `${v}s` 分支正常显示。
+export function autoApproveValueLabel(v, t) {
+  if (v === AUTO_APPROVE_INSTANT) return t('ui.permission.autoApprove.instant');
+  if (!v) return t('ui.permission.autoApprove.off');
+  return `${v}s`;
+}
+
+// 档位数组 -> antd Select options
+export function autoApproveSelectOptions(values, t) {
+  return values.map(v => ({ value: v, label: autoApproveValueLabel(v, t) }));
+}

package/src/utils/avatarAnimationPostPass.js

@@ -0,0 +1,49 @@
+import React from 'react';
+import { shouldAnimateTeammateAvatar, pickAvatarAnimationTargets } from './teammateAvatars';
+
+/**
+ * Avatar animation loading strategy — post-pass applied at the end of
+ * ChatView.buildAllItems, once every item (and the out-of-band Last Response
+ * timestamp) is known. Teammate rows animate their one-shot draw-in only when
+ * within the 60s window of the newest item's timestamp; the single newest
+ * teammate row always animates ("welcome flourish" on historic logs). Losers
+ * get cloneElement({ animateAvatar: false }) — winners keep their original
+ * element reference so cached elements skip reconciliation entirely.
+ *
+ * The flags are frozen per build: the window is measured against the newest
+ * item's timestamp, NOT wall clock (do not "fix" with Date.now()); they
+ * refresh whenever new data rebuilds the list.
+ *
+ * @param {Array} items - freshly built ChatMessage element array; mutated in place
+ * @param {string|null} lastResponseTs - session.entryTimestamp of the Last
+ *   Response block, which lives OUTSIDE items but must count toward "newest"
+ * @returns {Array} the same array, with stale teammate rows cloned to static
+ */
+export function applyAvatarAnimationTargets(items, lastResponseTs = null) {
+  const scanEntries = items.map((item) => ({
+    ts: item?.props?.timestamp,
+    isTeammateAvatar: isTeammateAvatarItem(item?.props),
+  }));
+  if (lastResponseTs) scanEntries.push({ ts: lastResponseTs, isTeammateAvatar: false });
+  const { latestMs, newestTeammateIdx } = pickAvatarAnimationTargets(scanEntries);
+  if (newestTeammateIdx === -1) return items;
+  for (let i = 0; i < items.length; i++) {
+    if (!scanEntries[i].isTeammateAvatar) continue;
+    const animate = i === newestTeammateIdx ||
+      shouldAnimateTeammateAvatar(items[i].props.timestamp, latestMs);
+    if (!animate) items[i] = React.cloneElement(items[i], { animateAvatar: false });
+  }
+  return items;
+}
+
+// Mirrors ChatMessage.render()'s THREE teammate-avatar branches:
+// renderSubAgentChatMessage (role 'sub-agent-chat'), renderSubAgentMessage
+// (role 'sub-agent' — currently never constructed, covered defensively), and
+// renderTeammateMessage (role 'teammate-message'). If ChatMessage gains a new
+// teammate-avatar branch, add it here — rows missed by this predicate default
+// to animated forever.
+export function isTeammateAvatarItem(props) {
+  if (!props) return false;
+  return ((props.role === 'sub-agent-chat' || props.role === 'sub-agent') && props.isTeammate)
+    || props.role === 'teammate-message';
+}

package/src/utils/builtinPresets.js

@@ -0,0 +1,18 @@
+/**
+ * 内置预置快捷方式。
+ *
+ * builtinId 跨版本不变，用于追踪用户的删除/编辑。
+ * teamName / description 是 i18n key，渲染时通过 t() 解析。
+ */
+export const BUILTIN_PRESETS = [
+  {
+    builtinId: 'codereview-5',
+    teamName: 'ui.preset.codeReview5.name',
+    description: 'ui.preset.codeReview5.desc',
+  },
+  // 历史遗留 builtinId 已连同 i18n key 一并删除（用户反馈不常用）：
+  //   - 'scout-regiment'  / ui.preset.scoutRegiment.*
+  //   - 'codereview-2'    / ui.preset.codeReview2.*
+  // 若老用户的 preset 列表里已保存这些条目，i18n key 缺失时 t() 会回显原始 key，
+  // 视觉上难看但不崩；用户可在管理弹窗里手动删除。
+];

package/src/utils/clearCheckpoint.js

@@ -0,0 +1,7 @@
+// Re-export shell — the implementations moved VERBATIM to the shared client-safe
+// module server/lib/session-boundary.js in wire-v2 step S1 so the server-side
+// conversation router (S2+) and the client use ONE source of truth for session
+// boundaries (docs/refactor/WIRE_FORMAT_V2_PLAN.md). Existing client imports of
+// './clearCheckpoint.js' keep working through this shell; new code should import
+// from server/lib/session-boundary.js directly.
+export { isPostClearCheckpoint, isCompactContinuation, isSessionBoundary } from '../../server/lib/session-boundary.js';

package/src/utils/commandValidator.js

@@ -0,0 +1,45 @@
+/**
+ * File and command validation utilities.
+ */
+
+const IMAGE_EXTS = new Set(['png', 'jpg', 'jpeg', 'gif', 'svg', 'bmp', 'ico', 'icns', 'webp', 'avif']);
+
+export function isImageFile(path) {
+  const ext = (path || '').split('.').pop().toLowerCase();
+  return IMAGE_EXTS.has(ext);
+}
+
+/**
+ * Regex matching Bash commands that may mutate filesystem or git state.
+ * 命中任一即触发文件浏览器与 git 面板自动刷新（ToolFileChangeController 的 Bash 路径依赖）。
+ *
+ * 覆盖类别：
+ * - delete：rm（含 rm -rf）、rmdir（删空目录）、unlink（POSIX 单文件删除）、find ... -delete
+ * - create/move：mkdir、mv、cp、touch、ln
+ * - metadata：chmod、chown
+ * - package/archive：npm/yarn/pnpm install/uninstall、pip install、tar、unzip、curl -o、wget
+ * - redirect write：> 与 >>（排除 2>、>= 等由 [^>]>(?!>)/>> 处理）
+ * - git mutating：checkout/reset/stash/merge/rebase/cherry-pick/restore/clean/rm
+ *
+ * 设计取舍（trade-off）：
+ *   \b 单词边界不能区分"作为命令"还是"作为参数/字面量"，因此 `echo unlink` 之类
+ *   会被命中。文件浏览器额外刷新成本极低（一次 GET），宁可多刷不漏刷。
+ *
+ * find -delete 子表达式 `\bfind\b[^|;&\n]*-delete\b` 限定单条命令内，
+ * 避免 `grep find . | echo "-delete"` 之类的跨管道/分号误匹配。
+ *
+ * @example
+ *   isMutatingCommand('rm -rf node_modules')           // true
+ *   isMutatingCommand('find . -name "*.log" -delete')  // true
+ *   isMutatingCommand('git status')                    // false
+ *   isMutatingCommand('echo hello')                    // false
+ */
+const MUTATING_CMD_RE = /\b(rm|rmdir|unlink|mkdir|mv|cp|touch|chmod|chown|ln|git\s+(checkout|reset|stash|merge|rebase|cherry-pick|restore|clean|rm)|npm\s+(install|uninstall|ci)|yarn\s+(add|remove)|pnpm\s+(add|remove|install)|pip\s+install|tar|unzip|curl\s+-[^\s]*o|wget)\b|\bfind\b[^|;&\n]*-delete\b|[^>]>(?!>)|>>/;
+
+/**
+ * @param {string} cmd  Bash 命令字符串
+ * @returns {boolean}   true 表示命令可能修改文件树或 git 状态
+ */
+export function isMutatingCommand(cmd) {
+  return MUTATING_CMD_RE.test(cmd);
+}