@jsonstudio/rcc 0.90.429 → 0.90.701

package/dist/utils/errorsamples.js

@@ -2,6 +2,16 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { resolveRccPath } from '../config/user-data-paths.js';
+const KB = 1024;
+const MB = 1024 * KB;
+const DEFAULT_MAX_SAMPLE_BYTES = 256 * KB;
+const DEFAULT_MAX_FILES_PER_GROUP = 5000;
+const DEFAULT_MAX_BYTES_PER_GROUP = 1024 * MB;
+const DEFAULT_CLIENT_TOOL_MAX_SAMPLE_BYTES = 24 * KB;
+const DEFAULT_CLIENT_TOOL_MAX_FILES = 120;
+const DEFAULT_CLIENT_TOOL_MAX_BYTES = 12 * MB;
+const DEFAULT_PRUNE_INTERVAL_MS = 2000;
+const pruneState = new Map();
 function resolveErrorsamplesRoot() {
     const envOverride = process.env.ROUTECODEX_ERRORSAMPLES_DIR ||
         process.env.RCC_ERRORSAMPLES_DIR ||
@@ -18,12 +28,182 @@ function safeStamp() {
     const iso = new Date().toISOString();
     return iso.replace(/[-:]/g, '').replace('T', '-').replace('.', '-');
 }
+function parseEnvPositiveInt(keys, fallback, min = 1) {
+    for (const key of keys) {
+        const raw = process.env[key];
+        if (raw == null || String(raw).trim() === '') {
+            continue;
+        }
+        const parsed = Number(raw);
+        if (!Number.isFinite(parsed)) {
+            continue;
+        }
+        const value = Math.floor(parsed);
+        if (value >= min) {
+            return value;
+        }
+    }
+    return fallback;
+}
+function resolveGroupBudget(group) {
+    const normalizedGroup = safeName(group || 'sample').toLowerCase();
+    const maxSampleBytes = parseEnvPositiveInt(['ROUTECODEX_ERRORSAMPLE_MAX_BYTES', 'RCC_ERRORSAMPLE_MAX_BYTES'], DEFAULT_MAX_SAMPLE_BYTES);
+    const defaultMaxFiles = parseEnvPositiveInt(['ROUTECODEX_ERRORSAMPLE_MAX_FILES_PER_GROUP', 'RCC_ERRORSAMPLE_MAX_FILES_PER_GROUP'], DEFAULT_MAX_FILES_PER_GROUP);
+    const defaultMaxBytes = parseEnvPositiveInt(['ROUTECODEX_ERRORSAMPLE_MAX_BYTES_PER_GROUP', 'RCC_ERRORSAMPLE_MAX_BYTES_PER_GROUP'], DEFAULT_MAX_BYTES_PER_GROUP);
+    const pruneIntervalMs = parseEnvPositiveInt(['ROUTECODEX_ERRORSAMPLE_PRUNE_INTERVAL_MS', 'RCC_ERRORSAMPLE_PRUNE_INTERVAL_MS'], DEFAULT_PRUNE_INTERVAL_MS, 0);
+    if (normalizedGroup === 'client-tool-error') {
+        return {
+            maxSampleBytes: parseEnvPositiveInt(['ROUTECODEX_ERRORSAMPLE_CLIENT_TOOL_MAX_SAMPLE_BYTES', 'RCC_ERRORSAMPLE_CLIENT_TOOL_MAX_SAMPLE_BYTES'], DEFAULT_CLIENT_TOOL_MAX_SAMPLE_BYTES),
+            maxFiles: parseEnvPositiveInt(['ROUTECODEX_ERRORSAMPLE_CLIENT_TOOL_MAX_FILES', 'RCC_ERRORSAMPLE_CLIENT_TOOL_MAX_FILES'], DEFAULT_CLIENT_TOOL_MAX_FILES),
+            maxBytes: parseEnvPositiveInt(['ROUTECODEX_ERRORSAMPLE_CLIENT_TOOL_MAX_BYTES', 'RCC_ERRORSAMPLE_CLIENT_TOOL_MAX_BYTES'], DEFAULT_CLIENT_TOOL_MAX_BYTES),
+            pruneIntervalMs
+        };
+    }
+    return {
+        maxSampleBytes,
+        maxFiles: defaultMaxFiles,
+        maxBytes: defaultMaxBytes,
+        pruneIntervalMs
+    };
+}
+function serializePayloadForWrite(payload, maxSampleBytes) {
+    const maxBytes = Math.max(1024, Math.floor(maxSampleBytes));
+    let pretty = '';
+    try {
+        pretty = JSON.stringify(payload, null, 2);
+    }
+    catch {
+        pretty = JSON.stringify({
+            truncated: true,
+            reason: 'payload_unserializable',
+            preview: String(payload)
+        }, null, 2);
+    }
+    if (Buffer.byteLength(pretty, 'utf8') <= maxBytes) {
+        return pretty;
+    }
+    let compact = '';
+    try {
+        compact = JSON.stringify(payload);
+    }
+    catch {
+        compact = '';
+    }
+    const originalBytes = Buffer.byteLength(compact || pretty, 'utf8');
+    let previewChars = Math.max(512, Math.floor(maxBytes * 0.6));
+    while (previewChars >= 256) {
+        const candidate = JSON.stringify({
+            truncated: true,
+            reason: 'payload_too_large',
+            maxBytes,
+            originalBytes,
+            preview: (compact || pretty).slice(0, previewChars)
+        }, null, 2);
+        if (Buffer.byteLength(candidate, 'utf8') <= maxBytes) {
+            return candidate;
+        }
+        previewChars = Math.floor(previewChars * 0.75);
+    }
+    return JSON.stringify({
+        truncated: true,
+        reason: 'payload_too_large',
+        maxBytes,
+        originalBytes
+    }, null, 2);
+}
+async function collectGroupFiles(dir) {
+    const entries = await fs.readdir(dir, { withFileTypes: true }).catch(() => []);
+    const files = [];
+    for (const entry of entries) {
+        if (!entry.isFile()) {
+            continue;
+        }
+        const full = path.join(dir, entry.name);
+        try {
+            const stat = await fs.stat(full);
+            files.push({ path: full, size: stat.size, mtimeMs: stat.mtimeMs || 0 });
+        }
+        catch {
+            // ignore race with concurrent deletion
+        }
+    }
+    files.sort((a, b) => a.mtimeMs - b.mtimeMs || a.path.localeCompare(b.path));
+    return files;
+}
+async function pruneGroupDirectoryNow(dir, budget) {
+    if (budget.maxFiles <= 0 || budget.maxBytes <= 0) {
+        return;
+    }
+    const files = await collectGroupFiles(dir);
+    if (files.length <= 0) {
+        return;
+    }
+    let totalBytes = files.reduce((sum, file) => sum + Math.max(0, file.size), 0);
+    let fileCount = files.length;
+    const toDelete = [];
+    for (const file of files) {
+        if (fileCount <= budget.maxFiles && totalBytes <= budget.maxBytes) {
+            break;
+        }
+        toDelete.push(file.path);
+        fileCount -= 1;
+        totalBytes -= Math.max(0, file.size);
+    }
+    if (toDelete.length <= 0) {
+        return;
+    }
+    await Promise.all(toDelete.map((filePath) => fs.rm(filePath, { force: true })));
+}
+async function maybePruneGroupDirectory(dir, budget, options) {
+    const force = options?.force === true;
+    const state = pruneState.get(dir) || { lastRunAt: 0, pending: null };
+    if (state.pending) {
+        await state.pending;
+        return;
+    }
+    const now = Date.now();
+    if (!force && budget.pruneIntervalMs > 0 && now - state.lastRunAt < budget.pruneIntervalMs) {
+        return;
+    }
+    const pending = (async () => {
+        await pruneGroupDirectoryNow(dir, budget);
+        state.lastRunAt = Date.now();
+    })().finally(() => {
+        const latest = pruneState.get(dir);
+        if (latest) {
+            latest.pending = null;
+            pruneState.set(dir, latest);
+        }
+    });
+    state.pending = pending;
+    pruneState.set(dir, state);
+    await pending;
+}
+function isEnospc(error) {
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const code = error.code;
+    return typeof code === 'string' && code.toUpperCase() === 'ENOSPC';
+}
 export async function writeErrorsampleJson(options) {
     const root = resolveErrorsamplesRoot();
     const dir = path.join(root, safeName(options.group));
+    const budget = resolveGroupBudget(options.group);
     await fs.mkdir(dir, { recursive: true });
     const file = path.join(dir, `${safeName(options.kind)}-${safeStamp()}-${Math.random().toString(16).slice(2)}.json`);
-    await fs.writeFile(file, JSON.stringify(options.payload, null, 2), 'utf8');
+    const serialized = serializePayloadForWrite(options.payload, budget.maxSampleBytes);
+    try {
+        await fs.writeFile(file, serialized, 'utf8');
+    }
+    catch (error) {
+        if (!isEnospc(error)) {
+            throw error;
+        }
+        await maybePruneGroupDirectory(dir, budget, { force: true });
+        await fs.writeFile(file, serialized, 'utf8');
+    }
+    await maybePruneGroupDirectory(dir, budget);
     return file;
 }
 //# sourceMappingURL=errorsamples.js.map

package/dist/utils/errorsamples.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorsamples.js","sourceRoot":"","sources":["../../src/utils/errorsamples.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,SAAS,uBAAuB;IAC9B,MAAM,WAAW,GACf,OAAO,CAAC,GAAG,CAAC,2BAA2B;QACvC,OAAO,CAAC,GAAG,CAAC,oBAAoB;QAChC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC;IAC3C,IAAI,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,cAAc,CAAC,cAAc,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,SAAS;IAChB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAI1C;IACC,MAAM,IAAI,GAAG,uBAAuB,EAAE,CAAC;IACvC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CACpB,GAAG,EACH,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CACvF,CAAC;IACF,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3E,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"errorsamples.js","sourceRoot":"","sources":["../../src/utils/errorsamples.ts"],"names":[],"mappings":"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"}

package/dist/utils/snapshot-writer.js

@@ -1,7 +1,7 @@
 import fsp from 'fs/promises';
 import os from 'os';
 import path from 'path';
-import { resolveRccSnapshotsDir } from '../config/user-data-paths.js';
+import { resolveRccSnapshotsDirFromEnv } from '../config/user-data-paths.js';
 import { runtimeFlags } from '../runtime/runtime-flags.js';
 let snapshotHookWriterPromise = null;
 function logServerSnapshotNonBlockingError(operation, error) {
@@ -22,11 +22,7 @@ export function isSnapshotsEnabled() {
     return runtimeFlags.snapshotsEnabled;
 }
 function resolveSnapshotRoot() {
-    const override = String(process.env.ROUTECODEX_SNAPSHOT_DIR || process.env.RCC_SNAPSHOT_DIR || '').trim();
-    if (override) {
-        return path.isAbsolute(override) ? override : path.resolve(override);
-    }
-    return resolveRccSnapshotsDir();
+    return resolveRccSnapshotsDirFromEnv();
 }
 function mapEndpointToFolder(entryEndpoint) {
     const ep = String(entryEndpoint || '').trim().toLowerCase();

package/dist/utils/snapshot-writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot-writer.js","sourceRoot":"","sources":["../../src/utils/snapshot-writer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshot-writer.js","sourceRoot":"","sources":["../../src/utils/snapshot-writer.ts"],"names":[],"mappings":"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"}

package/docs/ARCHITECTURE.md

@@ -17,6 +17,13 @@ RouteCodex 是一个多 Provider OpenAI 代理服务器，支持动态路由、
 
 > **落地要求**：Host 不再解析旧的“合并配置”蓝图，也不在 Provider 层做“模型选择”；所有模型替换/目标决策由 Virtual Router 执行，Host 仅负责“把 HTTP/SSE 转交给 Hub Pipeline + 根据 runtimeKey 调用 Provider”，从而保证单一职责和无兜底策略。
 
+### Hub Pipeline / Virtual Router Rust 真源说明（当前状态）
+
+- Hub Pipeline 与 Virtual Router 的核心运行时语义，当前以 Rust hotpath 为唯一真源：
+  - `sharedmodule/llmswitch-core/rust-core/crates/router-hotpath-napi/`
+- TS 层职责为 thin-shell（桥接/编排/输入输出承接），不再承载第二套语义真源。
+- 已废弃的 TS 旧实现统一归档到 `archive`/`*.legacy.ts`，避免在主路径被误改并引入双真源分叉。
+
 ## 系统架构
 
 ### 核心组件
@@ -177,6 +184,7 @@ RouteCodex 是一个多 Provider OpenAI 代理服务器，支持动态路由、
 RouteCodex 现在完全依赖 sharedmodule/llmswitch-core 的 Hub Pipeline，实现“HTTP ↔ 标准化请求 ↔ Virtual Router ↔ Provider”全链路处理：
 
 - **唯一入口**：服务器通过 `RouteCodexHttpServer` 调用 `sharedmodule/llmswitch-core/dist/conversion/hub/pipeline/hub-pipeline`，禁止旁路加载核心模块。
+- **Rust 真源**：Hub Pipeline / Virtual Router 的 runtime semantics 由 `router-hotpath-napi` 提供，TS 仅保留桥接编排薄壳。
 - **配置来源**：`routecodex-config-loader` 读取用户配置后调用 `bootstrapVirtualRouterConfig`。该工具会校验 routing/providers、展开 `provider.keyAlias.model`、生成 `targetRuntime` 映射（endpoint、headers、auth、compat profile），Hub Pipeline 构造函数直接接受该结果。
 - **节点链路**：Hub Pipeline 在内部组成 `SSE Input → Input Node → Chat Process → Virtual Router → (Compatibility，可选) → Output/SSE`。Host 不关心节点细节，只需要把 HTTP 请求封装成标准化的 Hub 请求。
 - **工具治理**：唯一的工具治理点位于 `chat-process-node`。Compatibility 层已完全下沉到 llmswitch-core（`sharedmodule/llmswitch-core/src/conversion/compat`），仅做 Provider 特定的最小字段修剪。

package/docs/design/heartbeat-session-execution-state.md

@@ -0,0 +1,227 @@
+# Heartbeat Session Execution State 设计
+
+## 目标
+
+为 heartbeat 注入建立一个 **tmux-scoped 执行状态真源**，在注入前判断目标 tmux 当前是否仍在执行任务；若仍在执行，则跳过本次 heartbeat，避免打扰。
+
+本设计重点解决两个问题：
+
+1. 不能再把 `client alive` 误判为 `session busy`。
+2. 不能只看 executor 生命周期；流式 SSE 仍在输出时，必须视为仍在执行。
+
+---
+
+## 已确认可用的现有信号
+
+### 1. tmux / session 绑定
+
+来源：
+
+- `src/server/runtime/http-server/executor-metadata.ts`
+- `src/server/runtime/http-server/session-scope-resolution.ts`
+
+当前可解析：
+
+- `tmuxSessionId`
+- `sessionId`
+- `conversationId`
+- `workdir`
+- `clientType`
+
+### 2. request 开始/结束
+
+来源：
+
+- `src/server/runtime/http-server/request-executor.ts`
+- `src/server/runtime/http-server/request-activity-tracker.ts`
+
+可用作“请求已发出”的信号，但 **不能单独作为流式执行态真源**，因为 `onRequestEnd` 发生在 executor `finally`，早于 SSE 真正结束。
+
+### 3. SSE 生命周期与 finish_reason
+
+来源：
+
+- `src/server/handlers/handler-response-utils.ts`
+- `src/server/utils/finish-reason.ts`
+
+当前已经能识别：
+
+- SSE stream start
+- SSE end
+- client close
+- finish / terminal event
+- `finish_reason`
+
+这些信号目前主要停留在响应层日志，没有形成 tmux-scoped 共享运行态。
+
+### 4. daemon alive / registry
+
+来源：
+
+- `src/server/runtime/http-server/session-client-registry.ts`
+
+当前能说明：
+
+- client daemon 是否仍在线
+- 最近 heartbeat / inject 时间
+
+但这 **不能说明 pane 当前是否 busy**。
+
+---
+
+## 核心判断原则
+
+### A. 流式请求优先
+
+若目标 tmux 当前存在 **未关闭的 SSE**，则直接判定为 **正在执行**，heartbeat 必须跳过。
+
+### B. 非流式请求看最近 request/response 时间线
+
+若最近一条事件是 request，且还未观察到对应 response：
+
+- 在 timeout 窗口内：视为仍在等待响应，应跳过 heartbeat
+- 超过 timeout：视为大概率已超时/断连，不应无限跳过 heartbeat
+
+### C. 最近一条事件是 response 时，看 finish_reason
+
+- `finish_reason=stop` 且之后没有新 request：视为空闲
+- `finish_reason!=stop`：进入短暂 grace 窗口，避免刚结束 tool_calls / length 时立刻误判为空闲
+
+---
+
+## 建议新增的真源模块
+
+建议新增：
+
+- `src/server/runtime/http-server/session-execution-state.ts`
+
+按 `tmuxSessionId` 维护最近执行态，至少记录：
+
+- `state`
+- `lastRequestId`
+- `lastRequestAtMs`
+- `lastRequestWasStream`
+- `openSseCount`
+- `lastSseOpenAtMs`
+- `lastSseCloseAtMs`
+- `lastResponseAtMs`
+- `lastFinishReason`
+- `lastTerminalAtMs`
+- `lastClientCloseBeforeTerminal`
+
+---
+
+## 状态机
+
+### 状态
+
+- `IDLE`
+- `WAITING_RESPONSE`
+- `STREAMING_OPEN`
+- `POST_RESPONSE_GRACE`
+- `STALED`
+- `UNKNOWN`
+
+### 含义
+
+#### `IDLE`
+
+当前可注入 heartbeat。
+
+#### `WAITING_RESPONSE`
+
+已收到 request，但尚未观察到 response 完成；在 timeout 窗口内应跳过 heartbeat。
+
+#### `STREAMING_OPEN`
+
+流式请求的 SSE 仍未关闭；这是“仍在执行”的最高优先级判定。
+
+#### `POST_RESPONSE_GRACE`
+
+刚结束一个非 `stop` 的响应，例如 `tool_calls` / `length`，短时间内仍可能紧接下一轮请求。
+
+#### `STALED`
+
+最近一条是 request，但超过 timeout 仍无 response，视为超时或断连，不应再无限跳过 heartbeat。
+
+#### `UNKNOWN`
+
+当前没有足够的新执行态数据；只允许降级到 tmux pane heuristic，不允许把 daemon alive 直接当作 busy。
+
+---
+
+## 事件与转移
+
+建议统一记录这些事件：
+
+- `REQUEST_STARTED`
+- `SSE_OPENED`
+- `SSE_CLOSED`
+- `RESPONSE_COMPLETED`
+- `RESPONSE_CLIENT_CLOSED`
+- `RESPONSE_ERROR`
+- `TIMEOUT_EXPIRED`
+
+主要转移：
+
+- `IDLE -> WAITING_RESPONSE`：收到 request
+- `WAITING_RESPONSE -> STREAMING_OPEN`：流式响应开始
+- `WAITING_RESPONSE -> IDLE`：收到非流式终态且 `finish_reason=stop`
+- `WAITING_RESPONSE -> POST_RESPONSE_GRACE`：收到非流式终态且 `finish_reason!=stop`
+- `WAITING_RESPONSE -> STALED`：超时无响应
+- `STREAMING_OPEN -> IDLE`：SSE 正常结束且 `finish_reason=stop`
+- `STREAMING_OPEN -> POST_RESPONSE_GRACE`：SSE 正常结束且 `finish_reason!=stop`
+- `STREAMING_OPEN -> STALED`：client close / 异常结束且没有正常终态
+- `POST_RESPONSE_GRACE -> WAITING_RESPONSE`：grace 期间来了新 request
+- `POST_RESPONSE_GRACE -> IDLE`：grace 到期且没有新 request
+- `STALED -> WAITING_RESPONSE`：之后出现新的 request
+
+---
+
+## Heartbeat skip 决策顺序
+
+推荐优先级：
+
+1. **存在未关闭 SSE** → `skip`
+2. **最新是 request，且仍在 timeout 窗口内** → `skip`
+3. **最新是 response，`finish_reason=stop`，且之后无新 request** → `allow`
+4. **最新是 request，但已超时无响应** → `allow`
+5. **状态不足** → fallback 到 tmux pane heuristic
+
+明确禁止：
+
+- 仅因为 `registry.hasAliveTmuxSession()` 为真，就直接判定 busy
+
+---
+
+## 与现有 heartbeat 的关系
+
+当前 heartbeat skip 逻辑里已有：
+
+- tmux 存活检查
+- request inflight 检查
+- client daemon alive 检查
+- tmux pane heuristic fallback
+
+新方案应调整为：
+
+1. execution-state tracker 为主真源
+2. tmux pane heuristic 仅作 fallback
+3. daemon alive 只表示“在线”，不表示“忙”
+
+---
+
+## 落地顺序建议
+
+1. 新增 `session-execution-state.ts`
+2. 在 request start 路径写入 `REQUEST_STARTED`
+3. 在 JSON response 完成路径写入 `RESPONSE_COMPLETED`
+4. 在 SSE 路径写入 `SSE_OPENED / SSE_CLOSED / RESPONSE_COMPLETED / RESPONSE_CLIENT_CLOSED`
+5. heartbeat 决策改为优先读取 execution-state tracker
+6. 在缺少状态时再回退到 tmux pane heuristic
+
+---
+
+## 备注
+
+该设计上线后，只能对 **上线后的新请求** 逐步建立准确执行态。对上线前已在跑的老 session，短期内仍需依赖 tmux pane heuristic 兜底。

package/docs/reports/apply-patch-errorsamples-classification.md

@@ -0,0 +1,144 @@
+# apply_patch 错误样本分类表（2026-03-18）
+
+## 范围
+
+本表基于两个样本集合：
+
+1. **近期主样本集**
+   - `~/.rcc/errorsamples/client-tool-error/chat_process.req.stage2.semantic_map.apply_patch-*.json`
+   - 按最近 **200** 条与最近 **500** 条做统计
+2. **历史回归样本集**
+   - `~/.rcc/errorsamples/apply-patch-regression/*.json`
+
+## 结论摘要
+
+- 近期高频错误几乎全部是 `apply_patch_verification_failed`，而且高度集中在 **4 类**。
+- 当前主因不是执行器随机失效，而是 **模型 patch 心智错误**：
+  1. 把 GNU diff 头混进 `*** Begin Patch` 块；
+  2. 把 merge/conflict 标记直接塞进 patch；
+  3. 继续硬写 GNU 行号上下文（`@@ -51,7 +51,9 @@`）；
+  4. 少量真实的 `expected lines not found`。
+- 历史回归样本还保留两类基础错误：
+  - `unsupported_patch_format`
+  - `empty_add_file_block`
+
+---
+
+## 近期样本统计
+
+### 最近 200 条 apply_patch 专属样本
+
+来源：
+
+- `~/.rcc/errorsamples/client-tool-error/chat_process.req.stage2.semantic_map.apply_patch-*.json`
+
+统计结果：
+
+| 分类 | 数量 |
+|---|---:|
+| conflict_markers_or_merge_chunks | 72 |
+| gnu_line_number_context_not_found | 55 |
+| mixed_gnu_diff_inside_begin_patch | 55 |
+| expected_lines_not_found | 18 |
+
+### 最近 500 条 JSON 错误样本中的 apply_patch 相关分类
+
+来源：
+
+- `~/.rcc/errorsamples/**/*.json`
+
+统计结果：
+
+| 分类 | 数量 |
+|---|---:|
+| conflict_markers_or_merge_chunks | 75 |
+| gnu_line_number_context_not_found | 57 |
+| mixed_gnu_diff_inside_begin_patch | 49 |
+| expected_lines_not_found | 19 |
+
+备注：
+
+- 最近 500 条 JSON 样本里，**未看到**新的 `exec_command_nested_apply_patch_warning` 成为主流；说明这轮主要问题已从“工具选错”转向“patch 形状错误”。
+
+---
+
+## 历史回归样本统计
+
+来源：
+
+- `~/.rcc/errorsamples/apply-patch-regression/*.json`
+
+统计结果：
+
+| 分类 | 数量 |
+|---|---:|
+| unsupported_patch_format | 2 |
+| empty_add_file_block | 1 |
+
+---
+
+## 分类表
+
+| 分类 | 典型 matchedText / 症状 | 当前数量 | 更可能的根因 | 建议修复层 | 优先级 | 建议动作 |
+|---|---|---:|---|---|---|---|
+| `conflict_markers_or_merge_chunks` | `Expected update hunk to start with a @@ context marker, got: '======='` | 72 / 75 | 模型把 merge/conflict chunk 或非 patch 文本直接塞进 `Update File` | **prompt/guidance** + request-path guard | P0 | 强化“禁止 `=======/<<<<<<</>>>>>>>`”与“`Update File` 必须有 `@@` hunk”；必要时在 request-path 直接拦截冲突标记并回写 guard reason |
+| `gnu_line_number_context_not_found` | `Failed to find context '-114,6 +114,7 @@'` | 55 / 57 | 模型误以为必须精确写 GNU 行号上下文；或基于旧内容生成 patch | **prompt/guidance** + post-failure retry policy | P0 | 明确“可以用 `@@` + 上下文，不必强写 GNU 行号”；失败后要求重读文件并缩小唯一上下文 |
+| `mixed_gnu_diff_inside_begin_patch` | `invalid hunk at line 2, '--- a/src/server/index.ts' is not a valid hunk header` | 55 / 49 | 模型把 internal `*** Begin Patch` 与 GNU diff 头混用 | **prompt/guidance** + validator normalization（可选） | P0 | 明确“二选一，严禁混用”；可评估是否把 `*** Begin Patch` 包裹的 GNU diff 头再做一层自动剥离修复 |
+| `expected_lines_not_found` | `Failed to find expected lines in ...` | 18 / 19 | 真正的上下文不匹配：文件已变化、上下文过大、不够唯一 | **runtime retry guidance** | P1 | 出错后强制重读最新文件，再用更小且唯一的上下文；必要时把单次 patch 拆小 |
+| `unsupported_patch_format` | `Update File` 后直接跟 frontmatter / 正文，没有 hunk | 2（历史） | 模型不理解 internal grammar；把 `Update File` 当“全文替换” | **tool guidance** + validator reason hint | P1 | 强化最小合法模板，显式提示“没有 `@@` hunk 的 `Update File` 会被拒绝” |
+| `empty_add_file_block` | `*** Add File: ...` 后没有任何 `+` 行 | 1（历史） | 模型误以为空文件 Add File 合法 | **tool guidance** + validator reason hint | P2 | 明确 Add File 必须至少包含一行 `+内容`；若真要空文件，应改为 shell `touch` 之类的受控策略或专门工具，而不是空 patch |
+| `exec_command_nested_apply_patch_warning` | `Warning: apply_patch was requested via exec_command` | 非近期主流，历史存在 | 工具选错：模型把 `apply_patch` 当 shell 命令 | **rewrite/guard** | P2 | 维持现有 rewrite/guard；后续做样本分类时单独追踪是否再次升高 |
+
+---
+
+## 已完成的前置收敛
+
+本轮已先修正工具引导文案，避免继续制造同类错误：
+
+- `src/config/system-prompts/codex-cli.txt`
+  - 去掉“apply_patch 不好用就换 Node/Python 脚本”的弱引导
+- `sharedmodule/llmswitch-core/src/guidance/index.ts`
+  - 明确 **Begin Patch / GNU diff 二选一，禁止混用**
+  - 增加最小合法模板
+  - 禁止 conflict markers / 裸 frontmatter 作为 `Update File` body
+- `sharedmodule/llmswitch-core/src/guidance/CCR_TOOL_GUIDE.md`
+  - 同步补齐以上规则
+- `sharedmodule/llmswitch-core/src/conversion/hub/process/chat-process-clock-tool-schemas.ts`
+  - 工具描述补齐 FREEFORM 与“不混用”要求
+
+---
+
+## 建议修复顺序
+
+### 第一步：先修 prompt / guidance
+
+优先原因：
+
+- 当前占比最高的三类错误都属于**模型生成 patch 形状错误**
+- 不先收紧提示词，后面即使增强 validator，也只是在被动收垃圾输入
+
+### 第二步：补 request-path / validator 的 reason 编码与 guard
+
+优先看两点：
+
+1. 对 conflict markers 的 request-path 早拦截
+2. 对“mixed GNU diff inside Begin Patch”评估是否做自动修复，还是继续 fail-fast
+
+### 第三步：为 `expected_lines_not_found` 设计统一 retry 策略
+
+这是最像“正常 patch 失败”的一类，应通过：
+
+- 重读文件
+- 缩小上下文
+- 拆小 patch
+
+来恢复，而不是继续堆更宽松的语法容错。
+
+---
+
+## 下一步实施建议
+
+1. 在 `apply_patch` 工具引导里增加**可复制模板**的实际注入验证
+2. 给 `tool-governor` / request-path 增加 **conflict-marker 明确分类 reason**
+3. 决定是否为“`*** Begin Patch` + GNU diff 头混用”加一层**自动正规化**
+4. 把本表对应到测试矩阵，新增每类错误至少 1 条回归用例