cc-viewer 1.7.22 → 1.8.0

package/{server/lib → node_modules/@ccv/core/src}/context-rules.js

@@ -1,8 +1,8 @@
-// CLIENT-SAFE: no node deps. Imported by src/ — do not add fs/process/node: imports.
+// CLIENT-SAFE: no node deps. Home: @ccv/core (context-rules.js) — consumed by apps/web + packages/app. Do not add fs/process/node: imports.
 //
 // 上下文窗口规则唯一事实源(前后端同源):
 //   - 服务端:server/lib/context-watcher.js、server/routes/events.js 直接 import
-//   - 前端:src/utils/helpers.js thin re-export(经 Vite 跨目录打包,先例见 tools-xml-formatter.js)
+//   - 前端:apps/web/src/utils/helpers.js thin re-export(经 @ccv/core 跨包打包,先例见 tools-xml-formatter.js)
 // 此前规则散落三处(前端 MODEL_CONTEXT_SIZES / _classifyContextSize、服务端 getContextSizeForModel)
 // 且已漂移(服务端不认识 deepseek-v4),收编于此后任何档位变更只改这一个文件。
 //

package/{server/lib → node_modules/@ccv/core/src}/delta-reconstructor.js

@@ -1,4 +1,4 @@
-// CLIENT-SAFE: no node deps. Imported by src/ — do not add fs/process/node: imports.
+// CLIENT-SAFE: no node deps. Home: @ccv/core (delta-reconstructor.js) — consumed by apps/web + packages/app. Do not add fs/process/node: imports.
 /**
  * Delta Reconstructor — 增量日志重建模块
  *
@@ -204,6 +204,46 @@ function _stepReconstruct(entry, ctx) {
   return false;
 }
 
+/**
+ * 孤儿占位符 checkpoint 的基线吸收 — 三个重建 API 共用。
+ *
+ * 被中断的请求（Esc/Stop/排队消息"立即追加"）永远等不到 `done`，其占位符上的
+ * inProgress 标记永不消散。占位符 delta 必须继续排除在累积基线之外（completed 孪生
+ * 随时可能落地并重复投递同一切片）；但占位符 **checkpoint** 携带的是权威全量状态：
+ * 不吸收它，基线就停留在旧长度，随后第一条 completed delta 的长度校验
+ * （vs `_totalMessageCount`）必然失配 → 毒化冻结 → 之后整段会话在离线视图里消失
+ * （实测：排队补发的 user prompt 连同后续回答全部不显示）。
+ *
+ * 刻意绕过 seq 守卫、且不推进 lastSeq：占位符与其 completed 孪生共享同一 _seq，
+ * 不推进才能保证孪生随后仍被正常应用（checkpoint 重复重置是幂等的）。
+ * 乱序占位符（同 epoch 且 seq <= lastSeq，镜像 _seqGuardCheck 的判定）不吸收——
+ * 旧全量状态不得回卷基线；不同 epoch（进程重启 seq 归零）的占位符无从判 stale，
+ * 与守卫一样按"新写进程"放行（同 §3.7 的盲信 epoch 语义）。
+ *
+ * 依赖的不变量（WIRE_FORMAT §3.7 形态冻结）：占位符 checkpoint 的 completed 孪生
+ * 必然也是 checkpoint（同一条目对象的就地转化）——若孪生以 delta 形态携带已吸收
+ * 的切片落地，会造成重复拼接直至下一 checkpoint 自愈（有界，非污染）。
+ *
+ * @param {object} entry - inProgress 条目（调用方已判定）
+ * @param {{accumulated: Array, intState: {baselineSeen: boolean, poisoned: boolean},
+ *          seqState: {lastSeq: number, lastEpoch: string|null}}} ctx
+ */
+function _absorbOrphanCheckpoint(entry, ctx) {
+  if (!isDeltaEntry(entry)) return; // v1 旧格式全量占位符：completed 到达时按全量重置即可，维持旧行为
+  if (!isCheckpointEntry(entry)) return;
+  const msgs = entry.body?.messages;
+  if (!Array.isArray(msgs)) return;
+  const seq = entry._seq;
+  if (typeof seq === 'number') {
+    const epoch = entry._seqEpoch || null;
+    const st = ctx.seqState;
+    if (st.lastEpoch !== null && epoch === st.lastEpoch && seq <= st.lastSeq) return;
+  }
+  ctx.accumulated = [...msgs];
+  ctx.intState.baselineSeen = true;
+  ctx.intState.poisoned = false;
+}
+
 /**
  * 批量重建 — 用于 readLogFile() 和 readLocalLog()。
  * 输入已去重的条目数组，输出重建后的条目数组（原地修改 body.messages）。
@@ -224,8 +264,14 @@ export function reconstructEntries(entries) {
   for (let i = 0; i < entries.length; i++) {
     const entry = entries[i];
     // 跳过 inProgress 条目：孤立的 inProgress（请求超时未完成）在 dedup 后残留，
-    // 其 delta 与后续 completed 条目重复，双重累积会导致 accumulated 偏移
-    if (entry.inProgress) continue;
+    // 其 delta 与后续 completed 条目重复，双重累积会导致 accumulated 偏移。
+    // 例外：占位符 checkpoint 携带权威全量状态 → 吸收进基线（见 _absorbOrphanCheckpoint），
+    // 否则被中断请求留下的纯占位符记录会让基线落后、随后 completed delta 的完整性校验
+    // 失配 → 毒化冻结 → 之后整段会话（含排队补发的 user prompt）在离线视图消失。
+    if (entry.inProgress) {
+      _absorbOrphanCheckpoint(entry, ctx);
+      continue;
+    }
     if (_stepReconstruct(entry, ctx)) broken.push(i);
   }
 
@@ -308,7 +354,12 @@ export function reconstructSegment(segment, nextCheckpoint, sharedSeqState) {
 
   for (let i = 0; i < segment.length; i++) {
     const entry = segment[i];
-    if (entry.inProgress) continue;
+    // inProgress 跳过规则与 reconstructEntries 同源：delta 跳过；占位符 checkpoint
+    // 吸收进基线（防中断孤儿冻结后续条目，见 _absorbOrphanCheckpoint）。
+    if (entry.inProgress) {
+      _absorbOrphanCheckpoint(entry, ctx);
+      continue;
+    }
     if (_stepReconstruct(entry, ctx)) broken.push(i);
   }
 
@@ -353,12 +404,17 @@ export function createIncrementalReconstructor() {
       // 防 completed 被"同 seq 重发"规则误吞）。
       // 这样客户端收到完整 messages（避免 delta 闪烁），
       // 而后续 completed 条目仍能基于正确的 accumulated 重建。
+      // 例外：占位符 checkpoint 携带权威全量状态 → 吸收进基线（否则被中断请求的
+      // 占位符记录会让基线落后，后续 completed delta 完整性失配 → 毒化冻结，
+      // 见 _absorbOrphanCheckpoint）；条目本身仍原样返回（展示语义不变）。
       if (entry.inProgress) {
         if (isDeltaEntry(entry) && !isCheckpointEntry(entry)) {
           const msgs = entry.body?.messages;
           if (Array.isArray(msgs)) {
             entry.body.messages = [...ctx.accumulated, ...msgs];
           }
+        } else {
+          _absorbOrphanCheckpoint(entry, ctx);
         }
         return entry;
       }

package/{server/lib → node_modules/@ccv/core/src}/error-report.js

@@ -1,10 +1,11 @@
-// CLIENT-SAFE: no node deps. Imported by src/ — do not add fs/process/node: imports.
+// CLIENT-SAFE: no node deps. Home: @ccv/core (error-report.js) — consumed by apps/web + packages/app. Do not add fs/process/node: imports.
 /**
  * Error-reporting convention for swallowed catch blocks.
  *
- * Canonical home since wire-v2 S2 (moved verbatim from src/utils/errorReport.js,
- * which remains as a re-export shell): server/lib/v2/* writers follow the same
- * convention, and src/ is not shipped in the npm package.
+ * Canonical home since wire-v2 S2 (moved verbatim from the client-side
+ * errorReport.js; apps/web/src/utils/errorReport.js remains as a re-export
+ * shell): server/lib/v2/* writers follow the same convention. Lives in
+ * @ccv/core since the core extraction so both sides import one copy.
  *
  * The rule (see CLAUDE.md): a `catch` whose failure has diagnostic value —
  * anything where a throw means lost data or broken UI (SSE/WS event parsing,

package/{server/lib → node_modules/@ccv/core/src}/session-boundary.js

@@ -1,10 +1,10 @@
-// CLIENT-SAFE: no node deps. Imported by src/ — do not add fs/process/node: imports.
+// CLIENT-SAFE: no node deps. Home: @ccv/core (session-boundary.js) — consumed by apps/web + packages/app. Do not add fs/process/node: imports.
 // (Same contract as delta-reconstructor.js.)
 //
 // Shared session-boundary + reverse-anchor module — single source of truth for
 // "where does a logical conversation start/align" used by BOTH sides:
-//  - client: src/utils/clearCheckpoint.js (re-export shell), sessionMerge.js,
-//    sessionManager.js, entry-slim.js, contentFilter.js
+//  - client: ./clearCheckpoint.js (sibling re-export shell), apps/web's
+//    sessionMerge.js, sessionManager.js, entry-slim.js, ./contentFilter.js
 //  - server (wire-v2, S2+): conversation-store epoch routing and the read-side
 //    materializer (docs/refactor/WIRE_FORMAT_V2.md §6/§9)
 //

package/{src/utils → node_modules/@ccv/core/src}/teammateDetector.js

@@ -53,6 +53,15 @@ export function isNativeTeammate(req) {
     return false;
   }
 
+  // SDK 主会话否决:ccv -SDK 主会话 system 同时含 "You are a Claude agent"(命中上面正则)
+  // 且 billing 标记 cc_entrypoint=sdk-ts,还被授予 SendMessage → 三条全中会被误判成 teammate
+  // (前端把每条 main 气泡双渲染成 main + teammate)。真 native teammate 经 Agent 工具启动、
+  // system 是 teammate 人格 + cc_entrypoint=cli(无 sdk-ts 主会话标记),不受此否决影响。
+  if (sysText.includes('cc_entrypoint=sdk-ts')) {
+    _cache.set(req, false);
+    return false;
+  }
+
   // SendMessage tool 是 teammate 间通信必需工具，普通 subagent 不会被授予。
   // 命中正则但没 SendMessage → 是通过 Agent tool 启动的 subagent，不是 teammate。
   const tools = req.body?.tools;

package/{server/lib → node_modules/@ccv/core/src}/tools-xml-formatter.js

@@ -1,4 +1,4 @@
-// CLIENT-SAFE: no node deps. Imported by src/ — do not add fs/process/node: imports.
+// CLIENT-SAFE: no node deps. Home: @ccv/core (tools-xml-formatter.js) — consumed by apps/web + packages/app. Do not add fs/process/node: imports.
 /**
  * Serialize an Anthropic tool definition (name / description / input_schema)
  * into the XML-shaped text format the model sees on the server side.
@@ -7,8 +7,8 @@
  * publish their exact internal serialization, so this is a faithful
  * approximation useful for inspection, not a canonical wire format.
  *
- * Single source of truth: src/utils/toolsXmlFormatter.js re-exports from here,
- * server/lib/kv-cache-analyzer.js imports from here.
+ * Single source of truth: apps/web/src/utils/toolsXmlFormatter.js re-exports
+ * from here (via @ccv/core), server/lib/kv-cache-analyzer.js imports from here.
  *
  * Note: free-text fields (name / description / enum) are NOT XML-escaped.
  * parseCachedTools relies on first-match semantics — the tool-level <name>

package/{server/lib → node_modules/@ccv/core/src}/v2-transcript-normalizer.js

@@ -1,4 +1,4 @@
-// CLIENT-SAFE: no node deps. Imported by src/ — do not add fs/process/node: imports.
+// CLIENT-SAFE: no node deps. Home: @ccv/core (v2-transcript-normalizer.js) — consumed by apps/web + packages/app. Do not add fs/process/node: imports.
 /**
  * V2 Transcript Normalizer — Claude Code 2.x JSONL → legacy-compatible entry
  *

package/{server/lib → node_modules/@ccv/core/src}/voice-pack-events.js

@@ -1,4 +1,4 @@
-// CLIENT-SAFE: no node deps. Imported by src/ — do not add fs/process/node: imports.
+// CLIENT-SAFE: no node deps. Home: @ccv/core (voice-pack-events.js) — consumed by apps/web + packages/app. Do not add fs/process/node: imports.
 // Single source of truth for voice-pack event keys + their default bindings.
 //
 // Why a shared module: this list was previously duplicated across
@@ -13,7 +13,7 @@
 
 // 注：timeoutWarning5min / timeoutWarning60s 已删除。AskUserQuestion 实质 24h 无超时后
 // 倒计时不再渲染（AskTimeoutCountdown.jsx isInfiniteTimeout → null），剩余时间预警事件失去意义。
-// 老用户 preferences.json 含这两个 key 由 server/lib/approval-modal-prefs.js _filterEvents 白名单
+// 老用户 preferences.json 含这两个 key 由 ./approval-modal-prefs.js（@ccv/core）_filterEvents 白名单
 // 自动 strip，零迁移工作量。孤儿 audio 文件留待 cleanup CLI（backlog）。
 export const EVENT_KEYS = [
   'planApproval',

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "cc-viewer",
-  "version": "1.7.22",
+  "version": "1.8.0",
   "description": "Claude Code logging, visualization, and management toolkit — launch a web viewer alongside Claude Code with full request/response tracing, proxy, and mobile support",
   "license": "MIT",
   "main": "server.js",
   "type": "module",
-  "packageManager": "npm@11.9.0",
   "exports": {
     ".": "./server.js",
     "./interceptor.js": "./server/interceptor.js"
@@ -15,25 +14,10 @@
     "ccv": "cli.js"
   },
   "scripts": {
-    "dev": "vite",
-    "build": "node build.js",
-    "build:sourcemap": "CCV_SOURCEMAP=1 node build.js",
+    "assemble": "node scripts/assemble-dist.mjs",
+    "prepack": "node scripts/assemble-dist.mjs",
     "start": "node server.js",
-    "lint:control-bytes": "node scripts/check-no-control-bytes.js",
-    "verify:wire-v2": "node cli.js verify",
-    "pretest": "npm run lint:control-bytes",
-    "pretest:cli": "npm run lint:control-bytes",
-    "pretest:coverage": "npm run lint:control-bytes",
-    "pretest:coverage:html": "npm run lint:control-bytes",
-    "test": "CCV_INSTANCE_ID= CCV_LOG_DIR=tmp CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 node --test --test-force-exit --test-timeout=120000",
-    "test:cli": "CCV_TEST_CLI=1 CCV_INSTANCE_ID= CCV_LOG_DIR=tmp CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 node --test --test-force-exit --test-timeout=120000",
-    "test:coverage": "CCV_TEST_CLI=1 CCV_INSTANCE_ID= CCV_LOG_DIR=tmp CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 node --test --test-force-exit --test-timeout=120000 --experimental-test-coverage --test-coverage-include='server/**/*.js' --test-coverage-include='src/utils/**/*.js' --test-coverage-include='*.js'",
-    "test:coverage:html": "CCV_TEST_CLI=1 CCV_INSTANCE_ID= CCV_LOG_DIR=tmp CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 c8 --reporter=text-summary --reporter=html node --test --test-force-exit --test-timeout=120000",
-    "prepublishOnly": "npm run build",
-    "electron:dev": "electron electron/main.js",
-    "electron:build": "npm run build && electron-builder",
-    "electron:sign": "npm run electron:build && ./scripts/mac-sign.sh",
-    "electron:check-sign": "./scripts/check-sign-config.sh"
+    "verify:wire-v2": "node cli.js verify"
   },
   "keywords": [
     "claude code",
@@ -56,7 +40,7 @@
   },
   "homepage": "https://github.com/weiesky/cc-viewer#readme",
   "engines": {
-    "node": ">=20.14.0"
+    "node": ">=20.18.1"
   },
   "files": [
     "dist/",
@@ -66,64 +50,17 @@
     "findcc.js",
     "interceptor.js",
     "server/",
-    "src/utils/",
     "plugins/",
     "concepts/",
     "ultraAgents/"
   ],
-  "devDependencies": {
-    "@ant-design/icons": "^5.6.1",
-    "@codemirror/lang-cpp": "^6.0.3",
-    "@codemirror/lang-css": "^6.3.1",
-    "@codemirror/lang-go": "^6.0.1",
-    "@codemirror/lang-java": "^6.0.2",
-    "@codemirror/lang-javascript": "^6.2.5",
-    "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/lang-markdown": "^6.5.0",
-    "@codemirror/lang-php": "^6.0.2",
-    "@codemirror/lang-python": "^6.2.1",
-    "@codemirror/lang-rust": "^6.0.2",
-    "@codemirror/lang-sql": "^6.10.0",
-    "@codemirror/lang-xml": "^6.1.0",
-    "@codemirror/lang-yaml": "^6.1.2",
-    "@codemirror/language": "^6.12.3",
-    "@codemirror/view": "^6.41.0",
-    "@electron/notarize": "^3.1.1",
-    "@lezer/highlight": "^1.2.3",
-    "@mdxeditor/editor": "^3.55.0",
-    "@replit/codemirror-minimap": "^0.5.2",
-    "@uiw/react-codemirror": "^4.25.8",
-    "@vitejs/plugin-react": "^4.5.2",
-    "@xterm/addon-fit": "^0.11.0",
-    "@xterm/addon-unicode11": "^0.9.0",
-    "@xterm/addon-web-links": "^0.12.0",
-    "@xterm/addon-webgl": "^0.19.0",
-    "@xterm/xterm": "^6.0.0",
-    "antd": "^5.29.2",
-    "c8": "^11.0.0",
-    "diff": "^8.0.3",
-    "electron": "^42.0.1",
-    "electron-builder": "^26.8.1",
-    "highlight.js": "^11.11.1",
-    "html2canvas": "^1.4.1",
-    "jszip": "^3.10.1",
-    "marked": "^17.0.2",
-    "mermaid": "^11.13.0",
-    "qrcode.react": "^4.2.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-json-view-lite": "^2.1.0",
-    "react-virtuoso": "^4.18.3",
-    "terser": "^5.48.0",
-    "vite": "^6.3.5"
-  },
   "dependencies": {
+    "@ccv/core": "0.0.0",
     "@larksuiteoapi/node-sdk": "1.66.0",
     "@wecom/aibot-node-sdk": "1.0.7",
-    "adm-zip": "^0.5.17",
+    "adm-zip": "^0.6.0",
     "dingtalk-stream": "2.1.5",
     "discord.js": "14.26.4",
-    "dompurify": "^3.3.3",
     "node-pty": "^1.1.0",
     "undici": "^7.22.0",
     "ws": "^8.21.0"
@@ -131,30 +68,8 @@
   "optionalDependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.91"
   },
-  "overrides": {
-    "axios": "^1.16.1",
-    "qs": "^6.15.2",
-    "node-gyp": "^12.1.0"
-  },
-  "c8": {
-    "include": [
-      "server/**/*.js",
-      "src/utils/**/*.js",
-      "*.js"
-    ],
-    "exclude": [
-      "test/**",
-      "dist/**",
-      "node_modules/**",
-      "build.js",
-      "vite.config.js",
-      "electron/**",
-      "scripts/**",
-      "coverage/**"
-    ],
-    "all": true,
-    "report-dir": "coverage",
-    "skip-full": false,
-    "check-coverage": false
-  }
+  "//bundledDependencies": "@ccv/core is the private workspace package (packages/core). npm pack follows the pnpm workspace symlink and ships it as real files inside the tarball — no registry publish, no import rewriting.",
+  "bundledDependencies": [
+    "@ccv/core"
+  ]
 }

package/server/_paths.js

@@ -14,6 +14,7 @@
 // fallback, but this constant itself is not aware of those edge cases.
 import { fileURLToPath } from 'node:url';
 import { dirname, join, resolve } from 'node:path';
+import { existsSync } from 'node:fs';
 
 const HERE = dirname(fileURLToPath(import.meta.url));
 
@@ -27,17 +28,37 @@ export const NODE_MODULES  = resolve(HERE, '..', '..');
 export const SERVER_LIB    = join(HERE, 'lib');
 /** Vite build output (dist/index.html + assets/*) */
 export const DIST_DIR      = join(PACKAGE_ROOT, 'dist');
-/** Dev resources (public/voice-packs/* etc., copied to dist/ by vite) */
-export const PUBLIC_DIR    = join(PACKAGE_ROOT, 'public');
-/** Multi-language concept docs (GlobalSettings.md / Tool-*.md etc.) */
-export const CONCEPTS_DIR  = join(PACKAGE_ROOT, 'concepts');
+/** Dev resources (public/voice-packs/* etc., copied to dist/ by vite).
+ *  Monorepo: public/ lives in apps/web (vite build input); the published tarball
+ *  ships no public/ at all (its contents reach dist/ via the web build). */
+export const PUBLIC_DIR    = existsSync(join(PACKAGE_ROOT, 'public'))
+  ? join(PACKAGE_ROOT, 'public')
+  : resolve(PACKAGE_ROOT, '..', '..', 'apps', 'web', 'public');
 /** Bundled plugin directory (scanned by plugin-loader at startup) */
 export const PLUGINS_DIR   = join(PACKAGE_ROOT, 'plugins');
+
+// Bundled content assets live in the @ccv/content workspace package (packages/content)
+// and are copied back into packages/app at pack time (scripts/assemble-dist.mjs).
+// Probe the content package FIRST so dev edits are live even when a stale assembled
+// copy exists in packages/app; the installed tarball has no ../content sibling and
+// falls back to the assembled in-package copy. Each probe checks a structural sentinel
+// to avoid false hits on an unrelated sibling directory.
+const CONTENT_PKG = resolve(PACKAGE_ROOT, '..', 'content');
+/** Multi-language concept docs (GlobalSettings.md / Tool-*.md etc.) */
+export const CONCEPTS_DIR  = existsSync(join(CONTENT_PKG, 'concepts', 'en'))
+  ? join(CONTENT_PKG, 'concepts')
+  : join(PACKAGE_ROOT, 'concepts');
 /** Bundled ultraplan preset expert directory (ultraAgents/*.json, served by /api/ultra-agents) */
-export const ULTRA_AGENTS_DIR = join(PACKAGE_ROOT, 'ultraAgents');
+export const ULTRA_AGENTS_DIR = existsSync(join(CONTENT_PKG, 'ultraAgents', 'code-expert.json'))
+  ? join(CONTENT_PKG, 'ultraAgents')
+  : join(PACKAGE_ROOT, 'ultraAgents');
 /** Bundled IM default skill source (server/imSkills/<lang>/<skill>/SKILL.md + scripts/*.mjs) */
-export const IM_SKILLS_DIR = join(SERVER_DIR, 'imSkills');
+export const IM_SKILLS_DIR = existsSync(join(CONTENT_PKG, 'server', 'imSkills', 'scripts'))
+  ? join(CONTENT_PKG, 'server', 'imSkills')
+  : join(SERVER_DIR, 'imSkills');
 /** Bundled IM persona preset templates (server/imPreset/<lang>.md, {platform}/{id} substituted at runtime) */
-export const IM_PRESET_DIR = join(SERVER_DIR, 'imPreset');
+export const IM_PRESET_DIR = existsSync(join(CONTENT_PKG, 'server', 'imPreset', 'en.md'))
+  ? join(CONTENT_PKG, 'server', 'imPreset')
+  : join(SERVER_DIR, 'imPreset');
 /** cc-viewer's own package.json (updater/server.js reads version) */
 export const PACKAGE_JSON  = join(PACKAGE_ROOT, 'package.json');

package/server/i18n.js

@@ -162,6 +162,46 @@ const i18nData = {
     "tr": "⚠️  Kullanıcının --settings değeri {value} yüklenemedi ({reason}); yalnızca CC Viewer'ın enjekte ettiği settings ile başlatılıyor",
     "uk": "⚠️  Не вдалося завантажити користувацьке значення --settings {value} ({reason}); запуск лише з налаштуваннями, впровадженими CC Viewer"
   },
+  "cli.systemPromptPinned": {
+    "zh": "已恢复会话：按原样重注入该会话原本的系统提示词（{files}），不重渲染变量，保持上下文缓存",
+    "en": "Resumed session: re-injecting the session's original system prompt ({files}) verbatim — variables are not re-rendered, preserving the context cache",
+    "zh-TW": "已恢復工作階段：按原樣重新注入該工作階段原本的系統提示詞（{files}），不重新渲染變數，保留上下文快取",
+    "ko": "재개된 세션: 세션의 원래 시스템 프롬프트({files})를 그대로 다시 주입합니다. 변수는 다시 렌더링되지 않으며 컨텍스트 캐시를 유지합니다",
+    "ja": "再開したセッション：セッション元のシステムプロンプト（{files}）をそのまま再注入します。変数は再レンダリングせず、コンテキストキャッシュを維持します",
+    "de": "Wiederaufgenommene Sitzung: Der ursprüngliche System-Prompt der Sitzung ({files}) wird unverändert erneut injiziert — Variablen werden nicht neu gerendert, der Kontext-Cache bleibt erhalten",
+    "es": "Sesión reanudada: se vuelve a inyectar el prompt del sistema original de la sesión ({files}) tal cual, sin volver a renderizar las variables, preservando la caché de contexto",
+    "fr": "Session reprise : réinjection à l'identique du prompt système d'origine de la session ({files}) — les variables ne sont pas re-rendues, le cache de contexte est préservé",
+    "it": "Sessione ripresa: reiniezione del prompt di sistema originale della sessione ({files}) così com'è — le variabili non vengono renderizzate nuovamente, preservando la cache di contesto",
+    "da": "Genoptaget session: sessionens oprindelige system prompt ({files}) indsættes igen uændret — variabler gengives ikke på ny, og kontekstcachen bevares",
+    "pl": "Wznowiona sesja: ponowne wstrzyknięcie oryginalnego promptu systemowego sesji ({files}) w niezmienionej formie — zmienne nie są ponownie renderowane, co zachowuje pamięć podręczną kontekstu",
+    "ru": "Возобновлённый сеанс: исходный системный промпт сеанса ({files}) повторно внедряется без изменений — переменные не подставляются заново, кэш контекста сохраняется",
+    "ar": "استُؤنفت الجلسة: إعادة حقن موجّه النظام الأصلي للجلسة ({files}) كما هو حرفيًا — لا تتم إعادة تصيير المتغيرات، مع الحفاظ على ذاكرة التخزين المؤقت للسياق",
+    "no": "Gjenopptatt økt: øktens opprinnelige system prompt ({files}) injiseres på nytt uendret — variabler rendres ikke på nytt, og kontekstbufferen bevares",
+    "pt-BR": "Sessão retomada: reinjetando o prompt de sistema original da sessão ({files}) sem alterações — as variáveis não são renderizadas novamente, preservando o cache de contexto",
+    "th": "เซสชันที่กลับมาทำต่อ: ฉีด system prompt เดิมของเซสชัน ({files}) กลับเข้าไปใหม่ตามต้นฉบับ — ไม่เรนเดอร์ตัวแปรใหม่ เพื่อรักษาแคชบริบท",
+    "tr": "Sürdürülen oturum: oturumun orijinal sistem istemi ({files}) olduğu gibi yeniden enjekte ediliyor — değişkenler yeniden render edilmez, bağlam önbelleği korunur",
+    "uk": "Відновлений сеанс: оригінальний системний промпт сеансу ({files}) повторно впроваджується без змін — змінні не підставляються заново, кеш контексту зберігається"
+  },
+  "cli.systemPromptResumeNoSnapshot": {
+    "zh": "恢复的会话没有已记录的系统提示词：本次不注入任何系统提示词，保持原有上下文不变",
+    "en": "No recorded system prompt for the resumed session: launching without any injected system prompt, leaving the original context untouched",
+    "zh-TW": "恢復的工作階段沒有已記錄的系統提示詞：本次不注入任何系統提示詞，保持原有上下文不變",
+    "ko": "재개된 세션에 기록된 시스템 프롬프트가 없습니다: 시스템 프롬프트를 주입하지 않고 시작하며 기존 컨텍스트를 그대로 유지합니다",
+    "ja": "再開したセッションには記録されたシステムプロンプトがありません：システムプロンプトを注入せずに起動し、元のコンテキストを変更しません",
+    "de": "Kein aufgezeichneter System-Prompt für die wiederaufgenommene Sitzung: Start ohne injizierten System-Prompt, der ursprüngliche Kontext bleibt unverändert",
+    "es": "No hay un prompt de sistema registrado para la sesión reanudada: se inicia sin inyectar ningún prompt de sistema, dejando el contexto original intacto",
+    "fr": "Aucun prompt système enregistré pour la session reprise : lancement sans injection de prompt système, le contexte d'origine reste intact",
+    "it": "Nessun prompt di sistema registrato per la sessione ripresa: avvio senza alcun prompt di sistema iniettato, lasciando intatto il contesto originale",
+    "da": "Ingen registreret system prompt for den genoptagede session: start uden nogen injiceret system prompt, så den oprindelige kontekst forbliver uændret",
+    "pl": "Brak zapisanego promptu systemowego dla wznowionej sesji: uruchamianie bez wstrzykiwania promptu systemowego, z pozostawieniem oryginalnego kontekstu bez zmian",
+    "ru": "Для возобновлённого сеанса нет записанного системного промпта: запуск без внедрения системного промпта, исходный контекст остаётся неизменным",
+    "ar": "لا يوجد موجّه نظام مسجّل للجلسة المستأنفة: التشغيل دون حقن أي موجّه نظام، مع ترك السياق الأصلي دون تغيير",
+    "no": "Ingen registrert system prompt for den gjenopptatte økten: starter uten å injisere noen system prompt, og etterlater den opprinnelige konteksten urørt",
+    "pt-BR": "Nenhum prompt de sistema registrado para a sessão retomada: iniciando sem injetar nenhum prompt de sistema, mantendo o contexto original intacto",
+    "th": "ไม่มี system prompt ที่บันทึกไว้สำหรับเซสชันที่กลับมาทำต่อ: จะเริ่มโดยไม่ฉีด system prompt ใด ๆ โดยคงบริบทเดิมไว้ไม่เปลี่ยนแปลง",
+    "tr": "Sürdürülen oturum için kayıtlı bir sistem istemi yok: hiçbir sistem istemi enjekte edilmeden başlatılıyor, orijinal bağlam olduğu gibi bırakılıyor",
+    "uk": "Для відновленого сеансу немає записаного системного промпту: запуск без впровадження будь-якого системного промпту, початковий контекст залишається незмінним"
+  },
   "cli.inject.notFound": {
     "zh": "❌ 找不到 Claude Code cli.js: {path}",
     "en": "❌ Claude Code cli.js not found: {path}",
@@ -843,6 +883,26 @@ const i18nData = {
     "tr": "Homebrew kurulumu algılandı, v{version} mevcut — çalıştırın: brew upgrade cc-viewer",
     "uk": "Виявлено встановлення Homebrew, доступна v{version} — виконайте: brew upgrade cc-viewer"
   },
+  "update.pnpmManaged": {
+    "zh": "检测到 pnpm 全局安装，新版本 v{version} 可用，请运行: pnpm add -g cc-viewer@{version}",
+    "en": "pnpm global install detected, v{version} available — run: pnpm add -g cc-viewer@{version}",
+    "zh-TW": "偵測到 pnpm 全域安裝，新版本 v{version} 可用，請執行: pnpm add -g cc-viewer@{version}",
+    "ko": "pnpm 전역 설치 감지됨, v{version} 사용 가능 — 실행: pnpm add -g cc-viewer@{version}",
+    "ja": "pnpm グローバルインストールを検出、v{version} が利用可能 — 実行: pnpm add -g cc-viewer@{version}",
+    "de": "pnpm-Globalinstallation erkannt, v{version} verfügbar — ausführen: pnpm add -g cc-viewer@{version}",
+    "es": "Instalación global de pnpm detectada, v{version} disponible — ejecutar: pnpm add -g cc-viewer@{version}",
+    "fr": "Installation globale pnpm détectée, v{version} disponible — exécuter : pnpm add -g cc-viewer@{version}",
+    "it": "Installazione globale pnpm rilevata, v{version} disponibile — eseguire: pnpm add -g cc-viewer@{version}",
+    "da": "pnpm-global installation registreret, v{version} tilgængelig — kør: pnpm add -g cc-viewer@{version}",
+    "pl": "Wykryto globalną instalację pnpm, v{version} dostępna — uruchom: pnpm add -g cc-viewer@{version}",
+    "ru": "Обнаружена глобальная установка pnpm, доступна v{version} — выполните: pnpm add -g cc-viewer@{version}",
+    "ar": "تم اكتشاف تثبيت pnpm العام، الإصدار v{version} متاح — قم بتشغيل: pnpm add -g cc-viewer@{version}",
+    "no": "pnpm-global installasjon oppdaget, v{version} tilgjengelig — kjør: pnpm add -g cc-viewer@{version}",
+    "pt-BR": "Instalação global pnpm detectada, v{version} disponível — execute: pnpm add -g cc-viewer@{version}",
+    "th": "ตรวจพบการติดตั้ง pnpm แบบ global, v{version} พร้อมใช้งาน — เรียกใช้: pnpm add -g cc-viewer@{version}",
+    "tr": "pnpm global kurulumu algılandı, v{version} mevcut — çalıştırın: pnpm add -g cc-viewer@{version}",
+    "uk": "Виявлено глобальне встановлення pnpm, доступна v{version} — виконайте: pnpm add -g cc-viewer@{version}"
+  },
   "update.failed": {
     "zh": "自动更新失败: {error}",
     "en": "Auto-update failed: {error}",

package/server/interceptor.js

@@ -6,7 +6,7 @@
 const _ccvSkipArgs = ['--version', '-v', '--v', '--help', '-h', 'doctor', 'install', 'update', 'upgrade', 'auth', 'setup-token', 'agents', 'plugin', 'plugins', 'mcp'];
 const _ccvSkip = _ccvSkipArgs.includes(process.argv[2]);
 
-import './lib/proxy-env.js';
+import './lib/proxy/proxy-env.js';
 import { mkdirSync, readFileSync, writeFileSync, existsSync, watchFile, unwatchFile, renameSync, rmSync } from 'node:fs';
 import http from 'node:http';
 import https from 'node:https';
@@ -16,10 +16,12 @@ import { dirname, join, basename } from 'node:path';
 import { LOG_DIR } from '../findcc.js';
 import { assembleStreamMessage, createStreamAssembler, isAnthropicApiPath, isMainAgentRequest, replaceTopLevelModel, injectOutputConfigEffort, resolveProfileModel, extractAgentSpawnPairs, classifyProxyRole, resolveRoleProfile, normalizeRoles, mergeActivePayload } from './lib/interceptor-core.js';
 import { V2Writer } from './lib/v2/v2-writer.js';
-import { reportSwallowed } from './lib/error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { latestMainSessionDir, sessionHasCompletedMainTurn } from './lib/v2/session-select.js';
 import { sanitizePathComponent } from './lib/v2/layout.js';
-import { setRetryConfigPath, loadRetryConfig, DEFAULT_RETRY_CONFIG } from './lib/proxy-retry.js';
+import { setRetryConfigPath, loadRetryConfig, DEFAULT_RETRY_CONFIG } from './lib/proxy/proxy-retry.js';
+import { setProjectName } from './lib/project-state.js';
+import { consumePendingForResume, writeSnapshot, projectKeyForCwd } from './lib/system-prompt-snapshots.js';
 
 
 
@@ -351,7 +353,7 @@ export { _activeProfile, _defaultConfig, _loadProxyProfile, PROFILE_PATH, setAct
 function resolveProjectBinding() {
   let cwd;
   try { cwd = process.cwd(); } catch { cwd = homedir(); }
-  const projectName = basename(cwd).replace(/[^a-zA-Z0-9_\-\.]/g, '_');
+  const projectName = projectKeyForCwd(cwd);
   const dir = join(LOG_DIR, projectName);
   try { mkdirSync(dir, { recursive: true }); } catch { }
   return { dir, projectName };
@@ -392,6 +394,7 @@ if (process.env.CCV_WORKSPACE_MODE === '1') {
 } else {
   ({ dir: _logDir, projectName: _projectName } = resolveProjectBinding());
 }
+setProjectName(_projectName); // mirror into the shared leaf (lib readers must not import this module)
 // Deprecated (1.7.0): the v1 log file no longer exists. The always-empty
 // export keeps legacy read fallbacks ("no file → empty stream") type-stable
 // until the last consumers are deleted with the continuity machinery (P3).
@@ -477,7 +480,12 @@ export function getLiveLogSource() {
 export function markSessionStart(payload) {
   try {
     const { source, sessionId, transcriptPath, cwd } = payload || {};
-    if (source !== 'resume') return;
+    // 'resume' re-binds the writer AND feeds snapshot Bind B; 'fork' feeds only
+    // Bind B (a fork mints a fresh wire sid + the fork mark suppresses adoption,
+    // so the writer routes it correctly without a switch). Everything else is
+    // ignored (startup needs nothing; /clear has epoch machinery; teammate
+    // processes inherit CCVIEWER_PORT and fire startup events — dropped here).
+    if (source !== 'resume' && source !== 'fork') return;
     if (!transcriptPath || typeof transcriptPath !== 'string') {
       console.warn('[ccv session-start] resume signal without transcript_path — ignored');
       return;
@@ -487,17 +495,32 @@ export function markSessionStart(payload) {
     // enforced when both sides are known (workspace mode may leave
     // _projectName empty until bound).
     if (cwd && typeof cwd === 'string' && _projectName) {
-      const cwdProject = basename(cwd).replace(/[^a-zA-Z0-9_\-\.]/g, '_');
+      const cwdProject = projectKeyForCwd(cwd);
       if (cwdProject !== _projectName) {
         console.warn(`[ccv session-start] resume signal from project "${cwdProject}" ignored (bound to "${_projectName}")`);
         return;
       }
     }
     const transcriptUuid = basename(transcriptPath, '.jsonl');
-    _v2Writer.beginResumeSwitch({
-      transcriptUuid,
-      hookSid: (typeof sessionId === 'string' && sessionId) ? sessionId : null,
-    });
+    if (source === 'resume') {
+      _v2Writer.beginResumeSwitch({
+        transcriptUuid,
+        hookSid: (typeof sessionId === 'string' && sessionId) ? sessionId : null,
+      });
+    }
+    // System-prompt snapshot, Bind B (system-prompt-snapshots.js): a process-level
+    // -c/-r launch queued a resumeExpected pending at spawn (pty-manager). The
+    // consume is identity-exact — source 'resume' matches on resolvedUuid, 'fork'
+    // on the fork flag — so a stolen in-terminal /resume hook or an out-of-order
+    // racing hook consumes nothing and poisons nothing; a mismatch only warns.
+    try {
+      const res = consumePendingForResume(cwd, transcriptUuid, source);
+      if (res && res.hit) {
+        writeSnapshot(cwd, transcriptUuid, { entries: res.hit.entries, model: res.hit.model, boundVia: 'hook' });
+      } else if (res && res.mismatch) {
+        console.warn(`[CC Viewer] -c/-r target mismatch (resolved ${res.mismatch}, actual ${transcriptUuid}) — system-prompt snapshot not bound`);
+      }
+    } catch (err) { reportSwallowed('session-start.sys-prompt-bind', err); }
   } catch (err) {
     reportSwallowed('session-start.mark', err);
   }
@@ -579,11 +602,12 @@ export { LOG_FILE, _initPromise, _projectName, _logDir };
 // forceNew 仅存于签名兼容（Electron multi-tab 传入）：v2 下每个 claude 进程
 // 天然是新 session，无旧文件可复用。
 export function initForWorkspace(projectPath, { forceNew = false } = {}) { // eslint-disable-line no-unused-vars
-  const projectName = basename(projectPath).replace(/[^a-zA-Z0-9_\-\.]/g, '_');
+  const projectName = projectKeyForCwd(projectPath);
   const dir = join(LOG_DIR, projectName);
   try { mkdirSync(dir, { recursive: true }); } catch {}
 
   _projectName = projectName;
+  setProjectName(projectName);
   _logDir = dir;
   // Fresh workspace context — no carried names apply; future requests must
   // create session dirs under the NEW project.
@@ -608,6 +632,7 @@ export function initForWorkspace(projectPath, { forceNew = false } = {}) { // es
 // 工作区模式：重置日志状态（返回工作区列表时调用）
 export function resetWorkspace() {
   _projectName = '';
+  setProjectName('');
   _logDir = '';
   // Workspace context gone: drop carried teammate names — the registry is
   // module-global, and without this a rotation in the NEXT workspace would

package/server/lib/adapters/dingtalk-adapter.js

@@ -1,9 +1,9 @@
 // DingTalk adapter — the platform-specific half of the DingTalk bridge. The generic
 // orchestration (dedup, access control, queue, inject, chunk, turn-end reply) lives in
-// server/lib/im-bridge-core.js; this module only knows DingTalk's Stream client, ACK protocol,
+// server/lib/im/im-bridge-core.js; this module only knows DingTalk's Stream client, ACK protocol,
 // inbound payload shape, access-token fetch, and proactive App API send endpoints.
 import { randomUUID } from 'node:crypto';
-import { registerAdapter } from '../im-bridge-core.js';
+import { registerAdapter } from '../im/im-bridge-core.js';
 import { t } from '../../i18n.js';
 
 // ─── test seam: a fake Stream client factory (zero dingtalk-stream / network) ───