codexmate 0.0.25 → 0.0.27

package/cli/openai-bridge.js

@@ -369,6 +369,76 @@ function normalizeResponsesInputToChatMessages(input) {
     return [];
 }
 
+
+function normalizeResponsesToolsToChatTools(tools) {
+    if (!Array.isArray(tools)) return tools;
+    return tools
+        .map((tool) => {
+            if (!tool || typeof tool !== 'object') return null;
+            if (tool.type !== 'function') return null;
+            const sourceFn = tool.function && typeof tool.function === 'object' && !Array.isArray(tool.function)
+                ? tool.function
+                : {};
+            const name = typeof sourceFn.name === 'string' && sourceFn.name.trim()
+                ? sourceFn.name.trim()
+                : (typeof tool.name === 'string' ? tool.name.trim() : '');
+            if (!name) return null;
+            const parameters = sourceFn.parameters && typeof sourceFn.parameters === 'object' && !Array.isArray(sourceFn.parameters)
+                ? sourceFn.parameters
+                : (tool.parameters && typeof tool.parameters === 'object' && !Array.isArray(tool.parameters) ? tool.parameters : {});
+            const fn = { name, parameters };
+            const description = typeof sourceFn.description === 'string'
+                ? sourceFn.description
+                : (typeof tool.description === 'string' ? tool.description : undefined);
+            const strict = typeof sourceFn.strict === 'boolean'
+                ? sourceFn.strict
+                : (typeof tool.strict === 'boolean' ? tool.strict : undefined);
+            if (description !== undefined) fn.description = description;
+            if (strict !== undefined) fn.strict = strict;
+            return { type: 'function', function: fn };
+        })
+        .filter(Boolean);
+}
+
+function normalizeResponsesToolChoiceToChatToolChoice(toolChoice) {
+    if (!toolChoice || typeof toolChoice !== 'object' || Array.isArray(toolChoice)) return toolChoice;
+    if (toolChoice.type === 'function' && typeof toolChoice.name === 'string' && toolChoice.name.trim()) {
+        return { type: 'function', function: { name: toolChoice.name.trim() } };
+    }
+    return toolChoice;
+}
+
+function normalizeResponsesToolsForResponsesApi(tools) {
+    if (!Array.isArray(tools)) return tools;
+    return tools
+        .map((tool) => {
+            if (!tool || typeof tool !== 'object') return null;
+            if (tool.type !== 'function') return null;
+            const sourceFn = tool.function && typeof tool.function === 'object' && !Array.isArray(tool.function)
+                ? tool.function
+                : {};
+            const name = typeof sourceFn.name === 'string' && sourceFn.name.trim()
+                ? sourceFn.name.trim()
+                : (typeof tool.name === 'string' ? tool.name.trim() : '');
+            if (!name) return null;
+            const out = { type: 'function', name };
+            const description = typeof sourceFn.description === 'string'
+                ? sourceFn.description
+                : (typeof tool.description === 'string' ? tool.description : undefined);
+            const parameters = sourceFn.parameters && typeof sourceFn.parameters === 'object' && !Array.isArray(sourceFn.parameters)
+                ? sourceFn.parameters
+                : (tool.parameters && typeof tool.parameters === 'object' && !Array.isArray(tool.parameters) ? tool.parameters : undefined);
+            const strict = typeof sourceFn.strict === 'boolean'
+                ? sourceFn.strict
+                : (typeof tool.strict === 'boolean' ? tool.strict : undefined);
+            if (description !== undefined) out.description = description;
+            if (parameters !== undefined) out.parameters = parameters;
+            if (strict !== undefined) out.strict = strict;
+            return out;
+        })
+        .filter(Boolean);
+}
+
 function convertResponsesRequestToChatCompletions(payload) {
     const body = payload && typeof payload === 'object' ? payload : {};
     const model = typeof body.model === 'string' ? body.model.trim() : '';
@@ -401,12 +471,11 @@ function convertResponsesRequestToChatCompletions(payload) {
     if (Array.isArray(body.stop) && body.stop.length) {
         chat.stop = body.stop.filter((item) => typeof item === 'string' && item.trim());
     }
-    // Best-effort: pass through tool definitions (most OpenAI-compatible providers accept these fields).
     if (Array.isArray(body.tools) && body.tools.length) {
-        chat.tools = body.tools;
+        chat.tools = normalizeResponsesToolsToChatTools(body.tools);
     }
     if (body.tool_choice !== undefined) {
-        chat.tool_choice = body.tool_choice;
+        chat.tool_choice = normalizeResponsesToolChoiceToChatToolChoice(body.tool_choice);
     }
     if (body.response_format !== undefined) {
         chat.response_format = body.response_format;
@@ -489,6 +558,9 @@ function buildResponsesPayloadFromChatResult(model, text, toolCalls, upstreamPay
 
 function ensureResponseMetadata(response) {
     const payload = response && typeof response === 'object' ? response : {};
+    if (typeof payload.object !== 'string' || !payload.object.trim()) {
+        payload.object = 'response';
+    }
     if (typeof payload.created_at !== 'number') {
         payload.created_at = Math.floor(Date.now() / 1000);
     }
@@ -599,7 +671,11 @@ function extractResponsesOutputText(payload) {
 
 function toUpstreamNonStreamingResponsesPayload(payload) {
     const body = payload && typeof payload === 'object' ? payload : {};
-    return { ...body, stream: false };
+    const normalized = { ...body, stream: false };
+    if (Array.isArray(body.tools)) {
+        normalized.tools = normalizeResponsesToolsForResponsesApi(body.tools);
+    }
+    return normalized;
 }
 
 function shouldFallbackFromUpstreamResponses(status, bodyText) {
@@ -616,6 +692,7 @@ function shouldFallbackFromUpstreamResponses(status, bodyText) {
     if (/unknown (endpoint|route)/i.test(text)) return true;
     if (/unsupported.*\/?v1\/responses/i.test(text)) return true;
     if (/does not support.*responses/i.test(text)) return true;
+    if (/name['"`]?\s+is a required property/i.test(text) && /tools/i.test(text) && /function/i.test(text)) return true;
 
     // Best-effort parse for structured error codes.
     try {
@@ -627,6 +704,7 @@ function shouldFallbackFromUpstreamResponses(status, bodyText) {
         if (/unknown (endpoint|route)/i.test(msg)) return true;
         if (/unsupported.*\/?v1\/responses/i.test(msg)) return true;
         if (/does not support.*responses/i.test(msg)) return true;
+        if (/name['"`]?\s+is a required property/i.test(msg) && /tools/i.test(msg) && /function/i.test(msg)) return true;
     } catch (_) {}
 
     return false;
@@ -804,7 +882,23 @@ function createOpenaiBridgeHttpHandler(options = {}) {
                 ? upstream.headers
                 : {};
 
-            if (!normalizedSuffix || normalizedSuffix === 'models') {
+            if (!normalizedSuffix) {
+                if ((req.method || 'GET').toUpperCase() !== 'GET') {
+                    res.writeHead(405, { 'Content-Type': 'application/json; charset=utf-8' });
+                    res.end(JSON.stringify({ error: 'Method Not Allowed' }));
+                    return;
+                }
+                res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+                res.end(JSON.stringify({
+                    object: 'codexmate.openai_bridge',
+                    provider: match.provider,
+                    status: 'ok',
+                    endpoints: ['/v1/responses', '/v1/models']
+                }));
+                return;
+            }
+
+            if (normalizedSuffix === 'models') {
                 if ((req.method || 'GET').toUpperCase() !== 'GET') {
                     res.writeHead(405, { 'Content-Type': 'application/json; charset=utf-8' });
                     res.end(JSON.stringify({ error: 'Method Not Allowed' }));

package/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 };
+

package/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 };
+

package/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 };
+