gpteam 0.1.2 → 0.1.3

package/README.md

@@ -6,7 +6,9 @@ Interactive GPTeam API client configurator.
 npx gpteam
 ```
 
-The CLI asks for an API key, detects available models, benchmarks all production ingress endpoints with real API requests, then backs up old files and writes the selected client configuration. Ingress endpoints are benchmarked in parallel, while rounds for the same endpoint remain sequential to keep real API request pressure bounded.
+The CLI asks for an API key, validates it with `/v1/models`, detects available models, benchmarks all production ingress endpoints with real API requests, then backs up old files and writes the selected client configuration. The next steps are blocked until the key validation succeeds. Ingress endpoints are benchmarked in parallel, while rounds for the same endpoint remain sequential to keep real API request pressure bounded. Failed benchmark rows show their error reason in the result table.
+
+Codex config writing follows the same safety pattern as cc-switch: keep top-level fields separate from provider tables, preserve unrelated sections such as MCP servers, and stop before writing if the generated TOML would contain duplicate keys.
 
 Supported clients:
 

package/lib/cli.js

@@ -3,7 +3,7 @@ import { stdin as input, stdout as output } from 'node:process';
 import { benchmarkNodes, formatMs } from './bench.js';
 import { CLIENTS, writeClientConfig } from './config.js';
 import { getHelpText, PACKAGE_NAME, PACKAGE_VERSION } from './help.js';
-import { fetchModels, modelByID, normalizeModels } from './models.js';
+import { modelByID, validateApiKey } from './models.js';
 import { describeSplit, INGRESS_NODES } from './nodes.js';
 
 export async function runCli(argv = []) {
@@ -23,8 +23,11 @@ export async function runCli(argv = []) {
     console.log('接下来会用你的 key 跑几次真实请求测速，然后把选中的入口写进客户端配置。原来的配置会先备份。\n');
 
     const apiKey = args.key || args.apiKey || await askRequired(rl, '请输入 API key：');
+    console.log('\n正在校验 API key，会请求 /v1/models。校验通过后才会继续。');
+    const validation = await validateApiKey(INGRESS_NODES, apiKey);
+    console.log(`API key 校验通过：${validation.node.label}`);
     const client = await choose(rl, '请选择客户端类型', CLIENTS, args.client);
-    const models = await loadModels(apiKey);
+    const models = validation.models;
     const model = await chooseModel(rl, models, args.model);
     const contextLength = await askContextLength(rl, model, args.context);
     const effort = await choose(rl, '请选择思考深度', model.efforts.map((id) => ({ id, label: id })), args.effort);
@@ -95,26 +98,16 @@ export function printResults(results) {
     formatMs(item.totalMs),
     `${Math.round(item.successRate * 100)}%`,
     formatMs(item.healthMs),
-    item === recommended ? '推荐' : '-'
+    item === recommended ? '推荐' : '-',
+    item.error || '-'
   ]);
-  const header = ['节点', 'DNS', 'TCP', 'TLS', '首包', '完成', '成功率', '健康检查', '推荐'];
+  const header = ['节点', 'DNS', 'TCP', 'TLS', '首包', '完成', '成功率', '健康检查', '推荐', '错误'];
   const widths = header.map((name, i) => Math.max(displayWidth(name), ...rows.map((row) => displayWidth(row[i]))) + 2);
   console.log('');
   console.log(formatRow(header, widths));
   for (const row of rows) console.log(formatRow(row, widths));
 }
 
-async function loadModels(apiKey) {
-  for (const node of INGRESS_NODES) {
-    try {
-      return await fetchModels(node.baseUrl, apiKey);
-    } catch {
-      // 继续尝试下一个入口，全部失败时用本地兜底模型表。
-    }
-  }
-  return normalizeModels({ data: [] });
-}
-
 async function chooseModel(rl, models, preferred) {
   const selected = preferred ? modelByID(models, preferred) : null;
   if (selected) return selected;

package/lib/config.js

@@ -27,27 +27,31 @@ export function writeCodexConfig(settings) {
   backupIfExists(authPath);
 
   const raw = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf8') : '';
-  const cleaned = stripCodexManagedConfig(raw);
-  const managed = [
+  const { rootLines, rest } = stripCodexManagedConfig(raw);
+  const managedRoot = [
     `model = ${tomlString(settings.model)}`,
     `model_provider = "gpteam"`,
     `model_context_window = ${Number(settings.contextLength)}`,
     `model_reasoning_effort = ${tomlString(settings.effort)}`,
-    'disable_response_storage = true',
-    '',
+    'disable_response_storage = true'
+  ];
+  const managedProvider = [
     '[model_providers.gpteam]',
     'name = "gpteam"',
     `base_url = ${tomlString(settings.node.baseUrl)}`,
     'wire_api = "responses"',
     'requires_openai_auth = true',
     'supports_websockets = false'
-  ].join('\n');
-  const next = `${managed}\n\n${cleaned.trim()}`.trim() + '\n';
-  fs.writeFileSync(configPath, next, { encoding: 'utf8', mode: 0o600 });
-  fs.writeFileSync(authPath, `${JSON.stringify({ OPENAI_API_KEY: settings.apiKey }, null, 2)}\n`, {
-    encoding: 'utf8',
-    mode: 0o600
-  });
+  ];
+  const next = joinTomlSections([
+    managedRoot.join('\n'),
+    rootLines.join('\n'),
+    rest.join('\n'),
+    managedProvider.join('\n')
+  ]);
+  assertNoDuplicateTomlKeys(next);
+  writeTextAtomic(configPath, next, 0o600);
+  writeTextAtomic(authPath, `${JSON.stringify({ OPENAI_API_KEY: settings.apiKey }, null, 2)}\n`, 0o600);
   return [configPath, authPath];
 }
 
@@ -100,7 +104,7 @@ export function writeClaudeCodeEnv(settings) {
     '',
     '# 使用方式：source ~/.gpteam/claude-code.env'
   ];
-  fs.writeFileSync(filePath, `${lines.join('\n')}\n`, { encoding: 'utf8', mode: 0o600 });
+  writeTextAtomic(filePath, `${lines.join('\n')}\n`, 0o600);
   return [filePath];
 }
 
@@ -135,13 +139,81 @@ export function writeOpenClawConfig(settings) {
 }
 
 function stripCodexManagedConfig(raw) {
-  return String(raw || '')
-    .replace(/^\s*model\s*=.*\n?/gm, '')
-    .replace(/^\s*model_provider\s*=.*\n?/gm, '')
-    .replace(/^\s*model_context_window\s*=.*\n?/gm, '')
-    .replace(/^\s*model_reasoning_effort\s*=.*\n?/gm, '')
-    .replace(/^\s*\[model_providers\.gpteam\][\s\S]*?(?=^\s*\[[^\]]+\]|$)/gm, '')
-    .trim();
+  const rootLines = [];
+  const rest = [];
+  let inManagedProvider = false;
+
+  for (const line of String(raw || '').split(/\r?\n/)) {
+    if (isTableHeader(line)) {
+      inManagedProvider = isGpteamProviderHeader(line);
+      if (!inManagedProvider) rest.push(line);
+      continue;
+    }
+    if (isManagedRootLine(line)) continue;
+    if (inManagedProvider) {
+      if (isManagedProviderLine(line)) continue;
+      if (isSalvageableRootLine(line)) rootLines.push(line);
+      continue;
+    }
+    rest.push(line);
+  }
+
+  return {
+    rootLines: trimEmptyEdges(rootLines),
+    rest: trimEmptyEdges(rest)
+  };
+}
+
+function joinTomlSections(sections) {
+  return sections.map((section) => String(section || '').trim()).filter(Boolean).join('\n\n') + '\n';
+}
+
+function assertNoDuplicateTomlKeys(text) {
+  const seen = new Map();
+  let section = '<root>';
+  for (const line of String(text || '').split(/\r?\n/)) {
+    const table = line.match(/^\s*\[([^\]]+)\]\s*$/);
+    if (table) {
+      section = table[1];
+      if (!seen.has(section)) seen.set(section, new Set());
+      continue;
+    }
+    const assignment = line.match(/^\s*([A-Za-z0-9_.-]+)\s*=/);
+    if (!assignment) continue;
+    const keys = seen.get(section) || new Set();
+    if (keys.has(assignment[1])) {
+      throw new Error(`生成的 Codex 配置存在重复字段：${section}.${assignment[1]}，已停止写入`);
+    }
+    keys.add(assignment[1]);
+    seen.set(section, keys);
+  }
+}
+
+function trimEmptyEdges(lines) {
+  const out = [...lines];
+  while (out.length && !out[0].trim()) out.shift();
+  while (out.length && !out[out.length - 1].trim()) out.pop();
+  return out;
+}
+
+function isTableHeader(line) {
+  return /^\s*\[[^\]]+\]\s*$/.test(line);
+}
+
+function isGpteamProviderHeader(line) {
+  return /^\s*\[model_providers\.gpteam\]\s*$/.test(line);
+}
+
+function isManagedRootLine(line) {
+  return /^\s*(model|model_provider|model_context_window|model_reasoning_effort|disable_response_storage)\s*=/.test(line);
+}
+
+function isManagedProviderLine(line) {
+  return /^\s*(name|base_url|wire_api|requires_openai_auth|supports_websockets)\s*=/.test(line);
+}
+
+function isSalvageableRootLine(line) {
+  return /^\s*(js_repl_node_path|preferred_auth_method|personality|plan_mode_reasoning_effort|service_tier)\s*=/.test(line);
 }
 
 function backupIfExists(filePath) {
@@ -150,6 +222,17 @@ function backupIfExists(filePath) {
   fs.copyFileSync(filePath, `${filePath}.bak-${stamp}`);
 }
 
+function writeTextAtomic(filePath, text, mode) {
+  const tmp = `${filePath}.tmp-${process.pid}-${Date.now()}`;
+  fs.writeFileSync(tmp, text, { encoding: 'utf8', mode });
+  fs.renameSync(tmp, filePath);
+  try {
+    fs.chmodSync(filePath, mode);
+  } catch {
+    // Windows 上 chmod 语义有限，写入成功优先。
+  }
+}
+
 function readJSON(filePath, fallback) {
   if (!fs.existsSync(filePath)) return fallback;
   try {
@@ -160,7 +243,7 @@ function readJSON(filePath, fallback) {
 }
 
 function writeJSON(filePath, value) {
-  fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
+  writeTextAtomic(filePath, `${JSON.stringify(value, null, 2)}\n`, 0o600);
 }
 
 function tomlString(value) {

package/lib/help.js

@@ -1,5 +1,5 @@
 export const PACKAGE_NAME = 'gpteam';
-export const PACKAGE_VERSION = '0.1.2';
+export const PACKAGE_VERSION = '0.1.3';
 
 export function getHelpText() {
   return [
@@ -21,6 +21,6 @@ export function getHelpText() {
     '  --help                  显示帮助',
     '  --version               显示版本',
     '',
-    '说明：测速会请求 GET /api/health 和流式 POST /v1/responses。入口之间并行测速，写新配置前会先备份旧配置。'
+    '说明：输入 key 后会先请求 /v1/models 校验，通过后才继续。测速会请求 GET /api/health 和流式 POST /v1/responses。入口之间并行测速，写新配置前会先备份旧配置。'
   ].join('\n');
 }

package/lib/models.js

@@ -72,19 +72,43 @@ export function normalizeModels(payload) {
   return Array.from(result.values()).sort((a, b) => a.id.localeCompare(b.id));
 }
 
-export async function fetchModels(baseUrl, apiKey) {
+export async function fetchModels(baseUrl, apiKey, options = {}) {
   const response = await fetch(`${baseUrl.replace(/\/$/, '')}/models`, {
+    signal: makeTimeoutSignal(options.timeoutMs || 15000),
     headers: {
       Authorization: `Bearer ${apiKey}`,
       'User-Agent': 'gpteam-api-config/0.1'
     }
   });
   if (!response.ok) {
-    throw new Error(`/v1/models 返回 HTTP ${response.status}`);
+    const detail = await readResponseError(response);
+    throw new Error(`/v1/models 返回 HTTP ${response.status}${detail ? `：${detail}` : ''}`);
   }
   return normalizeModels(await response.json());
 }
 
+export async function validateApiKey(nodes, apiKey) {
+  const candidates = (nodes || []).filter((node) => node && node.baseUrl);
+  if (!candidates.length) {
+    throw new Error('API key 校验失败：没有可用入口');
+  }
+
+  const results = await Promise.all(candidates.map(async (node) => {
+    try {
+      return { ok: true, node, models: await fetchModels(node.baseUrl, apiKey) };
+    } catch (error) {
+      return { ok: false, node, error };
+    }
+  }));
+  const success = results.find((item) => item.ok);
+  if (success) return { node: success.node, models: success.models };
+
+  const detail = results
+    .map((item) => `${item.node.label || item.node.id || item.node.baseUrl}: ${item.error && item.error.message ? item.error.message : item.error}`)
+    .join('；');
+  throw new Error(`API key 校验失败：${detail}`);
+}
+
 export function modelByID(models, id) {
   return models.find((model) => model.id === id) || models[0];
 }
@@ -98,3 +122,24 @@ function normalizeEfforts(levels) {
   }
   return out.length ? out : ['medium'];
 }
+
+function makeTimeoutSignal(timeoutMs) {
+  return typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function'
+    ? AbortSignal.timeout(timeoutMs)
+    : undefined;
+}
+
+async function readResponseError(response) {
+  try {
+    const text = await response.text();
+    if (!text) return '';
+    try {
+      const parsed = JSON.parse(text);
+      return parsed && parsed.error && parsed.error.message ? String(parsed.error.message) : text.slice(0, 240);
+    } catch {
+      return text.slice(0, 240);
+    }
+  } catch {
+    return '';
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gpteam",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "GPTeam API interactive client configurator and ingress benchmark CLI.",
   "type": "module",
   "bin": {