base_parts_ai 1.0.46 → 1.0.47

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);
                                 }

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);
 }
 
@@ -432,7 +445,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,7 +465,7 @@ setapiCx._private = {
     escapeTomlString: escapeTomlString,
     hasTopLevelKey: hasTopLevelKey,
     ensureSandboxMode: ensureSandboxMode,
-    ensureEditorInsertNewlineKeymap: ensureEditorInsertNewlineKeymap,
+    removeEditorInsertNewlineKeymap: removeEditorInsertNewlineKeymap,
     removeTopLevelModelProvider: removeTopLevelModelProvider,
     removeJcodexProviderBlock: removeJcodexProviderBlock,
     removeJcodexWireApi: removeJcodexWireApi,

package/package.json

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

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_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);