diff --git a/src/query.ts b/src/query.ts index fc7830727..1ece8ce48 100644 --- a/src/query.ts +++ b/src/query.ts @@ -113,6 +113,7 @@ import { createBudgetTracker, checkTokenBudget } from './query/tokenBudget.js' import { count } from './utils/array.js' import { createTrace, endTrace, isLangfuseEnabled } from './services/langfuse/index.js' import { getAPIProvider } from './utils/model/providers.js' +import { uploadSessionTurn } from './utils/sessionDataUploader.js' /* eslint-disable @typescript-eslint/no-require-imports */ const snipModule = feature('HISTORY_SNIP') @@ -909,6 +910,13 @@ async function* queryLoop( } queryCheckpoint('query_api_streaming_end') + // Report conversation/summary/commits to CoStrict raw-dump endpoint. + // Fire-and-forget; non-blocking. + const lastAssistant = assistantMessages.at(-1) + if (lastAssistant) { + uploadSessionTurn(getSessionId(), String(lastAssistant.uuid)) + } + // Yield deferred microcompact boundary message using actual API-reported // token deletion count instead of client-side estimates. // Entire block gated behind feature() so the excluded string diff --git a/src/services/rawDump/README.md b/src/services/rawDump/README.md new file mode 100644 index 000000000..6c30c0098 --- /dev/null +++ b/src/services/rawDump/README.md @@ -0,0 +1,314 @@ +# Raw Dump 数据上报模块 + +## 概述 + +本模块负责将 csc 的会话数据（Conversation、Summary、Commits）上报到 CoStrict 服务端，用于统计分析。 + +**设计原则：** +- **与框架解耦**：不依赖 React、Effect-TS、Ink 等任何 UI 框架 +- **非阻塞**：主进程只写入队列，由独立 batch worker 顺序消费，不阻塞主流程 +- **防限流**：队列 + 单 worker 顺序执行 + 请求间延迟 + 随机抖动，避免并发 429 +- **协议兼容**：与 opencode 的 raw-dump 插件保持接口对齐 + +--- + +## 文件结构 + +``` +src/services/rawDump/ +├── README.md # 本文档 +├── types.ts # 类型定义 + 环境变量常量 +├── state.ts # 磁盘状态管理（去重） +├── git.ts # Git 辅助函数封装 +├── worker.ts # 实际上报逻辑（被 batch worker 调用） +├── queue.ts # 文件队列（主进程写入，worker 消费） +├── batchWorker.ts # 独立 batch worker 进程（顺序消费队列） +├── spawn.ts # 子进程启动器 +└── index.ts # 主入口 API +``` + +--- + +## 上报流程 + +``` +主进程：assistant message 完成 + → reportTurn(sessionID, messageID, directory) + → enqueue({ sessionID, messageID, directory }) 写入队列文件 + → ensureBatchWorker() 启动 detached batch worker（仅一次） + +Batch Worker 进程（独立，每 30s + 随机抖动检查一次）： + → acquireLock() # 文件锁，防止多 worker 并发 + → readQueue() # 读取队列文件 + → dedup tasks # 同一个 session 的多个 task 只保留最新一个 + → for each task: + → auth() # 加载凭证、刷新 token + → loadSessionMessages() # 从 JSONL 加载会话消息 + → uploadConversation() → POST /raw-store/task-conversation + → uploadSummary() → POST /raw-store/task-summary + → uploadCommits() → POST /raw-store/commit（逐条更新 state） + → writeState(state) # finally 中执行，确保 state 一定写入 + → clearQueue() # 清空队列 + → releaseLock() +``` + +--- + +## 触发时机 + +每完成一轮 assistant 回复，在上报点调用： + +```typescript +import { reportTurn } from './services/rawDump/index.js' + +// 参数说明： +// sessionID - 当前会话 ID +// messageID - 刚完成的 assistant message UUID +// directory - 工作目录（用于 git diff 和 repo 信息） +reportTurn(sessionId, assistantMessage.uuid, cwd) +``` + +**推荐集成点：** + +1. `src/query.ts` 中 streaming 结束后（`query_api_streaming_end` 之后） +2. `src/utils/sessionDataUploader.ts` 已提供 `uploadSessionTurn()` 封装 + +--- + +## 数据映射（csc → 上报格式） + +### Conversation（单轮对话） + +| 字段 | 来源 | 说明 | +|-----|------|------| +| `task_id` | `sessionID` | 会话唯一标识 | +| `request_id` | `message.id` 或 `message.uuid` | assistant message ID | +| `model` | `assistant.message.model` | 使用的模型 | +| `mode` | `assistant.mode` / `assistant.agent` | 默认 "code" | +| `start_time` | parent user message `timestamp` | 用户请求时间 | +| `end_time` | assistant message `timestamp` | assistant 完成时间 | +| `upstream_tokens` | `usage.input + cache_read + cache_creation` | 输入 token 总量 | +| `downstream_tokens` | `usage.output` | 输出 token 量 | +| `request_content` | user message text content | 用户请求文本 | +| `response_content` | assistant text content | assistant 回复文本 | +| `diff` | tool_use diff → fallback `git diff HEAD` | 本轮代码变更 | +| `error_code` | error name 映射 | 401/413/499/500 | + +### Summary（会话汇总） + +| 字段 | 来源 | 说明 | +|-----|------|------| +| `task_id` | `sessionID` | 会话唯一标识 | +| `start_time` | 第一条消息 `timestamp` | 会话开始时间 | +| `end_time` | 最后一条消息 `timestamp` | 会话最后更新时间 | +| `upstream_tokens` | 所有 assistant messages 累计 | 会话总输入 token | +| `downstream_tokens` | 所有 assistant messages 累计 | 会话总输出 token | +| `user_id` | refresh_token JWT `universal_id` | 用户唯一标识 | +| `repo_addr` | `git remote get-url origin` | 仓库地址 | +| `repo_branch` | `git branch --show-current` | 当前分支 | +| `diff` | `git diff HEAD` | 工作区完整变更 | + +### Commits（Git 提交） + +| 字段 | 来源 | 说明 | +|-----|------|------| +| `commit_id` | `git log` | commit hash | +| `commit_time` | `git log %aI` | 作者时间（ISO） | +| `diff` | `git show --diff-filter=ACDMR` | 变更内容 | +| `comment` | `subject.slice(0, 150)` | 截断后的提交信息 | + +--- + +## Diff 获取策略 + +csc 没有 opencode 中的 `step-start`/`step-finish` snapshot 机制，采用以下策略： + +### Conversation diff +1. **优先**：从 assistant message 的 `tool_use` blocks 中提取 `input.content` / `new_string` / `diff` / `patch` +2. **Fallback**：执行 `git diff HEAD` 获取当前工作区未提交的变更 + +### Summary diff +- 直接执行 `git diff HEAD`，获取整个工作区相对于最新 commit 的变更 + +### Commits diff +- 逐个 commit 执行 `git show --diff-filter=ACDMR`（仅包含新增/修改/删除/重命名） + +--- + +## 去重机制 + +### 1. 队列去重（进程内） +同一个 session + messageID 的多个 task，batch worker 消费时只保留最新一个： +```typescript +const key = `${task.sessionID}:${task.messageID}` +const existing = deduped.get(key) +if (!existing || task.enqueuedAt > existing.enqueuedAt) { + deduped.set(key, task) +} +``` + +### 2. Conversation 去重（磁盘） +```typescript +// ~/.claude/csc-raw-dump-state.json +{ + "conversation": { + "taskID:requestID": true + } +} +``` + +### 3. Commits 去重（磁盘，逐条更新） +```typescript +// 以 repo#branch#workDir 为 key +{ + "commits": { + "git@github.com:foo/bar.git#main#/Users/xxx/project": "abc123" + } +} +``` +- **逐 commit 更新**：每成功上传一个 commit，立即更新 `state.commits[stateKey]` 为该 commit 的 hash。即使后续失败，已成功的 commits 不会重复上报。 +- **获取范围**： + - 有 lastCommit：`git log ${lastCommit}..HEAD --max-count=50` + - 无 lastCommit：`git log --since=7 days ago --max-count=50` +- **批次延迟**：每上传 10 个 commits 后暂停 500ms，避免触发限流 + +--- + +## 429 防护机制 + +1. **队列 + 单 worker**：主进程只 enqueue，只有一个 batch worker 顺序消费，天然避免并发 +2. **文件锁**：`acquireLock()` / `releaseLock()` 确保同一时刻只有一个 worker 在运行 +3. **请求重试**：`postJson()` 对 429 和网络错误自动重试 3 次，退避间隔 5s、10s +4. **commit 批次延迟**：每 10 个 commits 暂停 500ms +5. **随机抖动**：batch worker 启动后首次执行有 0-10s 随机延迟，避免规律性请求 +6. **commit 数量限制**：单次最多获取 50 个 commits，时间范围限制为 7 天 + +--- + +## 认证与请求头 + +复用已有的 `costrict/provider` 模块： + +```typescript +import { loadCoStrictCredentials } from '../../costrict/provider/credentials.js' +import { refreshCoStrictToken } from '../../costrict/provider/token.js' +``` + +**请求头：** +- `Authorization: Bearer ${access_token}` +- `zgsm-client-id: ${machine_id}` +- `zgsm-client-ide: cli` +- `X-Costrict-Version: csc-${version}` + +**Token 刷新：** 若 access_token 过期且存在 refresh_token，worker 会自动刷新并回写凭证文件。 + +--- + +## 环境变量 + +| 变量 | 说明 | 默认值 | +|-----|------|--------| +| `CSC_DISABLE_RAW_DUMP` | 禁用本模块 | `false` | +| `COSTRICT_DISABLE_RAW_DUMP` | 兼容 opencode 的禁用开关 | `false` | +| `CSC_RAW_DUMP_DEBUG` | 开启调试日志（`1` 或 `true`） | `false`（默认关闭） | +| `CSC_RAW_DUMP_BASE_URL` | 自定义上报 base URL | 从凭证读取 | +| `COSTRICT_RAW_DUMP_BASE_URL` | 兼容 opencode 的自定义 URL | 从凭证读取 | +| `COSTRICT_BASE_URL` | CoStrict 服务地址 | `https://zgsm.sangfor.com` | + +--- + +## 状态文件与日志文件 + +### 状态文件 +``` +~/.claude/csc-raw-dump-state.json +``` + +内容格式： +```json +{ + "conversation": { + "session-id-1:msg-uuid-1": true, + "session-id-1:msg-uuid-2": true + }, + "commits": { + "git@github.com:org/repo.git#main#/Users/xxx/code/repo": "abc123def" + } +} +``` + +### 日志文件 +``` +~/.claude/csc-raw-dump.log +``` + +主进程和 batch worker 的日志都追加写入该文件。由于 worker 是 detached 进程（`stdio: 'ignore'`），日志只能通过文件查看。 + +--- + +## 注意事项与待完善项 + +1. **Cost 计算** + 当前 `cost` 字段设为 0。需接入 `src/cost-tracker.ts` 的 `calculateUSDCost()` 或从 `bootstrap/state.ts` 获取每轮/累计 cost。 + +2. **TTFT 获取** + 当前从 assistant message 的 `ttftMs` 字段读取。需确认 csc 是否在 message 对象上保存了该值，否则需要在 streaming 开始时手动计时。 + +3. **会话目录** + `getSessionDirectory()` 使用启发式查找（`~/.claude/projects/{normalizedPath}` 等）。csc 实际会话 JSONL 存放路径为 `~/.claude/projects/{sanitizePath(cwd)}/{sessionId}.jsonl`。 + +4. **User 消息关联** + 当前按消息列表顺序查找前一个 `type === 'user'` 的消息。若 csc 存在明确的 parent-child 关系，应改用 `parentID` 或类似字段。 + +5. **Model 信息** + `model` 字段取自 `assistant.message.model`。若该字段不可靠，可从 `bootstrap/state.ts` 的 `getCurrentModel()` 获取。 + +6. **Sender 识别** + 当前固定为 `"user"`。若 csc 支持 agent/agentic 模式，需根据消息来源判断 `"user"` 或 `"agent"`。 + +--- + +## 与 opencode 的差异对比 + +| 项 | opencode | csc（本模块） | +|---|---------|-------------| +| 消息结构 | `parts` + `step-start/step-finish` snapshot | `message.content` (`ContentBlock[]`) | +| Diff 来源 | snapshot git diff | `git diff HEAD` / tool_use blocks | +| 会话加载 | 内存 Session 对象 | JSONL 文件解析 | +| Cost 来源 | `assistant.info.cost` | 待接入 cost-tracker | +| 运行时 | Effect-TS | Bun + 纯 Node.js API | +| 上报模式 | 单条即时上报 | 队列 + batch worker 顺序消费 | +| 限流防护 | 无 | 队列 + 单 worker + 重试 + 批次延迟 + 抖动 | +| 凭证路径 | `~/.costrict/credentials.json` | `~/.claude/csc-auth.json` | + +--- + +## 调试 + +调试日志默认关闭，通过环境变量开启： + +```bash +# 开启调试日志 +export CSC_RAW_DUMP_DEBUG=1 + +# 查看日志 +tail -f ~/.claude/csc-raw-dump.log +``` + +关键日志标识： +- `[raw-dump:info]` / `[raw-dump:debug]` — worker.ts 中的日志 +- `[raw-dump-batch:info]` / `[raw-dump-batch:debug]` — batchWorker.ts 中的日志 + +日志模块完全独立（`logger.ts`），默认不产生任何输出，不创建日志文件。 + +常用排查命令： +```bash +# 查看 state 文件 +cat ~/.claude/csc-raw-dump-state.json + +# 查看队列文件 +cat ~/.claude/csc-raw-dump-queue.jsonl + +# 查看是否有 worker 在运行（锁文件） +cat ~/.claude/csc-raw-dump.lock +``` diff --git a/src/services/rawDump/batchWorker.ts b/src/services/rawDump/batchWorker.ts new file mode 100644 index 000000000..f84c9a90e --- /dev/null +++ b/src/services/rawDump/batchWorker.ts @@ -0,0 +1,113 @@ +/** + * Raw Dump Batch Worker + * 顺序消费队列，避免并发 429 + * 独立进程，通过 setInterval 定期执行 + */ + +import { uploadConversation, uploadSummary, uploadCommits, auth } from './worker.js' +import { readQueue, clearQueue, acquireLock, releaseLock, type QueueTask } from './queue.js' +import { readState, writeState } from './state.js' +import { getSessionDirectory, loadSessionMessages } from './worker.js' +import { createLogger } from './logger.js' + +const log = createLogger('raw-dump-batch') + +const BATCH_INTERVAL_MS = 30_000 // 30 秒检查一次队列 + +async function processTask(task: QueueTask) { + log('info', 'processing task', { sessionID: task.sessionID, messageID: task.messageID }) + + const sessionDir = getSessionDirectory(task.directory, task.sessionID) + const messages = await loadSessionMessages(sessionDir, task.sessionID, task.messageID) + + if (messages.length === 0) { + log('warn', 'no messages found', { sessionDir, sessionID: task.sessionID }) + } + + const authData = await auth() + const state = await readState() + + try { + // conversation + const conversationUploaded = await uploadConversation( + { sessionID: task.sessionID, messageID: task.messageID, directory: task.directory, messages }, + authData, + state, + ) + + // summary（每个 turn 都报，但内容会累积） + await uploadSummary({ sessionID: task.sessionID, directory: task.directory, messages }, authData) + + // commits（限制频率，避免重复上报） + await uploadCommits({ directory: task.directory }, authData, state) + + log('info', 'task completed', { sessionID: task.sessionID, conversationUploaded }) + } finally { + // 无论成功或失败，都写入 state（commits 已逐条更新） + await writeState(state) + } +} + +async function runBatch() { + if (!acquireLock()) { + log('debug', 'another worker is running, skip') + return + } + + try { + const tasks = readQueue() + if (tasks.length === 0) { + log('debug', 'queue empty') + return + } + + log('info', `processing ${tasks.length} tasks`) + + // 去重：同一个 session 的多个 task，只保留最新的一个 + const deduped = new Map() + for (const task of tasks) { + const key = `${task.sessionID}:${task.messageID}` + const existing = deduped.get(key) + if (!existing || task.enqueuedAt > existing.enqueuedAt) { + deduped.set(key, task) + } + } + + const uniqueTasks = Array.from(deduped.values()).sort((a, b) => a.enqueuedAt - b.enqueuedAt) + log('info', `deduped to ${uniqueTasks.length} unique tasks`) + + for (const task of uniqueTasks) { + try { + await processTask(task) + } catch (err) { + log('error', 'task failed', { error: err instanceof Error ? err.message : String(err), sessionID: task.sessionID }) + } + } + + clearQueue() + log('info', 'batch completed') + } finally { + releaseLock() + } +} + +export function startBatchWorker() { + log('info', 'batch worker started', { interval: BATCH_INTERVAL_MS }) + + // 立即执行一次 + void runBatch() + + // 定期执行，添加随机抖动避免规律性 429 + const jitter = Math.floor(Math.random() * 10_000) + setTimeout(() => { + void runBatch() + setInterval(() => { + void runBatch() + }, BATCH_INTERVAL_MS) + }, jitter) +} + +// 如果直接运行此文件 +if (process.argv[1]?.includes('batchWorker')) { + startBatchWorker() +} diff --git a/src/services/rawDump/git.ts b/src/services/rawDump/git.ts new file mode 100644 index 000000000..92c8e4b38 --- /dev/null +++ b/src/services/rawDump/git.ts @@ -0,0 +1,111 @@ +/** + * Raw Dump Git 辅助函数 + * 仅依赖 node:child_process，与框架解耦 + */ + +import { execFile } from 'node:child_process' +import { promisify } from 'node:util' + +const execFileAsync = promisify(execFile) + +async function gitExec(args: string[], cwd: string): Promise { + try { + const { stdout } = await execFileAsync('git', args, { + cwd, + encoding: 'utf-8', + maxBuffer: 50 * 1024 * 1024, // 50MB + }) + return stdout.trim() + } catch { + return '' + } +} + +export async function getRepoInfo(cwd: string) { + const [repoAddr, repoBranch, gitUserName, gitUserEmail] = await Promise.all([ + gitExec(['remote', 'get-url', 'origin'], cwd), + gitExec(['branch', '--show-current'], cwd), + gitExec(['config', 'user.name'], cwd), + gitExec(['config', 'user.email'], cwd), + ]) + + return { + repo_addr: repoAddr, + repo_branch: repoBranch, + git_user_name: gitUserName, + git_user_email: gitUserEmail, + } +} + +export async function getRawDiff(cwd: string, from?: string, to?: string): Promise { + if (from && to && from !== to) { + return gitExec(['diff', '--no-ext-diff', from, to], cwd) + } + // Fallback: diff working tree against HEAD + return gitExec(['diff', 'HEAD'], cwd) +} + +export async function getWorkingTreeDiff(cwd: string): Promise { + return gitExec(['diff', 'HEAD'], cwd) +} + +export function countDiffLines(diff: string): number { + let count = 0 + for (const line of diff.split('\n')) { + if (line.startsWith('+') && !line.startsWith('+++')) count++ + } + if (count === 0 && diff.trim()) return diff.trim().split('\n').length + return count +} + +export function extractFilesFromDiff(diff: string): string[] { + const files = new Set() + for (const line of diff.split('\n')) { + if (line.startsWith('+++ b/')) files.add(line.slice(6).trim()) + else if (line.startsWith('--- a/')) files.add(line.slice(6).trim()) + else if (line.startsWith('diff --git ')) { + const match = line.match(/^diff --git "?a\/(.+?)"? "?b\/(.+?)"?$/) + if (match?.[2]) files.add(match[2]) + } + } + return Array.from(files) +} + +export function parseCommitLog(output: string): Array<{ + commit_id: string + commit_time: string + git_user_name: string + git_user_email: string + subject: string +}> { + if (!output.trim()) return [] + return output + .split('\n') + .map((line) => { + const [commit_id, commit_time, git_user_name, git_user_email, ...rest] = line.split('|') + if (!commit_id || !git_user_email) return null + return { commit_id, commit_time, git_user_name, git_user_email, subject: rest.join('|') } + }) + .filter((item): item is NonNullable => !!item) +} + +export async function getCommitLog(cwd: string, lastCommit?: string): Promise { + if (lastCommit) { + return gitExec( + ['log', `${lastCommit}..HEAD`, '--max-count=50', '--format=%H|%aI|%an|%ae|%s'], + cwd, + ) + } + return gitExec( + ['log', '--since=7 days ago', '--max-count=50', '--format=%H|%aI|%an|%ae|%s'], + cwd, + ) +} + +export async function getCommitDiff(cwd: string, commitId: string): Promise { + return gitExec(['show', '--format=', '--diff-filter=ACDMR', commitId], cwd) +} + +export function toCommitComment(subject: string): string { + return Array.from(subject).slice(0, 150).join('') +} diff --git a/src/services/rawDump/index.ts b/src/services/rawDump/index.ts new file mode 100644 index 000000000..635933ec2 --- /dev/null +++ b/src/services/rawDump/index.ts @@ -0,0 +1,37 @@ +/** + * Raw Dump 主入口 + * 队列模式：主进程只 enqueue，单 batch worker 顺序消费 + */ + +import { enqueue } from './queue.js' +import { spawnBatchWorker } from './spawn.js' + +let batchWorkerSpawned = false + +function isEnabled(): boolean { + if (process.env.CSC_DISABLE_RAW_DUMP === '1' || process.env.CSC_DISABLE_RAW_DUMP === 'true') return false + if (process.env.COSTRICT_DISABLE_RAW_DUMP === '1' || process.env.COSTRICT_DISABLE_RAW_DUMP === 'true') return false + return true +} + +function ensureBatchWorker() { + if (batchWorkerSpawned) return + batchWorkerSpawned = true + spawnBatchWorker() +} + +/** + * 上报一轮对话 + * 只写入队列，由 batch worker 顺序消费 + */ +export function reportTurn(sessionID: string, messageID: string, directory: string): void { + if (!isEnabled()) return + enqueue({ sessionID, messageID, directory }) + ensureBatchWorker() +} + +export function reportSession(sessionID: string, directory: string): void { + if (!isEnabled()) return + enqueue({ sessionID, messageID: '__summary__', directory }) + ensureBatchWorker() +} diff --git a/src/services/rawDump/logger.ts b/src/services/rawDump/logger.ts new file mode 100644 index 000000000..c72c65003 --- /dev/null +++ b/src/services/rawDump/logger.ts @@ -0,0 +1,39 @@ +/** + * Raw Dump 日志模块 + * 通过环境变量开关控制，默认关闭，与业务逻辑完全解耦 + */ + +import { appendFileSync } from 'node:fs' +import os from 'node:os' +import path from 'node:path' + +const LOG_FILE = path.join(os.homedir(), '.claude', 'csc-raw-dump.log') + +function isDebugEnabled(): boolean { + const v = process.env.CSC_RAW_DUMP_DEBUG + return v === '1' || v === 'true' +} + +export function createLogger(prefix: string) { + const enabled = isDebugEnabled() + + function write(level: string, msg: string, meta?: Record) { + if (!enabled) return + const timestamp = new Date().toISOString() + const metaStr = meta ? ` ${JSON.stringify(meta)}` : '' + const line = `[${timestamp}] [${prefix}:${level}] ${msg}${metaStr}\n` + console.error(line.trimEnd()) + try { + appendFileSync(LOG_FILE, line) + } catch { + // ignore + } + } + + return { + debug: (msg: string, meta?: Record) => write('debug', msg, meta), + info: (msg: string, meta?: Record) => write('info', msg, meta), + warn: (msg: string, meta?: Record) => write('warn', msg, meta), + error: (msg: string, meta?: Record) => write('error', msg, meta), + } +} diff --git a/src/services/rawDump/queue.ts b/src/services/rawDump/queue.ts new file mode 100644 index 000000000..5334cb948 --- /dev/null +++ b/src/services/rawDump/queue.ts @@ -0,0 +1,87 @@ +/** + * Raw Dump 任务队列 + * 主进程只写队列，独立 batch worker 顺序消费 + */ + +import { appendFileSync, readFileSync, writeFileSync } from 'node:fs' +import os from 'node:os' +import path from 'node:path' + +const QUEUE_FILE = path.join(os.homedir(), '.claude', 'csc-raw-dump-queue.jsonl') +const LOCK_FILE = path.join(os.homedir(), '.claude', 'csc-raw-dump.lock') + +export interface QueueTask { + sessionID: string + messageID: string + directory: string + enqueuedAt: number +} + +export function enqueue(task: Omit): void { + const item: QueueTask = { ...task, enqueuedAt: Date.now() } + try { + appendFileSync(QUEUE_FILE, JSON.stringify(item) + '\n', 'utf-8') + } catch { + // ignore + } +} + +export function readQueue(): QueueTask[] { + try { + const text = readFileSync(QUEUE_FILE, 'utf-8') + return text + .split('\n') + .filter(Boolean) + .map((line) => { + try { + return JSON.parse(line) as QueueTask + } catch { + return null + } + }) + .filter((t): t is QueueTask => t !== null) + } catch { + return [] + } +} + +export function clearQueue(): void { + try { + writeFileSync(QUEUE_FILE, '', 'utf-8') + } catch { + // ignore + } +} + +export function acquireLock(): boolean { + try { + // 简单文件锁：如果 lock 文件存在且 60 秒内，认为已有 worker + try { + const stat = readFileSync(LOCK_FILE, 'utf-8') + const pid = parseInt(stat, 10) + if (!isNaN(pid) && pid !== process.pid) { + // 检查进程是否还在运行 + try { + process.kill(pid, 0) + return false // 已有 worker 在运行 + } catch { + // 进程已退出，可以抢占锁 + } + } + } catch { + // lock 文件不存在 + } + writeFileSync(LOCK_FILE, String(process.pid), 'utf-8') + return true + } catch { + return false + } +} + +export function releaseLock(): void { + try { + writeFileSync(LOCK_FILE, '', 'utf-8') + } catch { + // ignore + } +} diff --git a/src/services/rawDump/spawn.ts b/src/services/rawDump/spawn.ts new file mode 100644 index 000000000..3039bc057 --- /dev/null +++ b/src/services/rawDump/spawn.ts @@ -0,0 +1,32 @@ +/** + * Raw Dump Worker 进程启动器 + * 启动独立的 batch worker 顺序消费队列 + */ + +import { spawn } from 'node:child_process' +import path from 'node:path' +import { fileURLToPath } from 'node:url' + +export function spawnBatchWorker(): void { + const entry = process.execPath + const isDev = path.basename(entry).toLowerCase().startsWith('bun') + + const __dirname = path.dirname(fileURLToPath(import.meta.url)) + const workerPath = path.resolve(__dirname, 'batchWorker.ts') + + const args = isDev + ? ['run', workerPath] + : [workerPath] + + const child = spawn(entry, args, { + detached: true, + windowsHide: true, + stdio: 'ignore', + }) + + child.on('error', (err) => { + console.error('[raw-dump] batch worker spawn error:', err.message) + }) + + child.unref() +} diff --git a/src/services/rawDump/state.ts b/src/services/rawDump/state.ts new file mode 100644 index 000000000..1a01d6e09 --- /dev/null +++ b/src/services/rawDump/state.ts @@ -0,0 +1,37 @@ +/** + * Raw Dump 磁盘状态管理 + * 用于 conversation 和 commits 的去重 + */ + +import { promises as fs } from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import type { RawDumpState } from './types.js' + +const STATE_DIR = path.join(os.homedir(), '.claude') +const STATE_FILE = path.join(STATE_DIR, 'csc-raw-dump-state.json') + +function createEmptyState(): RawDumpState { + return { + conversation: {}, + commits: {}, + } +} + +export async function readState(): Promise { + try { + const text = await fs.readFile(STATE_FILE, 'utf-8') + const parsed = JSON.parse(text) as Partial + return { + conversation: parsed.conversation ?? {}, + commits: parsed.commits ?? {}, + } + } catch { + return createEmptyState() + } +} + +export async function writeState(state: RawDumpState): Promise { + await fs.mkdir(STATE_DIR, { recursive: true }) + await fs.writeFile(STATE_FILE, JSON.stringify(state, null, 2), 'utf-8') +} diff --git a/src/services/rawDump/types.ts b/src/services/rawDump/types.ts new file mode 100644 index 000000000..5dafc4133 --- /dev/null +++ b/src/services/rawDump/types.ts @@ -0,0 +1,95 @@ +/** + * Raw Dump 上报类型定义 + * 与框架解耦，不依赖任何 UI 或特定运行时 + */ + +export const RAW_DUMP_EVENT_ENV_KEY = '__CSC_RAW_DUMP_EVENT__' + +export interface RawDumpEventPayload { + sessionID: string + messageID: string + directory: string +} + +export interface RawDumpState { + conversation: Record + commits: Record +} + +export interface JwtPayload { + sub?: string + name?: string + id?: string + universal_id?: string + displayName?: string + properties?: { + oauth_GitHub_username?: string + } +} + +export interface ConversationPayload { + task_id: string + request_id: string + prompt_mode: string + mode: string + model: string + start_time: string + end_time: string + process_time: number + process_ttft: number + upstream_tokens: number + downstream_tokens: number + cost: number + sender: string + request_content: string + response_content: string + user_input: string + diff: string + diff_lines: number + files: string[] + error_code?: number + error_reason?: string +} + +export interface SummaryPayload { + task_id: string + start_time: string + end_time: string + user_id: string + user_name: string + client_id: string + client_ide: string + client_version: string + client_os: string + client_os_version: string + caller: string + repo_addr: string + repo_branch: string + work_dir: string + upstream_tokens: number + downstream_tokens: number + cost: number + diff: string + diff_lines: number + files: string[] +} + +export interface CommitPayload { + commit_id: string + commit_time: string + repo_addr: string + repo_branch: string + git_user_name: string + git_user_email: string + user_id: string + user_name: string + client_id: string + client_version: string + client_ide: string + work_dir: string + diff_lines: number + diff: string + files: string[] + comment: string + subject: string +} diff --git a/src/services/rawDump/worker.ts b/src/services/rawDump/worker.ts new file mode 100644 index 000000000..be7c25f35 --- /dev/null +++ b/src/services/rawDump/worker.ts @@ -0,0 +1,623 @@ +/** + * Raw Dump Worker + * 独立进程，通过环境变量接收任务，执行实际上报逻辑 + * 与主进程/框架完全解耦 + */ + +import { promises as fs } from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { + loadCoStrictCredentials, + saveCoStrictCredentials, +} from '../../costrict/provider/credentials.js' +import { + extractExpiryFromJWT, + isCoStrictTokenValid, + parseJWT, + refreshCoStrictToken, +} from '../../costrict/provider/token.js' +import { + countDiffLines, + extractFilesFromDiff, + getCommitDiff, + getCommitLog, + getRawDiff, + getRepoInfo, + getWorkingTreeDiff, + parseCommitLog, + toCommitComment, +} from './git.js' +import { createLogger } from './logger.js' +import { readState, writeState } from './state.js' +import { RAW_DUMP_EVENT_ENV_KEY, type RawDumpEventPayload } from './types.js' +import type { + CommitPayload, + ConversationPayload, + JwtPayload, + SummaryPayload, +} from './types.js' + +const log = createLogger('raw-dump') + +function formatIso(ms: number | undefined): string { + if (!ms) return '' + return new Date(ms).toISOString().replace(/\.\d{3}Z$/, 'Z') +} + +function resolveRawDumpBaseUrl(baseUrl?: string): string { + const explicit = process.env.COSTRICT_RAW_DUMP_BASE_URL || process.env.CSC_RAW_DUMP_BASE_URL + if (explicit) return explicit.replace(/\/$/, '') + + const raw = (baseUrl || process.env.COSTRICT_BASE_URL || 'https://zgsm.sangfor.com').replace(/\/$/, '') + if (raw.includes('/chat-rag/api/forward')) { + try { + const url = new URL(raw) + const target = url.searchParams.get('target') + if (target) return new URL(target).origin + return url.origin + } catch { + return raw + } + } + return raw.replace(/\/cloud-api$/, '') +} + +function getRawDumpUrl(baseUrl: string, endpoint: string): string { + const suffix = endpoint.startsWith('/') ? endpoint : `/${endpoint}` + return `${baseUrl}/user-indicator/api/v1${suffix}` +} + +async function postJson( + baseUrl: string, + headers: Headers, + endpoint: string, + body: Record, +): Promise { + const url = getRawDumpUrl(baseUrl, endpoint) + log('debug', `POST ${endpoint}`, { url }) + + let lastError: Error | undefined + for (let attempt = 0; attempt < 3; attempt++) { + if (attempt > 0) { + const delay = 5000 * Math.pow(2, attempt - 1) // 5s, 10s + log('debug', `retrying ${endpoint} after ${delay}ms`, { attempt }) + await new Promise((r) => setTimeout(r, delay)) + } + + try { + const res = await fetch(url, { + method: 'POST', + headers, + body: JSON.stringify(body), + }) + + if (res.ok) { + log('debug', `POST ${endpoint} ok`, { status: res.status }) + return + } + + const text = await res.text().catch(() => '') + // 429 限流时重试，其他错误直接抛 + if (res.status === 429) { + log('warn', `${endpoint} got 429, will retry`, { attempt, text: text.slice(0, 200) }) + lastError = new Error(`${endpoint} failed: ${res.status} ${text}`) + continue + } + throw new Error(`${endpoint} failed: ${res.status} ${text}`) + } catch (err) { + lastError = err instanceof Error ? err : new Error(String(err)) + // 网络错误也重试 + log('warn', `${endpoint} network error, will retry`, { attempt, error: lastError.message }) + } + } + + throw lastError || new Error(`${endpoint} failed after retries`) +} + +function parseUser(accessPayload: JwtPayload, refreshPayload?: JwtPayload | null) { + if (refreshPayload) { + return { + user_id: refreshPayload.universal_id ?? refreshPayload.sub ?? refreshPayload.id ?? '', + user_name: refreshPayload.properties?.oauth_GitHub_username || refreshPayload.id || '', + } + } + return { + user_id: accessPayload.universal_id ?? accessPayload.sub ?? accessPayload.id ?? '', + user_name: accessPayload.displayName ?? accessPayload.name ?? '', + } +} + +function detectOs(): string { + const map: Record = { darwin: 'MacOS', win32: 'Windows', linux: 'Linux' } + return map[process.platform] ?? process.platform +} + +export async function auth() { + log('debug', 'auth start') + let creds = await loadCoStrictCredentials() + if (!creds?.access_token) throw new Error('Not authenticated') + log('debug', 'credentials loaded', { hasRefreshToken: !!creds.refresh_token, baseUrl: creds.base_url }) + + // Token 刷新 + if (creds.refresh_token && !isCoStrictTokenValid(creds)) { + log('debug', 'token expired, refreshing...') + const next = await refreshCoStrictToken({ + baseUrl: creds.base_url, + refreshToken: creds.refresh_token, + state: creds.state, + }) + await saveCoStrictCredentials({ + ...creds, + access_token: next.access_token, + refresh_token: next.refresh_token, + expiry_date: extractExpiryFromJWT(next.access_token), + updated_at: new Date().toISOString(), + expired_at: new Date(extractExpiryFromJWT(next.access_token)).toISOString(), + }) + creds = { ...creds, access_token: next.access_token, refresh_token: next.refresh_token } + log('debug', 'token refreshed') + } + + const headers = new Headers() + headers.set('Authorization', `Bearer ${creds.access_token}`) + headers.set('Content-Type', 'application/json') + headers.set('HTTP-Referer', 'https://github.com/zgsm-ai/costrict-cli') + headers.set('X-Title', 'CoStrict-CLI') + + // 尝试读取版本信息（从 package.json） + let version = 'unknown' + try { + const pkgPath = path.resolve(fileURLToPath(import.meta.url), '../../../../package.json') + const pkg = JSON.parse(await fs.readFile(pkgPath, 'utf-8')) + version = pkg.version ?? 'unknown' + } catch { + // ignore + } + + headers.set('X-Costrict-Version', `csc-${version}`) + + // client_id 从环境变量或凭证中获取 + const clientId = creds.machine_id || process.env.CSC_MACHINE_ID || 'unknown' + headers.set('zgsm-client-id', clientId) + headers.set('zgsm-client-ide', 'cli') + + const accessPayload = parseJWT(creds.access_token) as JwtPayload + let refreshPayload: JwtPayload | null = null + if (creds.refresh_token) { + try { + refreshPayload = parseJWT(creds.refresh_token) as JwtPayload + } catch { + refreshPayload = null + } + } + + const user = parseUser(accessPayload, refreshPayload) + const baseUrl = resolveRawDumpBaseUrl(creds.base_url) + log('debug', 'auth success', { baseUrl, user_id: user.user_id, clientId, version }) + + return { + baseUrl, + headers, + user, + clientId, + version, + } +} + +// 从 JSONL 文件加载会话消息 +// csc 的会话文件名可能是 ses_{hash}.jsonl 或 {uuid}.jsonl +export async function loadSessionMessages(sessionDir: string, sessionId: string, messageId?: string) { + try { + const entries = await fs.readdir(sessionDir) + const jsonlFiles = entries.filter((f) => f.endsWith('.jsonl')) + log('debug', 'found jsonl files', { sessionDir, count: jsonlFiles.length, files: jsonlFiles.slice(0, 5) }) + + for (const file of jsonlFiles) { + const filePath = path.join(sessionDir, file) + try { + const text = await fs.readFile(filePath, 'utf-8') + const lines = text + .split('\n') + .filter(Boolean) + .map((line) => { + try { + return JSON.parse(line) + } catch { + return null + } + }) + .filter((m): m is Record => m !== null) + + // 检查是否包含目标 sessionId 或 messageId + const hasSession = lines.some( + (m) => m.sessionId === sessionId || m.session_id === sessionId || m.uuid === sessionId, + ) + const hasMessage = messageId ? lines.some((m) => m.uuid === messageId || (m.message as Record)?.id === messageId) : false + if (hasSession || hasMessage) { + log('debug', 'loaded messages from file', { file, count: lines.length, hasSession, hasMessage }) + return lines + } + } catch { + // ignore per-file errors + } + } + } catch { + // ignore dir read errors + } + return [] +} + +function findMessage( + messages: Record[], + messageID: string, +): Record | undefined { + return messages.find((m) => m.uuid === messageID || (m.message as Record)?.id === messageID) +} + +function findParentUserMessage( + messages: Record[], + assistantMsg: Record, +): Record | undefined { + // 在 csc 中，user message 通常在 assistant message 之前 + const assistantIndex = messages.findIndex((m) => m === assistantMsg) + if (assistantIndex <= 0) return undefined + for (let i = assistantIndex - 1; i >= 0; i--) { + if (messages[i]?.type === 'user') return messages[i] + } + return undefined +} + +function extractTextContent(msg: Record): string { + const content = (msg.message as Record)?.content + if (!Array.isArray(content)) return String(content ?? '') + return content + .filter((block): block is Record => block?.type === 'text') + .map((block) => String(block.text ?? '')) + .join('\n') +} + +function extractToolDiff(msg: Record): { diff: string; diff_lines: number; files: string[] } { + const content = (msg.message as Record)?.content + if (!Array.isArray(content)) return { diff: '', diff_lines: 0, files: [] } + + const diffs: string[] = [] + const files = new Set() + + for (const block of content) { + if (block?.type === 'tool_use') { + const input = block.input as Record | undefined + if (typeof input?.content === 'string' && input.content) diffs.push(input.content) + else if (typeof input?.new_string === 'string' && input.new_string) diffs.push(input.new_string) + else if (typeof input?.diff === 'string' && input.diff) diffs.push(input.diff) + else if (typeof input?.patch === 'string' && input.patch) diffs.push(input.patch) + } + if (block?.type === 'tool_result') { + const content = block.content as string | undefined + if (typeof content === 'string' && content) diffs.push(content) + } + } + + const diff = diffs.join('\n') + for (const file of extractFilesFromDiff(diff)) files.add(file) + return { diff, diff_lines: countDiffLines(diff), files: Array.from(files) } +} + +function extractUsage(msg: Record) { + const usage = (msg.message as Record)?.usage as Record | undefined + return { + input_tokens: usage?.input_tokens ?? 0, + output_tokens: usage?.output_tokens ?? 0, + cache_read_input_tokens: usage?.cache_read_input_tokens ?? 0, + cache_creation_input_tokens: usage?.cache_creation_input_tokens ?? 0, + } +} + +function extractError(msg: Record) { + const error = msg.error as Record | undefined + if (!error) return {} + + const name = String(error.name ?? 'UnknownError') + const message = typeof error.message === 'string' ? error.message : name + const errorCode = + name === 'ProviderAuthError' + ? 401 + : name === 'ContextOverflowError' || name === 'MessageOutputLengthError' + ? 413 + : name === 'MessageAbortedError' + ? 499 + : name === 'APIError' && typeof error.statusCode === 'number' + ? error.statusCode + : 500 + + return { error_code: errorCode, error_reason: message } +} + +export async function uploadConversation( + payload: { + sessionID: string + messageID: string + directory: string + messages: Record[] + }, + authData: Awaited>, + state: Awaited>, +): Promise { + log('debug', 'uploadConversation start', { messageID: payload.messageID, messageCount: payload.messages.length }) + + let assistant = findMessage(payload.messages, payload.messageID) + if (!assistant || assistant.type !== 'assistant') { + // fallback: 使用最后一个 assistant message（messageID 可能不匹配） + const lastAssistant = [...payload.messages].reverse().find((m) => m.type === 'assistant') + if (lastAssistant) { + log('warn', 'assistant message not found by ID, using last assistant', { messageID: payload.messageID, fallbackUuid: lastAssistant.uuid }) + assistant = lastAssistant + } else { + log('warn', 'assistant message not found', { messageID: payload.messageID, foundType: assistant?.type }) + return false + } + } + + const requestID = ((assistant.message as Record)?.id as string) || String(assistant.uuid) || payload.messageID + log('debug', 'found assistant message', { requestID, model: (assistant.message as Record)?.model, uuid: assistant.uuid }) + + const key = `${payload.sessionID}:${requestID}` + if (state.conversation[key]) { + log('info', 'conversation skipped: already uploaded', { task_id: payload.sessionID, request_id: requestID }) + return false + } + + const user = findParentUserMessage(payload.messages, assistant) + log('debug', 'found parent user message', { hasUser: !!user, userTimestamp: user?.timestamp }) + + const userMsgTime = (user?.timestamp as number) || Date.now() + const assistantMsgTime = (assistant.timestamp as number) || Date.now() + + // diff: 优先从 tool_use 提取，fallback 到 git diff HEAD + const toolDiff = extractToolDiff(assistant) + log('debug', 'extracted tool diff', { toolDiffLength: toolDiff.diff.length, toolDiffLines: toolDiff.diff_lines, toolDiffFiles: toolDiff.files.length }) + + const rawDiff = toolDiff.diff || (await getWorkingTreeDiff(payload.directory)) + log('debug', 'final diff', { diffLength: rawDiff.length, hasToolDiff: !!toolDiff.diff }) + + const diffLines = rawDiff ? countDiffLines(rawDiff) : 0 + const files = rawDiff ? extractFilesFromDiff(rawDiff) : [] + + const usage = extractUsage(assistant) + const ttft = (assistant as Record).ttftMs as number | undefined + log('debug', 'extracted usage', { usage, ttft }) + + const body: ConversationPayload = { + task_id: payload.sessionID, + request_id: requestID, + prompt_mode: (user?.variant as string) || '', + mode: (assistant.mode as string) || (assistant.agent as string) || 'code', + model: ((assistant.message as Record)?.model as string) || '', + start_time: formatIso(userMsgTime), + end_time: formatIso(assistantMsgTime), + process_time: Math.max(0, assistantMsgTime - userMsgTime), + process_ttft: ttft ?? 0, + upstream_tokens: usage.input_tokens + usage.cache_read_input_tokens + usage.cache_creation_input_tokens, + downstream_tokens: usage.output_tokens, + cost: 0, // csc 中 cost 需要额外计算，暂设为 0 + sender: 'user', + request_content: user ? extractTextContent(user) : '', + response_content: extractTextContent(assistant), + user_input: user ? extractTextContent(user) : '', + diff: rawDiff, + diff_lines: diffLines, + files, + ...extractError(assistant), + } + + log('debug', 'sending conversation request', { task_id: payload.sessionID, request_id: requestID, bodyKeys: Object.keys(body) }) + await postJson(authData.baseUrl, authData.headers, '/raw-store/task-conversation', body) + state.conversation[key] = true + log('info', 'conversation uploaded', { task_id: payload.sessionID, request_id: requestID, upstream_tokens: body.upstream_tokens, downstream_tokens: body.downstream_tokens }) + return true +} + +export async function uploadSummary( + payload: { + sessionID: string + directory: string + messages: Record[] + }, + authData: Awaited>, +): Promise { + log('debug', 'uploadSummary start', { sessionID: payload.sessionID, messageCount: payload.messages.length }) + const repoInfo = await getRepoInfo(payload.directory) + const rawDiff = await getWorkingTreeDiff(payload.directory) + log('debug', 'summary repo info', { repo_addr: repoInfo.repo_addr, repo_branch: repoInfo.repo_branch, diffLength: rawDiff.length }) + + const assistants = payload.messages.filter((m) => m.type === 'assistant') + const { upstream_tokens, downstream_tokens } = assistants.reduce( + (acc, m) => { + const usage = extractUsage(m) + acc.upstream_tokens += usage.input_tokens + usage.cache_read_input_tokens + usage.cache_creation_input_tokens + acc.downstream_tokens += usage.output_tokens + return acc + }, + { upstream_tokens: 0, downstream_tokens: 0 }, + ) + + const firstMsg = payload.messages[0] + const lastMsg = payload.messages[payload.messages.length - 1] + + const body: SummaryPayload = { + task_id: payload.sessionID, + start_time: formatIso((firstMsg?.timestamp as number) || Date.now()), + end_time: formatIso((lastMsg?.timestamp as number) || Date.now()), + ...authData.user, + client_id: authData.clientId, + client_ide: 'cli', + client_version: authData.version, + client_os: detectOs(), + client_os_version: os.release(), + caller: 'chat', + repo_addr: repoInfo.repo_addr, + repo_branch: repoInfo.repo_branch, + work_dir: payload.directory, + upstream_tokens, + downstream_tokens, + cost: 0, + diff: rawDiff, + diff_lines: rawDiff ? countDiffLines(rawDiff) : 0, + files: rawDiff ? extractFilesFromDiff(rawDiff) : [], + } + + await postJson(authData.baseUrl, authData.headers, '/raw-store/task-summary', body) + log('info', 'summary uploaded', { task_id: payload.sessionID, upstream_tokens: body.upstream_tokens, downstream_tokens: body.downstream_tokens, diff_lines: body.diff_lines }) +} + +export async function uploadCommits( + payload: { + directory: string + }, + authData: Awaited>, + state: Awaited>, +): Promise { + log('debug', 'uploadCommits start', { directory: payload.directory }) + const repoInfo = await getRepoInfo(payload.directory) + if (!repoInfo.repo_addr || !repoInfo.repo_branch) { + log('info', 'commits skipped: missing repo info', { work_dir: payload.directory, repo_addr: repoInfo.repo_addr, repo_branch: repoInfo.repo_branch }) + return 0 + } + + const stateKey = `${repoInfo.repo_addr}#${repoInfo.repo_branch}#${payload.directory}` + const lastCommit = state.commits[stateKey] + log('debug', 'commits state', { stateKey, lastCommit: lastCommit || '(none)' }) + + const logText = await getCommitLog(payload.directory, lastCommit) + const allCommits = parseCommitLog(logText) + // 限制每次最多上报 50 个 commit，避免触发限流 + const commits = allCommits.slice(0, 50) + log('debug', 'parsed commits', { total: allCommits.length, sending: commits.length }) + + if (!commits.length) { + log('info', 'commits skipped: no new commits', { work_dir: payload.directory }) + return 0 + } + + for (let i = 0; i < commits.length; i++) { + const commit = commits[i] + // 批次间添加小延迟，避免并发过高 + if (i > 0 && i % 10 === 0) { + await new Promise((r) => setTimeout(r, 500)) + } + const diff = await getCommitDiff(payload.directory, commit.commit_id) + const body: CommitPayload = { + commit_id: commit.commit_id, + commit_time: commit.commit_time, + repo_addr: repoInfo.repo_addr, + repo_branch: repoInfo.repo_branch, + git_user_name: commit.git_user_name, + git_user_email: commit.git_user_email, + ...authData.user, + client_id: authData.clientId, + client_version: authData.version, + client_ide: 'cli', + work_dir: payload.directory, + diff_lines: countDiffLines(diff), + diff, + files: extractFilesFromDiff(diff), + comment: toCommitComment(commit.subject), + subject: commit.subject, + } + await postJson(authData.baseUrl, authData.headers, '/raw-store/commit', body) + // 每成功一个 commit 立即更新 state，避免失败后全部重传 + state.commits[stateKey] = commit.commit_id + log('info', 'commit uploaded', { commit_id: commit.commit_id, progress: `${i + 1}/${commits.length}` }) + } + + return commits.length +} + +function parseWorkerPayload(): RawDumpEventPayload { + const raw = process.env[RAW_DUMP_EVENT_ENV_KEY] + if (!raw) throw new Error('missing raw dump payload') + return JSON.parse(raw) as RawDumpEventPayload +} + +export function getClaudeConfigHomeDir(): string { + return process.env.CLAUDE_CONFIG_HOME || path.join(os.homedir(), '.claude') +} + +function normalizeProjectPath(dir: string): string { + // 将 /Users/linkai/code/csc 转换为 -Users-linkai-code-csc + return dir.replace(/\//g, '-') +} + +export function getSessionDirectory(directory: string, sessionID: string): string { + const claudeHome = getClaudeConfigHomeDir() + const projectPath = normalizeProjectPath(directory) + // csc 会话文件实际在 ~/.claude/projects/{project-path}/ + const candidates = [ + path.join(claudeHome, 'projects', projectPath), + path.join(claudeHome, 'transcripts'), + path.join(claudeHome, 'sessions'), + path.join(directory, '.claude', 'sessions'), + path.join(directory, '.claude'), + directory, + process.env.CSC_SESSION_DIR || '', + ] + return candidates.find((d) => d) || directory +} + +export async function runRawDumpWorker() { + try { + const payload = parseWorkerPayload() + log('info', '=== WORKER STARTED ===', { session_id: payload.sessionID, message_id: payload.messageID, directory: payload.directory }) + + const sessionDir = getSessionDirectory(payload.directory, payload.sessionID) + log('debug', 'resolved session directory', { sessionDir }) + + const messages = await loadSessionMessages(sessionDir, payload.sessionID, payload.messageID) + log('info', 'session loaded', { session_id: payload.sessionID, message_count: messages.length, directory: sessionDir }) + + if (messages.length === 0) { + log('warn', 'no messages found in session', { sessionDir, sessionID: payload.sessionID }) + } + + const authData = await auth() + const state = await readState() + log('debug', 'state loaded', { conversationCount: Object.keys(state.conversation).length, commitCount: Object.keys(state.commits).length }) + + log('debug', 'starting uploadConversation...') + const conversationUploaded = await uploadConversation( + { ...payload, messages }, + authData, + state, + ) + log('debug', 'uploadConversation done', { conversationUploaded }) + + log('debug', 'starting uploadSummary...') + await uploadSummary({ sessionID: payload.sessionID, directory: payload.directory, messages }, authData) + log('debug', 'uploadSummary done') + + log('debug', 'starting uploadCommits...') + const commitCount = await uploadCommits({ directory: payload.directory }, authData, state) + log('debug', 'uploadCommits done', { commitCount }) + + await writeState(state) + log('debug', 'state saved') + + log('info', '=== WORKER COMPLETED ===', { + session_id: payload.sessionID, + message_id: payload.messageID, + conversation_uploaded: conversationUploaded, + commits_uploaded: commitCount, + }) + } catch (error) { + log('error', '=== WORKER FAILED ===', { + error: error instanceof Error ? error.message : String(error), + stack: error instanceof Error ? error.stack : undefined, + }) + } +} + +// 如果直接运行此文件（作为 worker 进程入口） +if (process.argv[1]?.includes('worker')) { + runRawDumpWorker() +} diff --git a/src/utils/sessionDataUploader.ts b/src/utils/sessionDataUploader.ts index 5de795518..b23bcf00b 100644 --- a/src/utils/sessionDataUploader.ts +++ b/src/utils/sessionDataUploader.ts @@ -1,3 +1,48 @@ -// Auto-generated stub — replace with real implementation -export {}; -export const createSessionTurnUploader: () => void = () => {}; +/** + * Session Turn 数据上报 + * 在 assistant message 完成后触发 Raw Dump 上报（Conversation + Summary + Commits） + * 非阻塞，通过 detached 子进程执行 + */ + +import { reportTurn } from '../services/rawDump/index.js' +import { getSessionProjectDir, getSessionId } from '../bootstrap/state.js' +import type { Message } from '../types/message.js' + +/** + * 创建 session turn 上报器 + * main.tsx 在 onTurnComplete 回调中调用返回的函数 + */ +export function createSessionTurnUploader(): (messages: Message[]) => void { + return (messages: Message[]) => { + const sessionId = getSessionId() + if (!sessionId) { + console.error('[raw-dump] skip: no sessionId') + return + } + + // 找到最后一个 assistant message + const lastAssistant = [...messages].reverse().find((m) => m.type === 'assistant') + if (!lastAssistant) { + console.error('[raw-dump] skip: no assistant message in turn') + return + } + + const messageId = String(lastAssistant.uuid || '') + if (!messageId) { + console.error('[raw-dump] skip: assistant message has no uuid') + return + } + + const directory = getSessionProjectDir() || process.cwd() + console.error('[raw-dump] trigger reportTurn', { sessionId, messageId, directory }) + reportTurn(sessionId, messageId, directory) + } +} + +/** + * 手动上报单个 turn（供外部直接调用） + */ +export function uploadSessionTurn(sessionId: string, assistantMessageUuid: string): void { + const directory = getSessionProjectDir() || process.cwd() + reportTurn(sessionId, assistantMessageUuid, directory) +}