llm-api-gateway-cli 1.0.5 → 1.0.6

package/lib/config.js

@@ -11,6 +11,8 @@
 import { DEFAULT_BASE_URL, strArg } from './common.js';
 import { resolveSecretKey } from './secrets.js';
 import { resolveSettings, settingsFilePath } from './settings.js';
+// CLI 侧语言：这四个 CLI 入口的报错与提示都从这里取词（默认中文）
+import { pick } from './i18n.js';
 
 /**
  * 缺密钥时的统一提示（各 CLI 文案一致，避免用户按提示改了还是不通）。
@@ -24,6 +26,24 @@ export const KEY_HINT =
   + '② 或 gateway-agent config set key sk-xxx / 在任务页·聊天页「设置」里填（都存 credentials.json，仅本用户可读）；'
   + '③ 或 --key sk-xxx、环境变量 SK / GATEWAY_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY，或在 .env 中写 GATEWAY_KEY=sk-xxx';
 
+/**
+ * 英文版提示（只给 CLI 侧用）。
+ *
+ * 为什么不直接把 KEY_HINT 改成 `pick(...)`：它是**模块级常量**，import 时就求值了，
+ * 而语言是入口脚本 parseArgs 之后才 setLang 的 —— 那样永远只会拿到中文（见 lib/i18n.js 纪律 3）。
+ * 所以保留 KEY_HINT 这个常量的中文原样（既有测试与调用方都按值用它），
+ * 需要按语言取词的地方调 `keyHint()`。
+ */
+export const KEY_HINT_EN =
+  'Missing sk- key: (1) run gateway-agent setup (first-time setup: it asks once for the gateway URL and the key); '
+  + '(2) or gateway-agent config set key sk-xxx, or fill it in the task/chat page under "Settings" (both write credentials.json, readable by this user only); '
+  + '(3) or --key sk-xxx, env SK / GATEWAY_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY, or GATEWAY_KEY=sk-xxx in .env';
+
+/** 按当前 CLI 语言取密钥提示（默认中文） */
+export function keyHint() {
+  return pick(KEY_HINT, KEY_HINT_EN);
+}
+
 /**
  * 数字参数：非法值（NaN / 布尔 / 空串）一律返回 undefined。
  * 之前直接 Number(v) 会把 --temperature abc 变成 NaN 塞给上游，报错信息很难看懂。
@@ -80,11 +100,11 @@ export function resolveConfig(args = {}, { defaultModel = '', defaultMaxTokens,
   };
 }
 
-/** 把异常压成一行可读中文（上游错误、HTTP 状态、普通异常都覆盖） */
+/** 把异常压成一行可读文字（上游错误、HTTP 状态、普通异常都覆盖） */
 export function errorMessage(e) {
   const status = e?.status ?? e?.statusCode ?? '';
   const message = e?.error?.message || e?.message || String(e);
-  return `[错误]${status ? ` HTTP ${status}` : ''}: ${message}`;
+  return pick(`[错误]${status ? ` HTTP ${status}` : ''}: ${message}`, `[error]${status ? ` HTTP ${status}` : ''}: ${message}`);
 }
 
 /**

package/lib/configcmd.js

@@ -11,6 +11,9 @@
  * 密钥（`key`）走**另一条路**：它不进 config.json，而是写 `<数据根>/credentials.json`（仅属主可读），
  * 所以 `set key` 不是「被拒绝」，而是「写到另一个文件」。命令行的说法与 Web 设置面板完全一致 ——
  * 这也是「不用手写 .env 就能用」的落点。
+ *
+ * 输出语言（20260922）：文案全部走 `pick(中文, 英文)`，默认中文一字不变；
+ * 语言由入口脚本 setLang 设好，这里只管取词。**pick 必须在函数里调用**（见 lib/i18n.js 纪律 3）。
  */
 
 import {
@@ -24,10 +27,19 @@ import {
   SETTINGS_SCHEMA,
 } from './settings.js';
 import { clearSecret, keyRow, secretFilePath, secretSourceText, writeSecret } from './secrets.js';
+import { pick } from './i18n.js';
 
-const SOURCE_LABEL = { flag: '命令行', env: '环境变量', file: '配置文件', default: '内置默认' };
+/** 来源标签：中英各留一份，取词在函数里做 —— 顶层 pick 会在 setLang 之前求值，永远拿到中文 */
+const SOURCE_LABEL_ZH = { flag: '命令行', env: '环境变量', file: '配置文件', default: '内置默认' };
+const SOURCE_LABEL_EN = { flag: 'command line', env: 'environment variable', file: 'config file', default: 'built-in default' };
 /** 密钥的来源只有三层（它不在 config.json 里），所以单独一套标签 */
-const SECRET_SOURCE_LABEL = { flag: '命令行 --key', env: '环境变量', file: '密钥文件', default: '未配置' };
+const SECRET_SOURCE_LABEL_ZH = { flag: '命令行 --key', env: '环境变量', file: '密钥文件', default: '未配置' };
+const SECRET_SOURCE_LABEL_EN = { flag: 'command line --key', env: 'environment variable', file: 'secret file', default: 'not configured' };
+
+/** 取标签；认不出的来源原样回显（与旧行为一致）。
+ *  注意 pick() 只认字符串：整张表传进去会因为 en 不是字符串而**静默回落中文**，所以按 key 逐个取词。 */
+const sourceLabel = (s) => pick(SOURCE_LABEL_ZH[s], SOURCE_LABEL_EN[s]) || s;
+const secretSourceLabel = (s) => pick(SECRET_SOURCE_LABEL_ZH[s], SECRET_SOURCE_LABEL_EN[s]) || s;
 
 /** CLI 传进来的值是字符串；这里粗切一下，`set system 你是助手 请简短` 的剩余部分都算值 */
 export function splitConfigArg(arg) {
@@ -37,9 +49,9 @@ export function splitConfigArg(arg) {
 }
 
 const show = (v) => {
-  if (v === null || v === undefined) return '（未设）';
-  if (Array.isArray(v)) return v.length ? `${v.length} 项` : '（空）';
-  if (typeof v === 'string') return v.length > 40 ? `${v.slice(0, 39)}…` : v || '（空串）';
+  if (v === null || v === undefined) return pick('（未设）', '(not set)');
+  if (Array.isArray(v)) return v.length ? pick(`${v.length} 项`, `${v.length} item(s)`) : pick('（空）', '(empty)');
+  if (typeof v === 'string') return v.length > 40 ? `${v.slice(0, 39)}…` : v || pick('（空串）', '(empty string)');
   return String(v);
 };
 
@@ -47,8 +59,18 @@ const show = (v) => {
 function overrideWarning(resolved, key) {
   const source = resolved.sources[key];
   const entry = SETTINGS_SCHEMA.find((e) => e.key === key);
-  if (source === 'flag') return `注意：当前生效值来自命令行参数（${entry?.flag || key}），它优先于配置文件，你写的值现在不会生效。`;
-  if (source === 'env') return `注意：当前生效值来自环境变量 ${entry?.env}，它优先于配置文件，你写的值现在不会生效。`;
+  if (source === 'flag') {
+    return pick(
+      `注意：当前生效值来自命令行参数（${entry?.flag || key}），它优先于配置文件，你写的值现在不会生效。`,
+      `Note: the effective value comes from the command-line option (${entry?.flag || key}), which overrides the config file — what you just wrote will not take effect.`,
+    );
+  }
+  if (source === 'env') {
+    return pick(
+      `注意：当前生效值来自环境变量 ${entry?.env}，它优先于配置文件，你写的值现在不会生效。`,
+      `Note: the effective value comes from environment variable ${entry?.env}, which overrides the config file — what you just wrote will not take effect.`,
+    );
+  }
   return '';
 }
 
@@ -69,8 +91,12 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
     return {
       code: 0,
       out:
-        `${r.file}\n${r.exists ? '（已存在）' : '（还没有这份文件；set 一次就会创建）'}\n` +
-        `${s.file}\n${s.hasKey ? `（已存在，${s.mask}，来自${secretSourceText(s.source)}）` : '（还没有；config set key sk-xxx 或页面设置里填）'}\n`,
+        `${r.file}\n${r.exists ? pick('（已存在）', '(exists)') : pick('（还没有这份文件；set 一次就会创建）', '(no such file yet; one `config set` creates it)')}\n` +
+        `${s.file}\n${
+          s.hasKey
+            ? pick(`（已存在，${s.mask}，来自${secretSourceText(s.source)}）`, `(exists, ${s.mask}, from ${secretSourceText(s.source)})`)
+            : pick('（还没有；config set key sk-xxx 或页面设置里填）', '(not set yet; run `config set key sk-xxx` or fill it in the settings page)')
+        }\n`,
       err: '',
     };
   }
@@ -80,10 +106,16 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
     // 密钥行排在最前：它是「能不能用」的前提，而它不在 config.json 里，单独标出来免得用户去文件里翻
     const secret = secretRow();
     const rows = [
-      ['配置项', '当前值', '来源'],
-      ['key', secret.hasKey ? `${secret.mask}（存 ${secret.file}）` : '（未配置）', SECRET_SOURCE_LABEL[secret.source] || secret.source],
+      [pick('配置项', 'Setting'), pick('当前值', 'Current value'), pick('来源', 'Source')],
+      [
+        'key',
+        secret.hasKey
+          ? pick(`${secret.mask}（存 ${secret.file}）`, `${secret.mask} (in ${secret.file})`)
+          : pick('（未配置）', '(not configured)'),
+        secretSourceLabel(secret.source),
+      ],
       ...SETTINGS_SCHEMA.map((e) => {
-        const row = [e.key, show(getByPath(r.values, e.key)), SOURCE_LABEL[r.sources[e.key]] || r.sources[e.key]];
+        const row = [e.key, show(getByPath(r.values, e.key)), sourceLabel(r.sources[e.key])];
         if (e.restart) row[0] = `${e.key} *`;
         return row;
       }),
@@ -91,32 +123,45 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
     const w = [0, 1, 2].map((i) => Math.max(...rows.map((row) => [...row[i]].length)));
     const body = rows.map((row, i) => row.map((c, ci) => pad(c, w[ci])).join('  ').trimEnd()).join('\n');
     const warns = [...r.warnings, ...[secret.warning].filter(Boolean)];
-    const warn = warns.length ? `\n\n[警告]\n${warns.map((x) => `  ${x}`).join('\n')}` : '';
+    const warn = warns.length ? `${pick('\n\n[警告]\n', '\n\n[Warnings]\n')}${warns.map((x) => `  ${x}`).join('\n')}` : '';
     return {
       code: 0,
       out:
         `${body}\n\n` +
-        `来源：命令行 > 环境变量 > 配置文件 > 内置默认。带 * 的改了要重启服务才生效。\n` +
-        `配置文件：${r.file}${r.exists ? '' : '（还没有，用 config set 创建）'}\n` +
-        `密钥不入配置文件：key 存在 ${secret.file}（仅本用户可读），环境变量 / --key 给的密钥优先于它。\n` +
-        `改某项：gateway-agent config set <键> <值>；改回来：config unset <键>${warn}\n`,
+        pick(
+          `来源：命令行 > 环境变量 > 配置文件 > 内置默认。带 * 的改了要重启服务才生效。\n` +
+            `配置文件：${r.file}${r.exists ? '' : '（还没有，用 config set 创建）'}\n` +
+            `密钥不入配置文件：key 存在 ${secret.file}（仅本用户可读），环境变量 / --key 给的密钥优先于它。\n` +
+            `改某项：gateway-agent config set <键> <值>；改回来：config unset <键>`,
+          `Source: command line > environment variable > config file > built-in default. Rows marked * only take effect after a service restart.\n` +
+            `Config file: ${r.file}${r.exists ? '' : ' (none yet; create it with config set)'}\n` +
+            `The secret is not stored in the config file: key lives in ${secret.file} (readable by this user only), and a key from the environment / --key takes precedence over it.\n` +
+            `Change a setting: gateway-agent config set <key> <value>; revert: config unset <key>`,
+        ) +
+        `${warn}\n`,
       err: '',
     };
   }
 
   if (action === 'get') {
-    if (!key) return { code: 1, out: '', err: '用法：gateway-agent config get <键>\n' };
+    if (!key) return { code: 1, out: '', err: pick('用法：gateway-agent config get <键>\n', 'Usage: gateway-agent config get <key>\n') };
     if (key === 'key') {
       const s = secretRow();
       const lines = [
         // 明文永不回显：命令行输出经常被贴进 issue / 日志
-        `key = ${s.hasKey ? s.mask : '（未配置）'}`,
-        `  来源      ${SECRET_SOURCE_LABEL[s.source] || s.source}`,
-        `  存放      ${s.file}${s.fileMode ? `（权限 ${s.fileMode.toString(8)}）` : ''}`,
-        '  说明      密钥不写进 config.json；这里只回掩码，明文请回网关后台重新生成',
-        '  环境变量  SK / GATEWAY_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY',
-        '  命令行    --key',
-        s.warning ? `  警告      ${s.warning}` : '',
+        `key = ${s.hasKey ? s.mask : pick('（未配置）', '(not configured)')}`,
+        pick(`  来源      ${secretSourceLabel(s.source)}`, `  Source    ${secretSourceLabel(s.source)}`),
+        pick(
+          `  存放      ${s.file}${s.fileMode ? `（权限 ${s.fileMode.toString(8)}）` : ''}`,
+          `  Location  ${s.file}${s.fileMode ? ` (mode ${s.fileMode.toString(8)})` : ''}`,
+        ),
+        pick(
+          '  说明      密钥不写进 config.json；这里只回掩码，明文请回网关后台重新生成',
+          '  Note      the key is never written to config.json; only a mask is shown here — regenerate the plaintext in the gateway console',
+        ),
+        pick('  环境变量  SK / GATEWAY_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY', '  Env       SK / GATEWAY_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY'),
+        pick('  命令行    --key', '  Flag      --key'),
+        s.warning ? pick(`  警告      ${s.warning}`, `  Warning   ${s.warning}`) : '',
       ].filter(Boolean);
       return { code: 0, out: `${lines.join('\n')}\n`, err: '' };
     }
@@ -125,18 +170,27 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
     const r = resolved();
     const lines = [
       `${key} = ${JSON.stringify(getByPath(r.values, key))}`,
-      `  来源      ${SOURCE_LABEL[r.sources[key]] || r.sources[key]}`,
-      `  内置默认  ${JSON.stringify(defaultValueOf(entry))}`,
-      `  说明      ${entry.desc}`,
-      entry.env ? `  环境变量  ${entry.env}` : '',
-      entry.flag ? `  命令行    ${entry.flag}` : '',
-      entry.restart ? '  注意      改这项需要重启服务才生效' : '',
+      pick(`  来源      ${sourceLabel(r.sources[key])}`, `  Source    ${sourceLabel(r.sources[key])}`),
+      pick(`  内置默认  ${JSON.stringify(defaultValueOf(entry))}`, `  Default   ${JSON.stringify(defaultValueOf(entry))}`),
+      pick(`  说明      ${entry.desc}`, `  Note      ${entry.desc}`),
+      entry.env ? pick(`  环境变量  ${entry.env}`, `  Env       ${entry.env}`) : '',
+      entry.flag ? pick(`  命令行    ${entry.flag}`, `  Flag      ${entry.flag}`) : '',
+      entry.restart ? pick('  注意      改这项需要重启服务才生效', '  Note      changing this takes effect only after a service restart') : '',
     ].filter(Boolean);
     return { code: 0, out: `${lines.join('\n')}\n`, err: '' };
   }
 
   if (action === 'set') {
-    if (!key || rest.length === 0) return { code: 1, out: '', err: '用法：gateway-agent config set <键> <值>（字符串带空格时整段都要写上）\n' };
+    if (!key || rest.length === 0) {
+      return {
+        code: 1,
+        out: '',
+        err: pick(
+          '用法：gateway-agent config set <键> <值>（字符串带空格时整段都要写上）\n',
+          'Usage: gateway-agent config set <key> <value> (pass the whole string when the value contains spaces)\n',
+        ),
+      };
+    }
     const value = rest.join(' ');
     // 密钥：写 credentials.json，不碰 config.json（红线没变，只是换了落点）
     if (key === 'key') {
@@ -144,12 +198,17 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
         const w = writeSecret(value, { file: secretFile });
         const s = secretRow();
         const override = s.source === 'env' || s.source === 'flag'
-          ? '\n注意：当前进程的密钥来自环境变量 / --key，它优先于这个文件，你写的值现在不会生效。'
+          ? pick(
+            '\n注意：当前进程的密钥来自环境变量 / --key，它优先于这个文件，你写的值现在不会生效。',
+            '\nNote: this process takes the key from the environment / --key, which overrides this file — what you just wrote will not take effect.',
+          )
           : '';
-        const perm = w.mode ? `（权限 ${w.mode.toString(8)}）` : '（Windows：靠用户目录 ACL）';
         return {
           code: 0,
-          out: `已写入 ${w.file}${perm}：key = ${s.mask}${w.warning ? `\n${w.warning}` : ''}${override}\n`,
+          out: pick(
+            `已写入 ${w.file}${w.mode ? `（权限 ${w.mode.toString(8)}）` : '（Windows：靠用户目录 ACL）'}：key = ${s.mask}${w.warning ? `\n${w.warning}` : ''}${override}\n`,
+            `Written to ${w.file}${w.mode ? ` (mode ${w.mode.toString(8)})` : ' (Windows: relies on the user-directory ACL)'}: key = ${s.mask}${w.warning ? `\n${w.warning}` : ''}${override}\n`,
+          ),
           err: '',
         };
       } catch (e) {
@@ -161,11 +220,11 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
       const r = resolved();
       const warn = overrideWarning(r, key);
       const entry = SETTINGS_SCHEMA.find((e) => e.key === key);
-      const restart = entry?.restart ? '\n（这项要重启服务才生效）' : '';
+      const restart = entry?.restart ? pick('\n（这项要重启服务才生效）', '\n(this only takes effect after a service restart)') : '';
       const shown = show(getByPath(r.values, key));
       return {
         code: 0,
-        out: `已写入 ${res.file}：${key} = ${shown}${restart}${warn ? `\n${warn}` : ''}\n`,
+        out: `${pick(`已写入 ${res.file}：${key} = ${shown}`, `Wrote ${key} = ${shown} to ${res.file}`)}${restart}${warn ? `\n${warn}` : ''}\n`,
         err: '',
       };
     } catch (e) {
@@ -174,14 +233,19 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
   }
 
   if (action === 'unset' || action === 'rm') {
-    if (!key) return { code: 1, out: '', err: '用法：gateway-agent config unset <键>\n' };
+    if (!key) return { code: 1, out: '', err: pick('用法：gateway-agent config unset <键>\n', 'Usage: gateway-agent config unset <key>\n') };
     if (key === 'key') {
       const cleared = clearSecret({ file: secretFile });
       const s = secretRow();
-      const still = s.hasKey ? `当前生效的仍是${SECRET_SOURCE_LABEL[s.source] || s.source}的密钥：${s.mask}` : '现在没有可用的密钥了。';
+      const still = s.hasKey
+        ? pick(`当前生效的仍是${secretSourceLabel(s.source)}的密钥：${s.mask}`, `the effective key still comes from ${secretSourceLabel(s.source)}: ${s.mask}`)
+        : pick('现在没有可用的密钥了。', 'there is no usable key now.');
       return {
         code: 0,
-        out: `${cleared.removed ? `已删掉 ${cleared.file}，` : `本来就没有 ${cleared.file}，`}${still}\n`,
+        out: pick(
+          `${cleared.removed ? `已删掉 ${cleared.file}，` : `本来就没有 ${cleared.file}，`}${still}\n`,
+          `${cleared.removed ? `Removed ${cleared.file}; ` : `there was no ${cleared.file}; `}${still}\n`,
+        ),
         err: '',
       };
     }
@@ -191,15 +255,31 @@ export function configCommand(argv = [], { env = process.env, file = settingsFil
       const now = show(getByPath(r.values, key));
       const warn = overrideWarning(r, key);
       if (!res.removed.length) {
-        return { code: 0, out: `${key} 本来就没在配置文件里，现在用的仍是${SOURCE_LABEL[r.sources[key]] || r.sources[key]}的值：${now}${warn ? `\n${warn}` : ''}\n`, err: '' };
+        return {
+          code: 0,
+          out:
+            pick(
+              `${key} 本来就没在配置文件里，现在用的仍是${sourceLabel(r.sources[key])}的值：${now}`,
+              `${key} was not in the config file; the value in effect is still the one from ${sourceLabel(r.sources[key])}: ${now}`,
+            ) + `${warn ? `\n${warn}` : ''}\n`,
+          err: '',
+        };
       }
-      return { code: 0, out: `已从 ${res.file} 删掉 ${key}，现在生效的是：${now}${warn ? `\n${warn}` : ''}\n`, err: '' };
+      return {
+        code: 0,
+        out:
+          pick(
+            `已从 ${res.file} 删掉 ${key}，现在生效的是：${now}`,
+            `Removed ${key} from ${res.file}; the value now in effect is: ${now}`,
+          ) + `${warn ? `\n${warn}` : ''}\n`,
+        err: '',
+      };
     } catch (e) {
       return { code: 1, out: '', err: `${e.message}\n` };
     }
   }
 
-  return { code: 1, out: '', err: `未知子命令 ${action}\n\n${configHelp()}` };
+  return { code: 1, out: '', err: `${pick(`未知子命令 ${action}`, `Unknown subcommand ${action}`)}\n\n${configHelp()}` };
 }
 
 /** 中文对齐：按显示宽度补齐（中文算两格），否则表格会歪 */
@@ -209,8 +289,8 @@ function pad(text, width) {
   return s + ' '.repeat(Math.max(0, width - w));
 }
 
-export function configHelp() {
-  return `用法：gateway-agent config <子命令>
+/** config help 正文：两块模板，函数里 pick（见 lib/i18n.js 纪律 3） */
+const CONFIG_HELP_ZH = `用法：gateway-agent config <子命令>
 
   list              列出所有配置项、当前值与来源（默认）
   get <键>          查看某一项（含默认值、说明、对应的环境变量与命令行选项）
@@ -227,4 +307,25 @@ Web 界面「设置」里的密钥输入框写的是同一个文件 —— 命
 
 REPL 里同一套：/config、/config set <键> <值>、/config get <键>、/config unset <键>
 `;
+
+const CONFIG_HELP_EN = `Usage: gateway-agent config <subcommand>
+
+  list              list every setting with its current value and source (default)
+  get <key>         show one setting (default value, description, matching env var and CLI option)
+  set <key> <value> write to the config file (atomic write; bad input fails loudly and lists valid keys)
+  unset <key>       remove a setting and fall back to the built-in default
+  path              print the paths of the config file and the secret file
+
+The config file path can be overridden with the LLM_GATEWAY_CONFIG environment variable.
+Priority: command line > environment variable > config file > built-in default — the "Source" column of list tells you which layer the effective value comes from.
+
+The secret (key) takes another path: config set key sk-xxx writes <data root>/credentials.json (readable by this user only)
+and is **never written to config.json**; a key from the command line / environment / .env takes precedence over it. get key returns only a mask, never the plaintext.
+The key input in the Web "Settings" panel writes the same file — the CLI and the UI never store two copies.
+
+The REPL uses the same set: /config, /config set <key> <value>, /config get <key>, /config unset <key>
+`;
+
+export function configHelp() {
+  return pick(CONFIG_HELP_ZH, CONFIG_HELP_EN);
 }