base_parts_ai 1.0.47 → 1.0.49

package/lib/ai_utils.js

@@ -76,7 +76,7 @@ function rerunCurrentCli() {
  */
 function fetchConfig(buildCfg) {
     return new Promise(function (resolve) {
-        var url = 'http://116.62.243.108:7180/pub/ai_cc_cfg?r=' + Math.random();
+        var url = 'https://jai.jaskle.cn/hm/hm_pub/ai_cc_cfg?r=' + Math.random();
         http.get(url, { timeout: 8000 }, function (res) {
             var chunks = '';
             res.on('data', function (chunk) { chunks += chunk; });
@@ -122,7 +122,7 @@ function fetchConfig(buildCfg) {
                             return false;
                         }
                         if (newVer && process.env.BASE_PARTS_AI_SKIP_SELF_UPDATE !== '1' && semverGt(newVer, currentVer)) {
-                            console.log('[fetchConfig] 检测到新版本 jcc: ' + newVer + '（当前 ' + currentVer + '）');
+                            console.log('[fetchConfig] 检测到新版本: ' + newVer + '（当前 ' + currentVer + '）');
                             var confirmed = "yes"
                             // confirmed = await select({
                             //     message: '是否立即升级？',
@@ -234,7 +234,7 @@ function getAiTipOsParam() {
  * @returns {string}
  */
 function buildAiTipCommand() {
-    return 'curl -s -m 2 ' + buildAiTipUrl('cc');
+    return 'curl -s -m 5 ' + buildAiTipUrl('cc');
 }
 
 /**
@@ -243,7 +243,7 @@ function buildAiTipCommand() {
  * @returns {string}
  */
 function buildAiTipUrl(cli) {
-    return 'http://116.62.243.108:7180/pub/ai_tip?cli=' + cli + '-' + getAiTipOsParam();
+    return 'https://jai.jaskle.cn/hm/pub/ai_tip?cli=' + cli + '-' + getAiTipOsParam();
 }
 
 /**
@@ -306,7 +306,7 @@ function getLastManualAuthToken(jccJson) {
 
 /**
  * 计算需要提示用户输入 Token 时的默认值
- * 优先使用当前渠道缓存，其次当前 settings，最后使用最后一次手动输入的 Token
+ * 优先使用当前渠道缓存；只有该渠道无缓存时，才使用当前渠道配置或最后一次手动 Token 兜底
  * @param {object} jccJson jcc.json 对象
  * @param {string} channelId 当前渠道 id
  * @param {object} settings Claude settings.json 对象
@@ -315,7 +315,8 @@ function getLastManualAuthToken(jccJson) {
 function getManualAuthTokenDefault(jccJson, channelId, settings) {
     var cachedToken = (jccJson.keys && jccJson.keys[channelId]) || '';
     var currentToken = (settings.env && settings.env.ANTHROPIC_AUTH_TOKEN) || '';
-    return cachedToken || currentToken || getLastManualAuthToken(jccJson);
+    var currentChannelToken = (!settings.__jid || settings.__jid === channelId) ? currentToken : '';
+    return cachedToken || currentChannelToken || getLastManualAuthToken(jccJson) || currentToken;
 }
 
 /**

package/lib/setapi_cx.js

@@ -369,6 +369,48 @@ function getCurrentCodexChannelId(auth, toml) {
     return channel ? channel.id : '';
 }
 
+/**
+ * 记录最后一次由用户手动输入的 Codex Key
+ * 该值仅作为新渠道无专属 Key 时的默认输入提示
+ * @param {object} auth auth.json 对象
+ * @param {string} key 用户手动输入的 OPENAI_API_KEY
+ */
+function saveLastManualOpenAiKey(auth, key) {
+    if (key) {
+        auth.__lastManualOpenAiKey = key;
+    }
+}
+
+/**
+ * 获取 Codex 手动 Key 输入框默认值
+ * 优先使用当前渠道专属缓存；没有缓存时才用当前渠道 Key 或最后手动 Key 兜底
+ * @param {object} auth auth.json 对象
+ * @param {string} channelId 当前选择的渠道 id
+ * @returns {string}
+ */
+function getManualOpenAiKeyDefault(auth, channelId) {
+    var cachedKey = (auth.__keys && auth.__keys[channelId]) || '';
+    var currentKey = auth.OPENAI_API_KEY || '';
+    var currentChannelKey = (!auth.__jid || auth.__jid === channelId) ? currentKey : '';
+    return cachedKey || currentChannelKey || auth.__lastManualOpenAiKey || currentKey;
+}
+
+/**
+ * 保存或删除 Codex 渠道专属 Key 缓存
+ * @param {object} auth auth.json 对象
+ * @param {string} channelId 当前选择的渠道 id
+ * @param {string} key 用户手动输入的 OPENAI_API_KEY，空值表示删除该渠道缓存
+ */
+function saveManualOpenAiKey(auth, channelId, key) {
+    if (!auth.__keys) { auth.__keys = {}; }
+    if (key) {
+        auth.__keys[channelId] = key;
+        saveLastManualOpenAiKey(auth, key);
+    } else {
+        delete auth.__keys[channelId];
+    }
+}
+
 /**
  * 执行 Codex setapi 交互配置
  * @param {object} cmd 命令参数
@@ -420,9 +462,10 @@ async function setapiCx(cmd, buildCfg) {
             type: 'input',
             name: 'value',
             message: '请输入 OPENAI_API_KEY（输入空格后回车删除该配置）:',
-            default: auth.OPENAI_API_KEY || '',
+            default: getManualOpenAiKeyDefault(auth, selected.id),
         }]);
         forcedKey = keyAnswer.value.trim();
+        saveManualOpenAiKey(auth, selected.id, forcedKey);
     } else {
         console.log('已使用渠道配置中的 OPENAI_API_KEY，跳过 Key 输入。');
     }
@@ -472,6 +515,9 @@ setapiCx._private = {
     setJcodexWireApi: setJcodexWireApi,
     setJcodexProvider: setJcodexProvider,
     getCurrentCodexChannelId: getCurrentCodexChannelId,
+    saveLastManualOpenAiKey: saveLastManualOpenAiKey,
+    getManualOpenAiKeyDefault: getManualOpenAiKeyDefault,
+    saveManualOpenAiKey: saveManualOpenAiKey,
     resolveRequiredCodexVersion: resolveRequiredCodexVersion,
     ensureCodexVersion: ensureCodexVersion,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "base_parts_ai",
-  "version": "1.0.47",
+  "version": "1.0.49",
   "description": "jaskle base_parts_ai",
   "main": "./main.js",
   "registry": true,

package/test_home/.codex/auth.json

@@ -1,4 +1,8 @@
 {
     "__jid": "version_channel",
-    "OPENAI_API_KEY": "sk-version-openai-key"
+    "OPENAI_API_KEY": "sk-version-openai-key",
+    "__lastManualOpenAiKey": "sk-channel-b-new",
+    "__keys": {
+        "channel_b": "sk-channel-b-new"
+    }
 }

package/test_jcc.js

@@ -378,12 +378,15 @@ console.log('\n======= Test 10: Token 默认值与强制配置 =======');
 
     settings.env.ANTHROPIC_AUTH_TOKEN = 'sk-current-settings';
     var currentDefault = utils.getManualAuthTokenDefault({ keys: {} }, 'channel_c', settings);
+    settings.__jid = 'other_channel';
+    var otherChannelDefault = utils.getManualAuthTokenDefault(jccJson, 'channel_b', settings);
 
     console.log('强制 Token:', forcedToken);
     console.log('空强制 Token:', emptyForcedToken || '(空)');
     console.log('渠道缓存默认值:', cachedDefault);
     console.log('最后手动默认值:', lastManualDefault);
     console.log('当前 settings 默认值:', currentDefault);
+    console.log('其它渠道 settings 兜底默认值:', otherChannelDefault);
 
     var ok = true;
     ok = ok && (forcedToken === 'sk-forced-token');
@@ -391,6 +394,7 @@ console.log('\n======= Test 10: Token 默认值与强制配置 =======');
     ok = ok && (cachedDefault === 'sk-channel-cache');
     ok = ok && (lastManualDefault === 'sk-last-manual');
     ok = ok && (currentDefault === 'sk-current-settings');
+    ok = ok && (otherChannelDefault === 'sk-last-manual');
 
     console.log('✅ Test 10 通过:', ok);
     if (!ok) { process.exit(1); }

package/test_jcx.js

@@ -286,7 +286,12 @@ async function runTests() {
     console.log('\n======= jcx Test 6: 可删除输入框保留默认值 =======');
     await withMockFetchText(async function () {
         writeText(buildCfg.codexConfigPath, 'model_provider = "jcodex"\n\n[model_providers.jcodex]\nname = "jcodex"\nbase_url = "https://old.example.com/v1"\n');
-        utils.writeJsonFile(buildCfg.codexAuthPath, { OPENAI_API_KEY: 'sk-old-key' });
+        utils.writeJsonFile(buildCfg.codexAuthPath, {
+            OPENAI_API_KEY: 'sk-old-key',
+            __keys: {
+                manual_channel: 'sk-old-key',
+            },
+        });
         utils.CX_CHANNELS.length = 0;
         utils.CX_CHANNELS.push({
             id: 'manual_channel',
@@ -322,6 +327,51 @@ async function runTests() {
         if (!ok) { process.exit(1); }
     });
 
+    // ============================================================
+    // 测试 6.1：Codex Key 按渠道缓存，当前其它渠道 Key 不覆盖专属默认值
+    // ============================================================
+    console.log('\n======= jcx Test 6.1: Codex Key 按渠道缓存 =======');
+    await withMockFetchText(async function () {
+        writeText(buildCfg.codexConfigPath, 'sandbox_mode = "danger-full-access"\n');
+        utils.writeJsonFile(buildCfg.codexAuthPath, {
+            __jid: 'channel_a',
+            OPENAI_API_KEY: 'sk-current-channel-a',
+            __lastManualOpenAiKey: 'sk-last-manual',
+            __keys: {
+                channel_b: 'sk-channel-b-cache',
+            },
+        });
+        utils.CX_CHANNELS.length = 0;
+        utils.CX_CHANNELS.push({
+            id: 'channel_b',
+            name: 'Channel B',
+            description: 'manual key cache channel',
+            useSettingsFile: false,
+            envObj: {
+                base_url: 'https://channel-b.example.com/v1',
+            },
+        });
+        var captured = [];
+        await withCapturedPrompts([
+            { channelId: 'channel_b' },
+            { value: 'sk-channel-b-new' },
+        ], captured, async function () {
+            await setapiCx({}, buildCfg);
+        });
+
+        var auth = JSON.parse(readText(buildCfg.codexAuthPath));
+        var ok = true;
+        ok = ok && captured.length === 2;
+        ok = ok && captured[1].message.indexOf('OPENAI_API_KEY') !== -1;
+        ok = ok && captured[1].default === 'sk-channel-b-cache';
+        ok = ok && auth.__jid === 'channel_b';
+        ok = ok && auth.OPENAI_API_KEY === 'sk-channel-b-new';
+        ok = ok && auth.__keys.channel_b === 'sk-channel-b-new';
+        ok = ok && auth.__lastManualOpenAiKey === 'sk-channel-b-new';
+        console.log('✅ Test 6.1 通过:', ok);
+        if (!ok) { process.exit(1); }
+    });
+
     // ============================================================
     // 测试 7：base_url 为空时仍强制写入非空 wire_api
     // ============================================================