base_parts_ai 1.0.44 → 1.0.46

package/README.md

@@ -1,6 +1,6 @@
 
 ## 下载发布的包
-https://registry.npmjs.org/base_parts_ai/-/base_parts_ai-1.0.43.tgz
+https://registry.npmjs.org/base_parts_ai/-/base_parts_ai-1.0.45.tgz
 
 ## 然后放在jdwfiles目录下
 https://jdwfiles.oss-cn-hangzhou.aliyuncs.com/npm_pkg/base_parts_ai-1.0.34.tgz

package/lib/setapi_cx.js

@@ -10,6 +10,7 @@ var fs = require('fs');
 var inquirer = require('inquirer');
 var utils = require('./ai_utils');
 var childProcess = require('child_process');
+var TOML = require('smol-toml');
 
 /**
  * 读取文本文件，文件不存在时返回空字符串
@@ -47,27 +48,63 @@ function getEnvString(channel, key) {
     return typeof value === 'string' ? value.trim() : '';
 }
 
+/**
+ * 解析 Codex TOML 配置，格式错误时阻止继续覆盖用户配置
+ * @param {string} toml TOML 内容
+ * @returns {object}
+ */
+function parseTomlConfig(toml) {
+    if (!toml || !String(toml).trim()) {
+        return {};
+    }
+    try {
+        return TOML.parse(toml);
+    } catch (e) {
+        throw new Error('Codex config.toml 格式错误，已停止写入以避免破坏配置: ' + e.message);
+    }
+}
+
+/**
+ * 将 Codex TOML 配置对象序列化为文本
+ * @param {object} config TOML 配置对象
+ * @returns {string}
+ */
+function stringifyTomlConfig(config) {
+    var content = TOML.stringify(config || {});
+    return content ? content.replace(/\s+$/, '') + '\n' : '';
+}
+
+/**
+ * 确保对象字段是可写 TOML table
+ * @param {object} parent 父级对象
+ * @param {string} key 字段名
+ * @returns {object}
+ */
+function ensureTable(parent, key) {
+    if (!parent[key] || typeof parent[key] !== 'object' || Array.isArray(parent[key])) {
+        // 字段不是 table 时用对象替换，避免生成非法的嵌套配置
+        parent[key] = {};
+    }
+    return parent[key];
+}
+
+/**
+ * 判断对象是否没有自有字段
+ * @param {object} value 待检查对象
+ * @returns {boolean}
+ */
+function isEmptyObject(value) {
+    return value && typeof value === 'object' && !Array.isArray(value) && Object.keys(value).length === 0;
+}
+
 /**
  * 从 TOML 文本中提取顶层 model_provider
  * @param {string} toml TOML 内容
  * @returns {string}
  */
 function getTopLevelModelProvider(toml) {
-    var lines = toml.split(/\r?\n/);
-    var inSection = false;
-    for (var i = 0; i < lines.length; i++) {
-        var line = lines[i];
-        if (/^\s*\[/.test(line)) {
-            inSection = true;
-        }
-        if (!inSection) {
-            var match = line.match(/^\s*model_provider\s*=\s*["']([^"']+)["']/);
-            if (match) {
-                return match[1];
-            }
-        }
-    }
-    return '';
+    var config = parseTomlConfig(toml);
+    return typeof config.model_provider === 'string' ? config.model_provider : '';
 }
 
 /**
@@ -76,26 +113,13 @@ function getTopLevelModelProvider(toml) {
  * @returns {string}
  */
 function getJcodexBaseUrl(toml) {
-    var lines = toml.split(/\r?\n/);
-    var inJcodex = false;
-    for (var i = 0; i < lines.length; i++) {
-        var line = lines[i];
-        if (/^\s*\[/.test(line)) {
-            inJcodex = /^\s*\[model_providers\.jcodex\]\s*$/.test(line);
-            continue;
-        }
-        if (inJcodex) {
-            var match = line.match(/^\s*base_url\s*=\s*["']([^"']*)["']/);
-            if (match) {
-                return match[1];
-            }
-        }
-    }
-    return '';
+    var config = parseTomlConfig(toml);
+    var provider = config.model_providers && config.model_providers.jcodex;
+    return provider && typeof provider.base_url === 'string' ? provider.base_url : '';
 }
 
 /**
- * 转义 TOML 字符串值，避免引号和反斜杠破坏配置格式
+ * 转义 TOML 字符串值，保留给测试和旧调用方使用
  * @param {string} value 原始字符串
  * @returns {string}
  */
@@ -103,25 +127,53 @@ function escapeTomlString(value) {
     return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
 
+/**
+ * 判断 TOML 顶层是否已经存在指定配置项
+ * @param {string} toml TOML 内容
+ * @param {string} key 顶层配置项名称
+ * @returns {boolean}
+ */
+function hasTopLevelKey(toml, key) {
+    var config = parseTomlConfig(toml);
+    return Object.prototype.hasOwnProperty.call(config, key);
+}
+
+/**
+ * 确保 Codex 配置包含默认 sandbox_mode，缺失时写入顶层配置
+ * @param {string} toml TOML 内容
+ * @returns {string}
+ */
+function ensureSandboxMode(toml) {
+    var config = parseTomlConfig(toml);
+    if (!Object.prototype.hasOwnProperty.call(config, 'sandbox_mode')) {
+        config.sandbox_mode = 'danger-full-access';
+    }
+    return stringifyTomlConfig(config);
+}
+
+/**
+ * 强制写入 Codex TUI 编辑器换行快捷键，已有值会被覆盖为 alt-enter
+ * @param {string} toml TOML 内容
+ * @returns {string}
+ */
+function ensureEditorInsertNewlineKeymap(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';
+    return stringifyTomlConfig(config);
+}
+
 /**
  * 删除顶层 model_provider 字段，保留其它配置段落
  * @param {string} toml TOML 内容
  * @returns {string}
  */
 function removeTopLevelModelProvider(toml) {
-    var lines = toml.split(/\r?\n/);
-    var inSection = false;
-    var kept = [];
-    lines.forEach(function (line) {
-        if (/^\s*\[/.test(line)) {
-            inSection = true;
-        }
-        if (!inSection && /^\s*model_provider\s*=/.test(line)) {
-            return;
-        }
-        kept.push(line);
-    });
-    return kept.join('\n').replace(/\n{3,}/g, '\n\n').replace(/\s+$/, '') + '\n';
+    var config = parseTomlConfig(toml);
+    delete config.model_provider;
+    return stringifyTomlConfig(config);
 }
 
 /**
@@ -130,22 +182,14 @@ function removeTopLevelModelProvider(toml) {
  * @returns {string}
  */
 function removeJcodexProviderBlock(toml) {
-    var lines = toml.split(/\r?\n/);
-    var kept = [];
-    var skipping = false;
-    lines.forEach(function (line) {
-        if (/^\s*\[model_providers\.jcodex\]\s*$/.test(line)) {
-            skipping = true;
-            return;
-        }
-        if (skipping && /^\s*\[/.test(line)) {
-            skipping = false;
+    var config = parseTomlConfig(toml);
+    if (config.model_providers && typeof config.model_providers === 'object' && !Array.isArray(config.model_providers)) {
+        delete config.model_providers.jcodex;
+        if (isEmptyObject(config.model_providers)) {
+            delete config.model_providers;
         }
-        if (!skipping) {
-            kept.push(line);
-        }
-    });
-    return kept.join('\n').replace(/\n{3,}/g, '\n\n').replace(/\s+$/, '');
+    }
+    return stringifyTomlConfig(config);
 }
 
 /**
@@ -156,44 +200,18 @@ function removeJcodexProviderBlock(toml) {
  * @returns {string}
  */
 function setJcodexProvider(toml, baseUrl, wireApi) {
-    var withoutProvider = removeJcodexProviderBlock(toml);
-    var lines = withoutProvider.split(/\r?\n/);
-    var inserted = false;
-    var result = [];
-
-    lines.forEach(function (line) {
-        if (!inserted && /^\s*model_provider\s*=/.test(line)) {
-            result.push('model_provider = "jcodex"');
-            inserted = true;
-            return;
-        }
-        if (!inserted && /^\s*\[/.test(line)) {
-            result.push('model_provider = "jcodex"');
-            result.push('');
-            inserted = true;
-        }
-        result.push(line);
-    });
-
-    if (!inserted) {
-        if (result.length && result[result.length - 1].trim() !== '') {
-            result.push('');
-        }
-        result.unshift('model_provider = "jcodex"');
-    }
-
-    var body = result.join('\n').replace(/\n{3,}/g, '\n\n').replace(/\s+$/, '');
-    if (body) {
-        body += '\n\n';
-    }
-    body += '[model_providers.jcodex]\n';
-    body += 'name = "jcodex"\n';
-    body += 'base_url = "' + escapeTomlString(baseUrl) + '"\n';
+    var config = parseTomlConfig(toml);
+    var providers = ensureTable(config, 'model_providers');
+    config.model_provider = 'jcodex';
+    providers.jcodex = {
+        name: 'jcodex',
+        base_url: baseUrl,
+    };
     // wire_api 是 Codex provider 私有字段，非空时强制写入到 model_providers.jcodex 下
     if (wireApi) {
-        body += 'wire_api = "' + escapeTomlString(wireApi) + '"\n';
+        providers.jcodex.wire_api = wireApi;
     }
-    return body;
+    return stringifyTomlConfig(config);
 }
 
 /**
@@ -202,20 +220,13 @@ function setJcodexProvider(toml, baseUrl, wireApi) {
  * @returns {string}
  */
 function removeJcodexWireApi(toml) {
-    var lines = toml.split(/\r?\n/);
-    var kept = [];
-    var inJcodex = false;
-    lines.forEach(function (line) {
-        if (/^\s*\[/.test(line)) {
-            inJcodex = /^\s*\[model_providers\.jcodex\]\s*$/.test(line);
-        }
-        // wire_api 为空时只删除 jcodex provider 下的私有字段，不影响其它段落
-        if (inJcodex && /^\s*wire_api\s*=/.test(line)) {
-            return;
-        }
-        kept.push(line);
-    });
-    return kept.join('\n').replace(/\n{3,}/g, '\n\n').replace(/\s+$/, '') + '\n';
+    var config = parseTomlConfig(toml);
+    var provider = config.model_providers && config.model_providers.jcodex;
+    // wire_api 为空时只删除 jcodex provider 下的私有字段，不影响其它段落
+    if (provider && typeof provider === 'object' && !Array.isArray(provider)) {
+        delete provider.wire_api;
+    }
+    return stringifyTomlConfig(config);
 }
 
 /**
@@ -225,47 +236,14 @@ function removeJcodexWireApi(toml) {
  * @returns {string}
  */
 function setJcodexWireApi(toml, wireApi) {
-    var lines = removeJcodexWireApi(toml).split(/\r?\n/);
-    var kept = [];
-    var inJcodex = false;
-    var foundJcodex = false;
-    var inserted = false;
-    function appendWireApiLine() {
-        // 写入前去掉段尾空行，确保 wire_api 留在 jcodex 段内部
-        while (kept.length && kept[kept.length - 1].trim() === '') {
-            kept.pop();
-        }
-        kept.push('wire_api = "' + escapeTomlString(wireApi) + '"');
-    }
-
-    lines.forEach(function (line) {
-        if (/^\s*\[/.test(line)) {
-            if (inJcodex && !inserted) {
-                appendWireApiLine();
-                kept.push('');
-                inserted = true;
-            }
-            inJcodex = /^\s*\[model_providers\.jcodex\]\s*$/.test(line);
-            foundJcodex = foundJcodex || inJcodex;
-        }
-        kept.push(line);
-    });
-
-    if (foundJcodex && !inserted) {
-        appendWireApiLine();
-        inserted = true;
-    }
-    if (!foundJcodex) {
-        var body = kept.join('\n').replace(/\n{3,}/g, '\n\n').replace(/\s+$/, '');
-        if (body) {
-            body += '\n\n';
-        }
-        body += '[model_providers.jcodex]\n';
-        body += 'name = "jcodex"\n';
-        body += 'wire_api = "' + escapeTomlString(wireApi) + '"\n';
-        return body;
+    var config = parseTomlConfig(toml);
+    var providers = ensureTable(config, 'model_providers');
+    var provider = ensureTable(providers, 'jcodex');
+    if (!provider.name) {
+        provider.name = 'jcodex';
     }
-    return kept.join('\n').replace(/\n{3,}/g, '\n\n').replace(/\s+$/, '') + '\n';
+    provider.wire_api = wireApi;
+    return stringifyTomlConfig(config);
 }
 
 /**
@@ -453,6 +431,8 @@ async function setapiCx(cmd, buildCfg) {
         toml = removeTopLevelModelProvider(toml);
         toml = wireApi ? setJcodexWireApi(toml, wireApi) : removeJcodexWireApi(toml);
     }
+    toml = ensureSandboxMode(toml);
+    toml = ensureEditorInsertNewlineKeymap(toml);
     writeTextFile(buildCfg.codexConfigPath, toml);
 
     await refreshAgentsFile(buildCfg.codexAgentsPath);
@@ -470,6 +450,9 @@ setapiCx._private = {
     getTopLevelModelProvider: getTopLevelModelProvider,
     getJcodexBaseUrl: getJcodexBaseUrl,
     escapeTomlString: escapeTomlString,
+    hasTopLevelKey: hasTopLevelKey,
+    ensureSandboxMode: ensureSandboxMode,
+    ensureEditorInsertNewlineKeymap: ensureEditorInsertNewlineKeymap,
     removeTopLevelModelProvider: removeTopLevelModelProvider,
     removeJcodexProviderBlock: removeJcodexProviderBlock,
     removeJcodexWireApi: removeJcodexWireApi,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "base_parts_ai",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "jaskle base_parts_ai",
   "main": "./main.js",
   "registry": true,
@@ -16,12 +16,13 @@
     "jcx": "./bin/jcx.js"
   },
   "engines": {
-    "node": ">= 0.8.0"
+    "node": ">=18"
   },
   "author": "jaskle",
   "license": "ISC",
   "dependencies": {
     "commander": "^14.0.3",
-    "inquirer": "^8.2.7"
+    "inquirer": "^8.2.7",
+    "smol-toml": "^1.6.1"
   }
 }

package/test_home/.claude/settings.json

@@ -8,7 +8,7 @@
                 "hooks": [
                     {
                         "type": "command",
-                        "command": "curl -s -m 2 http://116.62.243.108:7180/pub/ai_tip?cli=cc&os=windows_x64"
+                        "command": "curl -s -m 2 http://116.62.243.108:7180/pub/ai_tip?cli=cc-windows_x64"
                     }
                 ]
             }

package/test_home/.codex/AGENTS.md

@@ -1,3 +1,3 @@
 # mocked AGENTS
 
-url=http://116.62.243.108:7180/pub/ai_tip?cli=cx&os=windows_x64
+url=http://116.62.243.108:7180/pub/ai_tip?cli=cx-windows_x64

package/test_home/.codex/config.toml

@@ -1,9 +1,12 @@
-
+sandbox_mode = "danger-full-access"
 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

@@ -206,7 +206,7 @@ console.log('\n======= Test 3: setapi 写入渠道配置（envObj 合并）=====
     ok = ok && (s.language === '简体中文');
     ok = ok && (s.autoUpdatesChannel === 'stable');
     ok = ok && (typeof s.hooks === 'object');
-    ok = ok && (aiTipCommand.indexOf('os=' + utils.getAiTipOsParam()) !== -1);
+    ok = ok && (aiTipCommand.indexOf('cli=cc-' + utils.getAiTipOsParam()) !== -1);
     ok = ok && (aiTipCommand.indexOf('%OS%') === -1);
     ok = ok && (j.keys[selected.id] === newKey);
     ok = ok && (j.keys.__lastManualAuthToken === newKey);

package/test_jcx.js

@@ -157,6 +157,38 @@ async function runTests() {
         if (!ok) { process.exit(1); }
     })();
 
+    // ============================================================
+    // 测试 2.1：缺失 sandbox_mode 时写入默认顶层配置
+    // ============================================================
+    console.log('\n======= jcx Test 2.1: 缺失 sandbox_mode 自动补齐 =======');
+    (function () {
+        var original = 'model_provider = "jcodex"\n\n[tui]\ntheme = "dark"\n';
+        var updated = privateApi.ensureSandboxMode(original);
+        var ok = true;
+        ok = ok && updated.indexOf('sandbox_mode = "danger-full-access"') !== -1;
+        ok = ok && updated.indexOf('sandbox_mode = "danger-full-access"') < updated.indexOf('[tui]');
+        ok = ok && privateApi.ensureSandboxMode(updated).match(/sandbox_mode\s*=/g).length === 1;
+        console.log('✅ Test 2.1 通过:', ok);
+        if (!ok) { process.exit(1); }
+    })();
+
+    // ============================================================
+    // 测试 2.2：强制写入 TUI 编辑器换行快捷键
+    // ============================================================
+    console.log('\n======= jcx Test 2.2: 强制写入 TUI keymap =======');
+    (function () {
+        var original = '[tui]\ntheme = "dark"\n\n[tui.keymap.editor]\ninsert_newline = "enter"\n';
+        var updated = privateApi.ensureEditorInsertNewlineKeymap(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;
+        console.log('✅ Test 2.2 通过:', ok);
+        if (!ok) { process.exit(1); }
+    })();
+
     // ============================================================
     // 测试 3：空 base_url 删除顶层 model_provider，保留 provider 段
     // ============================================================
@@ -200,10 +232,13 @@ async function runTests() {
         ok = ok && auth.__jid === 'forced_channel';
         ok = ok && auth.OPENAI_API_KEY === 'sk-forced-codex-key';
         ok = ok && toml.indexOf('model_provider = "jcodex"') !== -1;
+        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 && agents.indexOf('cli=cx') !== -1;
-        ok = ok && agents.indexOf('os=' + utils.getAiTipOsParam()) !== -1;
+        ok = ok && agents.indexOf('cli=cx-' + utils.getAiTipOsParam()) !== -1;
         console.log('✅ Test 4 通过:', ok);
         if (!ok) { process.exit(1); }
     });