@xiaoyuyu6420/dsh-backup 0.14.0 → 0.14.1

package/lib/index.js

@@ -3701,17 +3701,23 @@ export function apply(ctx, pluginConfig) {
     };
   }
 
-  // ---------------- 外部聊天记录导入 v1（Claude Code） ----------------
-  // 把 Claude Code 的会话 JSONL 翻译成 DSH v4 会话日志（新建会话、绝不改原数据）。
-  // 只映射「用户/助手文本 + 工具调用/结果」；图片/文件块与私有事件跳过并计数。
-  // 行格式对齐宿主：{type,seq,time,data} + 消息事件带 surfaceOp:'append'。
+  // ---------------- 外部聊天记录导入(多来源) ----------------
+  // 把其它 AI 工具的会话日志翻译成 DSH v4 会话日志(新建会话、绝不改原数据)。
+  // 支持:claude-code(~/.claude/projects/*/*.jsonl)、codex(~/.codex/sessions/**/rollout-*.jsonl)。
+  // 只映射「用户/助手文本 + 推理摘要 + 工具调用/结果」;其余事件跳过并计数。
+  // 行格式对齐宿主:{type,seq,time,data} + 消息事件带 surfaceOp:'append'。
   const CLAUDE_PROJECTS_DIR = '.claude/projects';
+  const CODEX_SESSIONS_DIR = '.codex/sessions';
   const CHAT_IMPORT_MAX_MESSAGES = 5000;
+  const CHAT_SOURCE_LABELS = { 'claude-code': 'Claude Code', codex: 'Codex' };
 
-  function claudeSessionId(file, slug) {
-    const tail = String(file).replace(/[^A-Za-z0-9]/g, '').slice(-12);
-    const head = String(slug || 'session').replace(/[^A-Za-z0-9]/g, '').slice(-16);
-    return `claude-${head || 'session'}-${tail || '0'}`;
+  function chatSourceOf(id) {
+    return String(id || '').startsWith('codex-') ? 'codex' : 'claude-code';
+  }
+
+  function chatSessionId(prefix, name) {
+    const tail = String(name).replace(/[^A-Za-z0-9]/g, '').slice(-12);
+    return `${prefix}-${tail || 'session'}`;
   }
 
   async function listClaudeSessions() {
@@ -3729,12 +3735,39 @@ export function apply(ctx, pluginConfig) {
         const abs = `${root}/${proj.name}/${f}`;
         let st;
         try { st = await fsStat(abs); } catch { continue; }
-        out.push({ abs, rel: `${CLAUDE_PROJECTS_DIR}/${proj.name}/${f}`, slug: proj.name, file: f, id: claudeSessionId(f, proj.name), bytes: st.size, mtime: st.mtimeMs });
+        out.push({ abs, rel: `${CLAUDE_PROJECTS_DIR}/${proj.name}/${f}`, project: proj.name, file: f, id: chatSessionId('claude', `${proj.name}${f}`), bytes: st.size, mtime: st.mtimeMs });
       }
     }
     return out;
   }
 
+  async function listCodexSessions() {
+    const { home } = paths();
+    const root = `${home}/${CODEX_SESSIONS_DIR}`;
+    const out = [];
+    const walk = async (dir, depth) => {
+      if (depth > 6 || out.length >= 200) return;
+      let entries;
+      try { entries = await readdir(dir, { withFileTypes: true }); } catch { return; }
+      for (const e of entries) {
+        const abs = `${dir}/${e.name}`;
+        if (e.isDirectory()) { await walk(abs, depth + 1); continue; }
+        if (!e.name.endsWith('.jsonl')) continue;
+        let st;
+        try { st = await fsStat(abs); } catch { continue; }
+        const stem = e.name.replace(/^rollout-/, '').replace(/\.jsonl$/, '');
+        out.push({ abs, rel: abs.slice(home.length + 1), project: stem.slice(0, 10), file: e.name, id: chatSessionId('codex', stem), bytes: st.size, mtime: st.mtimeMs });
+      }
+    };
+    await walk(root, 0);
+    return out;
+  }
+
+  function textBlocks(blocks) {
+    if (!Array.isArray(blocks)) return [];
+    return blocks.filter((b) => b && typeof b.text === 'string' && b.text).map((b) => b.text);
+  }
+
   /** 解析 Claude Code JSONL → 归一化消息序列。 */
   async function parseClaudeSession(abs) {
     const text = await readFile(abs, 'utf8');
@@ -3751,7 +3784,7 @@ export function apply(ctx, pluginConfig) {
       const blocks = Array.isArray(msg.content)
         ? msg.content
         : (typeof msg.content === 'string' ? [{ type: 'text', text: msg.content }] : []);
-      const time = rec.timestamp ? (Date.parse(rec.timestamp) || Date.now()) : Date.now();
+      const time = rec.timestamp ? (Date.parse(rec.timestamp) || 0) : 0;
       if (type === 'user') {
         const texts = [];
         const results = [];
@@ -3774,7 +3807,7 @@ export function apply(ctx, pluginConfig) {
         for (const b of blocks) {
           if (b && b.type === 'text' && typeof b.text === 'string') texts.push(b.text);
           else if (b && b.type === 'thinking' && typeof b.thinking === 'string') reasoning.push(b.thinking);
-          else if (b && b.type === 'tool_use') toolCalls.push({ id: String(b.id || `call-${toolCalls.length}`), name: String(b.name || 'tool'), input: b.input });
+          else if (b && b.type === 'tool_use') toolCalls.push({ id: String(b.id || `call-${toolCalls.length}`), name: String(b.name || 'tool'), arguments: JSON.stringify(b.input ?? {}) });
           else skipped += 1;
         }
         if (texts.length || reasoning.length || toolCalls.length) {
@@ -3782,11 +3815,72 @@ export function apply(ctx, pluginConfig) {
         }
       }
     }
-    return { messages, skipped };
+    return { messages, skipped, cwd: null, model: null };
   }
 
-  /** 归一化消息 → DSH v4 事件行（seq 连续；消息事件带 surfaceOp）。 */
-  function claudeMessagesToEvents(messages, baseTime) {
+  /** 解析 Codex rollout JSONL → 归一化消息序列(函数调用与结果按 call_id 配对)。 */
+  async function parseCodexSession(abs) {
+    const text = await readFile(abs, 'utf8');
+    const messages = [];
+    const calls = new Map();
+    let skipped = 0;
+    let cwd = null;
+    let model = null;
+    for (const line of text.split('\n')) {
+      if (!line.trim()) continue;
+      if (messages.length >= CHAT_IMPORT_MAX_MESSAGES) break;
+      let rec;
+      try { rec = JSON.parse(line); } catch { skipped += 1; continue; }
+      const p = rec.payload || {};
+      if (rec.type === 'session_meta') {
+        if (typeof p.cwd === 'string') cwd = p.cwd;
+        continue;
+      }
+      if (rec.type === 'turn_context') {
+        if (typeof p.model === 'string') model = p.model;
+        continue;
+      }
+      if (rec.type !== 'response_item') { skipped += 1; continue; }
+      const time = rec.timestamp ? (Date.parse(rec.timestamp) || 0) : 0;
+      const kind = p.type;
+      if (kind === 'message') {
+        if (p.role === 'user') messages.push({ role: 'user', texts: textBlocks(p.content), reasoning: [], toolCalls: [], time });
+        else if (p.role === 'assistant') messages.push({ role: 'assistant', texts: textBlocks(p.content), reasoning: [], toolCalls: [], time });
+        else skipped += 1; // developer / system 指令不导入
+      } else if (kind === 'reasoning') {
+        const summary = textBlocks(p.summary).join('\n').trim();
+        if (summary) messages.push({ role: 'assistant', texts: [], reasoning: [summary], toolCalls: [], time });
+        else skipped += 1; // 只有加密推理,无法还原
+      } else if (kind === 'function_call' || kind === 'custom_tool_call') {
+        const callId = String(p.call_id || p.id || '');
+        const args = typeof p.arguments === 'string'
+          ? p.arguments
+          : (typeof p.input === 'string' ? JSON.stringify({ input: p.input }) : '{}');
+        calls.set(callId, { name: String(p.name || 'tool'), arguments: args });
+      } else if (kind === 'function_call_output' || kind === 'custom_tool_call_output') {
+        const callId = String(p.call_id || '');
+        const call = calls.get(callId);
+        const body = typeof p.output === 'string' ? p.output : textBlocks(p.output).join('\n');
+        messages.push({
+          role: 'tool',
+          texts: [body],
+          reasoning: [],
+          toolCalls: [],
+          callId,
+          name: call?.name,
+          arguments: call?.arguments,
+          time,
+        });
+      } else {
+        skipped += 1; // compaction / agent_message / world_state 等
+      }
+    }
+    const kept = messages.filter((m) => m.role === 'tool' ? m.texts.length > 0 : (m.texts.length > 0 || m.reasoning.length > 0));
+    return { messages: kept, skipped, cwd, model };
+  }
+
+  /** 归一化消息 → DSH v4 事件行(seq 连续;消息事件带 surfaceOp)。 */
+  function chatMessagesToEvents(messages, baseTime) {
     const rows = [];
     let seq = 0;
     let turn = 0;
@@ -3803,6 +3897,8 @@ export function apply(ctx, pluginConfig) {
       if (m.role === 'user') {
         push('user/message', { id: `u${turn}`, role: 'user', content: m.texts.map((t) => ({ type: 'text', text: t })), source: { kind: 'user' } }, true);
       } else if (m.role === 'tool') {
+        // Codex 的调用与结果分两条记录:同一回合内先补 tool/call,再落 tool/result。
+        if (m.name) push('tool/call', { turn, step: 1, callId: m.callId, name: m.name, arguments: m.arguments || '{}' });
         push('tool/result', {
           turn,
           step: 1,
@@ -3819,11 +3915,17 @@ export function apply(ctx, pluginConfig) {
         const content = [];
         for (const r of m.reasoning) content.push({ type: 'reasoning', text: r });
         for (const t of m.texts) content.push({ type: 'text', text: t });
-        for (const c of m.toolCalls) content.push({ type: 'tool-call', id: c.id, name: c.name, arguments: JSON.stringify(c.input ?? {}) });
+        for (const c of m.toolCalls) content.push({ type: 'tool-call', id: c.id, name: c.name, arguments: c.arguments });
+        if (!content.length) {
+          rows.pop();
+          rows.pop();
+          turn -= 1;
+          continue;
+        }
         push('assistant/message', {
           turn,
           step: 1,
-          message: { id: `a${turn}`, role: 'assistant', content, source: { kind: 'model', provider: 'claude-code', model: 'imported' } },
+          message: { id: `a${turn}`, role: 'assistant', content, source: { kind: 'model', provider: 'imported', model: 'imported' } },
           stream: [],
         }, true);
       }
@@ -3833,61 +3935,74 @@ export function apply(ctx, pluginConfig) {
     return rows;
   }
 
-  /** 外部聊天来源（v1 只有 Claude Code）。 */
+  /** 外部聊天来源汇总(检测 + 会话清单)。 */
   async function chatSources() {
-    const list = await listClaudeSessions();
+    const [claude, codex] = await Promise.all([listClaudeSessions(), listCodexSessions()]);
     const sessions = [];
-    for (const s of list.slice(0, 50)) {
-      try {
-        const parsed = await parseClaudeSession(s.abs);
-        const firstUser = parsed.messages.find((m) => m.role === 'user');
-        sessions.push({
-          id: s.id,
-          file: s.file,
-          project: s.slug,
-          messages: parsed.messages.length,
-          title: firstUser ? String(firstUser.texts[0] || '').slice(0, 60) : '',
-        });
-      } catch { /* 单文件解析失败不影响其它会话 */ }
-    }
+    const sources = [];
+    const collect = async (sourceId, list) => {
+      sources.push({ id: sourceId, label: CHAT_SOURCE_LABELS[sourceId], detected: list.length > 0, count: list.length });
+      for (const s of list.slice(0, 50)) {
+        try {
+          const parsed = sourceId === 'codex' ? await parseCodexSession(s.abs) : await parseClaudeSession(s.abs);
+          const firstUser = parsed.messages.find((m) => m.role === 'user');
+          sessions.push({
+            source: sourceId,
+            id: s.id,
+            file: s.file,
+            project: s.project,
+            messages: parsed.messages.length,
+            title: firstUser ? String(firstUser.texts[0] || '').slice(0, 60) : '',
+          });
+        } catch { /* 单文件解析失败不影响其它会话 */ }
+      }
+    };
+    await collect('claude-code', claude);
+    await collect('codex', codex);
+    const detected = sources.filter((s) => s.detected);
     return {
       ok: true,
-      source: 'claude-code',
-      detected: list.length > 0,
+      sources,
+      detected: detected.length > 0,
       sessions,
-      summary: list.length ? `💬 检测到 ${list.length} 个 Claude Code 会话` : '💬 没有检测到 Claude Code 会话（~/.claude/projects）',
+      summary: detected.length
+        ? `💬 检测到 ${detected.map((s) => `${s.label} ${s.count}`).join(' · ')} 个会话`
+        : '💬 没有检测到可导入的聊天记录(Claude Code / Codex)',
     };
   }
 
-  async function buildClaudeImport(sessionId) {
-    const list = await listClaudeSessions();
+  async function buildChatImport(source, sessionId) {
+    const src = source === 'codex' ? 'codex' : 'claude-code';
+    const list = src === 'codex' ? await listCodexSessions() : await listClaudeSessions();
     const target = list.find((s) => s.id === sessionId || s.file === sessionId || s.abs === sessionId);
-    if (!target) throw new Error(`找不到 Claude Code 会话：${sessionId}`);
-    const parsed = await parseClaudeSession(target.abs);
+    if (!target) throw new Error(`找不到 ${CHAT_SOURCE_LABELS[src]} 会话:${sessionId}`);
+    const parsed = src === 'codex' ? await parseCodexSession(target.abs) : await parseClaudeSession(target.abs);
     if (!parsed.messages.length) throw new Error('该会话没有可导入的文本消息');
     // 宿主要求 time 是安全整数:毫秒时间戳必须取整(mtimeMs 可能是小数)。
-    const rows = claudeMessagesToEvents(parsed.messages, Math.floor(target.mtime || Date.now()));
+    const rows = chatMessagesToEvents(parsed.messages, Math.floor(target.mtime || Date.now()));
     const id = `${target.id}-${stampNow()}`;
-    const header = { type: 'session', version: 4, id, createdAt: Math.floor(target.mtime || Date.now()), isSeeded: false, delegationDepth: 0 };
+    const header = { type: 'session', version: 4, id, createdAt: Math.floor(target.mtime || Date.now()), isSeeded: false, delegationDepth: 0, ...(parsed.cwd ? { cwd: parsed.cwd } : {}) };
     const lines = [JSON.stringify(header), ...rows.map((r) => JSON.stringify(r))];
     const defect = validateSessionLines(lines);
-    if (defect !== null) throw new Error(`导入会话未通过宿主容器校验，已中止：${defect}`);
-    return { target, parsed, rows, header, id, lines };
+    if (defect !== null) throw new Error(`导入会话未通过宿主容器校验,已中止:${defect}`);
+    return { source: src, target, parsed, rows, header, id, lines };
   }
 
-  /** 预览：只读，不写盘。 */
+  /** 预览:只读,不写盘。 */
   async function chatPreview(opts, signal) {
     const sessionId = typeof opts?.session === 'string' ? opts.session : '';
     if (!sessionId) throw new Error('缺少会话 id');
     if (signal?.aborted) throw new Error('操作已取消');
-    const bundle = await buildClaudeImport(sessionId);
+    const source = typeof opts?.source === 'string' && opts.source ? opts.source : chatSourceOf(sessionId);
+    const bundle = await buildChatImport(source, sessionId);
     const userCount = bundle.parsed.messages.filter((m) => m.role === 'user').length;
     const asstCount = bundle.parsed.messages.filter((m) => m.role === 'assistant').length;
     const toolCount = bundle.parsed.messages.filter((m) => m.role === 'tool').length;
+    const label = CHAT_SOURCE_LABELS[bundle.source];
     return {
       ok: true,
       dryRun: true,
-      source: 'claude-code',
+      source: bundle.source,
       session: bundle.target.id,
       file: bundle.target.file,
       messages: bundle.parsed.messages.length,
@@ -3897,45 +4012,46 @@ export function apply(ctx, pluginConfig) {
       skipped: bundle.parsed.skipped,
       events: bundle.rows.length,
       newId: bundle.id,
-      warnings: ['仅导入文本与工具调用/结果；图片/文件块与私有事件已跳过', '导入为新的 DSH 会话，不改动原会话'],
-      summary: `💬 Claude Code 导入预览\n${bundle.parsed.messages.length} 条消息（用户 ${userCount} / 助手 ${asstCount} / 工具结果 ${toolCount}）→ ${bundle.rows.length} 个事件\n跳过 ${bundle.parsed.skipped} 个非文本块；导入为新会话，原会话不动`,
+      warnings: ['仅导入文本、推理摘要与工具调用/结果;图片/文件块与私有事件已跳过', '导入为新的 DSH 会话,不改动原会话'],
+      summary: `💬 ${label} 导入预览\n${bundle.parsed.messages.length} 条消息(用户 ${userCount} / 助手 ${asstCount} / 工具结果 ${toolCount})→ ${bundle.rows.length} 个事件\n跳过 ${bundle.parsed.skipped} 个非文本事件;导入为新会话,原会话不动`,
     };
   }
 
-  /** 执行导入：默认 dry-run；confirm:true 才写（新会话目录，绝不覆盖）。 */
+  /** 执行导入:默认 dry-run;confirm:true 才写(新会话目录,绝不覆盖)。 */
   async function chatApply(opts, signal) {
     const sessionId = typeof opts?.session === 'string' ? opts.session : '';
     if (!sessionId) throw new Error('缺少会话 id');
     if (opts?.confirm !== true) return chatPreview(opts, signal);
-    const bundle = await buildClaudeImport(sessionId);
+    const source = typeof opts?.source === 'string' && opts.source ? opts.source : chatSourceOf(sessionId);
+    const bundle = await buildChatImport(source, sessionId);
     const { dshHome } = paths();
     const dir = `${dshHome}/sessions/_no-cwd/${encodeSessionSegment(bundle.id)}`;
-    if (pathExists(dir)) throw new Error('目标会话目录已存在，拒绝覆盖');
+    if (pathExists(dir)) throw new Error('目标会话目录已存在,拒绝覆盖');
     await mkdir(dir, { recursive: true });
     const headerFrame = zlib.zstdCompressSync(Buffer.from(`${JSON.stringify(bundle.header)}\n`));
     const bodyFrame = zlib.zstdCompressSync(Buffer.from(`${bundle.rows.map((r) => JSON.stringify(r)).join('\n')}\n`));
     const file = `${dir}/session.v4.jsonl.zstd`;
     try {
       await writeFile(file, Buffer.concat([headerFrame, bodyFrame]));
-      // 回读校验：同一套容器契约（首帧恰好一行 header + seq 连续）
+      // 回读校验:同一套容器契约(首帧恰好一行 header + seq 连续)
       const back = decodeZstdLog(await readFile(file));
       const defect = validateSessionLines(back.lines);
       if (defect !== null) throw new Error(defect);
     } catch (err) {
       await rm(dir, { recursive: true, force: true }).catch(() => {});
-      throw new Error(`写出的会话未通过校验：${String(err && err.message ? err.message : err)}`);
+      throw new Error(`写出的会话未通过校验:${String(err && err.message ? err.message : err)}`);
     }
     return {
       ok: true,
       dryRun: false,
+      source: bundle.source,
       newId: bundle.id,
       path: file,
       messages: bundle.parsed.messages.length,
       events: bundle.rows.length,
-      summary: `💬 已导入 Claude Code 会话：${bundle.parsed.messages.length} 条消息（${bundle.rows.length} 个事件）\n新会话 id: ${bundle.id}\n重启 dsh 后可在会话列表看到（仅文本与工具调用/结果）`,
+      summary: `💬 已导入 ${CHAT_SOURCE_LABELS[bundle.source]} 会话:${bundle.parsed.messages.length} 条消息(${bundle.rows.length} 个事件)\n新会话 id: ${bundle.id}\n重启 dsh 后可在会话列表看到(仅文本、推理摘要与工具调用/结果)`,
     };
   }
-
   /**
    * 打开导出 ZIP（必要时用口令解密到备份目录临时文件）。返回 { zipPath, encrypted,
    * cleanup }；调用方在 finally 里必调 cleanup（解密出的明文 ZIP 不能遗留）。
@@ -5547,7 +5663,7 @@ export function apply(ctx, pluginConfig) {
           const sub = parts[1] || 'list';
           if (sub === 'list') {
             const r = await chatSources();
-            const lines = r.sessions.map((s) => `  ${s.id}  ${s.messages} 条  ${s.title ? `「${s.title}」` : ''}`);
+            const lines = r.sessions.map((s) => `  ${CHAT_SOURCE_LABELS[s.source] ?? s.source}  ${s.id}  ${s.messages} 条  ${s.title ? `「${s.title}」` : ''}`);
             return { kind: 'success', text: `${r.summary}${lines.length ? `\n${lines.join('\n')}\n\n预览：/backup chat preview <id>；导入：/backup chat import <id> [--yes]` : ''}` };
           }
           if (sub === 'preview' || sub === 'import') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaoyuyu6420/dsh-backup",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "一条命令备份、恢复与迁移 DeepSeek Harness（dsh）的全部数据（~/.dsh：会话、设置、插件、MCP、技能）：定时自动备份、升级前快照、换机迁移、会话日志体检修复、宿主起不来也能用的进程外救援；凭据默认脱敏只存本机。 Backup, restore & migrate all DeepSeek Harness (~/.dsh) data — sessions, settings, plugins, MCP, skills: scheduled backups, pre-upgrade snapshots, cross-machine migration, session-log doctor, out-of-process rescue console; credentials redacted to a local-only vault.",
   "type": "module",
   "packageManager": "pnpm@11.24.0",