yymaxapi 1.0.89 → 1.0.91

package/bin/yymaxapi.js

@@ -134,7 +134,7 @@ const DEFAULT_API_CONFIG = {
   "codex": {
     "urlSuffix": "/codex",
     "api": "openai-completions",
-    "contextWindow": 1050000,
+    "contextWindow": 1000000,
     "maxTokens": 128000,
     "providerName": "yunyi"
   }
@@ -881,6 +881,7 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
   if (!normalizedUrl.endsWith('/v1')) normalizedUrl += '/v1';
   try {
     let existing = '';
+    const escapedProviderKey = providerKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     if (fs.existsSync(configPath)) {
       existing = fs.readFileSync(configPath, 'utf8');
       // 移除旧的 maxapi section（provider block）
@@ -889,13 +890,14 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
       // 移除旧的 maxapi top-level block
       const topRe = new RegExp(`${topMarker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${topMarkerEnd.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g');
       existing = existing.replace(topRe, '');
-      // 兼容旧版：移除散落的 model/model_provider、旧 openclaw-relay、旧 yunyi opencode 标记块
-      existing = existing.replace(/^model\s*=\s*"[^"]*"\s*$/gm, '');
-      existing = existing.replace(/^model_provider\s*=\s*"[^"]*"\s*$/gm, '');
+      // 兼容旧版：移除历史遗留的未标记 yunyi-codex provider、旧 openclaw-relay、旧 yunyi opencode 标记块
+      existing = existing.replace(new RegExp(`\\[model_providers\\.${escapedProviderKey}\\]\\n(?:(?!\\[)[^\\n]*\\n?)*`, 'g'), '');
       existing = existing.replace(/\[model_providers\.openclaw-relay\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
       existing = existing.replace(/# >>> yunyi opencode >>>[\s\S]*?# <<< yunyi opencode <<<\n?/g, '');
       existing = existing.replace(/\n{3,}/g, '\n\n').trim();
     }
+    const hasExistingTopLevelModelConfig = /^model\s*=\s*"[^"]*"\s*$/m.test(existing)
+      || /^model_provider\s*=\s*"[^"]*"\s*$/m.test(existing);
 
     // 顶层设置（MUST 在所有 [section] 之前）
     const topBlock = [
@@ -919,7 +921,9 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
     // 组装：顶层设置 → 原有内容 → provider section
     let content;
     if (existing) {
-      content = `${topBlock}\n\n${existing}\n\n${providerBlock}\n`;
+      content = hasExistingTopLevelModelConfig
+        ? `${existing}\n\n${providerBlock}\n`
+        : `${topBlock}\n\n${existing}\n\n${providerBlock}\n`;
     } else {
       content = `${topBlock}\n\n${providerBlock}\n`;
     }
@@ -1933,6 +1937,10 @@ const YYMAXAPI_OPENCLAW_GPT_PRIMARY = `${YYMAXAPI_OPENCLAW_GPT_PROVIDER}/gpt-5.4
 const YYMAXAPI_OPENCLAW_GPT_FALLBACK = `${YYMAXAPI_OPENCLAW_GPT_PROVIDER}/gpt-5.3-codex`;
 const YYMAXAPI_MANAGED_MAIN_NAMES = new Set(['Claude', 'claude', 'yunyi-claude', 'claude-yunyi']);
 const YYMAXAPI_MANAGED_GPT_NAMES = new Set(['GPT', 'Codex', 'gpt', 'yunyi-gpt', 'yunyi-codex']);
+const YYMAXAPI_MANAGED_MULTIMODAL_MODELS = {
+  claude: new Set(['claude-sonnet-4-6', 'claude-opus-4-6']),
+  codex: new Set(['gpt-5.4', 'gpt-5.3-codex'])
+};
 
 function isYymaxapiOpenClawBuild() {
   return isLikelyYunyiBaseUrl(ENDPOINTS[0]?.url || '')
@@ -1982,14 +1990,21 @@ function resolveManagedYunyiModelName(type, modelId, fallbackName) {
   return catalog.find(model => model.id === modelId)?.name || fallbackName;
 }
 
+function getManagedYunyiModelInput(type, modelId) {
+  return YYMAXAPI_MANAGED_MULTIMODAL_MODELS[type]?.has(modelId)
+    ? ['text', 'image']
+    : ['text'];
+}
+
 function getManagedYunyiProviderModels(type) {
   const apiConfig = type === 'claude'
     ? { contextWindow: API_CONFIG.claude?.contextWindow || 200000, maxTokens: API_CONFIG.claude?.maxTokens || 8192 }
-    : { contextWindow: API_CONFIG.codex?.contextWindow || 1050000, maxTokens: API_CONFIG.codex?.maxTokens || 128000 };
+    : { contextWindow: API_CONFIG.codex?.contextWindow || 1000000, maxTokens: API_CONFIG.codex?.maxTokens || 128000 };
 
   return getManagedYunyiModelCatalog(type).map(model => ({
     id: model.id,
     name: resolveManagedYunyiModelName(type, model.id, model.name),
+    input: getManagedYunyiModelInput(type, model.id),
     contextWindow: apiConfig.contextWindow,
     maxTokens: apiConfig.maxTokens
   }));
@@ -2389,6 +2404,39 @@ function shouldManageYunyiDefaults(config) {
   return fallbacks.some(isManagedYunyiModelKey);
 }
 
+function shouldManageYunyiImageDefaults(config) {
+  const imageModelState = normalizeDefaultModelSelection(config?.agents?.defaults?.imageModel, config);
+  const primary = typeof imageModelState.primary === 'string' ? imageModelState.primary.trim() : '';
+  const fallbacks = Array.isArray(imageModelState.fallbacks) ? imageModelState.fallbacks : [];
+  if (!primary) return true;
+  if (isManagedYunyiModelKey(primary)) return true;
+  return fallbacks.some(isManagedYunyiModelKey);
+}
+
+function normalizeManagedYunyiImageModel(modelState = {}, options = {}) {
+  const currentPrimary = String(modelState.primary || '').trim();
+  const canPreserve = !options.force && currentPrimary && isManagedYunyiModelKey(currentPrimary);
+  const primary = canPreserve
+    ? canonicalizeManagedYunyiModelKey(currentPrimary)
+    : YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY;
+
+  let fallbacks = Array.isArray(modelState.fallbacks) ? modelState.fallbacks : [];
+  fallbacks = [...new Set(
+    fallbacks
+      .map(item => {
+        const text = String(item || '').trim();
+        return isManagedYunyiModelKey(text) ? canonicalizeManagedYunyiModelKey(text) : text;
+      })
+      .filter(item => item && item !== primary)
+  )];
+
+  if (fallbacks.length === 0) {
+    fallbacks = [isManagedYunyiClaudeModelKey(primary) ? YYMAXAPI_OPENCLAW_GPT_PRIMARY : YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY];
+  }
+
+  return { primary, fallbacks };
+}
+
 function applyManagedYunyiOpenClawLayout(config, options = {}) {
   if (!isYymaxapiOpenClawBuild()) {
     return { changed: false, applied: false, claudeAgentId: null, preservedMain: false };
@@ -2491,6 +2539,15 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
     }
   }
 
+  if (shouldManageYunyiImageDefaults(config)) {
+    const currentImageModel = normalizeDefaultModelSelection(config.agents.defaults.imageModel, config);
+    const nextImageModel = normalizeManagedYunyiImageModel(currentImageModel, options);
+    if (JSON.stringify(currentImageModel) !== JSON.stringify(nextImageModel)) {
+      config.agents.defaults.imageModel = nextImageModel;
+      changed = true;
+    }
+  }
+
   return { changed, applied: true, claudeAgentId, preservedMain };
 }
 

package/config/API/350/212/202/347/202/271/350/256/276/347/275/256.md

@@ -43,7 +43,7 @@
     "codex": {
       "urlSuffix": "/codex",
       "api": "openai-completions",
-      "contextWindow": 1050000,
+      "contextWindow": 1000000,
       "maxTokens": 128000,
       "providerName": "yunyi"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yymaxapi",
-  "version": "1.0.89",
+  "version": "1.0.91",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {