duojie-helper 0.2.6 → 0.2.8

package/package.json

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

package/src/tools/openclaw.js

@@ -5,168 +5,139 @@ import { API_CONFIG, getModels } from '../index.js';
 
 /**
  * 获取 OpenClaw 配置路径
+ * 支持 macOS / Linux / Windows（os.homedir() 跨平台处理）
  */
 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 {};
+  }
+}
+
+/**
+ * 将模型对象转换为 OpenClaw models.providers 格式
+ */
+function buildModelEntry(m, contextWindow, maxTokens) {
+  return {
+    id: m.id,
+    name: m.name || m.id,
+    reasoning: false,
+    input: ['text', 'image'],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow,
+    maxTokens,
   };
 }
 
 /**
  * 配置 OpenClaw
- * 自动配置所有可用模型
+ *
+ * 使用官方 models.providers 自定义 provider 格式：
+ *   models.providers.<name>.baseUrl / apiKey / api / models[]
+ *   agents.defaults.model.primary → "<provider>/<model-id>"
+ *
+ * 参考文档：https://docs.openclaw.ai/gateway/configuration-reference#custom-providers-and-base-urls
  */
 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();
 
-    // 构建 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,
-    }));
+    // 构建各类模型列表
+    const claudeModels = (models.claude || []).map(m => buildModelEntry(m, 200000, 64000));
+    const gptModels    = (models.gpt    || []).map(m => buildModelEntry(m, 128000, 16384));
+    const geminiModels = (models.gemini || []).map(m => buildModelEntry(m, 1000000, 65536));
+    const otherModels  = (models.other  || []).map(m => buildModelEntry(m, 128000, 16384));
 
-    // 构建 providers
+    // 构建 providers（按模型类型分组，api 协议对应文档规范）
     const providers = {};
 
     if (claudeModels.length > 0) {
       providers['duojie-claude'] = {
         baseUrl: API_CONFIG.baseUrl,
-        apiKey: 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,
+        apiKey,
+        api: models.gpt[0]?.api === 'openai-responses' ? 'openai-responses' : 'openai-completions',
         models: gptModels,
       };
     }
-
     if (geminiModels.length > 0) {
       providers['duojie-gemini'] = {
         baseUrl: API_CONFIG.baseUrl,
-        apiKey: apiKey,
-        api: 'anthropic-messages',
+        apiKey,
+        api: 'openai-completions',
         models: geminiModels,
       };
     }
-
     if (otherModels.length > 0) {
       providers['duojie-other'] = {
         baseUrl: API_CONFIG.baseUrl,
-        apiKey: apiKey,
+        apiKey,
         api: 'openai-completions',
         models: otherModels,
       };
     }
 
-    // 确定默认模型 - 优先使用 opus-4-6-kiro
-    let defaultModelProvider = 'duojie-claude';
-    let defaultModel = 'claude-opus-4-6-kiro';
-    
+    // 选出默认模型，优先级：opus-4-6-kiro > opus-4-6 > opus+kiro > opus > sonnet > 第一个
+    let defaultProvider = 'duojie-claude';
+    let defaultModelId = 'claude-opus-4-6-kiro';
+
     if (claudeModels.length > 0) {
-      defaultModelProvider = 'duojie-claude';
-      // 优先级：opus-4-6-kiro > opus-4-6 > opus+kiro > opus > sonnet > 第一个
-      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 opus = claudeModels.find(m => m.id.includes('opus'));
-      const sonnet = claudeModels.find(m => m.id.includes('sonnet'));
-      defaultModel = opusKiro46?.id || opus46?.id || opusKiro?.id || opus?.id || sonnet?.id || claudeModels[0].id;
+      defaultProvider = 'duojie-claude';
+      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]
+      ).id;
     } else if (gptModels.length > 0) {
-      defaultModelProvider = 'duojie-gpt';
-      defaultModel = gptModels[0].id;
+      defaultProvider = 'duojie-gpt';
+      defaultModelId = gptModels[0].id;
     }
 
-    // 构建模型允许列表
+    // 构建模型 allowlist（用于 /model 切换）
     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 };
-    }
+    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: {
@@ -182,7 +153,7 @@ export async function configureOpenClaw(apiKey) {
         defaults: {
           ...existingConfig.agents?.defaults,
           model: {
-            primary: `${defaultModelProvider}/${defaultModel}`,
+            primary: `${defaultProvider}/${defaultModelId}`,
             ...existingConfig.agents?.defaults?.model,
           },
           models: {
@@ -191,14 +162,12 @@ export async function configureOpenClaw(apiKey) {
           },
         },
       },
-      // 标记配置来源
       _duojie: {
         configuredAt: new Date().toISOString(),
-        version: '0.2.0',
+        version: '0.2.8',
       },
     };
 
-    // 写入配置
     await fs.writeJson(paths.configFile, newConfig, { spaces: 2 });
 
     return {
@@ -218,65 +187,40 @@ 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.models?.providers?.['duojie-claude']) {
+      return { configured: true, message: '已配置 Duojie API' };
+    }
+    if (config.models?.providers) {
+      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);
+
+    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 });
   }
 };