duojie-helper 0.2.4 → 0.2.7

package/package.json

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

package/src/tools/claude.js

@@ -50,23 +50,19 @@ export async function configureClaudeCode(apiKey) {
     const models = getModels();
     const claudeModels = models.claude || [];
     
-    // 查找各类型模型（优先查找 kiro 版本）
+    // 查找各类型模型（优先查找最新 kiro 版本）
     let sonnetModel = null;
     let opusModel = null;
     
-    for (const m of claudeModels) {
-      const id = m.id.toLowerCase();
-      // 优先使用 kiro 版本的 opus
-      if (id.includes('opus') && id.includes('kiro')) {
-        opusModel = m.id;
-      } else if (id.includes('opus') && !opusModel) {
-        opusModel = m.id;
-      }
-      // sonnet 模型
-      if (id.includes('sonnet') && !sonnetModel) {
-        sonnetModel = m.id;
-      }
-    }
+    // 优先级：opus-4-6-kiro > opus-4-6 > opus+kiro > opus > 第一个opus
+    const opusKiro46 = claudeModels.find(m => m.id.includes('opus-4-6') && m.id.includes('kiro'));
+    const opus46 = claudeModels.find(m => m.id.includes('opus-4-6'));
+    const opusKiro = claudeModels.find(m => m.id.includes('opus') && m.id.includes('kiro'));
+    const opusAny = claudeModels.find(m => m.id.includes('opus'));
+    opusModel = opusKiro46?.id || opus46?.id || opusKiro?.id || opusAny?.id || null;
+    
+    // sonnet 模型
+    sonnetModel = claudeModels.find(m => m.id.includes('sonnet'))?.id || null;
     
     // 4. 设置 Duojie API 环境变量
     settings.env.ANTHROPIC_API_KEY = apiKey;
@@ -82,7 +78,7 @@ export async function configureClaudeCode(apiKey) {
       settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = opusModel;
     }
     
-    // 设置默认主模型为 claude-opus-4-5-kiro（或可用的 opus）
+    // 设置默认主模型为 claude-opus-4-6-kiro（或可用的 opus）
     const defaultModel = 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-sonnet-4-5-20250929 或 gpt-4o
+                   例如: claude-opus-4-6-kiro 或 gpt-4o
 
 ${chalk.cyan('步骤 5:')} 可选配置:
   • ${chalk.green('Max Tokens:')} 8192 (推荐)

package/src/tools/codex.js

@@ -144,7 +144,7 @@ export async function configureCodex(apiKey) {
     // 如果没有设置默认 provider，设置为 duojie
     if (!existingConfig.model_provider) {
       existingConfig.model_provider = 'duojie';
-      existingConfig.model = 'gpt-4o';
+      existingConfig.model = 'claude-opus-4-6-kiro';
     }
 
     // 生成 TOML 内容

package/src/tools/cursor.js

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

package/src/tools/droid.js

@@ -21,7 +21,7 @@ function getDroidConfigPaths() {
  */
 function generateDisplayName(modelId) {
   // 将 model id 转换为友好名称
-  // claude-opus-4-5-kiro -> Opus 4.5 Kiro
+  // claude-opus-4-6-kiro -> Opus 4.6 Kiro
   // gpt-5.2-codex -> GPT 5.2 Codex
   // gemini-3-pro-preview -> Gemini 3 Pro Preview
   

package/src/tools/openclaw.js

@@ -5,199 +5,112 @@ import { API_CONFIG, getModels } from '../index.js';
 
 /**
  * 获取 OpenClaw 配置路径
+ * 支持 macOS / Linux / Windows
  */
 function getOpenClawConfigPaths() {
   const home = os.homedir();
   return {
     configDir: path.join(home, '.openclaw'),
     configFile: path.join(home, '.openclaw', 'openclaw.json'),
-    agentsDir: path.join(home, '.openclaw', 'agents'),
   };
 }
 
+/**
+ * 读取并解析 openclaw.json（支持 JSON5 注释/尾逗号）
+ */
+async function readConfig(filePath) {
+  try {
+    const content = await fs.readFile(filePath, 'utf-8');
+    const clean = content
+      .replace(/\/\/.*$/gm, '')
+      .replace(/\/\*[\s\S]*?\*\//g, '')
+      .replace(/,(\s*[}\]])/g, '$1');
+    return JSON.parse(clean);
+  } catch {
+    return {};
+  }
+}
+
+/**
+ * 从模型列表中选出最优默认模型 ID
+ * 优先级：opus-4-6-kiro > opus-4-6 > opus+kiro > opus > sonnet > 第一个
+ */
+function pickDefaultModel(models) {
+  const all = [
+    ...(models.claude || []),
+    ...(models.gpt || []),
+    ...(models.gemini || []),
+    ...(models.other || []),
+  ];
+  if (all.length === 0) return 'claude-opus-4-6-kiro';
+
+  const claudeList = models.claude || [];
+  if (claudeList.length > 0) {
+    return (
+      claudeList.find(m => m.id.includes('opus-4-6') && m.id.includes('kiro'))?.id ||
+      claudeList.find(m => m.id.includes('opus-4-6'))?.id ||
+      claudeList.find(m => m.id.includes('opus') && m.id.includes('kiro'))?.id ||
+      claudeList.find(m => m.id.includes('opus'))?.id ||
+      claudeList.find(m => m.id.includes('sonnet'))?.id ||
+      claudeList[0].id
+    );
+  }
+  return all[0].id;
+}
+
 /**
  * 配置 OpenClaw
- * 自动配置所有可用模型
+ *
+ * 使用 OpenClaw 标准的 env + agents.defaults.model 格式：
+ *   env.DUOJIE_API_KEY  → API 密钥
+ *   env.DUOJIE_BASE_URL → 自定义 base URL
+ *   agents.defaults.model.primary → "duojie/<model-id>"
  */
 export async function configureOpenClaw(apiKey) {
   const paths = getOpenClawConfigPaths();
-  
+
   try {
-    // 确保目录存在
     await fs.ensureDir(paths.configDir);
 
-    // 读取现有配置（如果存在）
-    let existingConfig = {};
-    if (await fs.pathExists(paths.configFile)) {
-      try {
-        const content = await fs.readFile(paths.configFile, 'utf-8');
-        // 简单的 JSON5 兼容处理（去除注释和尾逗号）
-        const cleanContent = content
-          .replace(/\/\/.*$/gm, '')  // 移除单行注释
-          .replace(/\/\*[\s\S]*?\*\//g, '')  // 移除多行注释
-          .replace(/,(\s*[}\]])/g, '$1');  // 移除尾逗号
-        existingConfig = JSON.parse(cleanContent);
-      } catch {
-        existingConfig = {};
-      }
-    }
+    const existingConfig = await fs.pathExists(paths.configFile)
+      ? await readConfig(paths.configFile)
+      : {};
 
-    // 获取模型列表
     const models = getModels();
+    const defaultModelId = pickDefaultModel(models);
+    const totalModels = Object.values(models).reduce((s, arr) => s + arr.length, 0);
 
-    // 构建 Duojie provider 配置 - Claude 模型 (anthropic-messages)
-    const claudeModels = (models.claude || []).map(m => ({
-      id: m.id,
-      name: m.name,
-      reasoning: false,
-      input: ['text', 'image'],
-      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-      contextWindow: 200000,
-      maxTokens: 64000,
-    }));
-
-    // GPT 模型 (openai-responses 或 openai-completions)
-    const gptModels = (models.gpt || []).map(m => ({
-      id: m.id,
-      name: m.name,
-      reasoning: false,
-      input: ['text', 'image'],
-      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-      contextWindow: 128000,
-      maxTokens: 16384,
-    }));
-
-    // Gemini 模型
-    const geminiModels = (models.gemini || []).map(m => ({
-      id: m.id,
-      name: m.name,
-      reasoning: false,
-      input: ['text', 'image'],
-      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-      contextWindow: 1000000,
-      maxTokens: 65536,
-    }));
-
-    // 其他模型
-    const otherModels = (models.other || []).map(m => ({
-      id: m.id,
-      name: m.name,
-      reasoning: false,
-      input: ['text', 'image'],
-      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-      contextWindow: 128000,
-      maxTokens: 16384,
-    }));
-
-    // 构建 providers
-    const providers = {};
-
-    if (claudeModels.length > 0) {
-      providers['duojie-claude'] = {
-        baseUrl: API_CONFIG.baseUrl,
-        apiKey: apiKey,
-        api: 'anthropic-messages',
-        models: claudeModels,
-      };
-    }
-
-    if (gptModels.length > 0) {
-      // GPT 使用 openai-responses (如果支持) 或 openai-completions
-      const gptApi = models.gpt[0]?.api || 'openai-responses';
-      providers['duojie-gpt'] = {
-        baseUrl: API_CONFIG.baseUrl,
-        apiKey: apiKey,
-        api: gptApi,
-        models: gptModels,
-      };
-    }
-
-    if (geminiModels.length > 0) {
-      providers['duojie-gemini'] = {
-        baseUrl: API_CONFIG.baseUrl,
-        apiKey: apiKey,
-        api: 'anthropic-messages',
-        models: geminiModels,
-      };
-    }
-
-    if (otherModels.length > 0) {
-      providers['duojie-other'] = {
-        baseUrl: API_CONFIG.baseUrl,
-        apiKey: apiKey,
-        api: 'openai-completions',
-        models: otherModels,
-      };
-    }
-
-    // 确定默认模型 - 优先使用 Claude，其次 GPT
-    let defaultModelProvider = 'duojie-claude';
-    let defaultModel = claudeModels[0]?.id || gptModels[0]?.id || 'claude-sonnet-4-5-20250929';
-    
-    if (claudeModels.length > 0) {
-      defaultModelProvider = 'duojie-claude';
-      defaultModel = claudeModels[0].id;
-    } else if (gptModels.length > 0) {
-      defaultModelProvider = 'duojie-gpt';
-      defaultModel = gptModels[0].id;
-    }
-
-    // 构建模型允许列表
-    const modelAllowList = {};
-    for (const m of claudeModels) {
-      modelAllowList[`duojie-claude/${m.id}`] = { alias: m.name };
-    }
-    for (const m of gptModels) {
-      modelAllowList[`duojie-gpt/${m.id}`] = { alias: m.name };
-    }
-    for (const m of geminiModels) {
-      modelAllowList[`duojie-gemini/${m.id}`] = { alias: m.name };
-    }
-    for (const m of otherModels) {
-      modelAllowList[`duojie-other/${m.id}`] = { alias: m.name };
-    }
-
-    // 统计配置的模型数量
-    const totalModels = claudeModels.length + gptModels.length + geminiModels.length + otherModels.length;
-
-    // 合并配置（不覆盖用户其他配置）
+    // 合并配置，保留用户已有的非 Duojie 设置
     const newConfig = {
       ...existingConfig,
-      models: {
-        ...existingConfig.models,
-        mode: 'merge',
-        providers: {
-          ...existingConfig.models?.providers,
-          ...providers,
-        },
+      env: {
+        ...existingConfig.env,
+        DUOJIE_API_KEY: apiKey,
+        DUOJIE_BASE_URL: API_CONFIG.baseUrl,
       },
       agents: {
         ...existingConfig.agents,
         defaults: {
           ...existingConfig.agents?.defaults,
           model: {
-            primary: `${defaultModelProvider}/${defaultModel}`,
             ...existingConfig.agents?.defaults?.model,
-          },
-          models: {
-            ...existingConfig.agents?.defaults?.models,
-            ...modelAllowList,
+            primary: `duojie/${defaultModelId}`,
           },
         },
       },
-      // 标记配置来源
       _duojie: {
         configuredAt: new Date().toISOString(),
-        version: '0.2.0',
+        version: '0.2.7',
+        defaultModel: defaultModelId,
+        totalModels,
       },
     };
 
-    // 写入配置
     await fs.writeJson(paths.configFile, newConfig, { spaces: 2 });
 
     return {
       success: true,
-      message: `已配置 ${totalModels} 个模型 → ${paths.configFile}`,
+      message: `已配置 ${totalModels} 个模型，默认: duojie/${defaultModelId}`,
       configPath: paths.configFile,
       hint: '运行 openclaw gateway restart 使配置生效',
     };
@@ -212,65 +125,46 @@ export async function configureOpenClaw(apiKey) {
 /**
  * 检查 OpenClaw 配置状态
  */
-configureOpenClaw.checkStatus = async function() {
+configureOpenClaw.checkStatus = async function () {
   const paths = getOpenClawConfigPaths();
-  
+
   if (await fs.pathExists(paths.configFile)) {
-    try {
-      const content = await fs.readFile(paths.configFile, 'utf-8');
-      const cleanContent = content
-        .replace(/\/\/.*$/gm, '')
-        .replace(/\/\*[\s\S]*?\*\//g, '')
-        .replace(/,(\s*[}\]])/g, '$1');
-      const config = JSON.parse(cleanContent);
-      
-      if (config._duojie || config.models?.providers?.['duojie-claude']) {
-        return {
-          configured: true,
-          message: '已配置 Duojie API',
-        };
-      } else if (config.models?.providers) {
-        return {
-          configured: true,
-          message: '已配置（非 Duojie）',
-        };
-      }
-    } catch {
-      // ignore
+    const config = await readConfig(paths.configFile);
+    if (config._duojie || config.env?.DUOJIE_API_KEY) {
+      return { configured: true, message: '已配置 Duojie API' };
+    }
+    if (config.env || config.agents) {
+      return { configured: true, message: '已配置（非 Duojie）' };
     }
   }
-  
+
   return { configured: false };
 };
 
 /**
  * 撤销 OpenClaw 配置
  */
-configureOpenClaw.revoke = async function() {
+configureOpenClaw.revoke = async function () {
   const paths = getOpenClawConfigPaths();
-  
+
   if (await fs.pathExists(paths.configFile)) {
-    try {
-      const content = await fs.readFile(paths.configFile, 'utf-8');
-      const cleanContent = content
-        .replace(/\/\/.*$/gm, '')
-        .replace(/\/\*[\s\S]*?\*\//g, '')
-        .replace(/,(\s*[}\]])/g, '$1');
-      const config = JSON.parse(cleanContent);
-      
-      // 删除 Duojie 相关配置
-      if (config.models?.providers) {
-        delete config.models.providers['duojie-claude'];
-        delete config.models.providers['duojie-gpt'];
-        delete config.models.providers['duojie-gemini'];
-        delete config.models.providers['duojie-other'];
-      }
-      delete config._duojie;
-      
-      await fs.writeJson(paths.configFile, config, { spaces: 2 });
-    } catch {
-      // ignore
+    const config = await readConfig(paths.configFile);
+
+    // 移除 Duojie 注入的 env 变量
+    if (config.env) {
+      delete config.env.DUOJIE_API_KEY;
+      delete config.env.DUOJIE_BASE_URL;
+      if (Object.keys(config.env).length === 0) delete config.env;
+    }
+
+    // 若 primary 是 duojie/ 开头则清除
+    if (config.agents?.defaults?.model?.primary?.startsWith('duojie/')) {
+      delete config.agents.defaults.model.primary;
     }
+
+    delete config._duojie;
+
+    await fs.writeJson(paths.configFile, config, { spaces: 2 });
   }
 };