yingclaw 2.4.5 → 2.5.1

package/README.md

@@ -72,7 +72,6 @@ claw config          # 配置 API 连接
 claw code            # 接入 Claude Code 终端
 claw desktop         # 接入 Claude 桌面应用
 claw switch          # 快速切换厂商或模型
-claw prompt          # 配置系统提示词（按模型独立保存）
 claw status          # 查看当前配置，验证 Key 是否有效
 claw update          # 检查并升级到最新版本
 
@@ -82,6 +81,7 @@ claw reset           # 清除所有 yingclaw 配置
 
 claw install-claude  # 安装 Claude Code
 claw setup           # 兼容旧命令：config + code
+
 ```
 
 ## 平台支持

package/bin/cli.js

@@ -5,8 +5,6 @@ const { select, input, confirm } = require('@inquirer/prompts');
 const {
   loadConfig,
   saveConfig,
-  getSystemPrompt,
-  setSystemPrompt,
   writeEnvToZshrc,
   clearClaudeCodeEnv,
   fetchModels,
@@ -23,7 +21,7 @@ const {
 const { execSync, spawn, spawnSync } = require('child_process');
 const pkg = require('../package.json');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
-const { buildClaudeInstallCommand } = require('../lib/install');
+const { buildClaudeInstallCommand, checkNodeEnv, getNodeInstallGuide, getInstallFailureHints } = require('../lib/install');
 const { clearClaudeDesktopConfig, isDesktopConfigured, openClaudeDesktop, writeClaudeDesktopConfig } = require('../lib/desktop');
 const { runDoctorChecks, summarize, STATUS_OK, STATUS_FAIL, STATUS_WARN, STATUS_INFO } = require('../lib/doctor');
 
@@ -237,14 +235,6 @@ async function showStatus() {
     env: process.env,
   });
 
-  const systemPromptText = getSystemPrompt(config);
-  if (systemPromptText) {
-    const preview = systemPromptText.length > 60 ? systemPromptText.slice(0, 60) + '…' : systemPromptText;
-    view.lines.push({ label: '系统提示词', value: preview });
-  } else {
-    view.lines.push({ label: '系统提示词', value: '未配置' });
-  }
-
   const lines = view.lines.map(({ label, value }) => {
     const coloredValue = label === '厂商'
       ? chalk.white.bold(value)
@@ -364,7 +354,7 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
     cfg = customConfig || { provider: providerKey, model, fastModel, apiKey, baseUrl: provider.baseUrl, availableModels };
     saveConfig(cfg);
     if (writeCodeEnv) {
-      ({ file } = writeEnvToZshrc(cfg.baseUrl, cfg.apiKey, cfg.model, cfg.fastModel, { systemPrompt: getSystemPrompt(cfg) }));
+      ({ file } = writeEnvToZshrc(cfg.baseUrl, cfg.apiKey, cfg.model, cfg.fastModel));
     }
     spinner.succeed(chalk.green(writeCodeEnv ? 'API 连接已保存，Claude Code 终端已接入' : 'API 连接已保存'));
   } catch (e) {
@@ -412,6 +402,31 @@ program
       if (!yes) return;
     } catch {}
 
+    // 检查 npm / Node.js 环境
+    const nodeEnv = checkNodeEnv();
+    if (!nodeEnv.npmOk) {
+      console.log(boxen(
+        chalk.bold.red('未检测到 npm，无法安装 Claude Code\n\n') +
+        chalk.dim('Claude Code 通过 npm 安装，需要先安装 Node.js（含 npm）。\n\n') +
+        chalk.bold('安装方式：\n') +
+        getNodeInstallGuide().map(l => chalk.cyan('  ' + l)).join('\n') +
+        '\n\n' + chalk.dim('安装完成后重新运行 claw install-claude'),
+        { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'red', margin: { top: 1, bottom: 1 } }
+      ));
+      return;
+    }
+    if (!nodeEnv.nodeOk) {
+      console.log(boxen(
+        chalk.bold.yellow(`Node.js 版本过低（当前 v${nodeEnv.nodeVersion}，需要 ≥18）\n\n`) +
+        chalk.dim('Claude Code 要求 Node.js ≥18，当前版本可能导致安装或运行失败。\n\n') +
+        chalk.bold('升级方式：\n') +
+        getNodeInstallGuide().map(l => chalk.cyan('  ' + l)).join('\n'),
+        { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'yellow', margin: { top: 1, bottom: 1 } }
+      ));
+      const proceed = await confirm({ message: '仍然尝试安装？', default: false });
+      if (!proceed) return;
+    }
+
     const network = await select({ loop: false,
       message: chalk.cyan('你的网络环境'),
       choices: [
@@ -433,10 +448,9 @@ program
       console.log(chalk.green('\n✔ Claude Code 安装成功！'));
     } else {
       console.log(chalk.red('\n✘ 安装失败'));
+      const hints = getInstallFailureHints(result, chalk);
       console.log(boxen(
-        chalk.bold('手动安装：\n\n') +
-        chalk.cyan('npm config set registry https://registry.npmmirror.com\n') +
-        chalk.cyan('npm install -g @anthropic-ai/claude-code'),
+        hints.join(''),
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'yellow', margin: { top: 1, bottom: 1 } }
       ));
       return;
@@ -492,7 +506,7 @@ program
     const spinner = ora('写入 Claude Code 终端环境变量...').start();
     let file;
     try {
-      ({ file } = writeEnvToZshrc(config.baseUrl, config.apiKey, config.model, config.fastModel, { systemPrompt: getSystemPrompt(config) }));
+      ({ file } = writeEnvToZshrc(config.baseUrl, config.apiKey, config.model, config.fastModel));
       spinner.succeed(chalk.green(`Claude Code 终端已接入 → ${file}`));
     } catch (e) {
       spinner.fail(chalk.red(`写入失败: ${e.message}`));
@@ -643,105 +657,6 @@ program
     await offerDesktopSync(chalk, ora, newConfig);
   });
 
-program
-  .command('prompt')
-  .description('配置系统提示词')
-  .action(async () => {
-    const chalk = (await import('chalk')).default;
-    const ora = (await import('ora')).default;
-    const boxen = (await import('boxen')).default;
-
-    console.log(await getBanner());
-
-    const config = loadConfig();
-    if (!config) {
-      console.log(chalk.red('\n未配置 API 连接，请先运行: claw config\n'));
-      return;
-    }
-
-    const provider = PROVIDERS[config.provider];
-    const providerName = config.providerName || provider?.name || config.provider;
-    const currentPrompt = getSystemPrompt(config);
-
-    console.log(chalk.dim(`  当前模型：${providerName} · ${config.model}\n`));
-
-    if (currentPrompt) {
-      const preview = currentPrompt.length > 300 ? currentPrompt.slice(0, 300) + '\n...' : currentPrompt;
-      console.log(boxen(
-        chalk.bold('当前系统提示词\n\n') + chalk.dim(preview),
-        { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'cyan', margin: { top: 1, bottom: 1 } }
-      ));
-    } else {
-      console.log(chalk.dim('  当前模型未配置系统提示词\n'));
-    }
-
-    const action = await select({ loop: false,
-      message: chalk.cyan('操作'),
-      choices: [
-        { name: currentPrompt ? '✏️  编辑系统提示词' : '✏️  设置系统提示词', value: 'edit' },
-        ...(currentPrompt ? [{ name: '🗑  清除当前模型提示词', value: 'clear' }] : []),
-        { name: chalk.dim('↩  返回'), value: '__BACK__' },
-      ],
-    });
-
-    if (action === '__BACK__') return;
-
-    if (action === 'clear') {
-      const yes = await confirm({ message: '确定清除该模型的系统提示词？', default: false });
-      if (!yes) { console.log(chalk.dim('已取消')); return; }
-      const spinner = ora('清除中...').start();
-      setSystemPrompt(config, null);
-      saveConfig(config);
-      try {
-        writeEnvToZshrc(config.baseUrl, config.apiKey, config.model, config.fastModel, {});
-      } catch {}
-      spinner.succeed(chalk.green('系统提示词已清除'));
-      return;
-    }
-
-    if (currentPrompt) {
-      console.log(chalk.dim('  直接输入新内容覆盖，留空并回车取消'));
-    }
-
-    const newPrompt = await input({
-      message: chalk.cyan('系统提示词'),
-      default: currentPrompt || undefined,
-      validate: () => true,
-    });
-
-    if (!newPrompt || !newPrompt.trim()) {
-      console.log(chalk.dim('内容为空，已取消'));
-      return;
-    }
-
-    const spinner = ora('保存中...').start();
-    setSystemPrompt(config, newPrompt);
-    saveConfig(config);
-
-    // 无论是否已有 clawai 块，都同步写入 shell RC / PowerShell Profile
-    let rcFile;
-    try {
-      ({ file: rcFile } = writeEnvToZshrc(config.baseUrl, config.apiKey, config.model, config.fastModel, { systemPrompt: getSystemPrompt(config) }));
-    } catch {}
-
-    spinner.succeed(chalk.green('系统提示词已保存'));
-
-    if (process.platform === 'win32') {
-      console.log(boxen(
-        chalk.dim('• 通过菜单"启动 Claude Code"立即生效\n') +
-        chalk.dim('• 直接运行 claude 需重新打开 PowerShell 后生效\n') +
-        chalk.dim('  （已写入 PowerShell Profile，新窗口自动加载）'),
-        { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
-      ));
-    } else {
-      console.log(boxen(
-        chalk.dim('• 通过菜单"启动 Claude Code"立即生效\n') +
-        chalk.dim('• 终端直接运行 claude 需先执行：') + chalk.cyan(`source ${rcFile || '~/.zshrc'}`),
-        { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
-      ));
-    }
-  });
-
 program
   .command('status')
   .description('查看当前配置和 Key 有效性')
@@ -1174,7 +1089,6 @@ async function runMenu() {
         { name: '📦 安装 Claude Code', value: 'install' },
         { name: config ? '🔑 重新配置 API 连接' : '🔑 配置 API 连接', value: 'config' },
         { name: '🔄 切换厂商或模型', value: 'switch', disabled: disabledHint },
-        { name: getSystemPrompt(config) ? '📝 系统提示词（已配置）' : '📝 配置系统提示词', value: 'prompt', disabled: !config && '需先配置 API 连接' },
         { name: '💻 接入 Claude Code 终端', value: 'code', disabled: disabledHint },
         { name: '🖥  接入 Claude 桌面应用', value: 'desktop', disabled: disabledHint },
         { name: '📊 查看当前配置', value: 'status', disabled: !config && '需先配置 API 连接' },
@@ -1201,17 +1115,12 @@ async function runMenu() {
     if (resolvedAction === 'launch') {
       const cfg = loadConfig();
       if (!cfg || getConfigValidationMessage(cfg)) continue;
-      const systemPromptText = getSystemPrompt(cfg);
-      const launchArgs = systemPromptText ? ['--append-system-prompt', systemPromptText] : [];
-      if (systemPromptText) {
-        const preview = systemPromptText.length > 40 ? systemPromptText.slice(0, 40) + '…' : systemPromptText;
-        console.log(chalk.dim(`  系统提示词已启用：${preview}`));
-      }
       await new Promise((resolve) => {
-        // Windows 用显式 cmd.exe 调用，避免 shell:true 的参数拼接警告和转义问题
-        const child = process.platform === 'win32'
-          ? spawn('cmd.exe', ['/d', '/c', 'claude', ...launchArgs], { stdio: 'inherit', env: { ...process.env, ...buildClaudeEnv(cfg) } })
-          : spawn('claude', launchArgs, { stdio: 'inherit', env: { ...process.env, ...buildClaudeEnv(cfg) } });
+        const child = spawn('claude', [], {
+          stdio: 'inherit',
+          env: { ...process.env, ...buildClaudeEnv(cfg) },
+          shell: process.platform === 'win32',
+        });
         child.on('error', () => {
           console.log(chalk.yellow('\nClaude Code 未找到，请先选择"安装 Claude Code"'));
           resolve();
@@ -1227,7 +1136,6 @@ async function runMenu() {
       code: 'code',
       'code-reset': 'code-reset',
       switch: 'switch',
-      prompt: 'prompt',
       desktop: 'desktop',
       'desktop-reset': 'desktop-reset',
       status: 'status',

package/lib/config.js

@@ -128,26 +128,6 @@ function normalizeAnthropicBaseUrl(baseUrl) {
   return url.toString().replace(/\/+$/, '');
 }
 
-function systemPromptKey(config) {
-  return `${config.provider}::${config.model}`;
-}
-
-function getSystemPrompt(config) {
-  if (!config?.systemPrompts) return null;
-  return config.systemPrompts[systemPromptKey(config)] || null;
-}
-
-function setSystemPrompt(config, prompt) {
-  const key = systemPromptKey(config);
-  if (!config.systemPrompts) config.systemPrompts = {};
-  if (prompt && prompt.trim()) {
-    config.systemPrompts[key] = prompt.trim();
-  } else {
-    delete config.systemPrompts[key];
-    if (Object.keys(config.systemPrompts).length === 0) delete config.systemPrompts;
-  }
-}
-
 function buildModelUrlCandidates(baseUrl) {
   let url;
   try { url = new URL(normalizeAnthropicBaseUrl(baseUrl)); } catch { return []; }
@@ -344,10 +324,10 @@ function shellQuote(value) {
 }
 
 // 构造完整的 clawai 环境变量块
-function buildEnvBlock(baseUrl, apiKey, model, fastModel, systemPrompt) {
+function buildEnvBlock(baseUrl, apiKey, model, fastModel) {
   const provider = providerKeyFromBaseUrl(baseUrl);
   const env = buildClaudeEnv({ provider, baseUrl, apiKey, model, fastModel });
-  const lines = [
+  return [
     '',
     '# clawai-start',
     `export ANTHROPIC_BASE_URL=${shellQuote(env.ANTHROPIC_BASE_URL)}`,
@@ -359,47 +339,9 @@ function buildEnvBlock(baseUrl, apiKey, model, fastModel, systemPrompt) {
     `export ANTHROPIC_DEFAULT_HAIKU_MODEL=${shellQuote(env.ANTHROPIC_DEFAULT_HAIKU_MODEL)}`,
     `export CLAUDE_CODE_SUBAGENT_MODEL=${shellQuote(env.CLAUDE_CODE_SUBAGENT_MODEL)}`,
     `export CLAUDE_CODE_EFFORT_LEVEL=${shellQuote(env.CLAUDE_CODE_EFFORT_LEVEL)}`,
-  ];
-
-  if (systemPrompt && systemPrompt.trim()) {
-    lines.push(`_claw_system_prompt=${shellQuote(systemPrompt.trim())}`);
-    lines.push(`claude() { command claude --append-system-prompt "$_claw_system_prompt" "$@"; }`);
-  }
-
-  lines.push('# clawai-end', '');
-  return lines.join('\n');
-}
-
-function buildPsBlock(systemPrompt) {
-  const escaped = systemPrompt.replace(/'/g, "''");
-  return [
-    '',
-    '# clawai-start',
-    `$_claw_system_prompt = '${escaped}'`,
-    `function claude { $claudePath = (Get-Command -Name claude.cmd -ErrorAction SilentlyContinue)?.Source; if (-not $claudePath) { $claudePath = 'claude' }; & $claudePath --append-system-prompt $_claw_system_prompt @args }`,
     '# clawai-end',
     '',
-  ].join('\r\n');
-}
-
-function writePowerShellProfile(systemPrompt, options = {}) {
-  const homeDir = options.homeDir || os.homedir();
-  const profilePaths = [
-    path.join(homeDir, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1'),
-    path.join(homeDir, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'),
-  ];
-  const written = [];
-  for (const profilePath of profilePaths) {
-    try {
-      fs.mkdirSync(path.dirname(profilePath), { recursive: true });
-      const current = fs.existsSync(profilePath) ? fs.readFileSync(profilePath, 'utf8') : '';
-      const cleaned = current.replace(/\r?\n?# clawai-start[\s\S]*?# clawai-end\r?\n?/g, '');
-      const next = (systemPrompt && systemPrompt.trim()) ? cleaned + buildPsBlock(systemPrompt) : cleaned;
-      fs.writeFileSync(profilePath, next, 'utf8');
-      written.push(profilePath);
-    } catch {}
-  }
-  return written;
+  ].join('\n');
 }
 
 // 写入或更新 shell 配置文件中的环境变量块
@@ -409,7 +351,6 @@ function writeEnvToZshrc(baseUrl, apiKey, model, fastModel, options = {}) {
     const provider = providerKeyFromBaseUrl(baseUrl);
     const env = buildClaudeEnv({ provider, baseUrl, apiKey, model, fastModel });
     runWindowsEnvCommands(buildWindowsSetEnvCommands(env), options.runner || spawnSync);
-    writePowerShellProfile(options.systemPrompt, options);
     return { result: 'updated', file: WINDOWS_ENV_LABEL };
   }
 
@@ -423,7 +364,7 @@ function writeEnvToZshrc(baseUrl, apiKey, model, fastModel, options = {}) {
     rcFile = path.join(os.homedir(), '.zshrc');
   }
 
-  const block = buildEnvBlock(baseUrl, apiKey, model, fastModel, options.systemPrompt);
+  const block = buildEnvBlock(baseUrl, apiKey, model, fastModel);
   const current = fs.existsSync(rcFile) ? fs.readFileSync(rcFile, 'utf8') : '';
 
   // 兼容旧版（# clawai 单行块）和新版（# clawai-start...# clawai-end 多行块）
@@ -483,11 +424,7 @@ function resetConfig(options = {}) {
 module.exports = {
   loadConfig,
   saveConfig,
-  getSystemPrompt,
-  setSystemPrompt,
   writeEnvToZshrc,
-  writePowerShellProfile,
-  buildPsBlock,
   buildWindowsSetEnvCommands,
   buildWindowsClearEnvCommands,
   clearClaudeCodeEnv,

package/lib/install.js

@@ -1,3 +1,5 @@
+const { execSync } = require('child_process');
+
 function buildClaudeInstallCommand(network) {
   const args = ['install', '-g', '@anthropic-ai/claude-code'];
   if (network === 'cn') {
@@ -6,4 +8,87 @@ function buildClaudeInstallCommand(network) {
   return { command: 'npm', args };
 }
 
-module.exports = { buildClaudeInstallCommand };
+function checkNodeEnv() {
+  const nodeVersion = process.versions.node;
+  const nodeMajor = parseInt(nodeVersion.split('.')[0], 10);
+
+  let npmVersion = null;
+  try {
+    // Windows 上 npm 是 .cmd 文件，必须加 shell: true 才能找到
+    npmVersion = execSync('npm --version', {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+      shell: process.platform === 'win32',
+    }).trim();
+  } catch {}
+
+  return {
+    nodeVersion,
+    nodeMajor,
+    nodeOk: nodeMajor >= 18,
+    npmVersion,
+    npmOk: !!npmVersion,
+  };
+}
+
+function getNodeInstallGuide() {
+  const platform = process.platform;
+  if (platform === 'darwin') {
+    return [
+      'Homebrew:   brew install node',
+      '官方安装包: https://nodejs.org  （选 LTS 版本）',
+    ];
+  }
+  if (platform === 'win32') {
+    return [
+      '官方安装包: https://nodejs.org  （选 LTS 版本）',
+      'winget:     winget install OpenJS.NodeJS.LTS',
+    ];
+  }
+  return [
+    'Ubuntu/Debian: sudo apt install nodejs npm',
+    'CentOS/RHEL:   sudo yum install nodejs npm',
+    'nvm（推荐）:   https://github.com/nvm-sh/nvm',
+  ];
+}
+
+/**
+ * 根据 spawnSync 结果判断失败原因，返回对应的提示内容（chalk 字符串数组）。
+ * @param {object} result spawnSync 返回值
+ * @param {Function} chalk chalk 实例
+ * @returns {string[]}
+ */
+function getInstallFailureHints(result, chalk) {
+  // spawnSync 找不到命令（npm 在执行时消失或环境问题）
+  if (result.status === null && result.error?.code === 'ENOENT') {
+    return [
+      chalk.bold.red('npm 命令未找到\n\n'),
+      chalk.dim('安装 Node.js 后重试：\n'),
+      ...getNodeInstallGuide().map(l => chalk.cyan('  ' + l)),
+    ];
+  }
+
+  // 尝试从 stderr 判断权限错误（stdio inherit 时 stderr 为 null，兜底靠文字提示）
+  const stderr = result.stderr ? result.stderr.toString() : '';
+  if (stderr.includes('EACCES') || stderr.includes('permission denied') || stderr.includes('Access is denied')) {
+    const fixes = process.platform === 'win32'
+      ? ['以管理员身份运行 PowerShell / CMD，然后重试']
+      : [
+          'sudo npm install -g @anthropic-ai/claude-code',
+          '或修复 npm 全局目录权限：https://docs.npmjs.com/resolving-eacces-permissions-errors',
+        ];
+    return [
+      chalk.bold.red('权限不足（EACCES）\n\n'),
+      ...fixes.map(l => chalk.cyan('  ' + l)),
+    ];
+  }
+
+  // 通用失败：显示手动安装命令
+  return [
+    chalk.bold('手动安装：\n\n'),
+    chalk.cyan('npm config set registry https://registry.npmmirror.com\n'),
+    chalk.cyan('npm install -g @anthropic-ai/claude-code'),
+  ];
+}
+
+module.exports = { buildClaudeInstallCommand, checkNodeEnv, getNodeInstallGuide, getInstallFailureHints };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "2.4.5",
+  "version": "2.5.1",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Kimi、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {