duojie-helper 0.2.14 → 0.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "duojie-helper",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Duojie API 一键配置助手 - 支持 Claude Code, Droid, OpenClaw, Cursor, Cline 等主流 AI 编程工具",
   "type": "module",
   "bin": {

package/src/tools/claude.js

@@ -78,8 +78,9 @@ export async function configureClaudeCode(apiKey) {
       settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = opusModel;
     }
     
-    // 设置默认主模型为 claude-opus-4-6-kiro（或可用的 opus）
-    const defaultModel = opusModel || sonnetModel || claudeModels[0]?.id;
+    // 优先将默认主模型设为 gpt-5.2（如存在），否则回退到 opus/sonnet/首个 claude
+    const gpt52 = (models.gpt || []).find(m => m.id === 'gpt-5.2')?.id || null;
+    const defaultModel = gpt52 || opusModel || sonnetModel || claudeModels[0]?.id;
     if (defaultModel) {
       settings.model = defaultModel;
     }

package/src/tools/cline.js

@@ -48,7 +48,7 @@ ${chalk.cyan('步骤 4:')} 填入以下配置:
   ${chalk.green('Base URL:')}      ${baseUrl}
   ${chalk.green('API Key:')}       ${apiKey}
   ${chalk.green('Model:')}         选择 "Enter model ID" 并输入模型名称
-                   例如: claude-opus-4-6-kiro 或 gpt-4o
+                   例如: gpt-5.2 或 claude-opus-4-6-kiro
 
 ${chalk.cyan('步骤 5:')} 可选配置:
   • ${chalk.green('Max Tokens:')} 8192 (推荐)

package/src/tools/codex.js

@@ -5,7 +5,7 @@ import TOML from '@iarna/toml';
 import { getApiBaseForProtocol } from '../index.js';
 
 const DUOJIE_PROVIDER_ID = 'duojie';
-const DEFAULT_MODEL = 'gpt-5.3-codex';
+const DEFAULT_MODEL = 'gpt-5.2';
 
 /**
  * 获取 Codex CLI 配置路径

package/src/tools/continue.js

@@ -58,10 +58,10 @@ export async function configureContinue(apiKey) {
       for (const m of models.gpt) {
         duojieModels.push({
           title: `Duojie ${m.name}`,
-          provider: "openai",
+          provider: "anthropic",
           model: m.id,
           apiKey: apiKey,
-          apiBase: getApiBaseForProtocol('openai'),
+          apiBase: getApiBaseForProtocol('anthropic'),
           completionOptions: {
             maxTokens: 8192,
           },
@@ -69,21 +69,29 @@ export async function configureContinue(apiKey) {
       }
     }
 
-    // 添加其他模型 (使用 OpenAI 兼容协议)
+    // 添加其他模型
     const otherModels = [...(models.gemini || []), ...(models.other || [])];
     for (const m of otherModels) {
       duojieModels.push({
         title: `Duojie ${m.name}`,
-        provider: "openai",
+        provider: "anthropic",
         model: m.id,
         apiKey: apiKey,
-        apiBase: getApiBaseForProtocol('openai'),
+        apiBase: getApiBaseForProtocol('anthropic'),
         completionOptions: {
           maxTokens: 8192,
         },
       });
     }
 
+    // 把默认模型尽量设为 gpt-5.2（如果存在），否则保持当前顺序
+    const gpt52 = duojieModels.find(m => m.model === 'gpt-5.2');
+    if (gpt52) {
+      const others = duojieModels.filter(m => m !== gpt52);
+      duojieModels.length = 0;
+      duojieModels.push(gpt52, ...others);
+    }
+
     // 合并模型配置 - 移除旧的 Duojie 配置
     const existingModels = config.models || [];
     const filteredModels = existingModels.filter(m => 

package/src/tools/cursor.js

@@ -47,8 +47,8 @@ ${chalk.cyan('步骤 3:')} 填入以下配置:
   ${chalk.green('OpenAI API Key:')}        ${apiKey}
   ${chalk.green('Override OpenAI Base URL:')} ${baseUrl}
   ${chalk.green('Model Name:')}            输入模型名称（注意大小写）
-                          例如: claude-opus-4-6-kiro
-                          或: gpt-4o
+                          例如: gpt-5.2
+                          或: claude-opus-4-6-kiro
 
 ${chalk.cyan('步骤 4:')} 点击保存，然后在模型列表中选择刚添加的模型
 

package/src/tools/droid.js

@@ -3,6 +3,10 @@ import path from 'path';
 import os from 'os';
 import { API_CONFIG, getModels, getApiBaseForProtocol } from '../index.js';
 
+function normalizeBaseUrl(url) {
+  return `${url || ''}`.replace(/\/+$/, '');
+}
+
 /**
  * 获取 Droid (Factory) 配置路径
  */
@@ -65,24 +69,7 @@ function generateDisplayName(modelId) {
  * @returns {string} provider 名称
  */
 function determineProvider(modelId, endpoints = []) {
-  const id = modelId.toLowerCase();
-  
-  if (id.startsWith('gpt')) {
-    // GPT 模型使用 openai-response
-    return 'openai-response';
-  }
-  
-  // Claude, Gemini, GLM 等使用 anthropic
-  if (id.startsWith('claude') || id.startsWith('gemini') || id.startsWith('glm')) {
-    return 'anthropic';
-  }
-  
-  // 其他模型根据 endpoints 判断
-  if (endpoints.includes('anthropic')) {
-    return 'anthropic';
-  }
-  
-  return 'openai-response';
+  return 'anthropic';
 }
 
 /**
@@ -126,15 +113,22 @@ export async function configureDroid(apiKey) {
       ...(models.gemini || []),
       ...(models.other || []),
     ];
+
+    // 默认模型优先放在列表前（便于用户在 UI 中选择）
+    const preferredId = 'gpt-5.2';
+    const preferred = allModels.find(m => m.id === preferredId) || null;
+    const orderedModels = preferred
+      ? [preferred, ...allModels.filter(m => m.id !== preferredId)]
+      : allModels;
     
-    for (const m of allModels) {
+    for (const m of orderedModels) {
       const endpoints = endpointsMap[m.id] || [];
       const provider = determineProvider(m.id, endpoints);
       
       duojieModels.push({
         model_display_name: generateDisplayName(m.id),
         model: m.id,
-        base_url: getApiBaseForProtocol(provider),
+        base_url: normalizeBaseUrl(getApiBaseForProtocol(provider)),
         api_key: apiKey,
         provider: provider,
         supports_vision: true,

package/src/tools/openclaw.js

@@ -85,36 +85,39 @@ export async function configureOpenClaw(apiKey) {
       };
     }
     if (gptModels.length > 0) {
-      const gptApi = models.gpt[0]?.api === 'openai-responses' ? 'openai-responses' : 'openai-completions';
       providers['duojie-gpt'] = {
-        baseUrl: getApiBaseForProtocol(gptApi),
+        baseUrl: getApiBaseForProtocol('anthropic-messages'),
         apiKey,
-        api: gptApi,
+        api: 'anthropic-messages',
         models: gptModels,
       };
     }
     if (geminiModels.length > 0) {
       providers['duojie-gemini'] = {
-        baseUrl: getApiBaseForProtocol('openai-completions'),
+        baseUrl: getApiBaseForProtocol('anthropic-messages'),
         apiKey,
-        api: 'openai-completions',
+        api: 'anthropic-messages',
         models: geminiModels,
       };
     }
     if (otherModels.length > 0) {
       providers['duojie-other'] = {
-        baseUrl: getApiBaseForProtocol('openai-completions'),
+        baseUrl: getApiBaseForProtocol('anthropic-messages'),
         apiKey,
-        api: 'openai-completions',
+        api: 'anthropic-messages',
         models: otherModels,
       };
     }
 
-    // 选出默认模型，优先级：opus-4-6-kiro > opus-4-6 > opus+kiro > opus > sonnet > 第一个
+    // 默认模型：优先 gpt-5.2（如存在）
+    const gpt52 = (models.gpt || []).find(m => m.id === 'gpt-5.2')?.id || null;
     let defaultProvider = 'duojie-claude';
     let defaultModelId = 'claude-opus-4-6-kiro';
 
-    if (claudeModels.length > 0) {
+    if (gpt52) {
+      defaultProvider = 'duojie-gpt';
+      defaultModelId = gpt52;
+    } else if (claudeModels.length > 0) {
       defaultProvider = 'duojie-claude';
       defaultModelId = (
         claudeModels.find(m => m.id.includes('opus-4-6') && m.id.includes('kiro')) ||

package/src/tools/opencode.js

@@ -115,7 +115,7 @@ export async function configureOpenCode(apiKey) {
       npm: '@ai-sdk/anthropic',
       name: 'Duojie API',
       options: {
-        baseURL: `${API_CONFIG.baseUrl}/v1`,
+        baseURL: API_CONFIG.baseUrl,
       },
       models: duojieModels,
     };
@@ -126,6 +126,8 @@ export async function configureOpenCode(apiKey) {
       delete existingConfig.provider.duojie;
     }
 
+    const preferredModel = duojieModels['gpt-5.2'] ? 'duojie/gpt-5.2' : null;
+
     const newConfig = {
       ...existingConfig,
       $schema: existingConfig.$schema || 'https://opencode.ai/config.json',
@@ -133,6 +135,7 @@ export async function configureOpenCode(apiKey) {
         ...existingConfig.provider,
         duojie: duojieProvider,
       },
+      ...(preferredModel ? { model: preferredModel } : {}),
     };
 
     // 6. 写入配置文件