cc-viewer 1.7.23 → 1.8.1

package/server/lib/skills-api.js

@@ -1,5 +1,5 @@
 // Skill 动态装卸 API —— 扫描并移动 `.claude/skills/` 和 `.claude/skills-skip/` 之间的 skill 文件夹。
-// 纯 Node 实现，无 React / 浏览器 依赖，方便 test/skills-api.test.js 直接 import。
+// 纯 Node 实现，无 React / 浏览器 依赖，方便 packages/app/test/skills-api.test.js 直接 import。
 
 import { existsSync, readdirSync, readFileSync, lstatSync, mkdirSync, renameSync, cpSync, rmSync, realpathSync } from 'node:fs';
 import { join, basename, sep, normalize, isAbsolute } from 'node:path';

package/server/lib/spawn-model-resolver.js

@@ -9,12 +9,21 @@
 //
 // Signal priority (best-effort heuristic — the shell-env vs settings.json-env ordering is
 // a repo convention, not documented Claude Code semantics; a mismatch merely means "no
-// injection" or "same-family entry", both harmless):
-//   1. active third-party proxy profile for the spawned workspace (family mapping via
-//      resolveProfileModel — the model the ccv proxy will actually route to)
+// injection" or "same-family entry", both harmless).
+// Base model, most spawn-specific first:
+//   1. the MERGED --settings launch object (opts.launchSettings — pty-manager folds the
+//      user's/launcher's --settings into the injected one): env.CLAUDE_MODEL >
+//      env.ANTHROPIC_MODEL. Wrappers like cfuse deliver the real model EXCLUSIVELY
+//      inside this blob, and claude applies a settings env block over the inherited
+//      shell env — so this outranks process env.
 //   2. env CLAUDE_MODEL > env ANTHROPIC_MODEL (shell exports inherited by the spawn)
-//   3. settings.json `env.ANTHROPIC_MODEL` > settings.json top-level `model`
+//   3. launchSettings top-level `model` (below the inherited env vars, mirroring
+//      Claude Code's own env-over-settings precedence)
+//   4. settings.json `env.ANTHROPIC_MODEL` > settings.json top-level `model`
 //      (the env block outranks the top-level field, mirroring how Claude Code applies it)
+// Then the active third-party proxy profile for the spawned workspace rewrites the base
+// via family mapping (resolveProfileModel — the model the ccv proxy will actually
+// route to).
 // Known limitation: a `--model` flag passed through extraArgs is not consulted.
 //
 // Pure disk reads — deliberately NOT importing server/interceptor.js: its module-level
@@ -79,7 +88,10 @@ function readActiveProfile(spawnDir, logDir) {
  *
  * @param {string} spawnDir workspace being launched (absolute path)
  * @param {Object} [env] environment (default process.env)
- * @param {{ logDir?: string, configDir?: string }} [opts] test seams for the data roots
+ * @param {{ logDir?: string, configDir?: string, launchSettings?: Object|null }} [opts]
+ *        logDir/configDir: test seams for the data roots;
+ *        launchSettings: the merged --settings object this spawn will run with
+ *        (highest-priority base-model signal — see header)
  * @returns {string|null}
  */
 export function resolveSpawnModel(spawnDir, env = process.env, opts = {}) {
@@ -87,7 +99,10 @@ export function resolveSpawnModel(spawnDir, env = process.env, opts = {}) {
   const configDir = opts.configDir || getClaudeConfigDir();
 
   // Base model: what claude itself is configured to request.
-  let base = nonEmpty(env?.CLAUDE_MODEL) || nonEmpty(env?.ANTHROPIC_MODEL);
+  const launch = (opts.launchSettings && typeof opts.launchSettings === 'object') ? opts.launchSettings : null;
+  let base = nonEmpty(launch?.env?.CLAUDE_MODEL) || nonEmpty(launch?.env?.ANTHROPIC_MODEL)
+    || nonEmpty(env?.CLAUDE_MODEL) || nonEmpty(env?.ANTHROPIC_MODEL)
+    || nonEmpty(launch?.model);
   if (!base) {
     const settings = readJson(join(configDir, 'settings.json'));
     base = nonEmpty(settings?.env?.ANTHROPIC_MODEL) || nonEmpty(settings?.model);

package/server/lib/stats-worker.js

@@ -10,12 +10,12 @@ import { join, basename } from 'node:path';
 import { readJsonlTolerant, listSessionIds } from './v2/replay.js';
 import { dirSizeSync } from './v2/layout.js';
 import { isDiscardableSession } from './v2/session-select.js';
-import { reportSwallowed } from './error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import {
   INTER_SESSION_TYPES, isSystemText, extractUserTexts, isSuggestionMode,
   collectPromptsFromEvents, sortEpochFiles,
 } from './user-prompt-extract.js';
-import { aggregateRecords, mergeProxyFileCache, parseDailyFileName } from './proxy-stats.js';
+import { aggregateRecords, mergeProxyFileCache, parseDailyFileName } from './proxy/proxy-stats.js';
 
 // Prompt/preview extraction moved to the shared server/lib/user-prompt-extract.js
 // (also feeds the V2Writer prompts.jsonl cache and the log-list read side).

package/server/lib/system-prompt-files.js

@@ -1,6 +1,14 @@
-import { statSync, readFileSync, writeFileSync, rmSync } from 'node:fs';
+import { readFileSync, writeFileSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { MODEL_PROMPT_DIR, matchModelPrompt } from './model-system-prompts.js';
+import { isBuiltinDisabled, matchBuiltinModelPrompt, materializeBuiltinPrompt } from './builtin-model-prompts.js';
+import { isNonEmptyFile } from './file-api.js';
+import { reportSwallowed } from '@ccv/core/error-report';
+
+// isNonEmptyFile lives in file-api.js (shared leaf, cycle break:
+// model-system-prompts.js must not import this module). Re-exported here so
+// existing consumers (routes/expert.js) keep their module path.
+export { isNonEmptyFile } from './file-api.js';
 
 // 启动目录里检查的「全大写 sentinel」文件名：多词约定用下划线连接
 // (对齐 CLAUDE.md / GitHub CODE_OF_CONDUCT.md 等惯例)。
@@ -14,17 +22,12 @@ export const DISABLE_AUTO_SYSTEM_PROMPT_ENV = 'CCV_DISABLE_AUTO_SYSTEM_PROMPT';
 
 // 文件需存在、是普通文件且非空(size>0)才算数：空文件会把 system prompt 抹空，跳过更安全。
 // 坏符号链接 / 不存在 / 目录 → statSync 抛错或 isFile()=false → 返回 false。
-export function isNonEmptyFile(p) {
-  try {
-    const st = statSync(p);
-    return st.isFile() && st.size > 0;
-  } catch {
-    return false;
-  }
-}
+// (implementation: file-api.js — see the re-export above)
 
 // args 里是否已含某个 flag(同时匹配 `--x` 与 `--x=value` 两种写法，检测更稳)。
-function hasArg(args, ...names) {
+// Exported for pty-manager's pin path: a manually-passed flag suppresses the matching
+// pinned entry with the same semantics as the fresh-build path.
+export function hasArg(args, ...names) {
   if (!Array.isArray(args)) return false;
   return args.some(a =>
     typeof a === 'string' && names.some(n => a === n || a.startsWith(n + '='))
@@ -41,22 +44,28 @@ function hasArg(args, ...names) {
  *
  * 模型定制(opts.modelId 提供时)：先在 <projectDir>/system_prompt/(工作区)与
  * opts.globalModelDir(全局)里做模糊匹配；命中的条目「整体取代」上面两份默认 sentinel
- * ——即便手动 flag 抑制了注入也不再回看默认文件(条目已取而代之)。未命中/无 modelId
- * 则完全走旧逻辑。
+ * ——即便手动 flag 抑制了注入也不再回看默认文件(条目已取而代之)。未命中则进入内置层：
+ * 随包 presets(builtin-model-prompts.js)按同语义再匹配一次，命中且未被墓碑禁用时把
+ * preset 文本物化为临时文件注入；命中被禁用(builtinDisabled)或未命中才回落 sentinel。
  *
  * Decide whether to inject system-prompt file flags based on sentinel files in
  * the launch directory. When opts.modelId is given, model-specific entries in
  * the workspace/global system_prompt folders are matched first; a match fully
- * supersedes the Default sentinels. Pure function: reads fs/env only.
+ * supersedes the Default sentinels. Without a file match, shipped built-in presets
+ * act as the fallback layer (tombstone-disabled ones are skipped). Reads fs/env;
+ * writes materialized built-in temp files; the built-in layer never throws — any
+ * failure falls back to the sentinel logic via reportSwallowed.
  *
  * @param {string} projectDir 启动目录(绝对路径)
  * @param {string[]} [existingArgs] 已有的 claude 参数(用于「手动优先」判断)
  * @param {Object} [env] 环境变量(默认 process.env)
  * @param {{ modelId?: string|null, globalModelDir?: string|null }} [opts]
- * @returns {{ args: string[], loaded: string[], model: string|null, suppressed?: 'env'|'manual-flag' }}
+ * @returns {{ args: string[], loaded: string[], model: string|null, suppressed?: 'env'|'manual-flag',
+ *          builtinDisabled?: string }}
  *          args: 待追加参数；loaded: 实际加载的文件(终端提示)；model: 命中的条目名(未命中为 null)；
  *          suppressed: 注入被有意跳过的原因(env 开关 / 手动同义 flag 抑制了已命中的模型条目)——
  *          调用方(pty-manager)据此不再打「no matching entry」误导性告警。
+ *          builtinDisabled 仅在内置层命中但被墓碑禁用时出现(增量字段，否则不存在)。
  */
 export function buildSystemPromptFileArgs(projectDir, existingArgs = [], env = process.env, opts = {}) {
   const out = { args: [], loaded: [], model: null };
@@ -80,8 +89,37 @@ export function buildSystemPromptFileArgs(projectDir, existingArgs = [], env = p
       }
       return out; // 命中即返回：默认 sentinel 不再参与(含手动 flag 抑制注入的情况)。
     }
+    // 用户文件未命中 → 内置层(随包 presets)：同语义匹配 + 墓碑检查；命中即物化注入并
+    // 提前返回(同样取代 sentinel)。整层 try-catch：任何失败(preset 缺失/tmp 不可写)经
+    // reportSwallowed 回落 sentinel——内置不可用绝不应连默认注入都拖垮。
+    // No file match → built-in fallback layer (shipped presets, tombstone-aware).
+    try {
+      const builtin = matchBuiltinModelPrompt(opts.modelId);
+      if (builtin) {
+        const flagPair = builtin.mode === 'override'
+          ? ['--system-prompt', '--system-prompt-file']
+          : ['--append-system-prompt', '--append-system-prompt-file'];
+        if (hasArg(existingArgs, ...flagPair)) {
+          out.suppressed = 'manual-flag'; // 与文件命中同语义：有意跳过，非「无条目」
+          return out; // 手动抑制也提前返回(不物化、不回看 sentinel)
+        }
+        const workspaceModelDir = join(projectDir, MODEL_PROMPT_DIR);
+        if (isBuiltinDisabled(builtin.name, workspaceModelDir, opts.globalModelDir)) {
+          out.builtinDisabled = builtin.name; // 供 launch-config 区分「被禁用」与「无条目」
+          // 落回 sentinel（不 return）
+        } else {
+          const path = materializeBuiltinPrompt(builtin.id, builtin.text);
+          out.args.push(flagPair[1], path);
+          out.loaded.push(`builtin:${builtin.name}`); // 稳定标签，不打印 tmp 丑路径
+          out.model = builtin.name;
+          return out;
+        }
+      }
+    } catch (err) {
+      reportSwallowed('system-prompt-files.builtin', err);
+    }
     // No matching entry: fall through to the default sentinels. Diagnostics for
-    // this case live in the caller (pty-manager) — this stays a pure function.
+    // this case live in the caller (launch-config/pty-manager).
   }
 
   // 整段替换：CC_SYSTEM.md → --system-prompt-file (用户已传 --system-prompt[-file] 则跳过)

package/server/lib/system-prompt-render.js

@@ -39,25 +39,36 @@ export function renderedPromptDir(pid = process.pid) {
  *        modelId: resolved model id from the last launch — becomes ${model.name} (the [1m]
  *        context-window suffix is stripped: it is a claude-code UI notation, not a model name);
  *        variablesFactory: test seam replacing createSystemPromptVariables.
- * @returns {{ args: string[], loaded: string[], model: string|null }} same shape; file paths
- *          whose content was rendered point at the temp copy instead.
+ * @returns {{ args: string[], loaded: string[], model: string|null, entries: Array }}
+ *          same shape; file paths whose content was rendered point at the temp copy
+ *          instead. `entries` records the FINAL content of every injected file —
+ *          [{flag, basename, content}] for successfully read files (rendered text when
+ *          rendered, raw text when passed through — the launch-time bytes are what a
+ *          later `-c`/`-r` pin must reuse, not whatever the source file says by then),
+ *          or {flag, basename, content: null, unavailable: true} when the file could
+ *          not be read/rendered (the arg falls back to the raw path; snapshot writers
+ *          skip unavailable entries). Consumers that don't care can ignore the field.
  */
 export function renderSystemPromptFileArgs(sysPrompt, opts = {}) {
   // Defensive: null / non-object → safe default, so the caller always gets a valid
   // spread target and the "loaded" notice guard (sysPrompt.loaded.length) can't throw.
-  if (!sysPrompt || typeof sysPrompt !== 'object') return { args: [], loaded: [], model: null };
+  if (!sysPrompt || typeof sysPrompt !== 'object') return { args: [], loaded: [], model: null, entries: [] };
   const args = Array.isArray(sysPrompt.args) ? sysPrompt.args : [];
-  if (args.length === 0) return sysPrompt;
+  if (args.length === 0) return { entries: [], ...sysPrompt };
 
   let variables = null; // lazy: collected once, and only if some file actually has placeholders
   const out = [...args];
+  const entries = [];
   for (let i = 0; i + 1 < out.length; i += 2) {
     const flag = out[i];
     if (flag !== '--system-prompt-file' && flag !== '--append-system-prompt-file') continue;
     const path = out[i + 1];
     try {
       const text = readFileSync(path, 'utf-8');
-      if (!TEMPLATE_VARIABLE_RE.test(text)) continue;
+      if (!TEMPLATE_VARIABLE_RE.test(text)) {
+        entries.push({ flag, basename: basename(path), content: text }); // pass-through: pin the launch-time bytes
+        continue;
+      }
       if (!variables) {
         const factory = opts.variablesFactory || createSystemPromptVariables;
         const overrides = {};
@@ -65,15 +76,20 @@ export function renderSystemPromptFileArgs(sysPrompt, opts = {}) {
         variables = factory(overrides, { cwd: opts.cwd });
       }
       const rendered = createSystemPrompt(text, { variables, missingVariableMode: 'keep' });
-      if (rendered === text) continue; // every placeholder unknown → nothing changed, keep raw path
+      if (rendered === text) { // every placeholder unknown → nothing changed, keep raw path
+        entries.push({ flag, basename: basename(path), content: text });
+        continue;
+      }
       const dir = renderedPromptDir();
       mkdirSync(dir, { recursive: true });
       const target = join(dir, basename(path));
       writeFileSync(target, rendered, 'utf-8');
       out[i + 1] = target;
+      entries.push({ flag, basename: basename(path), content: rendered });
     } catch (e) {
+      entries.push({ flag, basename: basename(path), content: null, unavailable: true });
       console.warn(`[CC Viewer] system-prompt template render failed for ${path} (injecting the raw file):`, e?.message || e);
     }
   }
-  return { ...sysPrompt, args: out };
+  return { ...sysPrompt, args: out, entries };
 }