cc-viewer 1.7.0 → 1.7.2

package/src/utils/contextTurns.js

@@ -0,0 +1,117 @@
+// Context tab message parsing + turn grouping (extracted from ContextTab.jsx so the
+// pairing logic is unit-testable — JSX modules cannot be imported by the test harness).
+
+export function parseContentBlocks(content) {
+  if (content == null) return [];
+
+  if (typeof content === 'string') {
+    const trimmed = content.trim();
+    return trimmed ? [{ type: 'markdown', text: trimmed }] : [];
+  }
+
+  if (Array.isArray(content)) {
+    const blocks = [];
+    for (const block of content) {
+      if (!block) continue;
+      if (block.type === 'text') {
+        const trimmed = (block.text || '').trim();
+        if (trimmed) blocks.push({ type: 'markdown', text: trimmed });
+      } else if (block.type === 'tool_use') {
+        blocks.push({
+          type: 'tool_use',
+          name: block.name || 'unknown',
+          id: block.id || '',
+          input: block.input ?? {},
+        });
+      } else if (block.type === 'tool_result') {
+        const inner = parseResultContent(block.content);
+        blocks.push({
+          type: 'tool_result',
+          tool_use_id: block.tool_use_id || '',
+          is_error: block.is_error,
+          content: inner,
+        });
+      } else if (block.type === 'thinking') {
+        const text = block.thinking || '';
+        if (text.trim()) blocks.push({ type: 'thinking', text });
+      } else if (block.type === 'image') {
+        blocks.push({ type: 'json', label: 'image', data: block });
+      } else {
+        blocks.push({ type: 'json', label: block.type || 'block', data: block });
+      }
+    }
+    return blocks;
+  }
+
+  return [{ type: 'json', label: 'content', data: content }];
+}
+
+export function parseResultContent(content) {
+  if (content == null) return [];
+  if (typeof content === 'string') {
+    const trimmed = content.trim();
+    return trimmed ? [{ type: 'markdown', text: trimmed }] : [];
+  }
+  if (Array.isArray(content)) {
+    return content.flatMap((c) => {
+      if (!c) return [];
+      if (c.type === 'text') {
+        const trimmed = (c.text || '').trim();
+        return trimmed ? [{ type: 'markdown', text: trimmed }] : [];
+      }
+      return [{ type: 'json', label: c.type || 'block', data: c }];
+    });
+  }
+  return [{ type: 'json', label: 'content', data: content }];
+}
+
+export function extractPreviewText(content) {
+  if (typeof content === 'string') return content.slice(0, 60).replace(/\n/g, ' ');
+  if (Array.isArray(content)) {
+    for (const block of content) {
+      if (block?.type === 'text' && block.text?.trim()) {
+        return block.text.trim().slice(0, 60).replace(/\n/g, ' ');
+      }
+    }
+  }
+  return '';
+}
+
+// 注意：非 user 开头的消息（首条 assistant、连续 assistant 等）不进任何 turn，
+// 「原文」视图与解析视图同口径，同样不展示这些消息。
+// Mid-conversation `role:"system"` messages (mid-conversation-system beta) may sit
+// between the user message and its assistant reply; they are folded into the turn
+// (systemBlocks/rawSystem) so the assistant pairing is not broken. Only messages
+// with role === 'system' are skipped when locating the paired assistant — any
+// other unknown role still ends the turn, matching the old strict-adjacency rule.
+export function groupMessagesIntoTurns(messages) {
+  const turns = [];
+  let i = 0;
+  while (i < messages.length) {
+    const userMsg = messages[i];
+    if (userMsg?.role !== 'user') { i++; continue; }
+    let j = i + 1;
+    const systemMsgs = [];
+    while (messages[j]?.role === 'system') { systemMsgs.push(messages[j]); j++; }
+    const assistantMsg = messages[j]?.role === 'assistant' ? messages[j] : null;
+    turns.push({
+      id: `turn__${i}`,
+      isTurn: true,
+      turnIndex: turns.length,
+      timestamp: userMsg._timestamp || null,
+      assistantTimestamp: assistantMsg?._timestamp || null,
+      userBlocks: parseContentBlocks(userMsg?.content),
+      systemBlocks: systemMsgs.length
+        ? systemMsgs.map((m) => ({ blocks: parseContentBlocks(m.content), timestamp: m._timestamp || null }))
+        : null,
+      assistantBlocks: assistantMsg ? parseContentBlocks(assistantMsg.content) : null,
+      // 原始消息引用：供「原文」视图无损输出（解析 blocks 是单向的，不可逆）
+      rawUser: userMsg,
+      rawSystem: systemMsgs.length ? systemMsgs : null,
+      rawAssistant: assistantMsg,
+      preview: extractPreviewText(userMsg?.content),
+    });
+    i = assistantMsg ? j + 1 : i + 1;
+  }
+  return turns;
+}

package/src/utils/displayScaleHelper.js

@@ -0,0 +1,47 @@
+/**
+ * Display-scale (整体显示大小 / Chrome 式缩放) 的纯计算工具。
+ * 无 DOM / React 依赖,便于单测。比例以「整数百分比」表示(100 = 原始大小)。
+ */
+
+// 预设档位,贴近 Chrome 的缩放档位。
+export const DISPLAY_SCALE_PRESETS = [50, 67, 75, 80, 90, 100, 110, 125, 150, 175, 200];
+
+const MIN_SCALE = DISPLAY_SCALE_PRESETS[0];
+const MAX_SCALE = DISPLAY_SCALE_PRESETS[DISPLAY_SCALE_PRESETS.length - 1];
+
+/**
+ * 把任意输入(可能来自手改 preferences.json / 旧数据)夹到 [50,200] 并吸附到最近的预设档位。
+ * 平局时取较大档位。非法输入回退到 100。
+ * @param {number|string} pct
+ * @returns {number} 一个合法的预设值
+ */
+export function snapToPreset(pct) {
+  const n = Number(pct);
+  if (!Number.isFinite(n)) return 100;
+  const clamped = Math.max(MIN_SCALE, Math.min(MAX_SCALE, n));
+  let best = DISPLAY_SCALE_PRESETS[0];
+  let bestDist = Infinity;
+  for (const p of DISPLAY_SCALE_PRESETS) {
+    const d = Math.abs(p - clamped);
+    // `<=` 让平局时取后出现(更大)的档位
+    if (d <= bestDist) {
+      bestDist = d;
+      best = p;
+    }
+  }
+  return best;
+}
+
+/**
+ * 在预设档位上前进/后退一格(用于 Cmd/Ctrl +/- 快捷键)。
+ * 先把当前值吸附到档位,再按方向移动一格,两端夹紧。
+ * @param {number|string} current 当前比例
+ * @param {number} dir +1 放大 / -1 缩小
+ * @returns {number} 新的预设值
+ */
+export function stepPreset(current, dir) {
+  const snapped = snapToPreset(current);
+  const idx = DISPLAY_SCALE_PRESETS.indexOf(snapped);
+  const nextIdx = Math.max(0, Math.min(DISPLAY_SCALE_PRESETS.length - 1, idx + Math.sign(dir)));
+  return DISPLAY_SCALE_PRESETS[nextIdx];
+}

package/src/utils/effectiveModel.js

@@ -0,0 +1,13 @@
+// Extracted from helpers.js so pure session modules (sessionMerge/sessionManager) and node:test
+// can import it without pulling helpers' Vite-only svg imports; helpers.js re-exports it to keep
+// existing import paths unchanged (same pattern as autoApproveOptions.js).
+
+/**
+ * Resolve the effective model name for a log request entry, preferring the
+ * server-reported model in `response.body.model` (authoritative under proxy
+ * hot-switch) over the client-supplied `body.model`. Returns null when both
+ * are missing — callers should fall back to a sensible default.
+ */
+export function getEffectiveModel(request) {
+  return request?.response?.body?.model || request?.body?.model || null;
+}