gpteam 0.1.14 → 0.1.15

package/README.md

@@ -12,7 +12,9 @@ When a selected client is missing, the interactive CLI shows the exact install c
 
 Recommendation order is deterministic: success rate first, then an experience score. The score weighs first SSE event time, total completion time, p90 completion tail latency, and health-check time, so a node with one very slow probe is not recommended just because its median result looks good. The result table also marks the fastest full completion separately from the balanced recommendation, because deep or long-output model runs may care more about full completion time than first-token responsiveness. Model prompts use "configurable context" wording because the value is written to the client-side Codex `model_context_window`; it must not be confused with a public marketing total-window label.
 
-Client config writing follows the same safety pattern as cc-switch: keep Codex top-level fields separate from provider tables, preserve unrelated sections such as MCP servers, merge OpenCode/OpenClaw providers additively, and stop before writing when an existing JSON/JSON5 config cannot be parsed. GPTeam keeps two proxy-specific extensions on top of that baseline: Codex explicitly disables WebSocket prewarm, and Claude Code writes the reasoning-effort header through `ANTHROPIC_CUSTOM_HEADERS`.
+Client config writing follows the same safety pattern as cc-switch: keep Codex top-level fields separate from provider tables, preserve unrelated sections such as MCP servers, merge OpenCode/OpenClaw providers additively, and stop before writing when an existing JSON/JSON5 config cannot be parsed. GPTeam keeps three proxy-specific extensions on top of that baseline: Codex explicitly disables WebSocket prewarm, Codex writes the `gpteam_image` MCP server so Image 2 can be called from chat, and Claude Code writes the reasoning-effort header through `ANTHROPIC_CUSTOM_HEADERS`.
+
+For Codex, the Image MCP config uses the cc-switch-style MCP env block. On macOS/Linux it writes `command = "npx"` with `args = ["-y", "-p", "gpteam", "gpteam-image-mcp"]`; on Windows it writes a `cmd /c npx -y -p gpteam gpteam-image-mcp` wrapper. The MCP receives `GPTEAM_API_KEY` and `GPTEAM_BASE_URL` from `[mcp_servers.gpteam_image.env]`, so it does not depend on Codex `auth.json`.
 
 Claude Code is written to `~/.claude/settings.json` under the `env` section, using the GPTeam `/anthropic` base URL. OpenClaw writes `models.providers.gpteam` and also selects `gpteam/<model>` under `agents.defaults.model`, so the chosen model is active without an extra manual step.
 

package/bin/gpteam-image-mcp.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+import { runServer } from '../lib/image-mcp/server.js';
+
+runServer().catch((error) => {
+  console.error(error && error.message ? error.message : error);
+  process.exitCode = 1;
+});

package/lib/cli.js

@@ -71,6 +71,9 @@ export async function runCli(argv = []) {
     for (const filePath of written) console.log(`- ${filePath}`);
     console.log(`入口：${formatNodeLabel(selectedNode)}`);
     console.log(`地址：${selectedNode.baseUrl}`);
+    if (client.id === 'codex') {
+      printHint(theme, '已写入 GPTeam Image MCP。Codex 对话里需要生图时可调用 generate_image，MCP 使用专用环境变量读取 API key。');
+    }
   } finally {
     rl.close();
   }

package/lib/config.js

@@ -5,6 +5,9 @@ import JSON5 from 'json5';
 import { endpointRoot } from './nodes.js';
 
 const PROVIDER_ID = 'gpteam';
+const IMAGE_MCP_ID = 'gpteam_image';
+const IMAGE_MCP_PACKAGE = 'gpteam';
+const IMAGE_MCP_BIN = 'gpteam-image-mcp';
 
 export const CLIENTS = [
   { id: 'codex', label: 'Codex' },
@@ -46,10 +49,26 @@ export function writeCodexConfig(settings) {
     'requires_openai_auth = true',
     'supports_websockets = false'
   ];
+  const mcpCommand = codexImageMCPCommand();
+  const managedImageMCP = [
+    `[mcp_servers.${IMAGE_MCP_ID}]`,
+    `command = ${tomlString(mcpCommand.command)}`,
+    `args = [${mcpCommand.args.map((arg) => tomlString(arg)).join(', ')}]`,
+    'startup_timeout_sec = 20',
+    'tool_timeout_sec = 300',
+    'enabled_tools = ["generate_image"]',
+    'default_tools_approval_mode = "prompt"',
+    '',
+    `[mcp_servers.${IMAGE_MCP_ID}.env]`,
+    `GPTEAM_API_KEY = ${tomlString(settings.apiKey)}`,
+    `GPTEAM_BASE_URL = ${tomlString(settings.node.baseUrl)}`,
+    `GPTEAM_CODEX_HOME = ${tomlString(dir)}`
+  ];
   const next = joinTomlSections([
     managedRoot.join('\n'),
     rootLines.join('\n'),
     rest.join('\n'),
+    managedImageMCP.join('\n'),
     managedProvider.join('\n')
   ]);
   assertNoDuplicateTomlKeys(next);
@@ -179,18 +198,34 @@ function claudeBaseUrl(baseUrl) {
   return `${root}/anthropic`;
 }
 
+function codexImageMCPCommand() {
+  if (process.platform === 'win32') {
+    return {
+      command: 'cmd',
+      args: ['/c', 'npx', '-y', '-p', IMAGE_MCP_PACKAGE, IMAGE_MCP_BIN]
+    };
+  }
+  return {
+    command: 'npx',
+    args: ['-y', '-p', IMAGE_MCP_PACKAGE, IMAGE_MCP_BIN]
+  };
+}
+
 function stripCodexManagedConfig(raw) {
   const rootLines = [];
   const rest = [];
   let inManagedProvider = false;
+  let inManagedImageMCP = false;
 
   for (const line of String(raw || '').split(/\r?\n/)) {
     if (isTableHeader(line)) {
       inManagedProvider = isGpteamProviderHeader(line);
-      if (!inManagedProvider) rest.push(line);
+      inManagedImageMCP = isGpteamImageMCPHeader(line);
+      if (!inManagedProvider && !inManagedImageMCP) rest.push(line);
       continue;
     }
     if (isManagedRootLine(line)) continue;
+    if (inManagedImageMCP) continue;
     if (inManagedProvider) {
       if (isManagedProviderLine(line)) continue;
       if (isSalvageableRootLine(line)) rootLines.push(line);
@@ -245,6 +280,10 @@ function isGpteamProviderHeader(line) {
   return /^\s*\[model_providers\.gpteam\]\s*$/.test(line);
 }
 
+function isGpteamImageMCPHeader(line) {
+  return /^\s*\[mcp_servers\.gpteam_image(?:\.[^\]]+)?\]\s*$/.test(line);
+}
+
 function isManagedRootLine(line) {
   return /^\s*(model|model_provider|model_context_window|model_reasoning_effort|disable_response_storage)\s*=/.test(line);
 }

package/lib/help.js

@@ -1,5 +1,5 @@
 export const PACKAGE_NAME = 'gpteam';
-export const PACKAGE_VERSION = '0.1.14';
+export const PACKAGE_VERSION = '0.1.15';
 
 export function getHelpText() {
   return [
@@ -22,6 +22,6 @@ export function getHelpText() {
     '  --help                  显示帮助',
     '  --version               显示版本',
     '',
-    '说明：输入 key 后会先请求 /v1/models 校验，通过后才继续。选好客户端后会检测本机命令是否可用，缺失时提示安装；Windows 暂不支持自动配置 OpenClaw。测速会请求 GET /api/health 和流式 POST /v1/responses。入口之间并行测速，写新配置前会先备份旧配置。'
+    '说明：输入 key 后会先请求 /v1/models 校验，通过后才继续。选好客户端后会检测本机命令是否可用，缺失时提示安装；Windows 暂不支持自动配置 OpenClaw。测速会请求 GET /api/health 和流式 POST /v1/responses。入口之间并行测速，写新配置前会先备份旧配置。Codex 配置会同时写入 GPTeam Image MCP，生图工具从 MCP env 读取 key。'
   ].join('\n');
 }

package/lib/image-mcp/image.js

@@ -0,0 +1,186 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+export const DEFAULT_BASE_URL = 'https://api.gpteamservices.com/v1';
+export const DEFAULT_IMAGE_MODEL = 'gpt-image-2';
+export const DEFAULT_IMAGE_FORMAT = 'png';
+
+export function buildImageGenerationPayload(input = {}) {
+  return {
+    model: String(input.model || DEFAULT_IMAGE_MODEL),
+    prompt: String(input.prompt || '').trim(),
+    response_format: 'b64_json',
+    size: String(input.size || '1024x1024'),
+    quality: String(input.quality || 'high'),
+    output_format: normalizeImageFormat(input.format || input.output_format || DEFAULT_IMAGE_FORMAT)
+  };
+}
+
+export function loadGPTeamCredentials(options = {}) {
+  const env = options.env || process.env;
+  const codexHome = resolveCodexHome(env, options.home || os.homedir());
+  const readFile = options.readFile || ((filePath) => fs.readFileSync(filePath, 'utf8'));
+  const configText = safeRead(path.join(codexHome, 'config.toml'), readFile);
+  const configuredBaseUrl = parseGPTeamBaseUrl(configText);
+  const apiKey = firstNonEmpty(env.GPTEAM_API_KEY);
+  if (!apiKey) {
+    throw new Error('没有找到 GPTeam API key。请在 MCP 配置 env 中设置 GPTEAM_API_KEY，或先运行 npx gpteam 完成本地配置。');
+  }
+  const baseUrl = normalizeBaseUrl(firstNonEmpty(env.GPTEAM_BASE_URL, configuredBaseUrl, DEFAULT_BASE_URL));
+  return { apiKey, baseUrl, codexHome };
+}
+
+export function parseGPTeamBaseUrl(configText) {
+  let inGPTeamProvider = false;
+  for (const rawLine of String(configText || '').split(/\r?\n/)) {
+    const line = rawLine.trim();
+    const table = line.match(/^\[([^\]]+)\]$/);
+    if (table) {
+      inGPTeamProvider = table[1] === 'model_providers.gpteam';
+      continue;
+    }
+    if (!inGPTeamProvider) continue;
+    const match = line.match(/^base_url\s*=\s*"((?:\\"|[^"])*)"/);
+    if (match) return unescapeTomlString(match[1]);
+  }
+  return '';
+}
+
+export function normalizeBaseUrl(value) {
+  const trimmed = String(value || '').trim().replace(/\/+$/, '');
+  if (!trimmed) return DEFAULT_BASE_URL;
+  if (/\/v1$/i.test(trimmed)) return trimmed;
+  return `${trimmed}/v1`;
+}
+
+export async function generateImage(input = {}, options = {}) {
+  const prompt = String(input.prompt || '').trim();
+  if (!prompt) throw new Error('prompt 不能为空');
+  const credentials = loadGPTeamCredentials(options);
+  const payload = buildImageGenerationPayload(input);
+  const fetchImpl = options.fetch || globalThis.fetch;
+  if (typeof fetchImpl !== 'function') {
+    throw new Error('当前 Node.js 运行时不支持 fetch，请升级到 Node.js 18.18 或更高版本。');
+  }
+  const response = await fetchImpl(`${credentials.baseUrl}/images/generations`, {
+    method: 'POST',
+    headers: {
+      Authorization: `Bearer ${credentials.apiKey}`,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(payload)
+  });
+  if (!response.ok) {
+    const detail = typeof response.text === 'function' ? await response.text() : '';
+    throw new Error(`GPTeam /v1/images/generations 返回 HTTP ${response.status}${detail ? `：${redactSecret(detail, credentials.apiKey)}` : ''}`);
+  }
+  const data = await response.json();
+  const first = Array.isArray(data && data.data) ? data.data[0] : null;
+  const b64 = first && typeof first.b64_json === 'string' ? first.b64_json : '';
+  if (!b64) {
+    throw new Error('GPTeam 图片接口没有返回 b64_json 图片数据。');
+  }
+  const format = normalizeImageFormat(payload.output_format);
+  const outputPath = resolveOutputPath(input.output_path, format, options);
+  fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+  fs.writeFileSync(outputPath, Buffer.from(b64, 'base64'));
+  return {
+    path: outputPath,
+    mimeType: mimeTypeForFormat(format),
+    b64,
+    model: payload.model,
+    size: payload.size,
+    quality: payload.quality,
+    format,
+    revisedPrompt: first && typeof first.revised_prompt === 'string' ? first.revised_prompt : ''
+  };
+}
+
+export function toolResultContent(result) {
+  const text = [
+    'GPTeam Image 2 生成完成。',
+    `文件：${result.path}`,
+    `模型：${result.model}`,
+    `规格：${result.size} / ${result.quality} / ${result.format}`
+  ];
+  if (result.revisedPrompt) text.push(`修订提示词：${result.revisedPrompt}`);
+  return [
+    { type: 'text', text: text.join('\n') },
+    { type: 'image', data: result.b64, mimeType: result.mimeType }
+  ];
+}
+
+function resolveCodexHome(env, home) {
+  return expandHome(firstNonEmpty(env.GPTEAM_CODEX_HOME, env.CODEX_HOME, path.join(home, '.codex')), home);
+}
+
+function safeRead(filePath, readFile) {
+  try {
+    return readFile(filePath);
+  } catch {
+    return '';
+  }
+}
+
+function resolveOutputPath(rawOutputPath, format, options) {
+  const env = options.env || process.env;
+  const home = options.home || os.homedir();
+  const name = `gpteam-image-${new Date().toISOString().replace(/[-:]/g, '').replace(/\..+/, '').replace('T', '-')}.${format}`;
+  if (rawOutputPath) {
+    const expanded = expandHome(String(rawOutputPath), home);
+    if (isDirectoryLike(expanded)) return path.join(expanded, name);
+    return expanded;
+  }
+  const outputDir = expandHome(firstNonEmpty(env.GPTEAM_IMAGE_OUTPUT_DIR, defaultImageOutputDir(home)), home);
+  return path.join(outputDir, name);
+}
+
+function defaultImageOutputDir(home) {
+  const desktop = path.join(home, 'Desktop');
+  return fs.existsSync(desktop) ? desktop : process.cwd();
+}
+
+function isDirectoryLike(value) {
+  return /[\\/]$/.test(value) || (fs.existsSync(value) && fs.statSync(value).isDirectory());
+}
+
+function normalizeImageFormat(value) {
+  const normalized = String(value || DEFAULT_IMAGE_FORMAT).trim().toLowerCase();
+  if (normalized === 'jpg') return 'jpeg';
+  if (['png', 'jpeg', 'webp'].includes(normalized)) return normalized;
+  return DEFAULT_IMAGE_FORMAT;
+}
+
+function mimeTypeForFormat(format) {
+  if (format === 'jpeg') return 'image/jpeg';
+  if (format === 'webp') return 'image/webp';
+  return 'image/png';
+}
+
+function firstNonEmpty(...values) {
+  for (const value of values) {
+    const text = String(value || '').trim();
+    if (text) return text;
+  }
+  return '';
+}
+
+function expandHome(value, home) {
+  const text = String(value || '');
+  if (text === '~') return home;
+  if (text.startsWith(`~${path.sep}`)) return path.join(home, text.slice(2));
+  if (text.startsWith('~/')) return path.join(home, text.slice(2));
+  return text;
+}
+
+function unescapeTomlString(value) {
+  return String(value || '').replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+}
+
+function redactSecret(text, secret) {
+  let result = String(text || '');
+  if (secret) result = result.split(secret).join('[redacted]');
+  result = result.replace(/sk-[A-Za-z0-9_-]{6,}/g, 'sk-[redacted]');
+  return result;
+}

package/lib/image-mcp/server.js

@@ -0,0 +1,74 @@
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
+import { generateImage, toolResultContent } from './image.js';
+
+const GENERATE_IMAGE_TOOL = {
+  name: 'generate_image',
+  description: 'Generate an image through GPTeam Image 2 and save it to a local file.',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      prompt: {
+        type: 'string',
+        description: 'Image prompt.'
+      },
+      size: {
+        type: 'string',
+        description: 'Image size, for example 1024x1024.',
+        default: '1024x1024'
+      },
+      quality: {
+        type: 'string',
+        description: 'Image quality.',
+        default: 'high'
+      },
+      format: {
+        type: 'string',
+        description: 'Output image format.',
+        enum: ['png', 'jpeg', 'webp'],
+        default: 'png'
+      },
+      output_path: {
+        type: 'string',
+        description: 'Optional output file path or directory.'
+      }
+    },
+    required: ['prompt'],
+    additionalProperties: false
+  }
+};
+
+export function createServer(deps = {}) {
+  const server = new Server({
+    name: 'gpteam-image-mcp',
+    version: '0.1.0'
+  }, {
+    capabilities: {
+      tools: {}
+    }
+  });
+
+  server.setRequestHandler(ListToolsRequestSchema, async () => ({
+    tools: [GENERATE_IMAGE_TOOL]
+  }));
+
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const toolName = request.params && request.params.name;
+    if (toolName !== GENERATE_IMAGE_TOOL.name) {
+      throw new Error(`未知工具：${toolName}`);
+    }
+    const result = await generateImage(request.params.arguments || {}, deps);
+    return {
+      content: toolResultContent(result)
+    };
+  });
+
+  return server;
+}
+
+export async function runServer() {
+  const server = createServer();
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "gpteam",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "GPTeam API interactive client configurator and ingress benchmark CLI.",
   "type": "module",
   "bin": {
     "gpteam": "bin/gpteam-api-config.js",
-    "gpteam-api-config": "bin/gpteam-api-config.js"
+    "gpteam-api-config": "bin/gpteam-api-config.js",
+    "gpteam-image-mcp": "bin/gpteam-image-mcp.js"
   },
   "files": [
     "bin",
@@ -15,6 +16,7 @@
     "test": "node --test test/*.test.mjs"
   },
   "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "json5": "^2.2.3"
   },
   "engines": {