codexmate 0.0.18 → 0.0.20

package/lib/cli-models-utils.js

@@ -82,47 +82,202 @@ function normalizeWireApi(value) {
     return raw.replace(/[\s\-\/]/g, '_');
 }
 
+function buildApiProbeUrlCandidates(baseUrl, pathSuffix) {
+    const normalized = normalizeBaseUrl(baseUrl);
+    if (!normalized) return [];
+
+    const safeSuffix = String(pathSuffix || '').replace(/^\/+/g, '');
+    if (!safeSuffix) return [normalized];
+
+    const candidates = [];
+    const pushUnique = (value) => {
+        if (value && !candidates.includes(value)) {
+            candidates.push(value);
+        }
+    };
+
+    let pathname = '';
+    try {
+        pathname = new URL(normalized).pathname.replace(/\/+$/g, '');
+    } catch (e) {
+        pathname = '';
+    }
+
+    const directUrl = `${normalized}/${safeSuffix}`;
+    const versionedUrl = joinApiUrl(normalized, safeSuffix);
+    if (/\/v\d+$/i.test(pathname)) {
+        pushUnique(directUrl);
+        return candidates;
+    }
+
+    if (!pathname || pathname === '/') {
+        pushUnique(versionedUrl);
+        pushUnique(directUrl);
+        return candidates;
+    }
+
+    pushUnique(directUrl);
+    pushUnique(versionedUrl);
+    return candidates;
+}
+
 function buildModelsProbeUrl(baseUrl) {
-    return joinApiUrl(baseUrl, 'models');
+    return buildApiProbeUrlCandidates(baseUrl, 'models')[0] || '';
 }
 
-function buildModelProbeSpec(provider, modelName, baseUrl) {
+function buildModelProbeSpecs(provider, modelName, baseUrl) {
     const model = typeof modelName === 'string' ? modelName.trim() : '';
-    if (!model) return null;
+    if (!model) return [];
 
     const wireApi = normalizeWireApi(provider && provider.wire_api);
+    let pathSuffix = 'responses';
+    let body = {
+        model,
+        input: 'ping',
+        max_output_tokens: 1
+    };
+
     if (wireApi === 'chat_completions' || wireApi === 'chat') {
-        return {
-            url: joinApiUrl(baseUrl, 'chat/completions'),
-            body: {
-                model,
-                messages: [{ role: 'user', content: 'ping' }],
-                max_tokens: 1,
-                temperature: 0
-            }
+        pathSuffix = 'chat/completions';
+        body = {
+            model,
+            messages: [{ role: 'user', content: 'ping' }],
+            max_tokens: 1,
+            temperature: 0
+        };
+    } else if (wireApi === 'completions') {
+        pathSuffix = 'completions';
+        body = {
+            model,
+            prompt: 'ping',
+            max_tokens: 1,
+            temperature: 0
         };
     }
 
-    if (wireApi === 'completions') {
-        return {
-            url: joinApiUrl(baseUrl, 'completions'),
-            body: {
-                model,
-                prompt: 'ping',
-                max_tokens: 1,
-                temperature: 0
-            }
+    return buildApiProbeUrlCandidates(baseUrl, pathSuffix).map((url) => ({
+        url,
+        body
+    }));
+}
+
+function buildModelProbeSpec(provider, modelName, baseUrl) {
+    return buildModelProbeSpecs(provider, modelName, baseUrl)[0] || null;
+}
+
+function buildModelConversationSpecs(provider, modelName, baseUrl, prompt, options = {}) {
+    const model = typeof modelName === 'string' ? modelName.trim() : '';
+    const userPrompt = typeof prompt === 'string' ? prompt.trim() : '';
+    if (!model || !userPrompt) return [];
+
+    const wireApi = normalizeWireApi(provider && provider.wire_api);
+    const maxOutputTokens = Number.isFinite(options.maxOutputTokens)
+        ? Math.max(1, Number(options.maxOutputTokens))
+        : 256;
+    let pathSuffix = 'responses';
+    let body = {
+        model,
+        input: userPrompt,
+        max_output_tokens: maxOutputTokens
+    };
+
+    if (wireApi === 'chat_completions' || wireApi === 'chat') {
+        pathSuffix = 'chat/completions';
+        body = {
+            model,
+            messages: [{ role: 'user', content: userPrompt }],
+            max_tokens: maxOutputTokens
+        };
+    } else if (wireApi === 'completions') {
+        pathSuffix = 'completions';
+        body = {
+            model,
+            prompt: userPrompt,
+            max_tokens: maxOutputTokens
         };
     }
 
-    return {
-        url: joinApiUrl(baseUrl, 'responses'),
-        body: {
-            model,
-            input: 'ping',
-            max_output_tokens: 1
+    return buildApiProbeUrlCandidates(baseUrl, pathSuffix).map((url) => ({
+        url,
+        body,
+        wireApi
+    }));
+}
+
+function collectStructuredText(content, pieces) {
+    if (typeof content === 'string') {
+        const text = content.trim();
+        if (text) pieces.push(text);
+        return;
+    }
+    if (Array.isArray(content)) {
+        for (const item of content) {
+            collectStructuredText(item, pieces);
         }
-    };
+        return;
+    }
+    if (!content || typeof content !== 'object') {
+        return;
+    }
+
+    if (typeof content.output_text === 'string' && content.output_text.trim()) {
+        pieces.push(content.output_text.trim());
+    }
+    if (typeof content.text === 'string' && content.text.trim()) {
+        pieces.push(content.text.trim());
+    }
+    if (typeof content.content === 'string' && content.content.trim()) {
+        pieces.push(content.content.trim());
+    }
+
+    if (Array.isArray(content.content)) {
+        collectStructuredText(content.content, pieces);
+    }
+    if (content.message) {
+        collectStructuredText(content.message, pieces);
+    }
+}
+
+function extractModelResponseText(payload) {
+    if (!payload || typeof payload !== 'object') {
+        return '';
+    }
+
+    if (typeof payload.output_text === 'string' && payload.output_text.trim()) {
+        return payload.output_text.trim();
+    }
+
+    const pieces = [];
+
+    if (Array.isArray(payload.output)) {
+        for (const item of payload.output) {
+            collectStructuredText(item, pieces);
+        }
+    }
+
+    if (Array.isArray(payload.choices)) {
+        for (const choice of payload.choices) {
+            if (!choice || typeof choice !== 'object') continue;
+            if (typeof choice.text === 'string' && choice.text.trim()) {
+                pieces.push(choice.text.trim());
+            }
+            if (choice.message) {
+                collectStructuredText(choice.message, pieces);
+            }
+        }
+    }
+
+    if (payload.message) {
+        collectStructuredText(payload.message, pieces);
+    }
+    if (payload.content) {
+        collectStructuredText(payload.content, pieces);
+    }
+    if (typeof payload.text === 'string' && payload.text.trim()) {
+        pieces.push(payload.text.trim());
+    }
+
+    return Array.from(new Set(pieces)).join('\n\n').trim();
 }
 
 function hashModelsCacheValue(value) {
@@ -145,8 +300,12 @@ module.exports = {
     hasModelsListPayload,
     extractModelIds,
     normalizeWireApi,
+    buildApiProbeUrlCandidates,
     buildModelsProbeUrl,
+    buildModelProbeSpecs,
     buildModelProbeSpec,
+    buildModelConversationSpecs,
+    extractModelResponseText,
     hashModelsCacheValue,
     buildModelsCacheKey
 };

package/lib/cli-network-utils.js

@@ -1,58 +1,38 @@
 const http = require('http');
 const https = require('https');
 
-function probeUrl(targetUrl, options = {}) {
-    return new Promise((resolve) => {
-        let parsed;
-        try {
-            parsed = new URL(targetUrl);
-        } catch (e) {
-            return resolve({ ok: false, error: 'Invalid URL' });
-        }
-
-        const protocol = parsed.protocol;
-        if (protocol !== 'http:' && protocol !== 'https:') {
-            return resolve({
-                ok: false,
-                error: `ERR_INVALID_PROTOCOL: Protocol "${protocol}" not supported. Expected "http:" or "https:"`
-            });
-        }
-
-        const transport = protocol === 'https:' ? https : http;
-        const headers = {
-            'User-Agent': 'codexmate-health-check',
-            'Accept': 'application/json'
-        };
-        if (options.apiKey) {
-            headers['Authorization'] = `Bearer ${options.apiKey}`;
-        }
+function shouldRetryWithIpv4(result) {
+    if (!result || result.ok || typeof result.error !== 'string') {
+        return false;
+    }
+    return /timeout|timed out|ETIMEDOUT|ENETUNREACH|EHOSTUNREACH|EAI_AGAIN/i.test(result.error);
+}
 
-        const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : 0;
-        const maxBytes = Number.isFinite(options.maxBytes) ? options.maxBytes : 256 * 1024;
+function performProbeRequest(transport, parsed, requestOptions, options = {}) {
+    return new Promise((resolve) => {
         const start = Date.now();
-        const req = transport.request(parsed, { method: 'GET', headers }, (res) => {
+        const req = transport.request(parsed, requestOptions, (res) => {
             const chunks = [];
             let size = 0;
             res.on('data', (chunk) => {
                 if (!chunk) return;
                 size += chunk.length;
-                if (size <= maxBytes) {
+                if (size <= options.maxBytes) {
                     chunks.push(chunk);
                 }
             });
             res.on('end', () => {
-                const body = chunks.length > 0 ? Buffer.concat(chunks).toString('utf-8') : '';
                 resolve({
                     ok: true,
                     status: res.statusCode || 0,
                     durationMs: Date.now() - start,
-                    body
+                    body: chunks.length > 0 ? Buffer.concat(chunks).toString('utf-8') : ''
                 });
             });
         });
 
-        if (timeoutMs > 0) {
-            req.setTimeout(timeoutMs, () => {
+        if (options.timeoutMs > 0) {
+            req.setTimeout(options.timeoutMs, () => {
                 req.destroy(new Error('timeout'));
             });
         }
@@ -65,81 +45,117 @@ function probeUrl(targetUrl, options = {}) {
             });
         });
 
+        if (options.payload) {
+            req.write(options.payload);
+        }
         req.end();
     });
 }
 
-function probeJsonPost(targetUrl, body, options = {}) {
-    return new Promise((resolve) => {
-        let parsed;
-        try {
-            parsed = new URL(targetUrl);
-        } catch (e) {
-            return resolve({ ok: false, error: 'Invalid URL' });
-        }
-
-        const protocol = parsed.protocol;
-        if (protocol !== 'http:' && protocol !== 'https:') {
-            return resolve({
-                ok: false,
-                error: `ERR_INVALID_PROTOCOL: Protocol "${protocol}" not supported. Expected "http:" or "https:"`
-            });
-        }
-
-        const transport = protocol === 'https:' ? https : http;
-        const headers = {
-            'User-Agent': 'codexmate-health-check',
-            'Accept': 'application/json',
-            'Content-Type': 'application/json'
+async function probeUrl(targetUrl, options = {}) {
+    let parsed;
+    try {
+        parsed = new URL(targetUrl);
+    } catch (e) {
+        return { ok: false, error: 'Invalid URL' };
+    }
+
+    const protocol = parsed.protocol;
+    if (protocol !== 'http:' && protocol !== 'https:') {
+        return {
+            ok: false,
+            error: `ERR_INVALID_PROTOCOL: Protocol "${protocol}" not supported. Expected "http:" or "https:"`
         };
-        if (options.apiKey) {
-            headers['Authorization'] = `Bearer ${options.apiKey}`;
-        }
-
-        const payload = JSON.stringify(body || {});
-        headers['Content-Length'] = Buffer.byteLength(payload);
-
-        const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : 0;
-        const maxBytes = Number.isFinite(options.maxBytes) ? options.maxBytes : 256 * 1024;
-        const start = Date.now();
-        const req = transport.request(parsed, { method: 'POST', headers }, (res) => {
-            const chunks = [];
-            let size = 0;
-            res.on('data', (chunk) => {
-                if (!chunk) return;
-                size += chunk.length;
-                if (size <= maxBytes) {
-                    chunks.push(chunk);
-                }
-            });
-            res.on('end', () => {
-                const bodyText = chunks.length > 0 ? Buffer.concat(chunks).toString('utf-8') : '';
-                resolve({
-                    ok: true,
-                    status: res.statusCode || 0,
-                    durationMs: Date.now() - start,
-                    body: bodyText
-                });
-            });
-        });
-
-        if (timeoutMs > 0) {
-            req.setTimeout(timeoutMs, () => {
-                req.destroy(new Error('timeout'));
-            });
-        }
-
-        req.on('error', (err) => {
-            resolve({
-                ok: false,
-                error: err.message || 'request failed',
-                durationMs: Date.now() - start
-            });
-        });
+    }
+
+    const transport = protocol === 'https:' ? https : http;
+    const headers = {
+        'User-Agent': 'codexmate-health-check',
+        'Accept': 'application/json'
+    };
+    if (options.apiKey) {
+        headers['Authorization'] = `Bearer ${options.apiKey}`;
+    }
+
+    const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : 0;
+    const maxBytes = Number.isFinite(options.maxBytes) ? options.maxBytes : 256 * 1024;
+    const requestOptions = {
+        method: 'GET',
+        headers
+    };
+
+    const firstResult = await performProbeRequest(transport, parsed, requestOptions, {
+        timeoutMs,
+        maxBytes
+    });
+    if (!shouldRetryWithIpv4(firstResult)) {
+        return firstResult;
+    }
+
+    const secondResult = await performProbeRequest(transport, parsed, {
+        ...requestOptions,
+        family: 4
+    }, {
+        timeoutMs,
+        maxBytes
+    });
+    return secondResult.ok ? secondResult : firstResult;
+}
 
-        req.write(payload);
-        req.end();
+async function probeJsonPost(targetUrl, body, options = {}) {
+    let parsed;
+    try {
+        parsed = new URL(targetUrl);
+    } catch (e) {
+        return { ok: false, error: 'Invalid URL' };
+    }
+
+    const protocol = parsed.protocol;
+    if (protocol !== 'http:' && protocol !== 'https:') {
+        return {
+            ok: false,
+            error: `ERR_INVALID_PROTOCOL: Protocol "${protocol}" not supported. Expected "http:" or "https:"`
+        };
+    }
+
+    const transport = protocol === 'https:' ? https : http;
+    const headers = {
+        'User-Agent': 'codexmate-health-check',
+        'Accept': 'application/json',
+        'Content-Type': 'application/json'
+    };
+    if (options.apiKey) {
+        headers['Authorization'] = `Bearer ${options.apiKey}`;
+    }
+
+    const payload = JSON.stringify(body || {});
+    headers['Content-Length'] = Buffer.byteLength(payload);
+
+    const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : 0;
+    const maxBytes = Number.isFinite(options.maxBytes) ? options.maxBytes : 256 * 1024;
+    const requestOptions = {
+        method: 'POST',
+        headers
+    };
+
+    const firstResult = await performProbeRequest(transport, parsed, requestOptions, {
+        timeoutMs,
+        maxBytes,
+        payload
+    });
+    if (!shouldRetryWithIpv4(firstResult)) {
+        return firstResult;
+    }
+
+    const secondResult = await performProbeRequest(transport, parsed, {
+        ...requestOptions,
+        family: 4
+    }, {
+        timeoutMs,
+        maxBytes,
+        payload
     });
+    return secondResult.ok ? secondResult : firstResult;
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexmate",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "Codex/Claude Code 配置与会话管理 CLI + Web 工具",
   "main": "cli.js",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "files": [
     "cli.js",
+    "cli/",
     "web-ui.html",
     "lib/",
     "web-ui/",
@@ -26,10 +27,16 @@
   "scripts": {
     "dev": "node cli.js run",
     "start": "node cli.js",
+    "reset": "node cmd/reset-main.js",
     "docs:dev": "node ./node_modules/vitepress/dist/node/cli.js dev site",
     "docs:build": "node ./node_modules/vitepress/dist/node/cli.js build site",
     "docs:preview": "node ./node_modules/vitepress/dist/node/cli.js preview site",
+    "ci:install": "node scripts/run-ci-check.js install",
+    "ci:lint": "node scripts/run-ci-check.js lint",
+    "ci:test": "node scripts/run-ci-check.js test",
+    "lint": "node scripts/lint.js",
     "test": "npm run test:unit && npm run test:e2e",
+    "test:ci": "node scripts/run-ci-check.js all",
     "test:unit": "node tests/unit/run.mjs",
     "test:e2e": "node tests/e2e/run.js",
     "pretest": "node scripts/ensure-test-deps.js"