cc-viewer 1.7.23 → 1.8.1

package/server/routes/ask-perm.js

@@ -1,5 +1,5 @@
 // Ask / permission hook bridge routes (moved verbatim from server.js handleRequest).
-import { loadAskStore, consumeIfFinal as askStoreConsumeIfFinal, markCancelled as askStoreMarkCancelled } from '../lib/ask-store.js';
+import { loadAskStore, consumeIfFinal as askStoreConsumeIfFinal, markCancelled as askStoreMarkCancelled } from '../lib/ask/ask-store.js';
 import { runWaterfallHook, runParallelHook } from '../lib/plugin-loader.js';
 import { sendEventToClients } from '../lib/log-watcher.js';
 

package/server/routes/dingtalk.js

@@ -1,11 +1,11 @@
-// DingTalk bridge config API. See server/lib/dingtalk-config.js (storage) and
-// server/lib/dingtalk-bridge.js (the Stream client) for the underlying logic.
+// DingTalk bridge config API. See server/lib/im/dingtalk-config.js (storage) and
+// server/lib/im/dingtalk-bridge.js (the Stream client) for the underlying logic.
 //
 //   GET  /api/dingtalk/status — public; remote callers get only hasSecret, the local (admin)
 //                               caller additionally gets the plaintext appSecret to view/copy.
 //   POST /api/dingtalk/config — loopback-only (!isLocal → 403); save creds, reload bridge.
 //   POST /api/dingtalk/test   — loopback-only; validate creds (fetch an access token).
-import { loadDingTalkState, saveDingTalkConfig, loadDingTalkConfig } from '../lib/dingtalk-config.js';
+import { loadDingTalkState, saveDingTalkConfig, loadDingTalkConfig } from '../lib/im/dingtalk-config.js';
 
 const JSON_HEADERS = { 'Content-Type': 'application/json' };
 

package/server/routes/events.js

@@ -5,7 +5,7 @@ import { _projectName, getLiveLogSource, isContinuedLaunch } from '../intercepto
 import { LOG_DIR } from '../../findcc.js';
 import { streamRawEntriesAsync } from '../lib/log-stream.js';
 import { migrationStatus } from '../lib/v2/migrate-prompt.js';
-import { reportSwallowed } from '../lib/error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { sseHead, sseWrite, needsDrain, wireEnd, awaitWireDrain } from '../lib/wire-compress.js';
 import { readV2ColdBundle } from '../lib/v2/meta-rows.js';
 import { readV2SingleEntry } from '../lib/v2/adapter.js';
@@ -13,7 +13,7 @@ import { enrichRawIfNeeded } from '../lib/enrich-plan-input.js';
 import { validateLogPath } from '../lib/log-management.js';
 import { isMainAgentEntry, extractCachedContent } from '../lib/kv-cache-analyzer.js';
 import { CONTEXT_WINDOW_FILE, readModelContextSize, buildContextWindowEvent, getContextSizeForModel } from '../lib/context-watcher.js';
-import { adaptContextWindow } from '../lib/context-rules.js';
+import { adaptContextWindow } from '@ccv/core/context-rules';
 
 function turnEndNotify(req, res, parsedUrl, isLocal, deps) {
   if (!isLocal) {

package/server/routes/expert.js

@@ -15,6 +15,11 @@ import {
   MODEL_PROMPT_DIR, normalizeModelName, listModelPrompts,
   writeModelPrompt, deleteModelPrompt, matchModelPrompt,
 } from '../lib/model-system-prompts.js';
+import {
+  matchBuiltinModelPrompt, isBuiltinDisabled,
+  readBuiltinDisabled, setBuiltinDisabled, listBuiltinModelPrompts,
+} from '../lib/builtin-model-prompts.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { resolveSpawnModel } from '../lib/spawn-model-resolver.js';
 import { listSystemPromptPresets, groupPresetsByCategory, getSystemPromptVariablesDoc } from '../lib/system-prompt-presets.js';
 import { LOG_DIR } from '../../findcc.js';
@@ -41,12 +46,24 @@ function sendJson(res, code, obj) {
   } catch { /* socket 已关闭：忽略 */ }
 }
 
+// scope → 目标 modelPromptDir 的统一解析（postModelPrompts 普通分支与墓碑分支共用）：
+// global 直取 LOG_DIR；workspace 需活动工作区（缺失返回 {error} 由调用方回 400）。
+async function resolveScopeModelDir(deps, scope) {
+  if (scope === 'global') return { dir: join(LOG_DIR, MODEL_PROMPT_DIR) };
+  const dir = await resolveDir(deps);
+  if (!dir) return { error: 'no_active_workspace' };
+  return { dir: join(dir, MODEL_PROMPT_DIR) };
+}
+
 // Single source for "is a custom system prompt configured to inject" — mirrors the
 // spawn-time injection semantics of buildSystemPromptFileArgs: the env kill switch wins;
 // a matched model entry supersedes the Default sentinels for activation purposes.
 // Fidelity note: spawn-only gates this helper cannot see (insideLogDir skip, manual
 // --system-prompt-file flags, one-shot skip tokens) may rarely make "active" a false
-// positive — acceptable for a UI hint.
+// positive — acceptable for a UI hint. The built-in layer shares the same gates, and
+// can also false-NEGATIVE the other way: when the spawn-time model signal comes from
+// launchSettings (launcher-delivered ANTHROPIC_MODEL), this resolver may see no model
+// while spawn still injects a built-in preset (entry stays hidden). Same acceptance.
 function computeSystemPromptStatus(dir) {
   if (process.env[DISABLE_AUTO_SYSTEM_PROMPT_ENV] === '1') {
     return { active: false, modelId: null, matched: null, defaultActive: false };
@@ -61,8 +78,28 @@ function computeSystemPromptStatus(dir) {
         { dir: join(LOG_DIR, MODEL_PROMPT_DIR), scope: 'global' },
       ])
     : null;
-  const matched = match ? { scope: match.scope, name: match.name, mode: match.mode } : null;
-  return { active: !!matched || defaultActive, modelId, matched, defaultActive };
+  let matched = match ? { scope: match.scope, name: match.name, mode: match.mode } : null;
+  // 内置层镜像 spawn 语义：用户文件未命中时，内置 preset 命中（未禁用）同样构成注入；
+  // 命中被墓碑禁用则报 builtinDisabled（条件字段，仅此时出现，命名与 spawn 返回字段
+  // 对齐）——UI 据此让入口以「已禁用」态保活，点入可重启用，否则 chip 消失后无法找回禁用开关。
+  let builtinDisabledEntry;
+  if (!matched && modelId) {
+    try {
+      const builtin = matchBuiltinModelPrompt(modelId);
+      if (builtin) {
+        if (isBuiltinDisabled(builtin.name, dir ? join(dir, MODEL_PROMPT_DIR) : null, join(LOG_DIR, MODEL_PROMPT_DIR))) {
+          builtinDisabledEntry = { name: builtin.name };
+        } else {
+          matched = { scope: 'builtin', name: builtin.name, mode: builtin.mode };
+        }
+      }
+    } catch (err) {
+      reportSwallowed('expert.systemPromptStatus.builtin', err);
+    }
+  }
+  const out = { active: !!matched || defaultActive, modelId, matched, defaultActive };
+  if (builtinDisabledEntry) out.builtinDisabled = builtinDisabledEntry;
+  return out;
 }
 
 async function getSystemText(req, res, parsedUrl, isLocal, deps) {
@@ -124,12 +161,26 @@ async function getModelPrompts(req, res, parsedUrl, isLocal, deps) {
     const dir = await resolveDir(deps);
     const globalDir = join(LOG_DIR, MODEL_PROMPT_DIR);
     const status = computeSystemPromptStatus(dir);
+    // 内置 preset 条目（默认生效层）：text 为 renderPresetTemplate 输出（边界已剥离），
+    // disabled 双 scope 墓碑标志供弹窗渲染禁用态/重启用。
+    const workspaceModelDir = dir ? join(dir, MODEL_PROMPT_DIR) : null;
+    const disabledWs = readBuiltinDisabled(workspaceModelDir);
+    const disabledG = readBuiltinDisabled(globalDir);
+    const builtin = listBuiltinModelPrompts().map((e) => ({
+      id: e.id,
+      title: e.title,
+      name: e.name,
+      mode: e.mode,
+      text: e.text,
+      disabled: { workspace: disabledWs.includes(e.name), global: disabledG.includes(e.name) },
+    }));
     sendJson(res, 200, {
       workspaceDir: dir || null,
       workspaceActive: !!dir,
       globalDir,
       workspace: dir ? collectModelEntries(join(dir, MODEL_PROMPT_DIR)) : [],
       global: collectModelEntries(globalDir),
+      builtin,
       // 当前生效配置解析出的模型 id 及其命中的条目(未命中为 null)——弹窗据此把默认页签
       // 指向命中条目；matched.name 为规范化大写名，与页签 key 的构成一致。
       modelId: status.modelId,
@@ -162,29 +213,39 @@ function postModelPrompts(req, res, parsedUrl, isLocal, deps) {
   req.on('end', async () => {
     if (truncated) return; // 超限已 destroy，socket 关闭，勿再解析/回包(对齐 postSystemText)
     try {
-      const { scope, name, mode, text } = JSON.parse(body || '{}');
+      const { scope, name, mode, text, action } = JSON.parse(body || '{}');
       if (scope !== 'workspace' && scope !== 'global') {
         sendJson(res, 400, { error: 'bad_scope' });
         return;
       }
       const canonical = normalizeModelName(name);
       if (!canonical) { sendJson(res, 400, { error: 'bad_model_name' }); return; }
-      let targetDir;
-      if (scope === 'global') {
-        targetDir = join(LOG_DIR, MODEL_PROMPT_DIR);
-      } else {
-        const dir = await resolveDir(deps);
-        if (!dir) { sendJson(res, 400, { error: 'no_active_workspace' }); return; }
-        targetDir = join(dir, MODEL_PROMPT_DIR);
+      const target = await resolveScopeModelDir(deps, scope);
+      if (target.error) { sendJson(res, 400, { error: target.error }); return; }
+      // 墓碑操作（禁用/启用内置 preset 条目）。action 存在但非法 → 400 兜底：
+      // 拼错的 action 绝不可 fall-through 到下面的「空 text = 删除用户条目」分支。
+      if (action !== undefined) {
+        if (action !== 'disable-builtin' && action !== 'enable-builtin') {
+          sendJson(res, 400, { error: 'bad_action' });
+          return;
+        }
+        if (!listBuiltinModelPrompts().some((e) => e.name === canonical)) {
+          sendJson(res, 400, { error: 'unknown_builtin' });
+          return;
+        }
+        const disabled = action === 'disable-builtin';
+        setBuiltinDisabled(target.dir, canonical, disabled);
+        sendJson(res, 200, { ok: true, scope, name: canonical, disabled });
+        return;
       }
       const raw = typeof text === 'string' ? text : '';
       if (raw.trim().length === 0) {
         // 空文本 = 删除条目(对齐 system-text 的「存空即禁用」约定；此时 mode 可缺省)。
-        deleteModelPrompt(targetDir, canonical);
+        deleteModelPrompt(target.dir, canonical);
         sendJson(res, 200, { ok: true, name: canonical, scope, cleared: true });
         return;
       }
-      const result = writeModelPrompt(targetDir, canonical, mode === 'override' ? 'override' : 'append', raw);
+      const result = writeModelPrompt(target.dir, canonical, mode === 'override' ? 'override' : 'append', raw);
       sendJson(res, 200, { ok: true, scope, ...result });
     } catch (e) {
       console.error('[CC Viewer] expert model-prompts POST failed:', e.message);

package/server/routes/im.js

@@ -19,13 +19,13 @@
 // detached ccv worker (im-process-manager). In the MAIN process, status/process routes go through the
 // manager (lock + loopback probe of the worker). In a WORKER process (CCV_IM_PLATFORM set), status
 // reports its own in-process adapter (deps.im.getBridgeStatus) — that's what the manager probes.
-import { getDescriptor, loadConfig, loadState, saveConfig } from '../lib/im-config.js';
+import { getDescriptor, loadConfig, loadState, saveConfig } from '../lib/im/im-config.js';
 import { findRecentLog } from '../lib/interceptor-core.js';
 import { listV2Sessions } from '../lib/v2/adapter.js';
-import { readSenders } from '../lib/im-senders.js';
-import { readImAppendSystem, writeImAppendSystem, buildImAppendSystemPreset, MAX_IM_APPEND_SYSTEM_CHARS } from '../lib/im-append-system.js';
-import { imDir } from '../lib/im-lock.js';
-import { resolvePrefLang } from '../lib/im-lang.js';
+import { readSenders } from '../lib/im/im-senders.js';
+import { readImAppendSystem, writeImAppendSystem, buildImAppendSystemPreset, MAX_IM_APPEND_SYSTEM_CHARS } from '../lib/im/im-append-system.js';
+import { imDir } from '../lib/im/im-lock.js';
+import { resolvePrefLang } from '../lib/im/im-lang.js';
 import { listSkills, moveSkill, deleteSkill } from '../lib/skills-api.js';
 import { importSkillTo } from './skills.js';
 import { LOG_DIR } from '../../findcc.js';

package/server/routes/preferences.js

@@ -5,14 +5,14 @@ import { homedir } from 'node:os';
 import { LOG_DIR, setLogDir, getClaudeConfigDir, discoverClaudeExecutables, resolveExplicitClaudePath, CLAUDE_EXECUTABLE_PREF_KEY } from '../../findcc.js';
 import { PROFILE_PATH, _defaultConfig, getActiveProfileId, getStoredRoles, isOfficialDefaultEndpoint, setActiveProfileForWorkspace, _loadProxyProfile, RETRY_CONFIG_PATH, _retryConfigState, _loadRetryConfigState } from '../interceptor.js';
 import { migrateProxyProfileList, isValidRoleValue, PROXY_ROLE_KEYS } from '../lib/interceptor-core.js';
-import { DEFAULT_RETRY_CONFIG, validateRetryConfig, resolveRetryConfig } from '../lib/proxy-retry.js';
+import { DEFAULT_RETRY_CONFIG, validateRetryConfig, resolveRetryConfig } from '../lib/proxy/proxy-retry.js';
 import { discoverCcSwitchProviders, mergeImportedProfiles } from '../lib/ccswitch-import.js';
-import { reportSwallowed } from '../lib/error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { setLang } from '../i18n.js';
 import { reconcileVoicePackPrefs as vpReconcile } from '../lib/voice-pack-manager.js';
 import { readClaudeProjectModel } from '../lib/context-watcher.js';
 import { sendEventToClients } from '../lib/log-watcher.js';
-import { listPlatforms } from '../lib/im-config.js';
+import { listPlatforms } from '../lib/im/im-config.js';
 import { mutatePrefs, applyPrefsPatch, readPrefsRaw } from '../lib/prefs-store.js';
 import {
   getCurrentProjectKey, getCurrentProjectName, hasFork, listForks, resolveScoped,

package/server/routes/workspaces.js

@@ -4,7 +4,7 @@ import { basename } from 'node:path';
 import { initForWorkspace, resetWorkspace, getLiveLogSource, markContinuedLaunch, markForkSession, markResumeSession, isContinuedLaunch } from '../interceptor.js';
 import { LOG_DIR } from '../../findcc.js';
 import { migrationStatus } from '../lib/v2/migrate-prompt.js';
-import { reportSwallowed } from '../lib/error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 
 // P2: claude continuation flags — the workspace launcher injects `-c` itself
 // (WorkspaceList's logCount heuristic), so argv scanning in cli.js never sees