duojie-helper 0.2.7 → 0.2.8

package/package.json

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

package/src/tools/openclaw.js

@@ -5,7 +5,7 @@ import { API_CONFIG, getModels } from '../index.js';
 
 /**
  * 获取 OpenClaw 配置路径
- * 支持 macOS / Linux / Windows
+ * 支持 macOS / Linux / Windows（os.homedir() 跨平台处理）
  */
 function getOpenClawConfigPaths() {
   const home = os.homedir();
@@ -32,39 +32,28 @@ async function readConfig(filePath) {
 }
 
 /**
- * 从模型列表中选出最优默认模型 ID
- * 优先级：opus-4-6-kiro > opus-4-6 > opus+kiro > opus > sonnet > 第一个
+ * 将模型对象转换为 OpenClaw models.providers 格式
  */
-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;
+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
  *
- * 使用 OpenClaw 标准的 env + agents.defaults.model 格式：
- *   env.DUOJIE_API_KEY  → API 密钥
- *   env.DUOJIE_BASE_URL → 自定义 base URL
- *   agents.defaults.model.primary → "duojie/<model-id>"
+ * 使用官方 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();
@@ -77,32 +66,105 @@ export async function configureOpenClaw(apiKey) {
       : {};
 
     const models = getModels();
-    const defaultModelId = pickDefaultModel(models);
-    const totalModels = Object.values(models).reduce((s, arr) => s + arr.length, 0);
+
+    // 构建各类模型列表
+    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（按模型类型分组，api 协议对应文档规范）
+    const providers = {};
+
+    if (claudeModels.length > 0) {
+      providers['duojie-claude'] = {
+        baseUrl: API_CONFIG.baseUrl,
+        apiKey,
+        api: 'anthropic-messages',
+        models: claudeModels,
+      };
+    }
+    if (gptModels.length > 0) {
+      providers['duojie-gpt'] = {
+        baseUrl: API_CONFIG.baseUrl,
+        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,
+        api: 'openai-completions',
+        models: geminiModels,
+      };
+    }
+    if (otherModels.length > 0) {
+      providers['duojie-other'] = {
+        baseUrl: API_CONFIG.baseUrl,
+        apiKey,
+        api: 'openai-completions',
+        models: otherModels,
+      };
+    }
+
+    // 选出默认模型，优先级：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) {
+      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) {
+      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 };
+
+    const totalModels = claudeModels.length + gptModels.length + geminiModels.length + otherModels.length;
 
     // 合并配置，保留用户已有的非 Duojie 设置
     const newConfig = {
       ...existingConfig,
-      env: {
-        ...existingConfig.env,
-        DUOJIE_API_KEY: apiKey,
-        DUOJIE_BASE_URL: API_CONFIG.baseUrl,
+      models: {
+        ...existingConfig.models,
+        mode: 'merge',
+        providers: {
+          ...existingConfig.models?.providers,
+          ...providers,
+        },
       },
       agents: {
         ...existingConfig.agents,
         defaults: {
           ...existingConfig.agents?.defaults,
           model: {
+            primary: `${defaultProvider}/${defaultModelId}`,
             ...existingConfig.agents?.defaults?.model,
-            primary: `duojie/${defaultModelId}`,
+          },
+          models: {
+            ...existingConfig.agents?.defaults?.models,
+            ...modelAllowList,
           },
         },
       },
       _duojie: {
         configuredAt: new Date().toISOString(),
-        version: '0.2.7',
-        defaultModel: defaultModelId,
-        totalModels,
+        version: '0.2.8',
       },
     };
 
@@ -110,7 +172,7 @@ export async function configureOpenClaw(apiKey) {
 
     return {
       success: true,
-      message: `已配置 ${totalModels} 个模型，默认: duojie/${defaultModelId}`,
+      message: `已配置 ${totalModels} 个模型 → ${paths.configFile}`,
       configPath: paths.configFile,
       hint: '运行 openclaw gateway restart 使配置生效',
     };
@@ -130,10 +192,10 @@ configureOpenClaw.checkStatus = async function () {
 
   if (await fs.pathExists(paths.configFile)) {
     const config = await readConfig(paths.configFile);
-    if (config._duojie || config.env?.DUOJIE_API_KEY) {
+    if (config._duojie || config.models?.providers?.['duojie-claude']) {
       return { configured: true, message: '已配置 Duojie API' };
     }
-    if (config.env || config.agents) {
+    if (config.models?.providers) {
       return { configured: true, message: '已配置（非 Duojie）' };
     }
   }
@@ -150,18 +212,12 @@ configureOpenClaw.revoke = async function () {
   if (await fs.pathExists(paths.configFile)) {
     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;
+    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 });