cc-viewer 1.7.22 → 1.8.0

package/server/lib/{im-append-system.js → im/im-append-system.js}

@@ -12,14 +12,14 @@
 // 用 openSync(path,'wx') 原子创建：从不覆盖用户已编辑的文件（避免 existsSync→write 的 TOCTOU）。因此
 // 语言在「首次创建」时定格，之后换语言不会自动重写——重置/换语言由编辑器「恢复默认」(writeImAppendSystem) 触发。
 // 对比 server/lib/im-skills.js（内置技能）：那边是「受管同步」每次启动按包内版本覆盖内容；本模块相反，wx 创建后永不覆盖。
-import { openSync, writeFileSync, closeSync, mkdirSync, readFileSync, unlinkSync, statSync, lstatSync } from 'node:fs';
+import { openSync, writeFileSync, closeSync, mkdirSync, readFileSync, unlinkSync, lstatSync } from 'node:fs';
 import { join } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { imDir } from './im-lock.js';
-import { renameSyncWithRetry } from './file-api.js';
-import { IM_PRESET_DIR } from '../_paths.js';
+import { renameSyncWithRetry, isNonEmptyFile } from '../file-api.js';
+import { IM_PRESET_DIR } from '../../_paths.js';
 import { resolvePrefLang } from './im-lang.js';
-import { APPEND_SYSTEM_PROMPT_FILE } from './system-prompt-files.js';
+import { APPEND_SYSTEM_PROMPT_FILE } from '../system-prompt-files.js';
 
 // 写入上限（字符数，按 String.length / UTF-16 码元计）：远超任何合理人格定义，纯防失控大 body。
 export const MAX_IM_APPEND_SYSTEM_CHARS = 256 * 1024;
@@ -42,15 +42,7 @@ export function platformLabel(id, lang = resolvePrefLang(DEFAULT_LANG)) {
   return (typeof lang === 'string' && lang.startsWith('zh')) ? m.zh : m.default;
 }
 
-// 文件存在、是普通文件且非空(size>0)才算「已有内容」。坏符号链接/目录/不存在 → false。
-function isNonEmptyFile(p) {
-  try {
-    const st = statSync(p);
-    return st.isFile() && st.size > 0;
-  } catch {
-    return false;
-  }
-}
+// 文件存在、是普通文件且非空(size>0)才算「已有内容」——共享实现：../file-api.js。
 
 // 极简兜底：当 server/imPreset/<lang>.md 与 zh.md 都读不到时（理论上不会发生），至少给一份最小约束，避免崩。
 function fallbackPreset(P, id) {

package/server/lib/{im-bridge-core.js → im/im-bridge-core.js}

@@ -21,8 +21,8 @@
 //   a per-instance scratch object (token cache, send client) cleared on reset.
 import { existsSync, readFileSync, appendFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { LOG_DIR } from '../../findcc.js';
-import { t } from '../i18n.js';
+import { LOG_DIR } from '../../../findcc.js';
+import { t } from '../../i18n.js';
 import { upsertSender } from './im-senders.js';
 
 // ─── tunables (shared across platforms; per-platform rate caps come from adapter.rateLimit) ───
@@ -361,9 +361,9 @@ function audit(inst, event, data) {
   } catch { /* best-effort */ }
 }
 
-/** Bracketed-paste + submit, matching the frontend's ptyChunkBuilder. Kept local so the core
- *  never imports pty-manager (which would pull node-pty into the unit test). */
-function bracketPasteSubmit(text) {
+/** Bracketed-paste + submit, matching the frontend's ptyChunkBuilder. Exported for
+ *  chat-queue.js (the chat-composer busy queue shares the exact same inject framing). */
+export function bracketPasteSubmit(text) {
   return ['\x1b[200~' + text + '\x1b[201~', '\r'];
 }
 
@@ -385,13 +385,19 @@ function markOrigin(id, senderId, content) {
  * Claude TUI. CR is removed too: it is the submit key, so leaving it in inbound text would be a
  * submit byte smuggled into the paste frame.
  */
-function sanitizeInbound(text) {
+export function sanitizeInbound(text) {
   return String(text)
     .replace(/\x1b\[20[01]~/g, '')
     // eslint-disable-next-line no-control-regex
     .replace(/[\x00-\x08\x0b-\x1f\x7f]/g, '');
 }
 
+/** Cross-module injection mutex probe: chat-queue.js consults this before injecting into the
+ *  shared PTY so a chat-composer inject and an IM-bridge inject can never interleave. */
+export function anyActiveInjection() {
+  return !!activeInjection;
+}
+
 function remember(inst, msgId) {
   if (!msgId) return false;
   if (inst.seenMsgIds.includes(msgId)) return true;

package/server/lib/{im-config.js → im/im-config.js}

@@ -13,7 +13,7 @@
 // admin API masks secret fields entirely (→ hasSecret).
 import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { LOG_DIR } from '../../findcc.js';
+import { LOG_DIR } from '../../../findcc.js';
 
 const MIN_CHUNK = 500;
 const MAX_CHUNK = 5000;

package/server/lib/im/im-deny.js

@@ -0,0 +1,4 @@
+// Back-compat shim: the implementation moved to ../im-deny.js (shared leaf —
+// ask/perm-bridge.js consumes it without a cross-subsystem edge). Existing
+// imports of this path (tests pin it) keep working.
+export { evaluateImDeny } from '../im-deny.js';

package/server/lib/{im-lang.js → im/im-lang.js}

@@ -2,7 +2,7 @@
 // 供 IM 内置技能注入（im-skills.js）与人格预置（im-append-system.js）共用，避免各自重复读 preferences。
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { LOG_DIR } from '../../findcc.js';
+import { LOG_DIR } from '../../../findcc.js';
 
 /** 读 preferences.lang；读不到 / 无字段 / 解析失败一律回退 def（默认 zh）。 */
 export function resolvePrefLang(def = 'zh') {

package/server/lib/{im-lock.js → im/im-lock.js}

@@ -12,8 +12,8 @@ import { openSync, closeSync, readFileSync, writeFileSync, unlinkSync, mkdirSync
 import { join } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { get as httpGet } from 'node:http';
-import { LOG_DIR } from '../../findcc.js';
-import { renameSyncWithRetry } from './file-api.js';
+import { LOG_DIR } from '../../../findcc.js';
+import { renameSyncWithRetry } from '../file-api.js';
 
 // 启动窗：已建锁但尚未回填 port 的进程，在此时间内视为"启动中"（不可被判死/重拉）。
 export const BOOT_WINDOW_MS = 15000;

package/server/lib/{im-process-manager.js → im/im-process-manager.js}

@@ -14,7 +14,7 @@ import {
   imDir, readImLock, clearImLock, isPidAlive, getImLiveness, defaultProbe,
 } from './im-lock.js';
 
-const CLI_JS = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..', 'cli.js');
+const CLI_JS = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..', '..', 'cli.js');
 
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 

package/server/lib/{im-senders.js → im/im-senders.js}

@@ -11,7 +11,7 @@ import { openSync, closeSync, readFileSync, writeFileSync, unlinkSync, mkdirSync
 import { join } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { imDir } from './im-lock.js';
-import { renameSyncWithRetry } from './file-api.js';
+import { renameSyncWithRetry } from '../file-api.js';
 
 export const MAX_SENDERS = 500;
 

package/server/lib/{im-skills.js → im/im-skills.js}

@@ -12,9 +12,9 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { randomBytes } from 'node:crypto';
-import { IM_SKILLS_DIR } from '../_paths.js';
+import { IM_SKILLS_DIR } from '../../_paths.js';
 import { imDir } from './im-lock.js';
-import { renameSyncWithRetry } from './file-api.js';
+import { renameSyncWithRetry } from '../file-api.js';
 import { resolvePrefLang } from './im-lang.js';
 
 export const BUILTIN_SKILL_NAME = 'manage-ccv-projects';

package/server/lib/interceptor-core.js

@@ -10,8 +10,8 @@ const SUBAGENT_BILLING_RE = /cc_is_subagent=true\b/;
 // 同进程 Agent/Task 队友（teammate）：system prompt 注入团队协作标记，但继承完整 "You are Claude Code"
 // prompt + Edit/Bash/Task 工具，且不带 --agent-name 进程参数（_isTeammate 认不出），会误中下方 MainAgent
 // 启发式 → 流式期间被当 mainAgent 开 live-stream，其 thinking 污染主「最新回复」overlay。须显式排除。
-// KEEP IN SYNC: server/lib/kv-cache-analyzer.js + src/utils/contentFilter.js（三处判据必须一致）。
-// 两处服务端实现(本文件 + kv-cache-analyzer)由 test/interceptor-core-mainagent.test.js 互校防漂移；
+// KEEP IN SYNC: server/lib/kv-cache-analyzer.js + @ccv/core/contentFilter（三处判据必须一致）。
+// 两处服务端实现(本文件 + kv-cache-analyzer)由 packages/app/test/interceptor-core-mainagent.test.js 互校防漂移；
 // 前端 contentFilter 那份由 test/content-filter-unit.test.js 单测覆盖。
 const TEAMMATE_SYSTEM_RE = /running as an agent in a team|Agent Teammate Communication/i;
 // 1.7.0: the last external consumer (teammate-detect.js) retired with the
@@ -21,8 +21,8 @@ export { TEAMMATE_SYSTEM_RE, SUBAGENT_BILLING_RE };
 
 // Rotation carry-forward: prompt-prefix → teammate-name pairs extracted from a
 // mainAgent response body's Agent tool_use blocks. Prefix normalization MUST
-// match src/utils/contentFilter.js (trimStart BEFORE slice, length 60) —
-// pinned by test/interceptor.test.js parity cases.
+// match @ccv/core/contentFilter (trimStart BEFORE slice, length 60) —
+// pinned by packages/app/test/interceptor.test.js parity cases.
 export const TEAMMATE_PROMPT_PREFIX_LEN = 60;
 
 export function extractAgentSpawnPairs(responseBody) {
@@ -58,7 +58,10 @@ export function isMainAgentRequest(body) {
   if (TEAMMATE_SYSTEM_RE.test(sysText)) return false;
   // cc_is_subagent=true ⇒ 子代理，绝非 MainAgent（cc_version 2.1.181+）。从源头让新日志的 mainAgent 字段为 false。
   if (SUBAGENT_BILLING_RE.test(sysText)) return false;
-  if (!sysText.includes('You are Claude Code')) return false;
+  // SDK 模式(ccv -SDK)主会话 base prompt 是 "...built on Anthropic's Claude Agent SDK."，
+  // 非 CLI 的 "You are Claude Code"。SDK 子代理同用该 prompt,由下方工具启发式(缺 Agent/Task)排除;
+  // native teammate 已由 TEAMMATE_SYSTEM_RE 排除。用精确子串,勿放宽成 "You are a Claude agent"(误中 teammate)。
+  if (!sysText.includes('You are Claude Code') && !sysText.includes("built on Anthropic's Claude Agent SDK")) return false;
   if (SUBAGENT_SYSTEM_RE.test(sysText)) return false;
 
   const isSystemArray = Array.isArray(body.system);

package/server/lib/kv-cache-analyzer.js

@@ -1,15 +1,15 @@
 /**
  * Server-side KV-Cache content analyzer.
- * Ported from src/utils/helpers.js + src/utils/contentFilter.js
+ * Ported from apps/web/src/utils/helpers.js + @ccv/core/contentFilter
  */
 
-import { formatToolAsXml } from './tools-xml-formatter.js';
+import { formatToolAsXml } from '@ccv/core/tools-xml-formatter';
 export { formatToolAsXml };
 
 const SUBAGENT_SYSTEM_RE = /command execution specialist|file search specialist|planning specialist|general-purpose agent|security monitor|performing a web search/i;
 // cc_version 2.1.181+: billing header marks subagents (cc_is_subagent=true); genuine main omits it (never =false).
 // Such subagents inherit the full "You are Claude Code" prompt + Edit/Bash/Agent tools and would otherwise hit the
-// lightweight heuristic below. \b anchor avoids matching =truex. KEEP IN SYNC with src/utils/contentFilter.js + interceptor-core.js.
+// lightweight heuristic below. \b anchor avoids matching =truex. KEEP IN SYNC with @ccv/core/contentFilter + interceptor-core.js.
 const SUBAGENT_BILLING_RE = /cc_is_subagent=true\b/;
 const TEAMMATE_SYSTEM_RE = /running as an agent in a team|Agent Teammate Communication/i;
 
@@ -47,7 +47,8 @@ export function isMainAgentEntry(entry) {
   const body = entry.body || {};
   if (!body.system || !Array.isArray(body.tools)) return false;
 
-  if (!sysText.includes('You are Claude Code')) return false;
+  // SDK 模式(ccv -SDK)主会话 base prompt 含 "built on Anthropic's Claude Agent SDK."(同 interceptor-core.js 对齐)。
+  if (!sysText.includes('You are Claude Code') && !sysText.includes("built on Anthropic's Claude Agent SDK")) return false;
   if (SUBAGENT_SYSTEM_RE.test(sysText)) return false;
 
   // New architecture (v2.1.69+): deferred tool loading
@@ -165,7 +166,7 @@ export function extractCachedContent(entry) {
   // tools: API caches in order tools → system → messages.
   // Tools are implicitly cached as part of the prefix (no cache_control needed on tools themselves).
   // Show tools when system has cached content (indicating a cache prefix exists).
-  // Keep in sync with src/utils/helpers.js extractCachedContent
+  // Keep in sync with apps/web/src/utils/helpers.js extractCachedContent
   if (Array.isArray(body.tools) && body.tools.length > 0 && result.system.length > 0) {
     for (const tool of body.tools) {
       result.tools.push(formatToolAsXml(tool));

package/server/lib/launch-config.js

@@ -0,0 +1,321 @@
+/**
+ * launch-config.js — Launch-time configuration shared by the PTY and SDK spawns.
+ *
+ * Extracted from pty-manager.js so the SDK link (sdk-manager.js / cli.js runSdkMode)
+ * produces byte-identical system-prompt injection to the PTY link:
+ *   - withDefaultThinkingDisplay: inject `--thinking-display summarized` by default
+ *   - parseResumeArgs: continuation-flag parsing (-c/--continue/-r/--resume/--fork-session)
+ *   - resolveLaunchSystemPrompt: the full system-prompt pipeline — resume pin
+ *     (snapshot replay, never re-render variables) or fresh build (CC_SYSTEM.md /
+ *     CC_APPEND_SYSTEM.md sentinels, model-specific match, ${...} template render),
+ *     plus the pending record consumed by the wire-side binding (v2-writer Bind A).
+ *
+ * Everything here is spawn-shape logic only — no PTY, no SDK. Callers own their
+ * mode-specific concerns (PTY: rejection self-heal sets, spawn notices; SDK: args →
+ * options.extraArgs conversion).
+ */
+
+import { existsSync, writeFileSync, mkdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { randomBytes } from 'node:crypto';
+import { LOG_DIR } from '../../findcc.js';
+import { reportSwallowed } from '@ccv/core/error-report';
+import {
+  buildSystemPromptFileArgs, hasArg, isNonEmptyFile,
+  SYSTEM_PROMPT_FILE, APPEND_SYSTEM_PROMPT_FILE,
+} from './system-prompt-files.js';
+import { renderSystemPromptFileArgs, renderedPromptDir } from './system-prompt-render.js';
+import { appendPending, readSnapshot, resolveContinueTargetUuid } from './system-prompt-snapshots.js';
+import { MODEL_PROMPT_DIR, listModelPrompts } from './model-system-prompts.js';
+import { resolveSpawnModel } from './spawn-model-resolver.js';
+
+// Opus 4.7 默认不再返回 thinking；为所有非显式覆写的调用加上 summarized。
+// 纯函数：仅根据 args 决定是否注入；用户已显式传入 `--thinking-display` 时原样返回。
+export function withDefaultThinkingDisplay(args) {
+  if (!Array.isArray(args)) return args;
+  const hasFlag = args.some(a =>
+    a === '--thinking-display' || (typeof a === 'string' && a.startsWith('--thinking-display='))
+  );
+  return hasFlag ? args : [...args, '--thinking-display', 'summarized'];
+}
+
+// Parse continuation flags from claude args: -c/--continue, -r/--resume (value as the
+// next token or in = form), --fork-session. Returns null for non-continuation launches;
+// picker=true means a valueless -r (interactive picker — target unknowable at spawn).
+// Same flag set as cli.js markContinueEnv / routes/workspaces.js.
+export function parseResumeArgs(args) {
+  if (!Array.isArray(args)) return null;
+  let continued = false;
+  let resumeValue = null;
+  let picker = false;
+  let fork = false;
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === '-c' || a === '--continue') { continued = true; continue; }
+    if (a === '--fork-session') { fork = true; continue; }
+    if (a === '-r' || a === '--resume') {
+      continued = true;
+      const next = args[i + 1];
+      if (typeof next === 'string' && next && !next.startsWith('-')) { resumeValue = next; i++; }
+      else picker = true;
+      continue;
+    }
+    const m = typeof a === 'string' && a.match(/^(?:-r|--resume)=(.+)$/);
+    if (m) { continued = true; resumeValue = m[1]; }
+  }
+  return continued ? { resumeValue, picker, fork } : null;
+}
+
+// Materialize snapshot entries into temp files. Each spawn gets its own subdirectory
+// under renderedPromptDir (per-process): two sequential spawns pinning DIFFERENT
+// conversations would otherwise overwrite the same basename before claude reads it.
+// Returns the same {args, loaded, entries} shape renderSystemPromptFileArgs produces.
+export function materializePinnedEntries(entries) {
+  const args = [];
+  const loaded = [];
+  const out = [];
+  for (const e of entries) {
+    try {
+      const dir = join(renderedPromptDir(), `pin-${randomBytes(4).toString('hex')}`);
+      mkdirSync(dir, { recursive: true });
+      const target = join(dir, e.basename);
+      writeFileSync(target, e.content, 'utf-8');
+      args.push(e.flag, target);
+      loaded.push(e.basename);
+      out.push({ flag: e.flag, basename: e.basename, content: e.content });
+    } catch (err) {
+      // A dropped entry breaks the byte-identity this feature exists to protect —
+      // warn visibly AND report: silent degradation here is a future cache miss.
+      console.warn(`[CC Viewer] system-prompt pin materialize failed for ${e?.basename}:`, err?.message || err);
+      reportSwallowed('pty-pin.materialize', err);
+    }
+  }
+  return { args, loaded, entries: out };
+}
+
+// Manual-first: a user-passed synonymous flag suppresses the matching pinned entry
+// (same semantics as the fresh buildSystemPromptFileArgs path). All entries
+// suppressed → no injection.
+export function suppressManuallyFlaggedPinned(entries, userArgs) {
+  return entries.filter(e => {
+    const pair = e.flag === '--system-prompt-file'
+      ? ['--system-prompt', '--system-prompt-file']
+      : ['--append-system-prompt', '--append-system-prompt-file'];
+    return !hasArg(userArgs, ...pair);
+  });
+}
+
+// The F2 no-record notice only matters to users who HAVE injection configured right
+// now (sentinel files or a model-prompt dir) — for everyone else a resume silently
+// injecting nothing is exactly the status quo, and the line would be pure noise.
+export function injectionConfigured(spawnDir, logDir = LOG_DIR) {
+  try {
+    return isNonEmptyFile(join(spawnDir, SYSTEM_PROMPT_FILE))
+      || isNonEmptyFile(join(spawnDir, APPEND_SYSTEM_PROMPT_FILE))
+      || existsSync(join(spawnDir, MODEL_PROMPT_DIR))
+      || existsSync(join(logDir, MODEL_PROMPT_DIR));
+  } catch { return false; }
+}
+
+// Default model reader with the NODE_TEST_CONTEXT guard (dev-shell model env vars must
+// not leak into unit tests). pty-manager passes its own test-seam reader instead.
+function _defaultModelReader(spawnDir, env, opts) {
+  return env.NODE_TEST_CONTEXT ? null : resolveSpawnModel(spawnDir, env, opts);
+}
+
+/**
+ * Resolve this launch's system-prompt injection.
+ *
+ * Resume-pin semantics (see pty-manager header / system-prompt-snapshots.js):
+ *   target identified + snapshot record → re-inject the recorded bytes verbatim;
+ *   target identified + no record       → inject NOTHING (F2 — never alter the system
+ *                                         text an existing context already has);
+ *   target unidentifiable (picker/-c with no transcripts) → normal fresh pipeline.
+ *
+ * @param {object} p
+ * @param {string} p.spawnDir — directory claude runs with
+ * @param {string[]} p.extraArgs — final user args (post settings-merge, post thinking-display);
+ *   used for synonymous-flag suppression of injected entries
+ * @param {object} [p.env] — process env of the launch (model resolution + opt-out checks)
+ * @param {object|null} [p.launchSettings] — merged --settings object (model resolution signal)
+ * @param {object|null|undefined} [p.resume] — explicit resume intent {resumeValue, picker, fork};
+ *   `undefined` parses from extraArgs (PTY path); explicit null forces the fresh pipeline
+ * @param {function} [p.modelReader] — (spawnDir, env, {launchSettings}) => modelId|null
+ * @param {boolean} [p.insideLogDir] — IM-worker spawns skip the whole pin/match machinery
+ * @param {string} [p.logDir]
+ * @param {boolean} [p.suppressInjection] — caller-side suppression (PTY: rejected-binary
+ *   set / skip-once token). Zeroes the injection and drops the pending record.
+ * @param {boolean} [p.persistPending] — record the effective injection for the wire-side
+ *   binding (v2-writer Bind A). PTY passes true; SDK also passes true (its wire traffic
+ *   flows through the same proxy). Set false only for dry-run callers.
+ * @returns {{
+ *   sysPrompt: {args: string[], loaded: string[], model: string|null, entries: object[], suppressed?: string, pinned?: boolean, noRecord?: boolean, noRecordNotice?: boolean},
+ *   resume: object|null,
+ *   resolvedModelId: string|null,
+ *   diagnostic: null|'no-match'|'no-model',
+ * }}
+ */
+export function resolveLaunchSystemPrompt(p) {
+  const {
+    spawnDir,
+    extraArgs,
+    env = process.env,
+    launchSettings = null,
+    resume: resumeIntent,
+    modelReader = _defaultModelReader,
+    insideLogDir = false,
+    logDir = LOG_DIR,
+    suppressInjection = false,
+    persistPending = true,
+  } = p;
+
+  const out = {
+    sysPrompt: { args: [], loaded: [], model: null, entries: [] },
+    resume: null,
+    resolvedModelId: null,
+    diagnostic: null,
+  };
+  if (!spawnDir) return out;
+
+  // Continuation launches (-c/--continue/-r/--resume): pin the resumed conversation's
+  // original injection — never re-render variables. IM workers (insideLogDir) skip the
+  // whole snapshot machinery: their persona file must be re-read on every launch.
+  const resume = insideLogDir ? null : (resumeIntent !== undefined ? resumeIntent : parseResumeArgs(extraArgs));
+  out.resume = resume;
+  let pendingRec = null;
+  let pinned = null;
+  if (resume && env.CCV_DISABLE_AUTO_SYSTEM_PROMPT !== '1') {
+    const targetUuid = resume.resumeValue ?? resolveContinueTargetUuid(spawnDir);
+    if (targetUuid) {
+      const snap = readSnapshot(spawnDir, targetUuid);
+      if (snap) {
+        // Manual-flag suppression BEFORE materialize (suppressed entries never hit disk).
+        const kept = suppressManuallyFlaggedPinned(snap.entries, extraArgs);
+        const m = materializePinnedEntries(kept);
+        pinned = { args: m.args, loaded: m.loaded, model: snap.model, entries: m.entries, pinned: true };
+        // The pending carries the SNAPSHOT's entries (post-suppression), not the
+        // materialized subset — a transient temp-write failure must not degrade the
+        // permanent record via Bind B.
+        pendingRec = { entries: kept, model: snap.model, resumeExpected: true, resolvedUuid: targetUuid, fork: resume.fork };
+      } else {
+        // F2: target identified but no snapshot → inject NOTHING this launch (never
+        // alter the system text an existing context already has).
+        pinned = { args: [], loaded: [], model: null, entries: [], pinned: true, noRecord: true, noRecordNotice: injectionConfigured(spawnDir, logDir) };
+      }
+    }
+    // Bare -r (picker): the target is unknowable at spawn → normal pipeline, and NO
+    // pending. -c with no transcripts (targetUuid null): claude fails and the caller's
+    // retry respawns without -c — treat as fresh below.
+  }
+
+  if (pinned) {
+    out.sysPrompt = pinned;
+  } else {
+    // launchSettings is this launch's own live configuration — launchers like cfuse
+    // deliver ANTHROPIC_MODEL exclusively inside it, so it must participate in model
+    // resolution or model-specific entries silently never match.
+    const resolvedModelId = insideLogDir ? null : modelReader(spawnDir, env, { launchSettings });
+    out.resolvedModelId = resolvedModelId;
+    let sysPrompt = buildSystemPromptFileArgs(spawnDir, extraArgs, env, {
+      modelId: resolvedModelId,
+      globalModelDir: join(logDir, MODEL_PROMPT_DIR),
+    });
+    if (suppressInjection) {
+      sysPrompt = { args: [], loaded: [], model: null, entries: [] };
+    } else if (resolvedModelId && !sysPrompt.model && !sysPrompt.suppressed
+      && (existsSync(join(spawnDir, MODEL_PROMPT_DIR)) || existsSync(join(logDir, MODEL_PROMPT_DIR)))) {
+      // A system_prompt dir is configured but the resolved model matched no entry
+      // (likely a misnamed file).
+      out.diagnostic = 'no-match';
+    } else if (!resolvedModelId && !sysPrompt.suppressed && !insideLogDir
+      && (listModelPrompts(join(spawnDir, MODEL_PROMPT_DIR)).length > 0
+        || listModelPrompts(join(logDir, MODEL_PROMPT_DIR)).length > 0)) {
+      // Entries exist but NO model signal resolved at all, so matching never ran.
+      out.diagnostic = 'no-model';
+    }
+    // Resolve `${...}` template variables in the injected files. Skipped entirely when
+    // suppression zeroed the args (a rejected binary never pays the render cost).
+    if (sysPrompt.args.length > 0) {
+      sysPrompt = renderSystemPromptFileArgs(sysPrompt, { cwd: spawnDir, modelId: resolvedModelId });
+    } else {
+      sysPrompt = { ...sysPrompt, entries: [] };
+    }
+    out.sysPrompt = sysPrompt;
+  }
+
+  // Unified suppression (pin and fresh alike): nothing was injected → nothing can be bound.
+  if (suppressInjection) {
+    out.sysPrompt = { args: [], loaded: [], model: null, entries: [] };
+    pendingRec = null;
+  }
+
+  // Record this launch's effective injection for the binding channels (wire Bind A /
+  // SessionStart Bind B). Empty pendings are never queued (see pty-manager history).
+  const effectiveEntries = (out.sysPrompt.entries || []).filter(e => e && !e.unavailable);
+  if (pendingRec && pendingRec.entries.length === 0) pendingRec = null;
+  const rec = pendingRec || (!resume && !pinned && effectiveEntries.length > 0
+    ? { entries: effectiveEntries, model: out.sysPrompt.model ?? null, resumeExpected: false, resolvedUuid: null, fork: false }
+    : null);
+  if (persistPending && rec) {
+    try { appendPending(spawnDir, rec, logDir); } catch (err) { reportSwallowed('launch-config.appendPending', err); }
+  }
+  out.pendingRec = rec;
+  return out;
+}
+
+/**
+ * Convert a flat launch-args array (['--system-prompt-file', path, ...]) into the SDK
+ * query() options.extraArgs shape ({ 'system-prompt-file': path, ... }). Boolean flags
+ * (no value) map to null. Unknown pairing (trailing flag) maps to null — the SDK
+ * appends it bare, mirroring claude argv semantics.
+ */
+export function launchArgsToExtraArgs(args) {
+  const out = {};
+  if (!Array.isArray(args)) return out;
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (typeof a !== 'string' || !a.startsWith('--')) continue;
+    const eq = a.indexOf('=');
+    if (eq > 2) { out[a.slice(2, eq)] = a.slice(eq + 1); continue; }
+    const key = a.slice(2);
+    const next = args[i + 1];
+    if (typeof next === 'string' && !next.startsWith('--')) { out[key] = next; i++; }
+    else out[key] = null;
+  }
+  return out;
+}
+
+/**
+ * Split user CLI args for the SDK link: flags with SDK-native options are lifted out
+ * (--model / -c / --continue / -r / --resume / --fork-session — also needed at the
+ * sdk-manager level for resume-pin semantics); everything else rides along in `rest`
+ * (later converted to options.extraArgs verbatim). A valueless `-r` (interactive
+ * picker) can't work headless — reported via `pickerResume` so the caller can warn.
+ */
+export function splitSdkLaunchArgs(args) {
+  const out = { model: null, continue: false, resume: null, forkSession: false, pickerResume: false, rest: [] };
+  if (!Array.isArray(args)) return out;
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (typeof a !== 'string') { out.rest.push(a); continue; }
+    if (a === '-c' || a === '--continue') { out.continue = true; continue; }
+    if (a === '--fork-session') { out.forkSession = true; continue; }
+    if (a === '-r' || a === '--resume') {
+      const next = args[i + 1];
+      if (typeof next === 'string' && next && !next.startsWith('-')) { out.resume = next; i++; }
+      else out.pickerResume = true;
+      continue;
+    }
+    let m = a.match(/^(?:-r|--resume)=(.+)$/);
+    if (m) { out.resume = m[1]; continue; }
+    m = a.match(/^--model=(.+)$/);
+    if (m) { out.model = m[1]; continue; }
+    if (a === '--model') {
+      const next = args[i + 1];
+      if (typeof next === 'string' && next && !next.startsWith('-')) { out.model = next; i++; continue; }
+      out.rest.push(a); continue; // valueless --model: pass through, claude surfaces its own usage error
+    }
+    out.rest.push(a);
+  }
+  return out;
+}

package/server/lib/log-file-utils.js

@@ -0,0 +1,21 @@
+// Log-file naming primitives — shared leaf extracted from log-management.js to
+// break the static cycle log-management.js ↔ v2/adapter.js (v2 read/write paths
+// need these primitives but must not import the v1 session listing, which itself
+// imports the v2 adapter). Keep this module dependency-free.
+
+export function isLogFileName(name) {
+  return name.endsWith('.jsonl');
+}
+
+// 解析日志文件名里的时间戳 `YYYYMMDD_HHMMSS`（带不带 `<pid>__` 前缀都适用）。
+// 用于「按时间排序 / 判最新」——文件名整串排序会把 `<pid>__` 前缀（'1' < 'c'）的最新文件排到最底，
+// 必须按时间戳排。无法解析时返回 ''（排到最后）。v2 convert 消费，防漂移。
+export function parseLogTs(name) {
+  const m = name.match(/_(\d{8}_\d{6})\.jsonl$/);
+  return m ? m[1] : '';
+}
+
+// A session whose journal moved within this window is treated as live and
+// refused by deleteLogFiles (cross-process guard; the in-process guard is the
+// caller's own writer state).
+export const LIVE_SESSION_MTIME_MS = 5 * 60 * 1000;

package/server/lib/log-management.js

@@ -1,11 +1,12 @@
 import { existsSync, realpathSync, readdirSync, readFileSync, statSync, mkdirSync, renameSync } from 'node:fs';
 import { readFile, stat, readdir } from 'node:fs/promises';
 import { join, sep, dirname, basename } from 'node:path';
-import { reconstructEntries } from './delta-reconstructor.js';
+import { reconstructEntries } from '@ccv/core/delta-reconstructor';
 import { sanitizePathComponent } from './v2/layout.js';
 import { listV2Sessions } from './v2/adapter.js';
 import { summarizeSessionPage } from './v2/session-list.js';
 import { listSessionIds } from './v2/replay.js';
+import { isLogFileName, LIVE_SESSION_MTIME_MS } from './log-file-utils.js';
 
 // wire-v2 S5 addressing (spec §12): 'v2:<project>/<session_id>' in every
 // existing ?file= parameter slot. Components must survive the same whitelist
@@ -63,17 +64,10 @@ export function validateLogPath(logDir, file) {
   return realPath;
 }
 
-export function isLogFileName(name) {
-  return name.endsWith('.jsonl');
-}
-
-// 解析日志文件名里的时间戳 `YYYYMMDD_HHMMSS`（带不带 `<pid>__` 前缀都适用）。
-// 用于「按时间排序 / 判最新」——文件名整串排序会把 `<pid>__` 前缀（'1' < 'c'）的最新文件排到最底，
-// 必须按时间戳排。无法解析时返回 ''（排到最后）。v2 convert 消费，防漂移。
-export function parseLogTs(name) {
-  const m = name.match(/_(\d{8}_\d{6})\.jsonl$/);
-  return m ? m[1] : '';
-}
+// isLogFileName / parseLogTs / LIVE_SESSION_MTIME_MS live in log-file-utils.js
+// (shared leaf, cycle break: v2/* must not import this module). Re-exported here
+// so existing consumers and tests keep their module path.
+export { isLogFileName, parseLogTs, LIVE_SESSION_MTIME_MS } from './log-file-utils.js';
 
 // meta.startTs (ISO) → the v1 list's compact local-time stamp 'YYYYMMDD_HHMMSS'
 // so formatTimestamp / the desc sort work on v2 items unchanged.
@@ -371,8 +365,3 @@ export function deleteLogFiles(logDir, files, opts = {}) {
   }
   return results;
 }
-
-// A session whose journal moved within this window is treated as live and
-// refused by deleteLogFiles (cross-process guard; the in-process guard is the
-// caller's own writer state).
-export const LIVE_SESSION_MTIME_MS = 5 * 60 * 1000;

package/server/lib/log-stream.js

@@ -12,7 +12,7 @@
 
 import { existsSync, statSync, openSync, readSync, closeSync } from 'node:fs';
 import { open as fsOpen, stat as fsStat } from 'node:fs/promises';
-import { isCheckpointEntry, isDeltaEntry, reconstructSegment } from './delta-reconstructor.js';
+import { isCheckpointEntry, isDeltaEntry, reconstructSegment } from '@ccv/core/delta-reconstructor';
 import { isV2SessionDir, iterateV2RawEntries, iterateV2RawEntriesAsync, readV2WindowedEntries, streamV2WindowedEntries } from './v2/adapter.js';
 
 const READ_CHUNK_SIZE = 1024 * 1024; // 1MB

package/server/lib/log-watcher.js

@@ -1,7 +1,7 @@
 import { readFileSync, existsSync } from 'node:fs';
 import { isMainAgentEntry, extractCachedContent } from './kv-cache-analyzer.js';
 import { buildContextWindowEvent, getContextSizeForModel } from './context-watcher.js';
-import { reconstructEntries } from './delta-reconstructor.js';
+import { reconstructEntries } from '@ccv/core/delta-reconstructor';
 import { enrichEntry } from './enrich-plan-input.js';
 import { enrichEntry as enrichWorkflowEntry } from './enrich-workflow.js';
 import { sseWrite } from './wire-compress.js';

package/server/lib/model-system-prompts.js

@@ -1,6 +1,6 @@
 import { readdirSync, readFileSync, writeFileSync, rmSync, mkdirSync } from 'node:fs';
 import { join } from 'node:path';
-import { isNonEmptyFile } from './system-prompt-files.js';
+import { isNonEmptyFile } from './file-api.js';
 
 // 「按模型定制 system prompt」的文件夹与文件名语法。
 // 全局目录 <LOG_DIR>/system_prompt/ 与工作区目录 <workspace>/system_prompt/ 各放一套；