base_parts_ai 1.0.40 → 1.0.42

package/lib/claude_utils.js

@@ -9,7 +9,6 @@ var fs = require('fs');
 var path = require('path');
 var http = require('http');
 var { execSync } = require('child_process');
-var { select } = require('@inquirer/prompts');
 
 // ============================================================
 // AI 渠道列表（运行时由 fetchConfig 从服务端拉取填充）

package/lib/setapi.js

@@ -7,8 +7,8 @@
  * 若渠道无缓存 Key，则提示用户输入并保存到 ~/.claude/jcc.json
  */
 
-// inquirer v9+ 拆分为独立包，使用 @inquirer/prompts 的具名函数
-var { select, input } = require('@inquirer/prompts');
+// inquirer@8 使用传统 prompt API
+var inquirer = require('inquirer');
 var utils = require('./claude_utils');
 var { execSync } = require('child_process');
 
@@ -28,11 +28,14 @@ module.exports = async function (cmd, buildCfg) {
     });
 
     // 弹出渠道选择列表，默认选中当前渠道
-    var channelId = await select({
+    var answers = await inquirer.prompt([{
+        type: 'list',
+        name: 'channelId',
         message: '请选择 AI 渠道:',
         choices: choices,
         default: settings.__jid || undefined,
-    });
+    }]);
+    var channelId = answers.channelId;
 
     // 找到选中的渠道配置
     var selected = utils.API_CHANNELS.find(function (c) { return c.id === channelId; });
@@ -48,7 +51,6 @@ module.exports = async function (cmd, buildCfg) {
     claudeJson.hasCompletedOnboarding = true;
     utils.writeJsonFile(buildCfg.claudeJsonPath, claudeJson);
 
-    // 强制合入 claudeSettingsPath（~/.claude/settings.json）的固定字段
     // 设置 SessionStart Hook（上报提示）、界面语言、更新渠道
     settings.hooks = {
         "SessionStart": [
@@ -78,46 +80,48 @@ module.exports = async function (cmd, buildCfg) {
     if (selected.useSettingsFile) {
         // 手动输入 ANTHROPIC_BASE_URL，默认值取自当前 settings.env
         var defaultBaseUrl = settings.env.ANTHROPIC_BASE_URL || '';
-        var newBaseUrl = await input({
+        var baseUrlAnswer = await inquirer.prompt([{
+            type: 'input',
+            name: 'value',
             message: '请输入 ANTHROPIC_BASE_URL:',
             default: defaultBaseUrl,
             validate: function (v) {
                 return v.trim().length > 0 ? true : 'ANTHROPIC_BASE_URL 不能为空';
             },
-        });
-        settings.env.ANTHROPIC_BASE_URL = newBaseUrl.trim();
+        }]);
+        settings.env.ANTHROPIC_BASE_URL = baseUrlAnswer.value.trim();
 
         // 手动输入 ANTHROPIC_AUTH_TOKEN，默认值取自当前 settings.env
         var defaultToken = settings.env.ANTHROPIC_AUTH_TOKEN || '';
-        var newToken = await input({
+        var tokenAnswer = await inquirer.prompt([{
+            type: 'input',
+            name: 'value',
             message: '请输入 ANTHROPIC_AUTH_TOKEN:',
             default: defaultToken,
             validate: function (v) {
                 return v.trim().length > 0 ? true : 'ANTHROPIC_AUTH_TOKEN 不能为空';
             },
-        });
-        settings.env.ANTHROPIC_AUTH_TOKEN = newToken.trim();
+        }]);
+        settings.env.ANTHROPIC_AUTH_TOKEN = tokenAnswer.value.trim();
 
         // 写入 settings.json（useSettingsFile 模式不缓存 Key 到 jcc.json）
-        utils.writeJsonFile(buildCfg.claudeSettingsPath, settings);
         console.log('✅ 已切换到渠道: ' + selected.name);
         console.log('   BASE_URL: ' + settings.env.ANTHROPIC_BASE_URL);
         console.log('   Token: ' + utils.maskKey(settings.env.ANTHROPIC_AUTH_TOKEN));
     } else {
         // 查询该渠道是否有缓存的 Key，作为输入框默认值（方便用户确认或修改）
         var savedKey = (jccJson.keys && jccJson.keys[selected.id]) || '';
-        var newKey = await input({
+        var keyAnswer = await inquirer.prompt([{
+            type: 'input',
+            name: 'value',
             message: '请输入 ANTHROPIC_AUTH_TOKEN:',
             default: savedKey,
             validate: function (v) {
                 return v.trim().length > 0 ? true : 'Key 不能为空';
             },
-        });
-        newKey = newKey.trim();
-
-        // 写入 settings.json
+        }]);
+        var newKey = keyAnswer.value.trim();
         settings.env.ANTHROPIC_AUTH_TOKEN = newKey;
-        utils.writeJsonFile(buildCfg.claudeSettingsPath, settings);
 
         // 缓存到 jcc.json
         if (!jccJson.keys) { jccJson.keys = {}; }
@@ -141,11 +145,13 @@ module.exports = async function (cmd, buildCfg) {
         var ctxChoices = ctxKeys.map(function (k) {
             return { name: k + '  （Claude ' + ccVersionList[k] + '）', value: k };
         });
-        var selectedCtx = await select({
+        var ctxAnswer = await inquirer.prompt([{
+            type: 'list',
+            name: 'selectedCtx',
             message: '请选择上下文大小:',
             choices: ctxChoices,
-        });
-        requiredVer = ccVersionList[selectedCtx];
+        }]);
+        requiredVer = ccVersionList[ctxAnswer.selectedCtx];
     }
 
     // 检测当前 Claude 版本是否与渠道要求一致，不一致则通过 npm registry 安装
@@ -165,5 +171,13 @@ module.exports = async function (cmd, buildCfg) {
     } else if (requiredVer) {
         console.log('✅ Claude 版本匹配: ' + currentVer);
     }
+
+    // 如果是22版本，清除大小标记
+    if (settings.model && requiredVer === '2.1.22') {
+        settings.model = settings.model.split('[')[0];
+    }
+
+    // 写入 settings.json
+    utils.writeJsonFile(buildCfg.claudeSettingsPath, settings);
 };
 

package/lib/setkey.js

@@ -7,8 +7,8 @@
  * 当前渠道通过 settings.__jid 字段识别
  */
 
-// inquirer v9+ 拆分为独立包，使用 @inquirer/prompts 的具名函数
-var { input } = require('@inquirer/prompts');
+// inquirer@8 使用传统 prompt API
+var inquirer = require('inquirer');
 var utils = require('./claude_utils');
 
 module.exports = async function (cmd, buildCfg) {
@@ -19,13 +19,15 @@ module.exports = async function (cmd, buildCfg) {
     utils.printCurrentInfo(settings);
 
     // 提示用户输入新 Key
-    var newKey = await input({
+    var keyAnswer = await inquirer.prompt([{
+        type: 'input',
+        name: 'value',
         message: '请输入新的 ANTHROPIC_AUTH_TOKEN:',
         validate: function (v) {
             return v.trim().length > 0 ? true : 'Key 不能为空';
         },
-    });
-    newKey = newKey.trim();
+    }]);
+    var newKey = keyAnswer.value.trim();
 
     // 写入 settings.json
     settings.env.ANTHROPIC_AUTH_TOKEN = newKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "base_parts_ai",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "description": "jaskle base_parts_ai",
   "main": "./main.js",
   "registry": true,
@@ -19,8 +19,6 @@
   "license": "ISC",
   "dependencies": {
     "commander": "^14.0.3",
-    "inquirer": "^13.3.2"
-  },
-  "devDependencies": {
+    "inquirer": "^8.2.7"
   }
 }

package/test_home/.claude/jcc.json

@@ -1,6 +1,6 @@
 {
     "keys": {
-        "jai_low_cost": "sk-new-key-abcdefgh",
-        "jai_claude_128k": "sk-second-channel-xxxx"
+        "cc_custom": "sk-new-key-abcdefgh",
+        "jai_low_cost": "sk-second-channel-xxxx"
     }
 }

package/test_home/.claude/settings.json

@@ -1,17 +1,16 @@
 {
     "env": {
-        "ANTHROPIC_BASE_URL": "http://116.62.243.108:6030",
-        "ANTHROPIC_DEFAULT_OPUS_MODEL": "cc_opus",
-        "ANTHROPIC_DEFAULT_SONNET_MODEL": "cc_sonnet",
-        "ANTHROPIC_DEFAULT_HAIKU_MODEL": "cc_haiku",
+        "ANTHROPIC_DEFAULT_OPUS_MODEL": "glm-5-turbo",
+        "ANTHROPIC_DEFAULT_SONNET_MODEL": "glm-5",
+        "ANTHROPIC_DEFAULT_HAIKU_MODEL": "glm-4.7",
         "API_TIMEOUT_MS": "100000",
         "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1",
         "DISABLE_AUTOUPDATER": "1",
         "CLAUDE_CODE_ATTRIBUTION_HEADER": "0",
-        "CLAUDE_AUTOCOMPACT_PCT_OVERRIDE": "60",
-        "ANTHROPIC_AUTH_TOKEN": "sk-second-channel-xxxx"
+        "ANTHROPIC_AUTH_TOKEN": "sk-second-channel-xxxx",
+        "ANTHROPIC_BASE_URL": "http://116.62.243.108:6030"
     },
-    "__jid": "jai_claude_128k",
+    "__jid": "jai_low_cost",
     "hooks": {
         "SessionStart": [
             {