feat(sessions): derived conversion + resume commands

cli/session-convert-args.js

@@ -0,0 +1,65 @@
+const fs = require('fs');
+const path = require('path');
+
+const { parseMaxMessagesValue } = require('../lib/cli-session-utils');
+
+function ensureDir(dirPath) {
+    if (!dirPath) return;
+    if (fs.existsSync(dirPath)) return;
+    fs.mkdirSync(dirPath, { recursive: true });
+}
+
+function resolveOutputPath(outputPath, defaultFileName) {
+    const fallback = path.resolve(process.cwd(), defaultFileName);
+    if (typeof outputPath !== 'string' || !outputPath.trim()) return fallback;
+    const trimmed = outputPath.trim();
+    const resolved = path.resolve(trimmed);
+    if (/[\\\/]$/.test(trimmed)) {
+        ensureDir(resolved);
+        return path.join(resolved, defaultFileName);
+    }
+    if (fs.existsSync(resolved)) {
+        try { if (fs.statSync(resolved).isDirectory()) return path.join(resolved, defaultFileName); } catch (_) {}
+    }
+    return resolved;
+}
+
+function parseArgs(args = []) {
+    const options = { from: '', to: '', sessionId: '', filePath: '', output: '', maxMessages: undefined };
+    const errors = [];
+    for (let i = 0; i < args.length; i += 1) {
+        const arg = String(args[i] || '');
+        const next = args[i + 1] || '';
+        if (!arg) continue;
+        if (arg === '--from') { options.from = next; i += 1; continue; }
+        if (arg.startsWith('--from=')) { options.from = arg.slice(7); continue; }
+        if (arg === '--to') { options.to = next; i += 1; continue; }
+        if (arg.startsWith('--to=')) { options.to = arg.slice(5); continue; }
+        if (arg === '--session-id') { options.sessionId = next; i += 1; continue; }
+        if (arg.startsWith('--session-id=')) { options.sessionId = arg.slice(13); continue; }
+        if (arg === '--file') { options.filePath = next; i += 1; continue; }
+        if (arg.startsWith('--file=')) { options.filePath = arg.slice(7); continue; }
+        if (arg === '--output') { options.output = next; i += 1; continue; }
+        if (arg.startsWith('--output=')) { options.output = arg.slice(9); continue; }
+        if (arg === '--max-messages') { options.maxMessages = next; i += 1; continue; }
+        if (arg.startsWith('--max-messages=')) { options.maxMessages = arg.slice(15); continue; }
+        errors.push(`未知参数: ${arg}`);
+    }
+    options.from = String(options.from || '').trim().toLowerCase();
+    options.to = String(options.to || '').trim().toLowerCase();
+    if (options.from !== 'codex' && options.from !== 'claude') errors.push('参数 --from 仅支持 codex 或 claude');
+    if (options.to !== 'codex' && options.to !== 'claude') errors.push('参数 --to 仅支持 codex 或 claude');
+    if (options.from && options.to && options.from === options.to) errors.push('--from 与 --to 不能相同');
+    if (!options.from) errors.push('缺少 --from');
+    if (!options.to) errors.push('缺少 --to');
+    if (!options.sessionId && !options.filePath) errors.push('必须指定 --session-id 或 --file');
+    if (options.maxMessages !== undefined) {
+        const parsed = parseMaxMessagesValue(options.maxMessages);
+        if (parsed === null) errors.push('参数 --max-messages 无效');
+        else options.maxMessages = parsed === Infinity ? Infinity : Math.max(1, Math.floor(parsed));
+    }
+    return { options, error: errors.length ? errors.join('；') : '' };
+}
+
+module.exports = { ensureDir, resolveOutputPath, parseArgs };
+

cli/session-convert-io.js

@@ -0,0 +1,82 @@
+const fs = require('fs');
+const readline = require('readline');
+
+const {
+    toIsoTime,
+    extractMessageText,
+    normalizeRole,
+    resolveMaxMessagesValue
+} = require('../lib/cli-session-utils');
+
+const { removeLeadingSystemMessage } = require('../lib/cli-sessions');
+
+async function readSessionMessages(filePath, source, maxMessages) {
+    const limit = resolveMaxMessagesValue(maxMessages, 200);
+    const state = { sessionId: '', cwd: '', updatedAt: '', messages: [], truncated: false };
+    const stream = fs.createReadStream(filePath, { encoding: 'utf-8' });
+    const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+    for await (const line of rl) {
+        const trimmed = String(line || '').trim();
+        if (!trimmed) continue;
+        let record;
+        try { record = JSON.parse(trimmed); } catch (_) { continue; }
+        const timestamp = toIsoTime(record.timestamp, '');
+        if (timestamp) state.updatedAt = timestamp;
+        if (source === 'codex' && record.type === 'session_meta' && record.payload) {
+            if (!state.sessionId && record.payload.id) state.sessionId = String(record.payload.id || '');
+            if (!state.cwd && record.payload.cwd) state.cwd = String(record.payload.cwd || '');
+            continue;
+        }
+        if (source === 'claude') {
+            if (!state.sessionId && record.sessionId) state.sessionId = String(record.sessionId || '');
+            if (!state.cwd && record.cwd) state.cwd = String(record.cwd || '');
+        }
+        let role = '';
+        let text = '';
+        if (source === 'codex' && record.type === 'response_item' && record.payload && record.payload.type === 'message') {
+            role = normalizeRole(record.payload.role);
+            text = extractMessageText(record.payload.content);
+        } else if (source === 'claude') {
+            role = normalizeRole(record.type);
+            text = extractMessageText(record.message ? record.message.content : '');
+        }
+        if (!role || !text) continue;
+        state.messages.push({ role, text, timestamp });
+        if (limit !== Infinity && state.messages.length > limit) {
+            state.messages.shift();
+            state.truncated = true;
+        }
+    }
+    state.messages = removeLeadingSystemMessage(state.messages);
+    return state;
+}
+
+function buildTargetRecords(target, payload) {
+    const now = Date.now();
+    const sessionId = String(payload.sessionId || '').trim();
+    const cwd = String(payload.cwd || '').trim();
+    const messages = Array.isArray(payload.messages) ? payload.messages : [];
+    if (target === 'codex') {
+        const records = [{ type: 'session_meta', timestamp: new Date(now).toISOString(), payload: { id: sessionId, cwd } }];
+        for (let i = 0; i < messages.length; i += 1) {
+            const m = messages[i] || {};
+            const role = normalizeRole(m.role);
+            const text = typeof m.text === 'string' ? m.text : '';
+            if (!role || !text) continue;
+            records.push({ type: 'response_item', timestamp: m.timestamp || new Date(now + i).toISOString(), payload: { type: 'message', role, content: text } });
+        }
+        return records;
+    }
+    const records = [];
+    for (let i = 0; i < messages.length; i += 1) {
+        const m = messages[i] || {};
+        const role = normalizeRole(m.role);
+        const text = typeof m.text === 'string' ? m.text : '';
+        if (!role || !text) continue;
+        records.push({ type: role, timestamp: m.timestamp || new Date(now + i).toISOString(), sessionId, cwd, message: { content: text } });
+    }
+    return records;
+}
+
+module.exports = { readSessionMessages, buildTargetRecords };
+

cli/session-convert.js

@@ -0,0 +1,43 @@
+const fs = require('fs');
+const path = require('path');
+
+const { parseArgs, ensureDir, resolveOutputPath } = require('./session-convert-args');
+const { readSessionMessages, buildTargetRecords } = require('./session-convert-io');
+
+function printUsage() {
+    console.log('\n用法:');
+    console.log('  codexmate convert-session --from <codex|claude> --to <codex|claude> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
+}
+
+async function cmdConvertSession(args = [], deps = {}) {
+    const parsed = parseArgs(args);
+    if (parsed.error) {
+        console.error('错误:', parsed.error);
+        printUsage();
+        process.exit(1);
+    }
+    if (!deps || typeof deps.resolveSessionFilePath !== 'function') {
+        console.error('错误: convert-session missing resolver');
+        process.exit(1);
+    }
+    const opt = parsed.options;
+    const filePath = deps.resolveSessionFilePath(opt.from, opt.filePath, opt.sessionId);
+    if (!filePath) {
+        console.error('转换失败: Session file not found');
+        process.exit(1);
+    }
+    const extracted = await readSessionMessages(filePath, opt.from, opt.maxMessages);
+    const sessionId = extracted.sessionId || opt.sessionId || path.basename(filePath, '.jsonl');
+    const safeSessionId = String(sessionId).replace(/[^a-zA-Z0-9_-]/g, '_');
+    const records = buildTargetRecords(opt.to, { sessionId, cwd: extracted.cwd || '', messages: extracted.messages });
+    const jsonl = `${records.map(r => JSON.stringify(r)).join('\n')}\n`;
+    const outputPath = resolveOutputPath(opt.output, `${opt.to}-session-${safeSessionId}.jsonl`);
+    ensureDir(path.dirname(outputPath));
+    fs.writeFileSync(outputPath, jsonl, 'utf-8');
+    console.log('\n✓ 会话已转换:', outputPath);
+    if (extracted.truncated) console.log('! 已截断: 可使用 --max-messages=all');
+    console.log();
+}
+
+module.exports = { cmdConvertSession };
+

tests/unit/session-convert-web-ui.test.mjs

@@ -0,0 +1,43 @@
+import assert from 'assert';
+import { buildConvertedSessionJsonl } from '../../web-ui/logic.session-convert.mjs';
+
+test('buildConvertedSessionJsonl emits codex jsonl', () => {
+    const text = buildConvertedSessionJsonl('codex', {
+        sessionId: 'sess-1',
+        cwd: '/repo',
+        messages: [
+            { role: 'system', text: 'sys', timestamp: '2026-04-29T00:00:00.000Z' },
+            { role: 'user', text: 'hi', timestamp: '2026-04-29T00:00:01.000Z' },
+            { role: 'assistant', text: 'hello', timestamp: '2026-04-29T00:00:02.000Z' }
+        ]
+    });
+    const lines = text.trim().split('\n').map((line) => JSON.parse(line));
+    assert.strictEqual(lines[0].type, 'session_meta');
+    assert.strictEqual(lines[0].payload.id, 'sess-1');
+    assert.strictEqual(lines[0].payload.cwd, '/repo');
+    assert.strictEqual(lines[1].payload.role, 'user');
+    assert.strictEqual(lines[1].payload.content, 'hi');
+    assert.strictEqual(lines[2].payload.role, 'assistant');
+    assert.strictEqual(lines[2].payload.content, 'hello');
+});
+
+test('buildConvertedSessionJsonl emits claude jsonl', () => {
+    const text = buildConvertedSessionJsonl('claude', {
+        sessionId: 'sess-2',
+        cwd: '/repo',
+        messages: [
+            { role: 'system', text: 'sys', timestamp: '2026-04-29T00:00:00.000Z' },
+            { role: 'user', text: 'hi', timestamp: '2026-04-29T00:00:01.000Z' },
+            { role: 'assistant', text: 'hello', timestamp: '2026-04-29T00:00:02.000Z' }
+        ]
+    });
+    const lines = text.trim().split('\n').map((line) => JSON.parse(line));
+    assert.strictEqual(lines.length, 2);
+    assert.strictEqual(lines[0].type, 'user');
+    assert.strictEqual(lines[0].sessionId, 'sess-2');
+    assert.strictEqual(lines[0].cwd, '/repo');
+    assert.strictEqual(lines[0].message.content, 'hi');
+    assert.strictEqual(lines[1].type, 'assistant');
+    assert.strictEqual(lines[1].message.content, 'hello');
+});
+

tests/unit/session-convert.test.mjs

@@ -0,0 +1,76 @@
+import assert from 'assert';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const { cmdConvertSession } = require('../../cli/session-convert');
+
+function writeJsonl(filePath, records) {
+    const lines = records.map((r) => JSON.stringify(r));
+    fs.writeFileSync(filePath, `${lines.join('\n')}\n`, 'utf-8');
+}
+
+function listFiles(dirPath) {
+    return fs.readdirSync(dirPath).filter(Boolean).sort();
+}
+
+test('convert-session converts codex jsonl to claude jsonl', async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codexmate-convert-'));
+    const inputPath = path.join(tmpDir, 'input.jsonl');
+    const outDir = path.join(tmpDir, 'out');
+    fs.mkdirSync(outDir);
+
+    writeJsonl(inputPath, [
+        { type: 'session_meta', timestamp: '2026-04-29T00:00:00.000Z', payload: { id: 'sess-1', cwd: '/repo' } },
+        { type: 'response_item', timestamp: '2026-04-29T00:00:01.000Z', payload: { type: 'message', role: 'user', content: 'hi' } },
+        { type: 'response_item', timestamp: '2026-04-29T00:00:02.000Z', payload: { type: 'message', role: 'assistant', content: 'hello' } }
+    ]);
+
+    await cmdConvertSession(
+        ['--from', 'codex', '--to', 'claude', '--file', inputPath, '--output', `${outDir}/`],
+        { resolveSessionFilePath: () => inputPath }
+    );
+
+    const files = listFiles(outDir);
+    assert.deepStrictEqual(files, ['claude-session-sess-1.jsonl']);
+    const content = fs.readFileSync(path.join(outDir, files[0]), 'utf-8').trim();
+    const records = content.split('\n').map((line) => JSON.parse(line));
+    assert.strictEqual(records.length, 2);
+    assert.strictEqual(records[0].type, 'user');
+    assert.strictEqual(records[0].sessionId, 'sess-1');
+    assert.strictEqual(records[0].cwd, '/repo');
+    assert.strictEqual(records[0].message.content, 'hi');
+    assert.strictEqual(records[1].type, 'assistant');
+    assert.strictEqual(records[1].message.content, 'hello');
+});
+
+test('convert-session converts claude jsonl to codex jsonl', async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codexmate-convert-'));
+    const inputPath = path.join(tmpDir, 'input.jsonl');
+    const outDir = path.join(tmpDir, 'out');
+    fs.mkdirSync(outDir);
+
+    writeJsonl(inputPath, [
+        { type: 'user', timestamp: '2026-04-29T00:00:01.000Z', sessionId: 'sess-2', cwd: '/repo', message: { content: 'hi' } },
+        { type: 'assistant', timestamp: '2026-04-29T00:00:02.000Z', sessionId: 'sess-2', cwd: '/repo', message: { content: 'hello' } }
+    ]);
+
+    await cmdConvertSession(
+        ['--from', 'claude', '--to', 'codex', '--file', inputPath, '--output', `${outDir}/`],
+        { resolveSessionFilePath: () => inputPath }
+    );
+
+    const files = listFiles(outDir);
+    assert.deepStrictEqual(files, ['codex-session-sess-2.jsonl']);
+    const content = fs.readFileSync(path.join(outDir, files[0]), 'utf-8').trim();
+    const records = content.split('\n').map((line) => JSON.parse(line));
+    assert.strictEqual(records[0].type, 'session_meta');
+    assert.strictEqual(records[0].payload.id, 'sess-2');
+    assert.strictEqual(records[0].payload.cwd, '/repo');
+    assert.strictEqual(records[1].type, 'response_item');
+    assert.strictEqual(records[1].payload.role, 'user');
+    assert.strictEqual(records[2].payload.role, 'assistant');
+});
+

tests/unit/web-ui-behavior-parity.test.mjs

@@ -402,7 +402,8 @@ test('captured bundled app skeleton only exposes expected data key drift versus
         'promptComposerVarValuesRaw',
         'showPromptTemplateVarModal',
         'promptTemplateVarDraftName',
-        'promptTemplateVarDraftError'
+        'promptTemplateVarDraftError',
+        'sessionConverting'
     );
     if (parityAgainstHead) {
         const allowedExtraKeySet = new Set(allowedExtraCurrentKeys);
@@ -438,6 +439,7 @@ test('captured bundled app skeleton only exposes expected data key drift versus
         'findProviderByName',
         'getProviderValidation',
         'getShareCommandPrefixInvocation',
+        'convertSession',
         'invalidateSessionsUsageData',
         'isReservedProviderCreationName',
         'isSessionLoadNativeDialogEnabled',

web-ui/app.js

@@ -194,6 +194,7 @@ document.addEventListener('DOMContentLoaded', () => {
                     gemini: 0
                 },
                 sessionExporting: {},
+                sessionConverting: {},
                 sessionCloning: {},
                 sessionDeleting: {},
                 activeSession: null,