base_parts_ai 1.0.46 → 1.0.48

package/lib/ai_utils.js

@@ -8,7 +8,7 @@
 var fs = require('fs');
 var path = require('path');
 var http = require('http');
-var { execSync } = require('child_process');
+var { execSync, spawnSync } = require('child_process');
 
 // ============================================================
 // AI 渠道列表（运行时由 fetchConfig 从服务端拉取填充）
@@ -24,6 +24,51 @@ var noticeList = [];
 // jcc.json 中保存最后一次手动输入 Token 的内部字段名
 var LAST_MANUAL_AUTH_TOKEN_KEY = '__lastManualAuthToken';
 
+/**
+ * 从当前入口文件名推断正在运行的 CLI 命令名
+ * @returns {string} jcc、jcx 或空字符串
+ */
+function getCurrentCliName() {
+    var entryName = path.basename(process.argv[1] || '').toLowerCase();
+    if (entryName === 'jcx' || entryName === 'jcx.js') return 'jcx';
+    if (entryName === 'jcc' || entryName === 'jcc.js') return 'jcc';
+    return '';
+}
+
+/**
+ * 升级完成后重新运行当前 CLI，并保留本次传入的全部参数
+ * @returns {void}
+ */
+function rerunCurrentCli() {
+    var cliName = getCurrentCliName();
+    if (!cliName) {
+        console.log('[fetchConfig] 升级完成，未识别当前 CLI，请重新运行');
+        process.exit(0);
+    }
+
+    // 传递临时环境变量，避免新进程在版本缓存异常时反复触发升级。
+    var childEnv = Object.assign({}, process.env, {
+        BASE_PARTS_AI_SKIP_SELF_UPDATE: '1',
+    });
+    var args = process.argv.slice(2);
+    console.log('[fetchConfig] 升级完成，正在重新运行: ' + cliName + (args.length ? ' ' + args.join(' ') : ''));
+    var result = spawnSync(cliName, args, {
+        stdio: 'inherit',
+        shell: process.platform === 'win32',
+        env: childEnv,
+    });
+
+    if (result.error) {
+        console.warn('[fetchConfig] 重新运行失败:', result.error.message);
+        process.exit(1);
+    }
+    if (result.signal) {
+        console.warn('[fetchConfig] 重新运行被信号中断:', result.signal);
+        process.exit(1);
+    }
+    process.exit(typeof result.status === 'number' ? result.status : 0);
+}
+
 /**
  * 从服务端拉取渠道配置，并检查 jcc 自身是否需要升级
  * @param {object} buildCfg getBuildCfg 返回的配置对象
@@ -76,7 +121,7 @@ function fetchConfig(buildCfg) {
                             }
                             return false;
                         }
-                        if (newVer && semverGt(newVer, currentVer)) {
+                        if (newVer && process.env.BASE_PARTS_AI_SKIP_SELF_UPDATE !== '1' && semverGt(newVer, currentVer)) {
                             console.log('[fetchConfig] 检测到新版本 jcc: ' + newVer + '（当前 ' + currentVer + '）');
                             var confirmed = "yes"
                             // confirmed = await select({
@@ -93,8 +138,7 @@ function fetchConfig(buildCfg) {
                                 try {
                                     var tgzUrl = 'https://jdwfiles.oss-cn-hangzhou.aliyuncs.com/npm_pkg/base_parts_ai-' + newVer + '.tgz';
                                     execSync('npm install -g ' + tgzUrl + ' --force --registry=https://registry.npmmirror.com', { stdio: 'inherit' });
-                                    console.log('[fetchConfig] 升级完成，请重新运行 jcc');
-                                    process.exit(0);
+                                    rerunCurrentCli();
                                 } catch (e) {
                                     console.warn('[fetchConfig] 自动升级失败:', e.message);
                                 }
@@ -262,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 对象
@@ -271,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

@@ -152,16 +152,29 @@ function ensureSandboxMode(toml) {
 }
 
 /**
- * 强制写入 Codex TUI 编辑器换行快捷键，已有值会被覆盖为 alt-enter
+ * 强制删除 Codex TUI 编辑器 insert_newline 配置，交给官方默认行为处理
  * @param {string} toml TOML 内容
  * @returns {string}
  */
-function ensureEditorInsertNewlineKeymap(toml) {
+function removeEditorInsertNewlineKeymap(toml) {
     var config = parseTomlConfig(toml);
-    var tui = ensureTable(config, 'tui');
-    var keymap = ensureTable(tui, 'keymap');
-    var editor = ensureTable(keymap, 'editor');
-    editor.insert_newline = 'alt-enter';
+    var tui = config.tui;
+    var keymap = tui && typeof tui === 'object' && !Array.isArray(tui) ? tui.keymap : null;
+    var editor = keymap && typeof keymap === 'object' && !Array.isArray(keymap) ? keymap.editor : null;
+
+    // 只删除官方已支持的 insert_newline，保留用户其它 TUI 快捷键配置。
+    if (editor && typeof editor === 'object' && !Array.isArray(editor)) {
+        delete editor.insert_newline;
+        if (isEmptyObject(editor)) {
+            delete keymap.editor;
+        }
+        if (isEmptyObject(keymap)) {
+            delete tui.keymap;
+        }
+        if (isEmptyObject(tui)) {
+            delete config.tui;
+        }
+    }
     return stringifyTomlConfig(config);
 }
 
@@ -356,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 命令参数
@@ -407,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 输入。');
     }
@@ -432,7 +488,7 @@ async function setapiCx(cmd, buildCfg) {
         toml = wireApi ? setJcodexWireApi(toml, wireApi) : removeJcodexWireApi(toml);
     }
     toml = ensureSandboxMode(toml);
-    toml = ensureEditorInsertNewlineKeymap(toml);
+    toml = removeEditorInsertNewlineKeymap(toml);
     writeTextFile(buildCfg.codexConfigPath, toml);
 
     await refreshAgentsFile(buildCfg.codexAgentsPath);
@@ -452,13 +508,16 @@ setapiCx._private = {
     escapeTomlString: escapeTomlString,
     hasTopLevelKey: hasTopLevelKey,
     ensureSandboxMode: ensureSandboxMode,
-    ensureEditorInsertNewlineKeymap: ensureEditorInsertNewlineKeymap,
+    removeEditorInsertNewlineKeymap: removeEditorInsertNewlineKeymap,
     removeTopLevelModelProvider: removeTopLevelModelProvider,
     removeJcodexProviderBlock: removeJcodexProviderBlock,
     removeJcodexWireApi: removeJcodexWireApi,
     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.46",
+  "version": "1.0.48",
   "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_home/.codex/config.toml

@@ -4,9 +4,6 @@ model_provider = "jcodex"
 [tui]
 theme = "dark"
 
-[tui.keymap.editor]
-insert_newline = "alt-enter"
-
 [model_providers.jcodex]
 name = "jcodex"
 base_url = "https://version.example.com/v1"

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

@@ -173,18 +173,18 @@ async function runTests() {
     })();
 
     // ============================================================
-    // 测试 2.2：强制写入 TUI 编辑器换行快捷键
+    // 测试 2.2：强制删除 TUI 编辑器换行快捷键
     // ============================================================
-    console.log('\n======= jcx Test 2.2: 强制写入 TUI keymap =======');
+    console.log('\n======= jcx Test 2.2: 强制删除 TUI keymap insert_newline =======');
     (function () {
-        var original = '[tui]\ntheme = "dark"\n\n[tui.keymap.editor]\ninsert_newline = "enter"\n';
-        var updated = privateApi.ensureEditorInsertNewlineKeymap(original);
+        var original = '[tui]\ntheme = "dark"\n\n[tui.keymap.editor]\ninsert_newline = "enter"\naccept_completion = "tab"\n';
+        var updated = privateApi.removeEditorInsertNewlineKeymap(original);
         var ok = true;
         ok = ok && updated.indexOf('[tui]') !== -1;
         ok = ok && updated.indexOf('theme = "dark"') !== -1;
         ok = ok && updated.indexOf('[tui.keymap.editor]') !== -1;
-        ok = ok && updated.indexOf('insert_newline = "alt-enter"') !== -1;
-        ok = ok && updated.indexOf('insert_newline = "enter"') === -1;
+        ok = ok && updated.indexOf('accept_completion = "tab"') !== -1;
+        ok = ok && updated.indexOf('insert_newline') === -1;
         console.log('✅ Test 2.2 通过:', ok);
         if (!ok) { process.exit(1); }
     })();
@@ -235,8 +235,7 @@ async function runTests() {
         ok = ok && toml.indexOf('sandbox_mode = "danger-full-access"') !== -1;
         ok = ok && toml.indexOf('base_url = "https://forced.example.com/v1"') !== -1;
         ok = ok && toml.indexOf('wire_api = "wire-forced-provider-key"') !== -1;
-        ok = ok && toml.indexOf('[tui.keymap.editor]') !== -1;
-        ok = ok && toml.indexOf('insert_newline = "alt-enter"') !== -1;
+        ok = ok && toml.indexOf('insert_newline') === -1;
         ok = ok && agents.indexOf('cli=cx') !== -1;
         ok = ok && agents.indexOf('cli=cx-' + utils.getAiTipOsParam()) !== -1;
         console.log('✅ Test 4 通过:', ok);
@@ -287,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',
@@ -323,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
     // ============================================================