cc-viewer 1.8.0 → 1.8.2

package/dist/index.html

@@ -21,7 +21,7 @@
     // 整体显示大小已弃用 CSS zoom：Electron 改用 webFrame.setZoomFactor（首屏抢占见
     // electron/tab-content-preload.js），纯浏览器交由用户用浏览器自带快捷键缩放，故此处不再设 zoom。
   </script>
-  <script type="module" crossorigin src="./assets/index-C3BRHDVF.js"></script>
+  <script type="module" crossorigin src="./assets/index-CmXTH-Hd.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/vendor-antd-CSjy2pdD.js">
   <link rel="modulepreload" crossorigin href="./assets/vendor-codemirror-Clv6kvI5.js">
   <link rel="modulepreload" crossorigin href="./assets/vendor-mdxeditor-CtujsSUV.js">

package/node_modules/@ccv/core/src/context-rules.js

@@ -82,7 +82,9 @@ const MODEL_CONTEXT_SIZES = [
 ];
 
 /**
- * 模型名 → 上下文窗口 token 数。后缀优先,其次家族档位表,默认 200K。
+ * 模型名 → 上下文窗口 token 数。后缀优先,其次家族档位表;
+ * 无法识别的型号默认 1M(用户规约:宁可低估百分比,不让血条提前顶满)。
+ * 空/缺失名字不属于"无法识别的型号",维持 200K 静态兜底。
  * @param {string|null|undefined} modelName
  * @returns {number}
  */
@@ -93,7 +95,8 @@ export function getModelMaxTokens(modelName) {
   for (const entry of MODEL_CONTEXT_SIZES) {
     if (entry.match.test(modelName)) return entry.tokens;
   }
-  return 200000;
+  // Unrecognized model family → assume 1M (user convention).
+  return 1000000;
 }
 
 /**
@@ -107,6 +110,7 @@ export function getModelMaxTokens(modelName) {
  * 'k3[1m]' 时上游会把响应 model 归一化成裸 'k3'(剥掉 [1m] 后缀),
  * response-first 解析读到裸 'k3' 若归 200K 桶会与请求侧 1M 判定分裂,
  * 血条分母错成 200K;且裸 'k3' 本就是 k3[1m] 的 1M 形态被剥后缀的产物。
+ * 无法识别的型号经 getModelMaxTokens 落底 1M → 归 1M 桶(见该函数注释)。
  * @param {string} modelName
  * @returns {1000000|200000}
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "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",

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

@@ -0,0 +1,198 @@
+// 内置模型提示词层：让 packages/app/server/system-prompt-templates/presets/ 的 6 个预设
+// 成为「默认生效」的模型 system prompt——spawn 时模型匹配且用户无对应文件（workspace >
+// global 两级用户文件优先）时自动注入；用户可通过墓碑文件禁用某个内置条目。
+//
+// 数据源复用 system-prompt-presets.js 的 listSystemPromptPresets()（manifest 读取 +
+// renderPresetTemplate 边界剥离都已在里面，且注释承诺不触发 createSystemPromptVariables/
+// git 子进程）。本模块函数对非法入参会 throw（setBuiltinDisabled/materializeBuiltinPrompt），
+// spawn 注入链路的安全由调用点整层 try-catch 保证（system-prompt-files.js 失败回落
+// sentinel，注入链路永不 throw）。
+//
+// Built-in model prompt layer: the shipped presets act as default-effective model
+// system prompts. User files (workspace > global) always win; a per-scope tombstone
+// file disables individual built-in entries.
+import { createHash } from 'node:crypto';
+import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { expandModelIdVariants, normalizeModelName } from './model-system-prompts.js';
+import { listSystemPromptPresets } from './system-prompt-presets.js';
+import { renameSyncWithRetry } from './file-api.js';
+import { reportSwallowed } from '@ccv/core/error-report';
+
+// 墓碑文件名：放在对应 scope 的 modelPromptDir 里，内容是规范大写名的 JSON 数组。
+// parseModelPromptFileName 对非 *_SYSTEM.md 文件名返回 null，天然不干扰条目列表。
+// Tombstone file inside a scope's model-prompt dir: a JSON array of canonical names.
+export const BUILTIN_DISABLED_FILE = '.builtin-disabled.json';
+
+// 物化目录：preset 文本（边界已剥离、${...} 保持字面量，spawn 渲染管线再替换变量）
+// 写成内容寻址的临时文件，供 --system-prompt-file 注入（文件对形式是快照钉扎的前提）。
+// 惰性读取 env 覆盖（测试用）：node --test 多进程并行时共享目录会被彼此的 GC 竞态误删。
+// Materialized temp dir for boundary-stripped preset texts (content-addressed).
+const materializeDir = () => process.env.CCV_BUILTIN_PROMPT_MATERIALIZE_DIR || join(tmpdir(), 'cc-viewer-builtin-prompts');
+
+/**
+ * 列出全部内置模型条目。name = manifest match 的大写规范化（与用户条目同名体系，
+ * 用户同名文件天然形成覆盖）；text = renderPresetTemplate 输出（无边界标记）。
+ * List all built-in model entries derived from the preset manifest.
+ *
+ * @returns {Array<{ id: string, title: string, name: string, mode: 'override'|'append', matchLower: string, text: string }>}
+ */
+export function listBuiltinModelPrompts() {
+  let presets;
+  try {
+    presets = listSystemPromptPresets();
+  } catch {
+    return []; // manifest 损坏等：内置层整体缺席，调用方回落 sentinel
+  }
+  const out = [];
+  for (const p of presets) {
+    const name = normalizeModelName(typeof p?.match === 'string' ? p.match : '');
+    if (!name || typeof p.text !== 'string' || p.text.trim().length === 0) continue;
+    out.push({
+      id: p.id,
+      title: p.title || p.id,
+      name,
+      mode: p.defaultMode === 'override' ? 'override' : 'append',
+      matchLower: p.match.toLowerCase(),
+      text: p.text,
+    });
+  }
+  return out;
+}
+
+/**
+ * 按 modelId 匹配内置条目：别名展开（expandModelIdVariants，先 lowercase）后任一变体
+ * 包含 preset 的 match 即命中；多命中取 match 最长者、等长字典序（对齐 matchModelPrompt
+ * 的消歧规则）。
+ * Match a model id against built-in entries (alias-expanded substring, longest wins).
+ *
+ * @param {string|null} modelId
+ * @returns {{ id: string, name: string, mode: 'override'|'append', text: string } | null}
+ */
+export function matchBuiltinModelPrompt(modelId) {
+  const variants = expandModelIdVariants(modelId);
+  if (!variants.length) return null;
+  const hits = listBuiltinModelPrompts().filter((e) => variants.some((v) => v.includes(e.matchLower)));
+  if (!hits.length) return null;
+  hits.sort((a, b) => b.matchLower.length - a.matchLower.length || a.name.localeCompare(b.name));
+  const e = hits[0];
+  return { id: e.id, name: e.name, mode: e.mode, text: e.text };
+}
+
+/**
+ * 读某 scope 目录的墓碑名单。目录/文件缺失 → []（良性静默）；文件存在但 JSON 损坏或
+ * 形状非法 → console.warn + reportSwallowed 后仍宽容返回 []（fail-open 是刻意的：
+ * 墓碑是辅助状态，宁可恢复注入也不因损坏阻断功能——但用户显式 opt-out 被静默逆转
+ * 必须有诊断痕迹，三方审查一致要求）。
+ * Read a scope dir's tombstone list. Missing dir/file → []; corrupt file → warn +
+ * reportSwallowed, still [] (deliberate fail-open, but never silently).
+ *
+ * @param {string|null|undefined} modelPromptDir
+ * @returns {string[]} 规范大写名数组（已排序）
+ */
+export function readBuiltinDisabled(modelPromptDir) {
+  if (!modelPromptDir) return [];
+  const target = join(modelPromptDir, BUILTIN_DISABLED_FILE);
+  if (!existsSync(target)) return [];
+  try {
+    const raw = readFileSync(target, 'utf-8');
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed)) throw new Error('tombstone file is not a JSON array');
+    const names = parsed.map((n) => normalizeModelName(typeof n === 'string' ? n : '')).filter(Boolean);
+    return [...new Set(names)].sort();
+  } catch (err) {
+    console.warn(`[CC Viewer] built-in prompt tombstone ${target} unreadable (${err.message}); treating as no disables`);
+    reportSwallowed('builtin-model-prompts.readDisabled', err);
+    return [];
+  }
+}
+
+/**
+ * 写墓碑：disabled=true 把 name 加入名单，false 移出。tmp+rename 原子写，数组去重排序。
+ * Add/remove a name in a scope dir's tombstone list (atomic tmp+rename write).
+ *
+ * @param {string} modelPromptDir 目标 scope 的 modelPromptDir（自动 mkdir -p）
+ * @param {string} name 条目名（经 normalizeModelName 规范化，非法 throw）
+ * @param {boolean} disabled
+ * @returns {{ name: string, disabled: boolean, list: string[] }}
+ */
+export function setBuiltinDisabled(modelPromptDir, name, disabled) {
+  if (!modelPromptDir) throw new Error('no target directory');
+  const canonical = normalizeModelName(name);
+  if (!canonical) throw new Error('invalid model prompt name');
+  const list = readBuiltinDisabled(modelPromptDir);
+  const next = disabled ? [...new Set([...list, canonical])].sort() : list.filter((n) => n !== canonical);
+  mkdirSync(modelPromptDir, { recursive: true });
+  const target = join(modelPromptDir, BUILTIN_DISABLED_FILE);
+  const tmp = `${target}.${process.pid}.tmp`;
+  writeFileSync(tmp, `${JSON.stringify(next, null, 2)}\n`, 'utf-8');
+  renameSyncWithRetry(tmp, target); // Windows 杀软/索引瞬时 EPERM 重试（与仓库写路径一致）
+  return { name: canonical, disabled: !!disabled, list: next };
+}
+
+/**
+ * 多 scope 合成判断：任一目录的墓碑名单含 name 即视为禁用（workspace 墓碑禁本工作区、
+ * global 墓碑全局禁用；对单次启动而言两者都是「该禁」）。
+ * Combine tombstones across scopes: disabled when ANY dir's list contains the name.
+ *
+ * @param {string} name 规范大写名
+ * @param {...(string|null|undefined)} modelPromptDirs
+ * @returns {boolean}
+ */
+export function isBuiltinDisabled(name, ...modelPromptDirs) {
+  const canonical = normalizeModelName(name);
+  if (!canonical) return false;
+  return modelPromptDirs.some((dir) => readBuiltinDisabled(dir).includes(canonical));
+}
+
+/**
+ * 把内置条目文本物化为内容寻址的临时文件（不存在才写，避并发截断；顺手清同 id
+ * 旧 hash 文件）。返回文件路径。
+ * Materialize a built-in entry's text into a content-addressed temp file.
+ *
+ * @param {string} id preset id（文件名安全字符校验）
+ * @param {string} text renderPresetTemplate 输出（边界已剥离、${...} 字面量保留）
+ * @returns {string} 物化文件绝对路径
+ */
+export function materializeBuiltinPrompt(id, text) {
+  if (typeof id !== 'string' || !/^[A-Za-z0-9._-]+$/.test(id)) throw new Error('invalid preset id');
+  if (typeof text !== 'string' || text.trim().length === 0) throw new Error('empty preset text');
+  const hash = createHash('sha256').update(text).digest('hex').slice(0, 8);
+  const fileName = `${id}-${hash}.md`;
+  const dir = materializeDir();
+  mkdirSync(dir, { recursive: true, mode: 0o700 }); // 仅属主可读写：Linux 多用户 /tmp 下防跨用户预植
+  const target = join(dir, fileName);
+  // write-if-absent 必须回读校验内容 hash：可预测路径 + 预置恶意文件（hash 可算，
+  // preset 文本随包公开）会把注入内容掉包——不一致则覆盖。写入用 tmp+rename 原子落盘，
+  // 进程在写中途崩溃留下截断文件时 write-if-absent 永不愈合。
+  const writeAtomic = () => {
+    const tmp = `${target}.${process.pid}.tmp`;
+    writeFileSync(tmp, text, 'utf-8');
+    renameSyncWithRetry(tmp, target);
+  };
+  if (!existsSync(target)) {
+    writeAtomic();
+  } else {
+    try {
+      const existing = readFileSync(target, 'utf-8');
+      if (createHash('sha256').update(existing).digest('hex').slice(0, 8) !== hash) writeAtomic();
+    } catch {
+      writeAtomic(); // 读失败（截断/权限）→ 覆盖重写
+    }
+  }
+  // best-effort GC：同 id 的旧 hash 文件（版本升级后残留）。精确匹配 8 位 hex hash 防
+  // id 前缀误删（如未来 kimi-k3-turbo）；只清 mtime 足够旧的文件，避免跨版本并发
+  // （新旧实例同跑）时删掉旧实例正要读的文件。失败无碍。
+  try {
+    const idRe = new RegExp(`^${id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}-[0-9a-f]{8}\\.md$`);
+    for (const f of readdirSync(dir)) {
+      if (!idRe.test(f) || f === fileName) continue;
+      const p = join(dir, f);
+      try {
+        if (Date.now() - statSync(p).mtimeMs > 10 * 60_000) rmSync(p, { force: true });
+      } catch { /* ignore */ }
+    }
+  } catch { /* ignore */ }
+  return target;
+}

package/server/lib/context-watcher.js

@@ -71,7 +71,7 @@ export function getContextSizeForModel(modelOrEntry) {
     return _startupContextSize;
   }
   // 完整档位表见 @ccv/core/context-rules(与前端同源;含 haiku/旧 opus/3-opus 200K、
-  // deepseek-v4 1M、kimi/moonshot 256K、gpt/deepseek 等三方档位,默认 200K)
+  // deepseek-v4 1M、kimi/moonshot 256K、gpt/deepseek 等三方档位,未识别型号默认 1M)
   return getModelMaxTokens(apiModelName);
 }
 

package/server/lib/git-diff.js

@@ -64,11 +64,12 @@ export function countUntrackedLines(cwd, file) {
 }
 
 /**
- * Get commits between upstream and HEAD (i.e. local commits not yet pushed).
- * Returns an empty list when:
- *   - HEAD is detached (rev-parse --abbrev-ref HEAD prints "HEAD")
- *   - Branch has no upstream (@{u} resolution fails)
- *   - Working tree is at upstream (no commits ahead)
+ * Get local commits not yet pushed, between upstream and HEAD when an upstream
+ * is configured (`<upstream>..HEAD`), otherwise every HEAD commit absent from
+ * all remote-tracking refs (`git log HEAD --not --remotes`). The fallback keeps
+ * commits on branches without an upstream visible instead of silently dropping
+ * them. Returns an empty list when HEAD cannot be resolved (unborn branch) or
+ * the log command fails.
  *
  * Each commit includes its changed files via a single `git log --name-status` call,
  * to avoid one git invocation per commit.
@@ -86,21 +87,27 @@ export async function getUnpushedCommits(cwd, { maxCommits = 100 } = {}) {
   } catch {
     return { commits: [], hasUpstream: false, branch: null, upstream: null };
   }
-  if (!branch || branch === 'HEAD') {
-    return { commits: [], hasUpstream: false, branch, upstream: null };
-  }
+  // Detached HEAD prints "HEAD" — treat like a branch without upstream below.
+  const detached = !branch || branch === 'HEAD';
 
   let upstream = null;
-  try {
-    const { stdout } = await execFileAsync('git', ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}'], { cwd, encoding: 'utf-8', timeout: 3000 });
-    upstream = stdout.trim();
-  } catch {
-    return { commits: [], hasUpstream: false, branch, upstream: null };
-  }
-  if (!upstream || !SAFE_REF.test(upstream)) {
-    return { commits: [], hasUpstream: false, branch, upstream: null };
+  if (!detached) {
+    try {
+      const { stdout } = await execFileAsync('git', ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}'], { cwd, encoding: 'utf-8', timeout: 3000 });
+      const name = stdout.trim();
+      if (name && SAFE_REF.test(name)) upstream = name;
+    } catch { /* no upstream configured — fall through to the remote-refs fallback */ }
   }
 
+  // With an upstream: commits ahead of it. Otherwise (no upstream, invalid
+  // upstream name, detached HEAD): commits on HEAD not reachable from any
+  // remote-tracking ref. Argument order matters — `--not` flips every revision
+  // listed after it, including HEAD itself, so it must be
+  // ['HEAD', '--not', '--remotes'], never ['--not', '--remotes', 'HEAD'].
+  const rangeArgs = upstream ? [`${upstream}..HEAD`] : ['HEAD', '--not', '--remotes'];
+  const hasUpstream = !!upstream;
+  const resultBranch = detached ? null : branch;
+
   // Use NUL separators between fields and a sentinel between commits to avoid
   // getting fooled by tabs/newlines inside commit subjects.
   // Format: <hash>\x1f<author>\x1f<date>\x1f<subject>\n
@@ -117,13 +124,13 @@ export async function getUnpushedCommits(cwd, { maxCommits = 100 } = {}) {
         `--max-count=${maxCommits}`,
         `--pretty=format:${COMMIT_SEP}%H${FIELD_SEP}%an${FIELD_SEP}%aI${FIELD_SEP}%s`,
         '--name-status',
-        `${upstream}..HEAD`,
+        ...rangeArgs,
       ],
       { cwd, encoding: 'utf-8', timeout: 8000, maxBuffer: 10 * 1024 * 1024 }
     );
     stdout = r.stdout;
   } catch {
-    return { commits: [], hasUpstream: true, branch, upstream };
+    return { commits: [], hasUpstream, branch: resultBranch, upstream };
   }
 
   const commits = [];
@@ -163,7 +170,7 @@ export async function getUnpushedCommits(cwd, { maxCommits = 100 } = {}) {
   let truncated = commits.length === maxCommits;
   if (truncated) {
     try {
-      const r = await execFileAsync('git', ['rev-list', '--count', `${upstream}..HEAD`], { cwd, encoding: 'utf-8', timeout: 3000 });
+      const r = await execFileAsync('git', ['rev-list', '--count', ...rangeArgs], { cwd, encoding: 'utf-8', timeout: 3000 });
       const parsed = parseInt(r.stdout.trim(), 10);
       if (Number.isFinite(parsed) && parsed > 0) {
         totalCount = parsed;
@@ -172,7 +179,7 @@ export async function getUnpushedCommits(cwd, { maxCommits = 100 } = {}) {
     } catch {}
   }
 
-  return { commits, hasUpstream: true, branch, upstream, truncated, totalCount };
+  return { commits, hasUpstream, branch: resultBranch, upstream, truncated, totalCount };
 }
 
 /**

package/server/lib/launch-config.js

@@ -108,6 +108,10 @@ export function suppressManuallyFlaggedPinned(entries, userArgs) {
 // 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.
+// Fidelity note (accepted gap): this check does NOT see the built-in preset layer —
+// users whose only injection is a default-effective built-in (no dirs, no sentinels)
+// get no F2 notice on resume either. Deliberate: making built-in hits count would turn
+// the notice into near-constant noise for every built-in user resuming old sessions.
 export function injectionConfigured(spawnDir, logDir = LOG_DIR) {
   try {
     return isNonEmptyFile(join(spawnDir, SYSTEM_PROMPT_FILE))
@@ -152,7 +156,7 @@ function _defaultModelReader(spawnDir, env, opts) {
  *   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',
+ *   diagnostic: null|'no-match'|'no-model'|'builtin-disabled',
  * }}
  */
 export function resolveLaunchSystemPrompt(p) {
@@ -222,6 +226,10 @@ export function resolveLaunchSystemPrompt(p) {
     });
     if (suppressInjection) {
       sysPrompt = { args: [], loaded: [], model: null, entries: [] };
+    } else if (sysPrompt.builtinDisabled) {
+      // The resolved model hit a built-in preset that the user tombstone-disabled —
+      // distinct from 'no-match' (a likely misnamed file): this is an intentional opt-out.
+      out.diagnostic = 'builtin-disabled';
     } 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

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

@@ -261,10 +261,26 @@ function modelIdVariants(id) {
   return MODEL_ID_ALIASES[id] || [id];
 }
 
+// 供内置预设匹配复用的导出包装：入参任意大小写，先剥 `[1m]` 类方括号后缀
+// （spawn 渲染管线对 model.name 做同样的剥离；上游 resolver 正常会剥，这里兜底），
+// 再 toLowerCase 展开别名——避免大写 env（如 K3）或带后缀的裸名（k3[1m]）绕过别名表。
+// 单一别名源，勿在别处复制 MODEL_ID_ALIASES。
+// Exported wrapper for the built-in preset matcher: strips a trailing bracket suffix
+// and lowercases before expanding, so uppercase ids (K3) or suffixed shorthands
+// (k3[1m]) cannot bypass the alias table.
+export function expandModelIdVariants(modelId) {
+  if (!modelId || typeof modelId !== 'string') return [];
+  const stripped = modelId.replace(/\s*\[[^\]]*\]$/, '').toLowerCase();
+  return modelIdVariants(stripped);
+}
+
 export function matchModelPrompt(modelId, candidates) {
   if (!modelId || typeof modelId !== 'string') return null;
   if (!Array.isArray(candidates)) return null;
-  const variants = modelIdVariants(modelId.toLowerCase());
+  // 与内置层（builtin-model-prompts.js）同一展开：剥 `[1m]` 类后缀 + lowercase + 别名。
+  // 若用户层不剥后缀而内置层剥（k3[1m] + 用户有 KIMI-K3_SYSTEM.md），用户文件会
+  // 静默 miss、内置反客为主 —— 违反「用户文件永远优先」，两层必须同语义。
+  const variants = expandModelIdVariants(modelId);
   for (const cand of candidates) {
     if (!cand || !cand.dir) continue;
     const hits = listModelPrompts(cand.dir).filter((e) => {

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

@@ -1,7 +1,9 @@
 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
@@ -42,22 +44,28 @@ export 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 };
@@ -81,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/pty-manager.js

@@ -390,8 +390,9 @@ async function _spawnClaudeImpl(proxyPort, cwd, extraArgs = [], claudePath = nul
   // When the launch dir has a non-empty CC_SYSTEM.md / CC_APPEND_SYSTEM.md, auto-append
   // --system-prompt-file / --append-system-prompt-file (each independent; skipped if the
   // user already passed the synonymous flag). Model customization: fuzzy-match against
-  // <cwd>/system_prompt/ and <LOG_DIR>/system_prompt/ using "the model used on the last
-  // launch"; a matched entry wholly replaces the two default sentinels above.
+  // <cwd>/system_prompt/ and <LOG_DIR>/system_prompt/ using the model id resolved from the
+  // ACTIVE configuration (proxy profile mapping > env > settings.json); a matched entry
+  // (user file first, then built-in presets) wholly replaces the two default sentinels above.
   // Note: currentWorkspacePath is only assigned below, so the cwd param decides the launch
   // dir here. Spawns inside LOG_DIR (IM worker working dir = <LOG_DIR>/IM_<id>/) skip model
   // matching: the IM persona relies on the default sentinel CC_APPEND_SYSTEM.md injection,
@@ -425,7 +426,9 @@ async function _spawnClaudeImpl(proxyPort, cwd, extraArgs = [], claudePath = nul
       suppressInjection: _systemPromptFileRejectedPaths.has(claudePath) || skipOnce,
     });
     sysPrompt = r.sysPrompt;
-    if (r.diagnostic === 'no-match') {
+    if (r.diagnostic === 'builtin-disabled') {
+      console.warn(`[CC Viewer] model-specific prompt: built-in prompt "${r.sysPrompt.builtinDisabled}" for modelId="${r.resolvedModelId}" is disabled via .builtin-disabled.json in the workspace or global ${MODEL_PROMPT_DIR}/ — falling back to defaults`);
+    } else if (r.diagnostic === 'no-match') {
       console.warn(`[CC Viewer] model-specific prompt: modelId="${r.resolvedModelId}" resolved from active config but no matching entry found in workspace or global ${MODEL_PROMPT_DIR}/`);
     } else if (r.diagnostic === 'no-model') {
       console.warn(`[CC Viewer] model-specific prompt: no model id resolved from active config (--settings / env / settings.json / proxy profile) — entries in ${MODEL_PROMPT_DIR}/ skipped for this launch`);