@xbongbong/xbbcli 2.1.1 → 2.4.0

package/refund-list.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { readActiveConfig } from './xbb-config.js';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const REFUND_LIST_API_URL = 'https://proapi.xbongbong.com/pro/v2/api/refund/list';
@@ -11,20 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    const companies = Array.isArray(parsed)
-      ? parsed
-      : Array.isArray(parsed?.companies)
-        ? parsed.companies
-        : null;
-    if (companies) {
-      return companies.find((item) => item && item.enable) || {};
-    }
-    return parsed || {};
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/role-list.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { readActiveConfig } from './xbb-config.js';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/role/list';
@@ -11,20 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    const companies = Array.isArray(parsed)
-      ? parsed
-      : Array.isArray(parsed?.companies)
-        ? parsed.companies
-        : null;
-    if (companies) {
-      return companies.find((item) => item && item.enable) || {};
-    }
-    return parsed || {};
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/sign-in-list.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { readActiveConfig } from './xbb-config.js';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/signIn/list';
@@ -11,20 +12,7 @@ const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --co
 let lastPagination = null;
 
 function readConfig() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    const companies = Array.isArray(parsed)
-      ? parsed
-      : Array.isArray(parsed?.companies)
-        ? parsed.companies
-        : null;
-    if (companies) {
-      return companies.find((item) => item && item.enable) || {};
-    }
-    return parsed || {};
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/stage-get.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { readActiveConfig } from './xbb-config.js';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/stage/get';
@@ -10,20 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    const companies = Array.isArray(parsed)
-      ? parsed
-      : Array.isArray(parsed?.companies)
-        ? parsed.companies
-        : null;
-    if (companies) {
-      return companies.find((item) => item && item.enable) || {};
-    }
-    return parsed || {};
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/stage-jump.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { readActiveConfig } from './xbb-config.js';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/stage/jump';
@@ -10,20 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    const companies = Array.isArray(parsed)
-      ? parsed
-      : Array.isArray(parsed?.companies)
-        ? parsed.companies
-        : null;
-    if (companies) {
-      return companies.find((item) => item && item.enable) || {};
-    }
-    return parsed || {};
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/supplier-add.js

@@ -3,6 +3,7 @@ import os from 'node:os';
 import path from 'node:path';
 import crypto from 'node:crypto';
 import { cli, Strategy } from './xbb-registry.js';
+import { readActiveConfig } from './xbb-config.js';
 
 const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
@@ -10,20 +11,7 @@ const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/supplier/add';
 const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 
 function readConfig() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    const companies = Array.isArray(parsed)
-      ? parsed
-      : Array.isArray(parsed?.companies)
-        ? parsed.companies
-        : null;
-    if (companies) {
-      return companies.find((item) => item && item.enable) || {};
-    }
-    return parsed || {};
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function getRuntimeConfig() {

package/token-del.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { isEnvActive, isEnvOnly, getEnvVarNames } from './xbb-config.js';
 
 const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
@@ -66,6 +67,10 @@ async function delCompany(kwargs) {
     return createResult('error', '缺少 --corpid', '', '', '');
   }
 
+  if (isEnvOnly() || isEnvActive()) {
+    return createResult('error', `当前为环境变量模式（${getEnvVarNames().join(', ')}），不支持删除公司配置；如需多公司请改用 config.env`, corpid, '', '');
+  }
+
   const companies = readCompanies();
   if (!companies.length) {
     return createResult('error', '缺少本地配置；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>', corpid, '', 0);

package/token-generate.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { readActiveConfig } from './xbb-config.js';
 
 const CONFIG_FILE = path.join(os.homedir(), '.xbbcli', 'config.env');
 const API_URL = 'https://proapi.xbongbong.com/pro/v2/api/user/generateToken';
@@ -10,20 +11,7 @@ const DEFAULT_BASE_URL = 'https://proapi.xbongbong.com';
 const MISSING_TOKEN_MESSAGE = '缺少 token；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>';
 
 function readConfig() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    const companies = Array.isArray(parsed)
-      ? parsed
-      : Array.isArray(parsed?.companies)
-        ? parsed.companies
-        : null;
-    if (companies) {
-      return companies.find((item) => item && item.enable) || {};
-    }
-    return parsed || {};
-  } catch {
-    return {};
-  }
+  return readActiveConfig();
 }
 
 function resolveBaseUrl(corpid) {

package/token-list.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cli, Strategy } from './xbb-registry.js';
+import { readEnvConfig, hasEnvConfig, isEnvOnly } from './xbb-config.js';
 
 const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
@@ -50,7 +51,7 @@ function maskToken(token) {
   return `${value.slice(0, 8)}****${value.slice(-4)}`;
 }
 function makeErrorRow(code, msg) {
-  return [{ enable: '', corpid: '', corpName: '', userName: '', userId: '', baseurl: '', token: '', code, msg }];
+  return [{ enable: '', corpid: '', corpName: '', userName: '', userId: '', baseurl: '', token: '', code, msg, source: '' }];
 }
 
 cli({
@@ -64,9 +65,24 @@ cli({
   args: [
     { name: 'showToken', type: 'bool', default: false, help: '显示完整 token；默认只显示脱敏预览' },
   ],
-  columns: ['enable', 'corpid', 'userId', 'baseurl', 'token', 'corpName', 'userName', 'code', 'msg'],
+  columns: ['enable', 'corpid', 'userId', 'baseurl', 'token', 'corpName', 'userName', 'code', 'msg', 'source'],
   func: async (kwargs) => {
     const companies = readCompanies();
+    const envConfig = readEnvConfig();
+    if (isEnvOnly() || (!companies.some((item) => item && item.enable === true) && hasEnvConfig(envConfig))) {
+      return [{
+        enable: 'true',
+        corpid: String(envConfig.corpid || ''),
+        userId: String(envConfig.userId || ''),
+        baseurl: String(envConfig.baseurl || ''),
+        token: Boolean(kwargs.showToken) ? String(envConfig.token || '') : maskToken(envConfig.token),
+        corpName: String(envConfig.corpName || ''),
+        userName: String(envConfig.userName || ''),
+        code: '',
+        msg: '来源为环境变量 XBB_*（环境变量模式不支持多公司切换）',
+        source: 'env',
+      }];
+    }
     if (!companies.length) {
       return makeErrorRow('NO_CONFIG', '缺少本地配置；请先执行 xbbcli token-set --corpid <CORPID> --token <TOKEN> --userId <USERID>');
     }
@@ -82,6 +98,7 @@ cli({
       userName: String(item.userName || ''),
       code: '',
       msg: '',
+      source: 'config',
     }));
     if (enabledCount !== 1) {
       rows.push({
@@ -92,6 +109,7 @@ cli({
         token: '',
         corpName: '',
         userName: '',
+        source: 'config',
         code: 'INVALID_ENABLE',
         msg: `配置中启用（enable=true）的公司数量为 ${enabledCount}，请用 xbbcli token-use --corpid <CORPID> 修正`,
       });

package/token-set.js

@@ -1,374 +1,5 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { cli, Strategy, getRegistry } from './xbb-registry.js';
-
-const CONFIG_DIR = path.join(os.homedir(), '.xbbcli');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'config.env');
-const FORMLIST_FILE_SUFFIX = '.formlist.json';
-const COMMAND_MAP_FILE_SUFFIX = '.command-map.md';
-const DEPARTMENT_USER_FILE_SUFFIX = '.department-user.json';
-const READ_ALL_PAGE_SIZE = 200;
-const READ_ALL_MAX_PAGES = 1000;
-
-function resolveBaseUrl(corpid) {
-  if (corpid.startsWith('ding') || corpid.includes('$$ding')) {
-    return 'https://proapi.xbongbong.com';
-  }
-  return 'https://appapi.xbongbong.com';
-}
-
-function normalizeArg(value) {
-  return String(value || '').trim();
-}
-
-function getFormlistFile(corpid) {
-  return path.join(CONFIG_DIR, `${corpid}${FORMLIST_FILE_SUFFIX}`);
-}
-
-function getCommandMapFile(corpid) {
-  return path.join(CONFIG_DIR, `${corpid}${COMMAND_MAP_FILE_SUFFIX}`);
-}
-
-async function runCommandJson(name, kwargs) {
-  const command = getRegistry().get(`xbb/${name}`);
-  if (!command) throw new Error(`找不到命令：${name}`);
-  const rows = await command.func(kwargs);
-  if (!Array.isArray(rows)) throw new Error(`${name} 返回结果不是数组`);
-  return rows;
-}
-
-async function getFormlistRows(corpid, saasMark) {
-  const rows = await runCommandJson('form-list', { saasMark: String(saasMark) });
-
-  if (!Array.isArray(rows)) {
-    throw new Error(`form-list 返回结果不是数组：saasMark=${saasMark}`);
-  }
-
-  const errorRow = rows.find((item) => item && item.code);
-  if (errorRow) {
-    throw new Error(`form-list 获取失败（saasMark=${saasMark}）：${errorRow.code} ${errorRow.msg || ''}`.trim());
-  }
-
-  return rows;
-}
-
-async function requestPersonalToken(corpid, token, userId, resetToken) {
-  const rows = await runCommandJson('token-generate', {
-    checkUserId: userId,
-    resetToken: String(resetToken),
-    token,
-    corpid,
-  });
-
-  if (!Array.isArray(rows)) {
-    throw new Error('token-generate 返回结果不是数组');
-  }
-
-  const errorRow = rows.find((item) => item && String(item.code ?? '') !== '' && Number(item.code) !== 1);
-  if (errorRow) {
-    throw new Error(`token-generate 获取个人 token 失败：${errorRow.code} ${errorRow.msg || ''}`.trim());
-  }
-
-  return String(rows[0]?.token || '').trim();
-}
-
-async function getPersonalToken(corpid, token, userId) {
-  const existingToken = await requestPersonalToken(corpid, token, userId, 0);
-
-  if (existingToken) {
-    if (!existingToken.startsWith('user_')) {
-      throw new Error('token-generate 未返回有效的个人 token');
-    }
-    return existingToken;
-  }
-
-  const personalToken = await requestPersonalToken(corpid, token, userId, 1);
-  if (!personalToken.startsWith('user_')) {
-    throw new Error('token-generate 未返回有效的个人 token');
-  }
-
-  return personalToken;
-}
-
-async function writeFormlistFile(corpid) {
-  const customForms = await getFormlistRows(corpid, 2);
-  const systemForms = await getFormlistRows(corpid, 1);
-  const formlistFile = getFormlistFile(corpid);
-  const mergedRows = [...customForms, ...systemForms];
-
-  fs.writeFileSync(formlistFile, JSON.stringify(mergedRows, null, 2) + '\n', 'utf8');
-  return formlistFile;
-}
-
-function getDepartmentUserFile(corpid) {
-  return path.join(CONFIG_DIR, `${corpid}${DEPARTMENT_USER_FILE_SUFFIX}`);
-}
-
-async function fetchAllRows(name, pageSize) {
-  const rows = [];
-  for (let page = 1; page <= READ_ALL_MAX_PAGES; page += 1) {
-    const pageRows = await runCommandJson(name, { page: String(page), pageSize: String(pageSize) });
-    const errorRow = pageRows.find((item) => item && String(item.code ?? '') !== '');
-    if (errorRow) {
-      if (String(errorRow.code) === 'NO_DATA') {
-        return rows;
-      }
-      throw new Error(`${name} 获取失败（page=${page}）：${errorRow.code} ${errorRow.msg || ''}`.trim());
-    }
-    rows.push(...pageRows);
-  }
-  throw new Error(`${name} 分页超过 ${READ_ALL_MAX_PAGES} 页，未获取到完整数据`);
-}
-
-function parseDepartmentListField(value) {
-  if (Array.isArray(value)) {
-    return value;
-  }
-  const text = String(value ?? '').trim();
-  if (!text) {
-    return [];
-  }
-  try {
-    const parsed = JSON.parse(text);
-    return Array.isArray(parsed) ? parsed : text;
-  } catch {
-    return text;
-  }
-}
-
-function toDepartmentEntry(row) {
-  return {
-    id: row.id ?? '',
-    name: row.name ?? '',
-    parentId: row.parentId ?? '',
-    depIdRouter: row.depIdRouter ?? '',
-  };
-}
-
-function toUserEntry(row) {
-  return {
-    userId: row.userId ?? '',
-    name: row.name ?? '',
-    position: row.position ?? '',
-    jobnumber: row.jobnumber ?? '',
-    departmentList: parseDepartmentListField(row.departmentList),
-  };
-}
-
-async function writeDepartmentUserFile(corpid, userId) {
-  const departmentRows = await fetchAllRows('department-list', READ_ALL_PAGE_SIZE);
-  const userRows = await fetchAllRows('user-list', READ_ALL_PAGE_SIZE);
-  const payload = {
-    corpid,
-    updatedAt: new Date().toISOString(),
-    pageSize: READ_ALL_PAGE_SIZE,
-    departmentCount: departmentRows.length,
-    userCount: userRows.length,
-    departments: departmentRows.map(toDepartmentEntry),
-    users: userRows.map(toUserEntry),
-  };
-  const file = getDepartmentUserFile(corpid);
-  fs.mkdirSync(CONFIG_DIR, { recursive: true });
-  fs.writeFileSync(file, JSON.stringify(payload, null, 2) + '\n', 'utf8');
-  return { file, corpName: getCorpName(departmentRows), userName: getUserName(userRows, userId) };
-}
-
-function getCorpName(departmentRows) {
-  const root = departmentRows.find((row) => Number(row.id) === 1);
-  return root ? String(root.name || '').trim() : '';
-}
-
-function getUserName(userRows, userId) {
-  const target = String(userId || '').trim();
-  if (!target) {
-    return '';
-  }
-  const exact = userRows.find((row) => String(row.userId || '').trim() === target);
-  const matched = exact || userRows.find((row) => String(row.userId || '').trim().toLowerCase() === target.toLowerCase());
-  return matched ? String(matched.name || '').trim() : '';
-}
-
-function writeCompanyProfile(corpid, profile) {
-  const fields = Object.entries(profile).filter(([, value]) => String(value || '').trim() !== '');
-  if (!fields.length) {
-    return;
-  }
-  const patch = Object.fromEntries(fields);
-  const companies = readCompanies().map((item) => (
-    String(item.corpid || '').trim() === corpid ? { ...item, ...patch } : item
-  ));
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(companies, null, 2) + '\n', 'utf8');
-}
-
-function normalizeBusinessType(value) {
-  return String(value).trim().replace(/[)）\]】,，;；:：。!?！？]+$/g, '');
-}
-
-function getCommandBusinessType(command) {
-  if (command.businessType !== undefined && command.businessType !== null) {
-    return normalizeBusinessType(command.businessType);
-  }
-  const description = String(command.description || '');
-  const match = description.match(/businessType\s*:\s*(\d+)/i);
-  return match ? normalizeBusinessType(match[1]) : '';
-}
-
-function escapeCell(value) {
-  return String(value ?? '').replace(/\|/g, '\\|').replace(/\r?\n/g, ' ');
-}
-
-function optionDescription(option) {
-  return `--${option.name}: ${option.help || ''}`;
-}
-
-function writeCommandMap(corpid) {
-  const formFile = getFormlistFile(corpid);
-  if (!fs.existsSync(formFile)) {
-    throw new Error(`Form cache not found: ${formFile}`);
-  }
-  const raw = fs.readFileSync(formFile, 'utf8').replace(/^\uFEFF/, '');
-  const data = JSON.parse(raw);
-  const forms = Array.isArray(data) ? data : data.data || [];
-
-  const commands = [...getRegistry().values()]
-    .filter((command) => command.site === 'xbb')
-    .map((command) => ({
-      ...command,
-      command_options: command.args || [],
-    }));
-
-  const lines = [
-    '# XBB 命令映射',
-    '',
-    `来源：xbb --help；表单缓存：${path.basename(formFile)}`,
-    '',
-    '| 命令 | 命令名称 | formId | businessType | 字段说明 |',
-    '| --- | --- | --- | --- | --- |',
-  ];
-
-  for (const command of commands) {
-    const commandBusinessType = getCommandBusinessType(command);
-    const matchedForms = forms.filter((form) => String(form.businessType ?? '').trim() === commandBusinessType);
-    const formIds = [...new Set(matchedForms.map((form) => form.formId).filter(Boolean))];
-    const businessTypes = [...new Set(matchedForms.map((form) => form.businessType).filter(Boolean))];
-    const options = (command.command_options || []).map(optionDescription).join('<br>');
-    lines.push(
-      `| ${escapeCell(command.name)} | ${escapeCell(command.description)} | ${escapeCell(formIds.join(', '))} | ${escapeCell(businessTypes.join(', ') || commandBusinessType)} | ${escapeCell(options)} |`,
-    );
-  }
-
-  const commandMapFile = getCommandMapFile(corpid);
-  fs.mkdirSync(CONFIG_DIR, { recursive: true });
-  fs.writeFileSync(commandMapFile, `${lines.join('\n')}\n`, 'utf8');
-  return commandMapFile;
-}
-
-function createResult(status, message, corpid, baseurl, userId, formlistFile = '', commandMapFile = '', enable = '', companyCount = '', departmentUserFile = '', corpName = '', userName = '') {
-  return [{
-    status,
-    message,
-    configFile: CONFIG_FILE,
-    corpid,
-    baseurl,
-    userId,
-    enable,
-    companyCount,
-    formlistFile,
-    commandMapFile,
-    departmentUserFile,
-    corpName,
-    userName,
-  }];
-}
-
-function readCompanies() {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-    return normalizeCompanies(parsed);
-  } catch {
-    return [];
-  }
-}
-
-function normalizeCompanies(parsed) {
-  if (Array.isArray(parsed)) {
-    return parsed.filter((item) => item && typeof item === 'object');
-  }
-  if (parsed && Array.isArray(parsed.companies)) {
-    return parsed.companies.filter((item) => item && typeof item === 'object');
-  }
-  if (parsed && parsed.corpid) {
-    const { corpid, token, baseurl, userId } = parsed;
-    return [{ corpid, token, baseurl, userId, enable: true }];
-  }
-  return [];
-}
-
-function upsertCompany(companies, entry) {
-  const index = companies.findIndex((item) => String(item.corpid || '').trim() === entry.corpid);
-  const next = companies.map((item) => ({ ...item, enable: false }));
-  if (index === -1) {
-    next.push({ ...entry, enable: true });
-  } else {
-    next[index] = { ...next[index], ...entry, enable: true };
-  }
-  return next;
-}
-
-async function setToken(kwargs) {
-  const corpid = normalizeArg(kwargs.corpid);
-  const token = normalizeArg(kwargs.token);
-  const userId = normalizeArg(kwargs.userId);
-
-  if (!corpid) {
-    return createResult('error', '缺少 --corpid', '', '', '');
-  }
-
-  if (!token) {
-    return createResult('error', '缺少 --token', corpid, '', '');
-  }
-
-  if (!userId) {
-    return createResult('error', '缺少 --userId', corpid, '', '');
-  }
-
-  let personalToken = token;
-  if (!token.startsWith('user_')) {
-    try {
-      personalToken = await getPersonalToken(corpid, token, userId);
-    } catch (error) {
-      return createResult('error', `生成个人 token 失败：${error.message}`, corpid, '', userId);
-    }
-  }
-
-  const baseurl = resolveBaseUrl(corpid);
-  const companies = upsertCompany(readCompanies(), { corpid, token: personalToken, baseurl, userId });
-
-  fs.mkdirSync(CONFIG_DIR, { recursive: true });
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(companies, null, 2) + '\n', 'utf8');
-
-  try {
-    const formlistFile = await writeFormlistFile(corpid);
-    const commandMapFile = writeCommandMap(corpid);
-    const { file: departmentUserFile, corpName, userName } = await writeDepartmentUserFile(corpid, userId);
-    writeCompanyProfile(corpid, { corpName, userName });
-    return createResult('ok', '已保存 corpid、token、baseurl、userId，并同步表单模板缓存、命令映射文件与部门/员工缓存', corpid, baseurl, userId, formlistFile, commandMapFile, true, companies.length, departmentUserFile, corpName, userName);
-  } catch (error) {
-    return createResult(
-      'partial',
-      `已保存 corpid、token、baseurl、userId，但同步缓存失败：${error.message}`,
-      corpid,
-      baseurl,
-      userId,
-      getFormlistFile(corpid),
-      '',
-      true,
-      companies.length,
-      '',
-    );
-  }
-}
+import { cli, Strategy } from './xbb-registry.js';
+import { saveCompanyCredentials } from './xbb-token-store.js';
 
 cli({
   site: 'xbb',
@@ -381,7 +12,8 @@ cli({
     { name: 'corpid', type: 'str', help: '公司id（必填）' },
     { name: 'token', type: 'str', help: '要保存的 API token' },
     { name: 'userId', type: 'str', help: '操作人id（必填）' },
+    { name: 'noEnv', type: 'bool', default: false, help: '不写入环境变量，仅保存到 config.env' },
   ],
-  columns: ['status', 'message', 'configFile', 'corpid', 'baseurl', 'userId', 'enable', 'companyCount', 'formlistFile', 'commandMapFile', 'departmentUserFile', 'corpName', 'userName'],
-  func: setToken,
-});
+  columns: ['status', 'message', 'configFile', 'corpid', 'baseurl', 'userId', 'enable', 'companyCount', 'formlistFile', 'commandMapFile', 'departmentUserFile', 'corpName', 'userName', 'envStored', 'envFile'],
+  func: saveCompanyCredentials,
+});