base_parts_ai 1.0.54 → 1.0.55

package/lib/setapi_cx.js

@@ -10,7 +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');
+var TOML = require('@ltd/j-toml');
 
 // Codex 配置清除选项使用固定内部值，避免与服务端渠道 id 冲突。
 var CLEAR_CODEX_CONFIG = '__clear_codex_config__';
@@ -96,12 +96,12 @@ function parseTomlConfig(toml) {
  * @returns {string}
  */
 function stringifyTomlConfig(config) {
-    var content = TOML.stringify(config || {});
-    // smol-toml 默认把嵌套对象输出为子表；此固定请求头需按 Codex 支持的内联表格式写入。
-    content = content.replace(
-        /\n\[model_providers\.jcodex\.http_headers\]\n(?:"?x-openai-actor-authorization"?) = "local-image-extension"\n/g,
-        '\nhttp_headers = { "x-openai-actor-authorization" = "local-image-extension" }\n'
-    );
+    var content = TOML.stringify(config || {}, {
+        newline: '\n',
+        newlineAround: 'section',
+    });
+    // j-toml 默认在文档开头保留空行，此处统一为原有配置文件格式。
+    content = content.replace(/^\n/, '');
     return content ? content.replace(/\s+$/, '') + '\n' : '';
 }
 
@@ -177,7 +177,7 @@ function hasTopLevelKey(toml, key) {
 function ensureSandboxMode(toml) {
     var config = parseTomlConfig(toml);
     if (!Object.prototype.hasOwnProperty.call(config, 'sandbox_mode')) {
-        config.sandbox_mode = 'danger-full-access';
+        config.sandbox_mode = TOML.basic('danger-full-access');
     }
     return stringifyTomlConfig(config);
 }
@@ -241,62 +241,32 @@ function removeJcodexProviderBlock(toml) {
  * @param {string} toml 原 TOML 内容
  * @param {string} baseUrl provider base_url
  * @param {string} wireApi provider wire_api，空值表示删除该字段
+ * @param {string} openAiKey 当前渠道生效的 OPENAI_API_KEY
  * @returns {string}
  */
-function setJcodexProvider(toml, baseUrl, wireApi) {
+function setJcodexProvider(toml, baseUrl, wireApi, openAiKey) {
+    if (typeof openAiKey !== 'string' || !openAiKey.trim()) {
+        throw new Error('写入 jcodex provider 时 OPENAI_API_KEY 不能为空');
+    }
     var config = parseTomlConfig(toml);
     var providers = ensureTable(config, 'model_providers');
-    config.model_provider = 'jcodex';
-    providers.jcodex = {
-        name: 'jcodex',
-        base_url: baseUrl,
-        // jcodex 使用本地图片扩展身份，不要求 Codex 注入 OpenAI 鉴权。
+    config.model_provider = TOML.basic('jcodex');
+    providers.jcodex = TOML.Section({
+        name: TOML.basic('jcodex'),
+        base_url: TOML.basic(baseUrl),
+
+        // jcodex 使用本地图片扩展身份 - 该方法 codex 0.149.0 版本会导致401错误，需要增加Authorization请求头
         requires_openai_auth: false,
-        http_headers: {
-            'x-openai-actor-authorization': 'local-image-extension',
-        },
-    };
+        http_headers: TOML.inline({
+            'x-openai-actor-authorization': TOML.basic('local-image-extension'),
+            Authorization: TOML.basic('Bearer ' + openAiKey),
+        }),
+
+    });
     // wire_api 是 Codex provider 私有字段，非空时强制写入到 model_providers.jcodex 下
     if (wireApi) {
-        providers.jcodex.wire_api = wireApi;
-    }
-    return stringifyTomlConfig(config);
-}
-
-/**
- * 删除已有 jcodex provider 段中的 wire_api 字段，保留其它配置
- * @param {string} toml TOML 内容
- * @returns {string}
- */
-function removeJcodexWireApi(toml) {
-    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);
-}
-
-/**
- * 写入 jcodex provider 段中的 wire_api 字段，已有字段会被强制覆盖
- * @param {string} toml TOML 内容
- * @param {string} wireApi provider wire_api
- * @returns {string}
- */
-function setJcodexWireApi(toml, wireApi) {
-    var config = parseTomlConfig(toml);
-    var providers = ensureTable(config, 'model_providers');
-    var provider = ensureTable(providers, 'jcodex');
-    if (!provider.name) {
-        provider.name = 'jcodex';
+        providers.jcodex.wire_api = TOML.basic(wireApi);
     }
-    // 即使渠道只配置 wire_api，也要补齐 jcodex 的固定鉴权参数。
-    provider.requires_openai_auth = false;
-    provider.http_headers = {
-        'x-openai-actor-authorization': 'local-image-extension',
-    };
-    provider.wire_api = wireApi;
     return stringifyTomlConfig(config);
 }
 
@@ -547,10 +517,9 @@ async function setapiCx(cmd, buildCfg) {
     utils.writeJsonFile(buildCfg.codexAuthPath, auth);
 
     if (baseUrl) {
-        toml = setJcodexProvider(toml, baseUrl, wireApi);
+        toml = setJcodexProvider(toml, baseUrl, wireApi, forcedKey);
     } else {
         toml = removeTopLevelModelProvider(toml);
-        toml = wireApi ? setJcodexWireApi(toml, wireApi) : removeJcodexWireApi(toml);
     }
     toml = ensureSandboxMode(toml);
     toml = removeEditorInsertNewlineKeymap(toml);
@@ -576,8 +545,6 @@ setapiCx._private = {
     removeEditorInsertNewlineKeymap: removeEditorInsertNewlineKeymap,
     removeTopLevelModelProvider: removeTopLevelModelProvider,
     removeJcodexProviderBlock: removeJcodexProviderBlock,
-    removeJcodexWireApi: removeJcodexWireApi,
-    setJcodexWireApi: setJcodexWireApi,
     setJcodexProvider: setJcodexProvider,
     getCurrentCodexChannelId: getCurrentCodexChannelId,
     saveLastManualOpenAiKey: saveLastManualOpenAiKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "base_parts_ai",
-  "version": "1.0.54",
+  "version": "1.0.55",
   "description": "jaskle base_parts_ai",
   "main": "./main.js",
   "registry": true,
@@ -31,8 +31,8 @@
   "author": "jaskle",
   "license": "ISC",
   "dependencies": {
+    "@ltd/j-toml": "^1.38.0",
     "commander": "^14.0.3",
-    "inquirer": "^8.2.7",
-    "smol-toml": "^1.6.1"
+    "inquirer": "^8.2.7"
   }
 }