Merge origin/main into feat/cc-switch-import

Resolve history.md conflict: the cc-switch import entry moves into a new
Unreleased section (main's 1.7.3 stamp landed independently); main's 1.7.3
content kept verbatim.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: 2 people

README.md

@@ -52,11 +52,23 @@ Once started in programming mode, the web page opens automatically.
 
 cc-viewer also ships as a native desktop app: [download page](https://github.com/weiesky/cc-viewer/releases)
 
+### Upgrading to 1.7.0 (log format v2)
+
+Since 1.7.0, logs are stored in a per-session directory format (wire-format v2) instead of single `.jsonl` files — roughly 90% smaller on disk. Existing v1 `.jsonl` files are never modified or deleted; the log dialog lists v2 sessions by default, and a small “View legacy (v1) logs” entry (shown while old files exist) opens a v1 view where they can be viewed, migrated, or deleted. On startup, cc-viewer offers one-click migration when legacy logs are found (strongly recommended when continuing an old conversation with `claude -c`, whose first half lives in the old files). You can also migrate from the terminal:
+
+```bash
+ccv convert <project>   # migrate one project
+ccv convert --all       # migrate every project
+ccv verify <v1-file>    # check a v1 file against its converted sessions
+```
+
+A session that fails golden verification is held in `sessions-quarantine/` for inspection instead of failing the whole migration — the other sessions still migrate.
+
 ### Logger mode
 
 If you still prefer the native claude tool or the VS Code extension, use this mode.
 
-In this mode, launching `claude` will automatically start a logging process that records request logs to \~/.claude/cc-viewer/*yourproject*/date.jsonl
+In this mode, launching `claude` will automatically start a logging process that records request logs to per-session directories under \~/.claude/cc-viewer/*yourproject*/sessions/ (wire-format v2)
 
 Enable logger mode:
 
@@ -149,7 +161,7 @@ The **Edit System Prompt** modal (hamburger menu → Edit System Prompt) is tabb
 
 * The **Default** tab keeps the classic behavior: it writes `CC_SYSTEM.md` (override) or `CC_APPEND_SYSTEM.md` (append) into the current workspace, injected as `--system-prompt-file` / `--append-system-prompt-file` on the next ccv launch.
 * **Model tabs**: click **+ Add model**, type a name such as `opus` or `Gemini3`, and pick a scope — **Global** (`~/.claude/cc-viewer/system_prompt/`, applies to every workspace) or **Workspace** (`<project>/system_prompt/`). Each tab has its own Append/Override switch and Markdown preview.
-* Entries are stored as uppercase files: `OPUS_SYSTEM.md` (override) or `OPUS_APPEND_SYSTEM.md` (append). Matching is fuzzy — a case-insensitive substring of the model ID used at the last launch, so `opus` matches `claude-opus-4-8[1m]` regardless of version. A workspace match beats a global one; within a scope the longest name wins; a matched entry fully replaces the Default files for that launch.
+* Entries are stored as uppercase files: `OPUS_SYSTEM.md` (override) or `OPUS_APPEND_SYSTEM.md` (append). Matching is fuzzy — a case-insensitive substring of the model ID resolved from the ACTIVE configuration (an active third-party proxy profile's model mapping > the launch environment's `ANTHROPIC_MODEL`/`CLAUDE_MODEL` > the `model` configured in `settings.json`; with no configuration signal, no entry is injected), so `opus` matches `claude-opus-4-8[1m]` regardless of version. Switching the proxy profile mid-session re-matches only after the claude session is restarted, and a `--model` flag passed through extra args is not consulted (known limitations). A workspace match beats a global one; within a scope the longest name wins; a matched entry fully replaces the Default files for that launch.
 * Saving a tab empty deletes the entry. Model switches made mid-session apply at the next relaunch. Set `CCV_DISABLE_AUTO_SYSTEM_PROMPT=1` to disable all automatic injection. You may commit `<project>/system_prompt/` to share prompts with your team, or add it to `.gitignore` to keep them private.
 
 ### Logger mode (view the complete Claude Code session)

cli.js

@@ -15,6 +15,7 @@ import { INJECT_IMPORT, LEGACY_INJECT_IMPORTS, resolveCliPath, resolveNativePath
 import { ensureHooks, removeAllManagedHooks } from './server/lib/ensure-hooks.js';
 import { injectCliJsAt, removeCliJsInjectionAt, INJECT_START as _INJECT_START, INJECT_END as _INJECT_END, buildInjectBlock as _buildInjectBlock } from './server/lib/cli-inject.js';
 import { normalizeBasePath } from './server/lib/base-path.js';
+import { mergeSettingsIntoArgs } from './server/lib/settings-merge.js';
 import { createHardenedCleanup, installWinKeypressFallback } from './server/lib/term-signals.js';
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
@@ -222,6 +223,9 @@ function removeCliJsInjection() {
 
 async function runProxyCommand(args) {
   try {
+    // P2 detection channel ①（shell-hook 形态）：`claude -c` 经 hook 变成
+    // `ccv run -- claude --ccv-internal -c …`，在 proxy/server 模块加载前打标。
+    markContinueEnv(args);
     // Dynamic import to avoid side effects when just installing
     const { startProxy } = await import('./server/proxy.js');
     const proxyPort = await startProxy();
@@ -269,17 +273,34 @@ async function runProxyCommand(args) {
     // 剥离 cc-viewer 的内部短路开关，避免泄漏给 claude 子进程
     delete env.CCV_SKIP_THINKING_DISPLAY;
 
-    const settingsJson = JSON.stringify({
+    const settingsObj = {
       env: {
         ANTHROPIC_BASE_URL: env.ANTHROPIC_BASE_URL
       }
-    });
+    };
+    let settingsJson = JSON.stringify(settingsObj);
+
+    const isClaudeCmd = cmd === 'claude' || /[\\/]claude(\.exe)?$/.test(cmd);
+
+    // Fold a user-supplied --settings into the injected settings and emit a single flag
+    // (claude is last-wins for duplicate --settings; two parallel flags let the user's
+    // silently clobber the injected ANTHROPIC_BASE_URL and break capture). claude only:
+    // another tool's --settings belongs to that tool and must not be touched.
+    // Runs on the RAW cmdArgs BEFORE the --thinking-display append below: otherwise a
+    // trailing valueless user --settings would consume our appended token as its value.
+    if (isClaudeCmd) {
+      const settingsMerge = mergeSettingsIntoArgs(cmdArgs, settingsObj, { cwd: process.cwd() });
+      if (settingsMerge.warningDetail) {
+        console.warn(t('cli.settingsMergeFailed', settingsMerge.warningDetail));
+      }
+      settingsJson = settingsMerge.settingsJson;
+      cmdArgs = settingsMerge.args;
+    }
 
     // 注入默认 --thinking-display summarized，仅对 claude 二进制（其他命令如 `ccv run -- sometool` 跳过）。
     // 若 claude 不识别该 flag（老版本/fork）会 unknown option 崩溃——由 pty-manager.js::spawnClaude 的
     // onExit reactive retry 兜底；cli.js 这条路径是一次性子进程，没有 respawn 机会，用户需手动重试。
     // 可通过环境变量 CCV_SKIP_THINKING_DISPLAY=1 强制跳过。
-    const isClaudeCmd = cmd === 'claude' || /[\\/]claude(\.exe)?$/.test(cmd);
     if (isClaudeCmd && process.env.CCV_SKIP_THINKING_DISPLAY !== '1') {
       const { withDefaultThinkingDisplay } = await import('./server/pty-manager.js');
       cmdArgs = withDefaultThinkingDisplay(cmdArgs);
@@ -306,16 +327,41 @@ async function runProxyCommand(args) {
 
 // ensureHooks() extracted to server/lib/ensure-hooks.js (shared with electron/tab-worker.js)
 
-// Print the `--pid` instance id + this project's previously-used ids in the startup banner,
-// so the user can recall which id to reuse (with `-c`) next time. No-op without `--pid`.
-function printInstanceBanner(serverMod) {
+// P2 (-c migration guidance, detection channel ①): the interceptor resolves
+// CCV_CLAUDE_CONTINUE at prompt time, so setting it before the server module
+// loads is sufficient — claude's own -c semantics are untouched.
+function markContinueEnv(claudeArgs) {
+  if (!Array.isArray(claudeArgs)) return;
+  if (claudeArgs.some((a) => a === '-c' || a === '--continue' || a === '-r' || a === '--resume')) {
+    process.env.CCV_CLAUDE_CONTINUE = '1';
+  }
+  // Explicit `-r`/`--resume` targets a session of the user's choosing, while
+  // folder adoption always targets the LATEST main session — so a resume must
+  // keep its pre-adoption behavior (own folder). The CONTINUE env above still
+  // marks the launch for the migrate prompt.
+  if (claudeArgs.some((a) => a === '-r' || a === '--resume')) {
+    process.env.CCV_CLAUDE_RESUME = '1';
+  }
+  // `--fork-session` continues/resumes but mints a NEW session id on purpose —
+  // the interceptor reads this before the server module loads so `-c` folder
+  // adoption is suppressed (claude's own semantics are untouched).
+  if (claudeArgs.includes('--fork-session')) {
+    process.env.CCV_CLAUDE_FORK_SESSION = '1';
+  }
+}
+
+// 1.7.0: legacy v1 logs still present → one localized banner line pointing at
+// `ccv convert` (headless users never see the web migrate prompt).
+async function printMigrationBanner() {
   try {
-    const id = serverMod.getInstanceId && serverMod.getInstanceId();
-    if (!id) return;
-    console.log(`  ${t('cli.instanceId', { id })}`);
-    const known = (serverMod.getKnownInstances && serverMod.getKnownInstances()) || [];
-    const others = known.filter((x) => x !== id);
-    if (others.length) console.log(`  ${t('cli.instanceHistory', { ids: others.join(', ') })}`);
+    const { LOG_DIR } = await import('./findcc.js');
+    const { listConvertibleProjects } = await import('./server/lib/v2/convert.js');
+    const { migrationStatus } = await import('./server/lib/v2/migrate-prompt.js');
+    const pending = listConvertibleProjects(LOG_DIR)
+      .filter((p) => migrationStatus(LOG_DIR, p).pending);
+    if (pending.length > 0) {
+      console.log(`  ${t('cli.v1LogsFound', { count: pending.length })}`);
+    }
   } catch { /* banner is best-effort */ }
 }
 
@@ -440,7 +486,7 @@ async function runCliMode(extraClaudeArgs = [], cwd, noOpen = false) {
     if (_auth.password === '') console.error(`  ${t('server.passwordEmptyWarn')}`);
     else console.log(`  ${t('server.passwordActive', { password: _auth.password })}`);
   }
-  printInstanceBanner(serverMod);
+  await printMigrationBanner();
 
   // 5. 注册退出处理（hardened：watchdog 5s 强退 + 连按 Ctrl+C 立退，
   //    防 Windows 上 ConPTY kill / IM teardown 挂住导致"Ctrl+C 完全无反应"）
@@ -623,7 +669,7 @@ async function runSdkMode(extraClaudeArgs = [], cwd, noOpen = false) {
     if (_auth.password === '') console.error(`  ${t('server.passwordEmptyWarn')}`);
     else console.log(`  ${t('server.passwordActive', { password: _auth.password })}`);
   }
-  printInstanceBanner(serverMod);
+  await printMigrationBanner();
 
   // 注册退出处理（hardened，与 PTY 模式同款三层防御）
   const cleanup = createHardenedCleanup({
@@ -649,9 +695,9 @@ const logDirIdx = args.indexOf('--log-dir');
 if (logDirIdx !== -1) {
   const logDirVal = args[logDirIdx + 1];
   if (logDirVal && !logDirVal.startsWith('-')) {
-    const prevDir = LOG_DIR;
-    setLogDir(logDirVal);
-    if (LOG_DIR === prevDir) {
+    // setLogDir returns false only on a rejected path; comparing LOG_DIR
+    // before/after mis-rejected a --log-dir equal to the current default.
+    if (!setLogDir(logDirVal)) {
       console.error(`Error: --log-dir path rejected (must be under home directory or /tmp/): ${logDirVal}`);
       process.exit(1);
     }
@@ -721,29 +767,6 @@ if (usePwdIdx !== -1) {
   args.splice(usePwdIdx, 1);
 }
 
-// Extract --pid[=<name>] / --pid <name> — instance id for per-instance session-pin isolation.
-// NB: "pid" here is an instance *id* LABEL (user-chosen, e.g. alpha/beta), NOT an OS process id —
-// it only keys the session-pin file `.session-pin.<id>.json`; unrelated to process.pid.
-// ccv-owned (NEVER forwarded to claude — an unknown --pid would otherwise crash claude): sets
-// CCV_INSTANCE_ID and splices out. Sanitized to a filesystem-safe token (it becomes part of a
-// `.session-pin.<id>.json` filename → guard against path traversal / invalid names).
-const pidIdx = args.findIndex((a) => a === '--pid' || a.startsWith('--pid='));
-if (pidIdx !== -1) {
-  const arg = args[pidIdx];
-  let rawVal;
-  if (arg.startsWith('--pid=')) {
-    rawVal = arg.slice('--pid='.length);
-    args.splice(pidIdx, 1);
-  } else {
-    rawVal = args[pidIdx + 1];
-    if (rawVal && !rawVal.startsWith('-')) args.splice(pidIdx, 2);
-    else { console.error(t('cli.pidInvalid')); process.exit(1); }
-  }
-  const sanitized = (rawVal || '').replace(/[^a-zA-Z0-9_\-.]/g, '_');
-  if (!sanitized) { console.error(t('cli.pidInvalid')); process.exit(1); }
-  process.env.CCV_INSTANCE_ID = sanitized;
-}
-
 // Extract --im <platformId> — 启动一个独立常驻 IM worker：工作目录 IM_<id>/、绑 127.0.0.1、
 // skip-permissions、全局唯一锁。必须在动态 import 之前提取（runImMode 会在 import server.js 前设 env）。
 let imPlatform = null;
@@ -917,19 +940,93 @@ if (imPlatform) {
     console.error('IM mode error:', err);
     process.exit(1);
   });
+} else if (args[0] === 'verify') {
+  // wire-v2 S4: dual-write consistency check (docs/refactor/WIRE_FORMAT_V2_PLAN.md S4)
+  // Usage: ccv verify <v1-log.jsonl> [more.jsonl ...] — compares each v1 file
+  // against its project's v2 session dirs; exit 0 = zero diffs.
+  (async () => {
+    const files = args.slice(1).filter(a => a.endsWith('.jsonl'));
+    if (files.length === 0) {
+      console.error('usage: ccv verify <v1-log.jsonl> [more.jsonl ...]');
+      process.exit(2);
+    }
+    const { verifyV1File, renderReport } = await import('./server/lib/v2/verify.js');
+    let allOk = true;
+    for (const f of files) {
+      const report = await verifyV1File(resolve(f));
+      console.log(renderReport(report));
+      if (!report.ok) allOk = false;
+    }
+    process.exit(allOk ? 0 : 1);
+  })().catch(err => {
+    console.error('verify error:', err);
+    process.exit(1);
+  });
+} else if (args[0] === 'convert') {
+  // wire-v2 S8: offline v1→v2 migration (docs/refactor/WIRE_FORMAT_V2_PLAN.md S8)
+  // Usage: ccv convert <project> [more-projects ...] | ccv convert --all
+  //        [--log-dir <dir>] — chronological per project, file-level resume,
+  // staging + golden verify + promote. Strictly additive: v1 files untouched.
+  (async () => {
+    const { convertProject, listConvertibleProjects, QUARANTINE_DIR_NAME } = await import('./server/lib/v2/convert.js');
+    const rest = args.slice(1);
+    const dirIdx = rest.indexOf('--log-dir');
+    let logDir = LOG_DIR;
+    if (dirIdx !== -1) {
+      logDir = resolve(rest[dirIdx + 1] || '');
+      rest.splice(dirIdx, 2);
+    }
+    const all = rest.includes('--all');
+    const projects = all ? listConvertibleProjects(logDir) : rest.filter(a => !a.startsWith('-'));
+    if (projects.length === 0) {
+      console.error('usage: ccv convert <project> [more-projects ...] | ccv convert --all  [--log-dir <dir>]');
+      process.exit(2);
+    }
+    let allOk = true;
+    for (const project of projects) {
+      console.error(`converting ${project} (${logDir}) ...`);
+      try {
+        const state = await convertProject(logDir, project, {
+          onProgress: (p) => {
+            if (p.phase === 'done') return;
+            console.error(`  [${p.phase}] ${p.file} (${p.fileIndex}/${p.filesTotal}) entries=${p.entries} sessions=${p.sessionsConverted} skipped=${p.sessionsSkipped}`);
+          },
+        });
+        const quarantined = state.sessionsQuarantined || 0;
+        console.error(`  ${project}: ${state.status} — ${state.sessionsConverted} sessions converted, ${state.sessionsSkipped} skipped${quarantined ? `, ${quarantined} quarantined` : ''}, ${state.entries} entries`);
+        if (quarantined > 0) {
+          // Non-blocking: the good sessions promoted; only the flagged ones are held.
+          console.error(`  WARNING: ${quarantined} session(s) failed golden verify and were held in ${QUARANTINE_DIR_NAME}/ (not promoted). Suspect sessions:`);
+          for (const q of state.quarantined || []) {
+            console.error(`    - ${q.sessionId}${q.reasons && q.reasons.length ? ` (${q.reasons.slice(0, 5).join(', ')})` : ''}`);
+          }
+        }
+        if (state.status !== 'done') allOk = false;
+      } catch (err) {
+        console.error(`  ${project}: FAILED — ${err.message}`);
+        allOk = false;
+      }
+    }
+    process.exit(allOk ? 0 : 1);
+  })().catch(err => {
+    console.error('convert error:', err);
+    process.exit(1);
+  });
 } else if (args[0] === 'run') {
   runProxyCommand(args);
 } else if (args.includes('-SDK') || args.includes('--sdk')) {
   // SDK 模式（显式 -SDK 切换）
   const claudeArgs = args.filter(a => a !== '-SDK' && a !== '--sdk')
     .map(a => a === '--d' ? '--dangerously-skip-permissions' : a === '--ad' ? '--allow-dangerously-skip-permissions' : a);
+  markContinueEnv(claudeArgs);
   runSdkMode(claudeArgs, process.cwd(), noOpen).catch(err => {
     console.error('SDK mode error:', err);
     process.exit(1);
   });
 } else {
   // PTY 模式（默认）
   const claudeArgs = args.map(a => a === '--d' ? '--dangerously-skip-permissions' : a === '--ad' ? '--allow-dangerously-skip-permissions' : a);
+  markContinueEnv(claudeArgs);
   runCliMode(claudeArgs, process.cwd(), noOpen).catch(err => {
     console.error('CLI mode error:', err);
     process.exit(1);