duojie-helper 0.2.17 → 0.2.19

package/bin/cli.js

@@ -48,8 +48,9 @@ program
               type: 'input',
               name: 'apiKey',
               message: '请输入你的 Duojie API Key (Ctrl+C 退出):',
+              filter: (input) => input.trim(),
               validate: (input) => {
-                if (!input || input.trim().length < 10) {
+                if (!input || input.length < 10) {
                   return 'API Key 不能为空且长度至少 10 位';
                 }
                 return true;
@@ -217,18 +218,21 @@ program
             type: 'input',
             name: 'apiKey',
             message: '请输入你的 Duojie API Key:',
+            filter: (input) => input.trim(),
           }
         ]);
         apiKey = answer.apiKey;
+      } else {
+        apiKey = apiKey.trim();
       }
 
       // 获取模型列表
       const spinner = ora('正在验证 API Key...').start();
-      await fetchModels(apiKey.trim());
+      await fetchModels(apiKey);
       spinner.succeed('验证成功');
 
       const configSpinner = ora(`正在配置 ${tool}...`).start();
-      const result = await configureTool(tool, apiKey.trim());
+      const result = await configureTool(tool, apiKey);
       
       if (result.success) {
         configSpinner.succeed(result.message);

package/package.json

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

package/src/index.js

@@ -52,17 +52,41 @@ export function getApiBaseForProtocol(protocol = '') {
   return withoutV1(API_CONFIG.baseUrl);
 }
 
+/**
+ * 从 pricing 页面获取公开模型 ID 集合
+ * 返回 null 表示获取失败，调用方应跳过过滤
+ */
+async function fetchPublicModelIds(apiKey) {
+  try {
+    const response = await fetch(`${API_CONFIG.baseUrl}/pricing`, {
+      headers: { 'Authorization': `Bearer ${apiKey}` },
+    });
+    if (!response.ok) return null;
+    const html = await response.text();
+    const ids = new Set();
+    for (const m of (html.match(/###\s+([^\n\r]+)/g) || [])) {
+      ids.add(m.replace(/^###\s+/, '').trim());
+    }
+    return ids.size > 0 ? ids : null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * 从 API 获取模型列表
  */
 export async function fetchModels(apiKey) {
   try {
-    const response = await fetch(`${API_CONFIG.baseUrl}/v1/models`, {
-      headers: {
-        'Authorization': `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
-      },
-    });
+    const [response, publicIds] = await Promise.all([
+      fetch(`${API_CONFIG.baseUrl}/v1/models`, {
+        headers: {
+          'Authorization': `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+        },
+      }),
+      fetchPublicModelIds(apiKey),
+    ]);
 
     if (!response.ok) {
       throw new Error(`HTTP ${response.status}`);
@@ -79,6 +103,8 @@ export async function fetchModels(apiKey) {
     if (data.data && Array.isArray(data.data)) {
       for (const model of data.data) {
         const id = model.id;
+        // 跳过未在 pricing 页面公开的隐藏模型
+        if (publicIds && !publicIds.has(id)) continue;
         const endpoints = model.supported_endpoint_types || [];
         
         // 判断最佳协议

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" 并输入模型名称
-                   例如: gpt-5.2 或 claude-opus-4-6-kiro
+                   例如: gpt-5.2 或 claude-sonnet-4-6
 
 ${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.2';
+const DEFAULT_MODEL = 'gpt-5.4';
 
 /**
  * 获取 Codex CLI 配置路径

package/src/tools/cursor.js

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

package/src/tools/droid.js

@@ -15,6 +15,7 @@ function getDroidConfigPaths() {
   return {
     configDir: path.join(home, '.factory'),
     configFile: path.join(home, '.factory', 'config.json'),
+    settingsFile: path.join(home, '.factory', 'settings.json'),
   };
 }
 
@@ -69,7 +70,8 @@ function generateDisplayName(modelId) {
  * @returns {string} provider 名称
  */
 function determineProvider(modelId, endpoints = []) {
-  return 'anthropic';
+  if (modelId.startsWith('claude')) return 'anthropic';
+  return 'openai';
 }
 
 /**
@@ -166,6 +168,19 @@ export async function configureDroid(apiKey) {
     // 6. 写入配置文件
     await fs.writeJson(paths.configFile, newConfig, { spaces: 2 });
 
+    // 7. 清空 settings.json 中的 customModels（如文件和字段存在）
+    if (await fs.pathExists(paths.settingsFile)) {
+      try {
+        const settings = await fs.readJson(paths.settingsFile);
+        if (Array.isArray(settings.customModels) && settings.customModels.length > 0) {
+          settings.customModels = [];
+          await fs.writeJson(paths.settingsFile, settings, { spaces: 2 });
+        }
+      } catch {
+        // 忽略，不影响主流程
+      }
+    }
+
     return {
       success: true,
       message: `已配置 ${duojieModels.length} 个模型 → ${paths.configFile}`,

package/src/tools/openclaw.js

@@ -149,17 +149,15 @@ export async function configureOpenClaw(apiKey) {
 
     // 默认模型：优先 gpt-5.2（如存在）
     const gpt52 = gptModels.find(m => m.id === 'gpt-5.2')?.id || null;
-    let defaultProvider = modelIdToProvider.get('claude-opus-4-6-kiro') || 'duojie-claude';
-    let defaultModelId = 'claude-opus-4-6-kiro';
+    let defaultProvider = 'duojie-claude';
+    let defaultModelId = claudeModels[0]?.id || allModels[0]?.id || '';
 
     if (gpt52) {
       defaultProvider = modelIdToProvider.get(gpt52) || providerNameForApi('openai-completions');
       defaultModelId = gpt52;
     } else if (claudeModels.length > 0) {
       defaultModelId = (
-        claudeModels.find(m => m.id.includes('opus-4-6') && m.id.includes('kiro')) ||
         claudeModels.find(m => m.id.includes('opus-4-6')) ||
-        claudeModels.find(m => m.id.includes('opus') && m.id.includes('kiro')) ||
         claudeModels.find(m => m.id.includes('opus')) ||
         claudeModels.find(m => m.id.includes('sonnet')) ||
         claudeModels[0]