cc-viewer 1.7.23 → 1.8.1

package/server/lib/cli-inject.js

@@ -16,7 +16,7 @@
 //   * buildInjectBlockRegex 用 `\r?\n` 匹配，可同时识别两种形式的历史 marker；
 //   * 改成参数化 EOL 会破坏 LEGACY 形式的回归匹配（老 marker 是 `\n` 写入的）。
 // - 因此注入后 CRLF 文件**会含混合 EOL**（块内 LF + 块外 CRLF），这是已知的、
-//   被 test/cli-inject.test.js 'CRLF 文件注入后原 CRLF 部分被保留' 用例固化的行为。
+//   被 packages/app/test/cli-inject.test.js 'CRLF 文件注入后原 CRLF 部分被保留' 用例固化的行为。
 
 import { readFileSync, writeFileSync, existsSync } from 'node:fs';
 

package/server/lib/context-watcher.js

@@ -2,7 +2,7 @@ import { readFileSync, existsSync, realpathSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { getClaudeConfigDir } from '../../findcc.js';
-import { getModelMaxTokens, adaptContextWindow, sumUsageInputTokens, sumUsageContextTokens, getCalibrationModel } from './context-rules.js';
+import { getModelMaxTokens, adaptContextWindow, sumUsageInputTokens, sumUsageContextTokens, getCalibrationModel } from '@ccv/core/context-rules';
 
 export const CONTEXT_WINDOW_FILE = join(getClaudeConfigDir(), 'context-window.json');
 export const CLAUDE_SETTINGS_FILE = join(getClaudeConfigDir(), 'settings.json');
@@ -27,7 +27,7 @@ export function readModelContextSize() {
     const modelId = data?.model?.id || null;
     let contextSize = 200000;
     if (modelId) {
-      // [Nk]/[Nm] 后缀与家族档位统一走共享规则表(server/lib/context-rules.js)
+      // [Nk]/[Nm] 后缀与家族档位统一走共享规则表(@ccv/core/context-rules)
       contextSize = getModelMaxTokens(modelId);
       // Cache the base name → size mapping
       const base = modelId.toLowerCase().replace(/^claude-/i, '').replace(/\[.*\]/, '').trim();
@@ -70,7 +70,7 @@ export function getContextSizeForModel(modelOrEntry) {
   if (_startupModelBase && base === _startupModelBase) {
     return _startupContextSize;
   }
-  // 完整档位表见 server/lib/context-rules.js(与前端同源;含 haiku/旧 opus/3-opus 200K、
+  // 完整档位表见 @ccv/core/context-rules(与前端同源;含 haiku/旧 opus/3-opus 200K、
   // deepseek-v4 1M、kimi/moonshot 256K、gpt/deepseek 等三方档位,默认 200K)
   return getModelMaxTokens(apiModelName);
 }

package/server/lib/create_system_prompt.js

@@ -181,9 +181,6 @@ export function createSystemPromptVariables(overrides = {}, opts = {}) {
       userName: isGitRepository
         ? commandOutput('git', ['config', 'user.name'], cwd)
         : '',
-      status: isGitRepository
-        ? commandOutput('git', ['status', '--short'], cwd)
-        : '',
       recentCommits: isGitRepository
         ? commandOutput('git', ['log', '--oneline', '-5'], cwd)
         : '',
@@ -198,8 +195,6 @@ export function createSystemPromptVariables(overrides = {}, opts = {}) {
       hostname: stringOrEmpty(() => os.hostname()),
       availableParallelism: numberOrEmpty(() => os.availableParallelism()),
       totalMemory: numberOrEmpty(() => os.totalmem()),
-      freeMemory: numberOrEmpty(() => os.freemem()),
-      uptime: numberOrEmpty(() => os.uptime()),
     },
     runtime: {
       nodeVersion: stringOrEmpty(() => process.version),
@@ -208,8 +203,6 @@ export function createSystemPromptVariables(overrides = {}, opts = {}) {
       ppid: numberOrEmpty(() => process.ppid),
     },
     time: {
-      current: stringOrEmpty(() => now.toString()),
-      iso: stringOrEmpty(() => now.toISOString()),
       date: currentDate(timeZone, now),
       timezone: timeZone,
     },
@@ -234,8 +227,6 @@ export function createSystemPromptVariables(overrides = {}, opts = {}) {
     terminal: {
       term: envString('TERM'),
       colorTerm: envString('COLORTERM'),
-      columns: numberOrEmpty(() => process.stdout.columns),
-      rows: numberOrEmpty(() => process.stdout.rows),
     },
     filesystem: {
       tmpdir: stringOrEmpty(() => os.tmpdir()),

package/server/lib/enrich-plan-input.js

@@ -48,7 +48,7 @@ function findEmptyExitPlanModeBlocks(content, out) {
  * - Header 名规范：interceptor 走 fetch Headers.entries() 全小写（WHATWG 规范），
  *   只查小写键即可。
  * - In-place mutation by design：用 Object.assign(blk.input, patch) 而非
- *   `blk.input = {...}`。增量重建器 (server/lib/delta-reconstructor.js) 会让同一 tool_use
+ *   `blk.input = {...}`。增量重建器 (@ccv/core/delta-reconstructor) 会让同一 tool_use
  *   block 在多个 entry 间共享对象引用；in-place mutate 让后续 entry 的「Object.keys
  *   (inp).length === 0」预检自动跳过——正是我们想要的 (相同 plan，不重新查盘)。
  *   注意：此优化仅在 SSE / live 路径（共享对象）生效；REST 路径 raw → JSON.parse

package/server/lib/ensure-hooks.js

@@ -138,7 +138,7 @@ export function ensureHooks() {
 
     // AskUserQuestion hook → ask-bridge.js
     // Guard: only execute when CCVIEWER_PORT is set (i.e. launched by cc-viewer)
-    const askBridgePath = resolve(SERVER_LIB, 'ask-bridge.js');
+    const askBridgePath = resolve(SERVER_LIB, 'ask', 'ask-bridge.js');
     const askCmd = `[ -n "$CCVIEWER_PORT" ] && node "${askBridgePath}" || true ${CCV_HOOK_MARKER}`;
     const askDesired = _buildHookObj(askCmd);
     const askExisting = settings.hooks.PreToolUse.find(h => h.matcher === 'AskUserQuestion');
@@ -157,7 +157,7 @@ export function ensureHooks() {
 
     // Permission approval hook → perm-bridge.js (matcher: "" = match all tools)
     // Guard: only execute when CCVIEWER_PORT is set (i.e. launched by cc-viewer)
-    const permBridgePath = resolve(SERVER_LIB, 'perm-bridge.js');
+    const permBridgePath = resolve(SERVER_LIB, 'ask', 'perm-bridge.js');
     const permCmd = `[ -n "$CCVIEWER_PORT" ] && node "${permBridgePath}" || true ${CCV_HOOK_MARKER}`;
     const permMatcher = '';
     // Clean up legacy entries

package/server/lib/file-access-policy.js

@@ -13,7 +13,7 @@
 import { realpathSync } from 'node:fs';
 import { resolve, basename, sep, join } from 'node:path';
 import { homedir, platform, tmpdir } from 'node:os';
-import { getClaudeConfigDir } from '../../findcc.js';
+import { getClaudeConfigDir, onLogDirChange } from '../../findcc.js';
 import { loadWorkspaces } from '../workspace-registry.js';
 
 const osPlatform = platform();
@@ -105,6 +105,11 @@ export function bumpWorkspacesVersion() {
   _rootsCache = null;
 }
 
+// LOG_DIR changes relocate the workspace registry file — the allowlist cache
+// (including registered workspaces) must be invalidated. Registered at module
+// load so findcc (a leaf) never imports this module.
+onLogDirChange(() => bumpWorkspacesVersion());
+
 /**
  * 测试 / 多 process 场景显式重置 —— 测试可在更换 HOME env 后调,policy 重新解析。
  */

package/server/lib/file-api.js

@@ -5,6 +5,22 @@
 import { resolve, join, sep, isAbsolute } from 'node:path';
 import { realpathSync, existsSync, statSync, readFileSync, writeFileSync, renameSync } from 'node:fs';
 
+/**
+ * A path counts as a non-empty file only if it exists, is a regular file, and
+ * has size > 0 (an empty file would blank the system prompt — skipping is safer).
+ * Bad symlinks / missing paths / directories → statSync throws or isFile()=false → false.
+ * Shared leaf home (moved from system-prompt-files.js to break the
+ * model-system-prompts.js ↔ system-prompt-files.js static cycle).
+ */
+export function isNonEmptyFile(p) {
+  try {
+    const st = statSync(p);
+    return st.isFile() && st.size > 0;
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Check whether targetPath is contained within the project root directory.
  * Resolves symlinks via realpathSync. Returns false on any error.
@@ -31,7 +47,7 @@ class FileApiError extends Error {
 /**
  * Resolve and validate a file path. No production callers (readFileContent does its own inline
  * path validation); kept as a standalone, path-traversal-defending helper covered by
- * test/file-api-gap.test.js — don't delete as "dead code" without removing that test.
+ * packages/app/test/file-api-gap.test.js — don't delete as "dead code" without removing that test.
  * @param {string} cwd - project working directory
  * @param {string} reqPath - requested path (relative or absolute)
  * @param {boolean} isEditorSession - whether this is an editor session

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

@@ -6,7 +6,7 @@
 // and the existing dingtalk-bridge tests keep working unchanged. Importing it registers the
 // DingTalk adapter with the core.
 import * as core from './im-bridge-core.js';
-import { __setClientFactory } from './adapters/dingtalk-adapter.js';
+import { __setClientFactory } from '../adapters/dingtalk-adapter.js';
 
 const ID = 'dingtalk';
 

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));