ticketpro-auto-setup 1.1.8 → 1.1.10

package/dist/cli.js

@@ -5,6 +5,7 @@ import chalk from 'chalk';
 import { showWelcomePage } from './pages/welcome.js';
 import { performCleanup } from './pages/cleanup.js';
 import { apiConfigPage } from './pages/api-config.js';
+import { runPreflightChecks } from './pages/preflight.js';
 import { claudeSetupPage } from './pages/claude-setup.js';
 import { codexSetupPage } from './pages/codex-setup.js';
 import { generateCompleteBanner } from './utils/banner.js';
@@ -24,6 +25,11 @@ export async function runCli() {
         }
         // Step 1: 清理环境
         await performCleanup();
+        // Step 1.5: 安装前依赖预检
+        const preflightOk = await runPreflightChecks();
+        if (!preflightOk) {
+            process.exit(1);
+        }
         // Step 2: 工具选择 + API 配置 + 安装
         await apiConfigPage(state);
         // Step 3: Claude Code 扩展（若选了）

package/dist/installers/claude-code.js

@@ -51,7 +51,7 @@ export function configureClaudeCode(state) {
         settings.env = {
             ...(settings.env ?? {}),
             ANTHROPIC_BASE_URL: state.claudeBaseUrl,
-            ANTHROPIC_API_KEY: state.apiKey,
+            ANTHROPIC_API_KEY: state.claudeApiKey || state.apiKey,
             CLAUDE_AUTOCOMPACT_PCT_OVERRIDE: '78',
         };
         fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf-8');

package/dist/installers/code-abyss.js

@@ -137,7 +137,7 @@ function spawnCodeAbyss(command, args) {
  */
 export function repairCclineStatusLine() {
     try {
-        const { homeDir } = getPlatform();
+        const { homeDir, isWindows } = getPlatform();
         const claudeDir = getClaudeDir();
         const settingsPath = path.join(claudeDir, 'settings.json');
         if (!fs.existsSync(settingsPath)) {
@@ -151,15 +151,15 @@ export function repairCclineStatusLine() {
             return { name: 'ccline statusLine', success: false, error: 'settings.json parse failed' };
         }
         const cclineDir = path.join(claudeDir, 'ccline');
-        const localCcline = path.join(cclineDir, 'ccline');
-        // 动态解析全局 ccline 路径（兼容 nvm: ~/.nvm/.../bin/ccline）
-        let resolvedGlobal = '';
-        const whichResult = execCommand('command -v ccline', { cwd: homeDir, timeout: 5000 });
-        if (whichResult.success) {
-            resolvedGlobal = whichResult.stdout.split('\n').pop()?.trim() ?? '';
-        }
-        // 如果本地路径不存在，但全局 ccline 存在，创建软链接到本地稳定路径
-        if (!fs.existsSync(localCcline) && resolvedGlobal && fs.existsSync(resolvedGlobal)) {
+        const localCcline = path.join(cclineDir, isWindows ? 'ccline.cmd' : 'ccline');
+        // 动态探测全局 ccline（跨平台）
+        const detectCmd = isWindows ? 'where ccline.cmd' : 'command -v ccline';
+        const whichResult = execCommand(detectCmd, { cwd: homeDir, timeout: 5000 });
+        const resolvedGlobal = whichResult.success
+            ? whichResult.stdout.split(/\r?\n/).find(Boolean)?.trim() ?? ''
+            : '';
+        // Unix 下若本地路径不存在但全局 ccline 存在，创建软链接到稳定路径
+        if (!isWindows && !fs.existsSync(localCcline) && resolvedGlobal && fs.existsSync(resolvedGlobal)) {
             fs.mkdirSync(cclineDir, { recursive: true });
             try {
                 fs.symlinkSync(resolvedGlobal, localCcline);
@@ -173,17 +173,16 @@ export function repairCclineStatusLine() {
         const currentCommand = current && typeof current === 'object' && typeof current.command === 'string'
             ? current.command
             : '';
-        // 使用绝对路径，避免某些环境下 "~" 不展开导致 statusLine 命令不可执行
-        const localCmd = localCcline;
-        const fallbackCmd = resolvedGlobal && fs.existsSync(resolvedGlobal) ? resolvedGlobal : localCmd;
+        const preferredCommand = isWindows ? 'ccline.cmd' : 'ccline';
+        const fallbackCommand = fs.existsSync(localCcline) ? localCcline : preferredCommand;
         const needPatch = !currentCommand ||
-            !currentCommand.includes('ccline') ||
-            (currentCommand.includes('~/.claude/ccline/ccline') && !fs.existsSync(localCcline)) ||
-            currentCommand.includes('~/.claude/ccline/ccline');
+            !currentCommand.toLowerCase().includes('ccline') ||
+            (isWindows && currentCommand.trim() === 'ccline') ||
+            (!isWindows && currentCommand.includes('~/.claude/ccline/ccline'));
         if (needPatch) {
             settings.statusLine = {
                 type: 'command',
-                command: fs.existsSync(localCcline) ? localCmd : fallbackCmd,
+                command: resolvedGlobal ? preferredCommand : fallbackCommand,
                 padding: 0,
             };
             fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf-8');

package/dist/installers/codex-cli.js

@@ -48,7 +48,7 @@ env_key = "OPENAI_API_KEY"
         fs.writeFileSync(configPath, toml, 'utf-8');
         log.success(`Codex config written to ${configPath}`);
         // 设置环境变量
-        setOpenAIApiKey(state.apiKey);
+        setOpenAIApiKey(state.codexApiKey || state.apiKey);
         return { name: 'Codex CLI Config', success: true };
     }
     catch (err) {

package/dist/installers/grok-search.js

@@ -5,7 +5,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import ora from 'ora';
 import { execAsync, commandExists } from '../utils/shell.js';
-import { getClaudeDir } from '../utils/platform.js';
+import { getClaudeDir, getPlatform } from '../utils/platform.js';
 import { appendToCodexConfig } from './codex-cli.js';
 import { log } from '../utils/logger.js';
 /**
@@ -36,7 +36,10 @@ async function ensureUvx() {
     const pipCmd = hasPip3 ? 'pip3' : 'pip';
     log.info(`正在通过 ${pipCmd} 安装 uv...`);
     const spinner = ora(`${pipCmd} install uv...`).start();
-    const result = await execAsync(`${pipCmd} install uv --break-system-packages 2>/dev/null || ${pipCmd} install uv`, { timeout: 120_000 });
+    const pipInstallCmd = getPlatform().isWindows
+        ? `${pipCmd} install uv`
+        : `${pipCmd} install uv --break-system-packages 2>/dev/null || ${pipCmd} install uv`;
+    const result = await execAsync(pipInstallCmd, { timeout: 120_000 });
     if (!result.success) {
         spinner.fail('uv 安装失败');
         log.error('请手动安装 uv: pip install uv');

package/dist/installers/jshook-skill.js

@@ -17,18 +17,19 @@ const JSHOOK_REPO = 'https://github.com/wuji66dde/jshook-skill.git';
 export async function installJshookSkill() {
     const spinner = ora('Installing jshook-skill (JS逆向工程技能)...').start();
     const claudeDir = getClaudeDir();
-    const skillDir = path.join(claudeDir, 'skills', 'jshook-skill');
+    const skillsRoot = path.join(claudeDir, 'skills');
+    const skillDir = path.join(skillsRoot, 'jshook-skill');
     const { gitCmd, npmCmd } = getPlatform();
     try {
         // 确保 skills 目录存在
-        fs.mkdirSync(path.join(claudeDir, 'skills'), { recursive: true });
+        fs.mkdirSync(skillsRoot, { recursive: true });
         // 如果已存在，先删除
         if (fs.existsSync(skillDir)) {
             fs.rmSync(skillDir, { recursive: true, force: true });
         }
-        // git clone
+        // git clone（在 skillsRoot 下克隆相对目录，避免 Windows 引号/路径转义问题）
         spinner.text = 'Cloning jshook-skill repository...';
-        const cloneResult = await execAsync(`${gitCmd} clone ${JSHOOK_REPO} "${skillDir}"`, { cwd: getPlatform().homeDir, timeout: 120_000 });
+        const cloneResult = await execAsync(`${gitCmd} clone ${JSHOOK_REPO} jshook-skill`, { cwd: skillsRoot, timeout: 120_000 });
         if (!cloneResult.success) {
             spinner.fail('jshook-skill: git clone failed');
             log.dim(`请手动执行: git clone ${JSHOOK_REPO} ~/.claude/skills/jshook-skill`);

package/dist/pages/api-config.js

@@ -22,17 +22,34 @@ export async function apiConfigPage(state) {
     state.toolChoice = toolChoice;
     state.installClaude = toolChoice === 'both' || toolChoice === 'claude-only';
     state.installCodex = toolChoice === 'both' || toolChoice === 'codex-only';
-    // 2. 输入 API Key
+    // 2. 输入 API Key（Claude 和 Codex 分离）
     console.log();
-    const apiKey = await password({
-        message: '输入中转站 API Key：',
-        mask: '*',
-    });
-    if (!apiKey || apiKey.trim().length === 0) {
-        log.error('API Key 不能为空！');
-        process.exit(1);
+    // Claude Key
+    if (state.installClaude) {
+        const claudeApiKey = await password({
+            message: '输入 Claude Code API Key（ANTHROPIC_API_KEY）：',
+            mask: '*',
+        });
+        if (!claudeApiKey || claudeApiKey.trim().length === 0) {
+            log.error('Claude Code API Key 不能为空！');
+            process.exit(1);
+        }
+        state.claudeApiKey = claudeApiKey.trim();
+    }
+    // Codex Key
+    if (state.installCodex) {
+        const codexApiKey = await password({
+            message: '输入 Codex CLI API Key（OPENAI_API_KEY）：',
+            mask: '*',
+        });
+        if (!codexApiKey || codexApiKey.trim().length === 0) {
+            log.error('Codex CLI API Key 不能为空！');
+            process.exit(1);
+        }
+        state.codexApiKey = codexApiKey.trim();
     }
-    state.apiKey = apiKey.trim();
+    // 兼容旧逻辑：保留 state.apiKey，但优先使用分离字段
+    state.apiKey = state.claudeApiKey || state.codexApiKey || '';
     // 3. 显示中转站配置
     console.log();
     log.info('中转站配置（自动填写）：');

package/dist/pages/preflight.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 安装前依赖预检：缺少关键依赖则中断流程
+ */
+export declare function runPreflightChecks(): Promise<boolean>;
+//# sourceMappingURL=preflight.d.ts.map

package/dist/pages/preflight.js

@@ -0,0 +1,145 @@
+/**
+ * 预检页 — 运行环境与依赖检查
+ */
+import path from 'node:path';
+import { getPlatform } from '../utils/platform.js';
+import { commandExists, execCommand, checkDependencies } from '../utils/shell.js';
+import { log } from '../utils/logger.js';
+/**
+ * 安装前依赖预检：缺少关键依赖则中断流程
+ */
+export async function runPreflightChecks() {
+    log.section('🩺 环境预检');
+    const platform = getPlatform();
+    const required = checkDependencies([
+        { name: 'Node.js', command: 'node' },
+        { name: 'npm', command: platform.npmCmd },
+        { name: 'git', command: platform.gitCmd },
+    ]);
+    for (const item of required) {
+        if (item.installed) {
+            log.success(`${item.name} 检测通过 (${item.command})`);
+        }
+        else {
+            log.error(`${item.name} 缺失 (${item.command})`);
+        }
+    }
+    const failedRequired = required.filter((x) => x.required && !x.installed);
+    // 进一步验证命令可执行（不仅是存在）
+    const runtimeChecks = [
+        checkRuntime('Node.js', 'node --version'),
+        checkRuntime('npm', `${platform.npmCmd} --version`),
+        checkRuntime('git', `${platform.gitCmd} --version`),
+    ];
+    for (const r of runtimeChecks) {
+        if (r.ok)
+            log.success(`${r.name} 可执行 (${r.detail})`);
+        else
+            log.error(`${r.name} 不可执行 (${r.detail})`);
+    }
+    const runtimeFailed = runtimeChecks.filter((x) => !x.ok);
+    let effectiveRuntimeFailed = runtimeFailed;
+    // 自动修复：Windows 下 npm 可执行失败时，尝试切换到 npm.cmd
+    const autoFixApplied = autoFixCommandPaths(runtimeChecks);
+    if (autoFixApplied.length > 0) {
+        console.log();
+        for (const msg of autoFixApplied) {
+            log.warn(msg);
+        }
+        // 修复后重跑关键运行时检测
+        const rerunChecks = [
+            checkRuntime('npm', `${platform.npmCmd} --version`),
+        ];
+        for (const r of rerunChecks) {
+            if (r.ok)
+                log.success(`${r.name} 修复后可执行 (${r.detail})`);
+            else
+                log.error(`${r.name} 修复后仍不可执行 (${r.detail})`);
+        }
+        const fixedRuntime = runtimeFailed.filter(x => x.name !== 'npm').concat(rerunChecks.filter(x => !x.ok));
+        effectiveRuntimeFailed = fixedRuntime;
+        if (failedRequired.length > 0 || fixedRuntime.length > 0) {
+            console.log();
+            log.error('环境预检失败，已中止安装。');
+            printFixHints();
+            return false;
+        }
+    }
+    // 非阻断：GrokSearch 相关依赖提示
+    const hasPip = commandExists('pip') || commandExists('pip3');
+    const hasUvx = commandExists('uvx');
+    if (!hasPip) {
+        log.warn('未检测到 pip/pip3：若安装 GrokSearch MCP，后续将失败');
+    }
+    else if (!hasUvx) {
+        log.warn('未检测到 uvx：若安装 GrokSearch MCP，安装器会尝试自动安装 uv');
+    }
+    else {
+        log.success('GrokSearch 运行时依赖已就绪 (uvx)');
+    }
+    if (failedRequired.length > 0 || effectiveRuntimeFailed.length > 0) {
+        console.log();
+        log.error('环境预检失败，已中止安装。');
+        printFixHints();
+        return false;
+    }
+    console.log();
+    log.success('环境预检通过');
+    console.log();
+    return true;
+}
+function checkRuntime(name, command) {
+    const result = execCommand(command, { timeout: 15_000 });
+    return {
+        name,
+        ok: result.success,
+        detail: result.success ? (result.stdout.split(/\r?\n/)[0] ?? 'ok') : (result.stderr || 'failed'),
+    };
+}
+function autoFixCommandPaths(runtimeChecks) {
+    const { isWindows } = getPlatform();
+    const applied = [];
+    if (!isWindows)
+        return applied;
+    const npmFailed = runtimeChecks.find((x) => x.name === 'npm' && !x.ok);
+    if (!npmFailed)
+        return applied;
+    // 若 npm.cmd 可用但 npm 不可用，切到 cmd shell 并把 npm 所在目录前置到 PATH
+    const whereNpmCmd = execCommand('where npm.cmd', { timeout: 5000 });
+    const npmCmdPath = whereNpmCmd.success
+        ? whereNpmCmd.stdout.split(/\r?\n/).find(Boolean)?.trim() ?? ''
+        : '';
+    if (npmCmdPath) {
+        try {
+            process.env.npm_config_script_shell = 'cmd.exe';
+            const npmBinDir = path.dirname(npmCmdPath);
+            const currentPath = process.env.PATH ?? '';
+            const pathParts = currentPath.split(';').map((x) => x.trim()).filter(Boolean);
+            const hasNpmBin = pathParts.some((p) => p.toLowerCase() === npmBinDir.toLowerCase());
+            if (!hasNpmBin) {
+                process.env.PATH = `${npmBinDir};${currentPath}`;
+            }
+            applied.push(`检测到 npm 运行异常，已切换 shell=cmd.exe 并将 npm 目录前置 PATH: ${npmBinDir}`);
+        }
+        catch {
+            // ignore
+        }
+    }
+    return applied;
+}
+function printFixHints() {
+    const { isWindows } = getPlatform();
+    log.info('建议修复命令：');
+    if (isWindows) {
+        log.dim('  1) 安装 Node.js LTS（含 npm）: https://nodejs.org/');
+        log.dim('  2) 安装 Git for Windows: https://git-scm.com/download/win');
+        log.dim('  3) 重开终端后验证: node --version && npm --version && git --version');
+        log.dim('  4) 若 npm 路径异常，检查 PATH 中 Node 安装目录是否存在');
+    }
+    else {
+        log.dim('  Ubuntu/Debian: sudo apt update && sudo apt install -y nodejs npm git');
+        log.dim('  macOS(Homebrew): brew install node git');
+        log.dim('  验证: node --version && npm --version && git --version');
+    }
+}
+//# sourceMappingURL=preflight.js.map

package/dist/types/index.d.ts

@@ -23,8 +23,15 @@ export interface GrokConfig {
 export interface SetupState {
     /** 选择的工具 */
     toolChoice: ToolChoice;
-    /** 中转站 API Key */
+    /**
+     * 兼容旧版本的单密钥字段（deprecated）
+     * 新版本请使用 claudeApiKey / codexApiKey
+     */
     apiKey: string;
+    /** Claude Code API Key (ANTHROPIC_API_KEY) */
+    claudeApiKey: string;
+    /** Codex CLI API Key (OPENAI_API_KEY) */
+    codexApiKey: string;
     /** Claude Code 基础 URL */
     claudeBaseUrl: string;
     /** Codex 基础 URL */

package/dist/types/index.js

@@ -6,6 +6,8 @@ export function createDefaultState() {
     return {
         toolChoice: 'both',
         apiKey: '',
+        claudeApiKey: '',
+        codexApiKey: '',
         claudeBaseUrl: 'https://api.ticketpro.cc',
         codexBaseUrl: 'https://api.ticketpro.cc/v1',
         installClaude: true,

package/dist/utils/shell.d.ts

@@ -4,6 +4,12 @@ export interface ExecResult {
     stderr: string;
     code: number | null;
 }
+/** 依赖检查项 */
+export interface DependencyCheckItem {
+    name: string;
+    command: string;
+    required?: boolean;
+}
 /**
  * 同步执行命令，返回结构化结果
  */
@@ -17,6 +23,15 @@ export declare function execCommand(command: string, options?: {
  * 检查命令是否可用
  */
 export declare function commandExists(cmd: string): boolean;
+/**
+ * 检查命令依赖，返回逐项结果
+ */
+export declare function checkDependencies(items: DependencyCheckItem[]): Array<{
+    name: string;
+    command: string;
+    required: boolean;
+    installed: boolean;
+}>;
 /**
  * 异步执行命令（不阻塞事件循环，spinner 可正常旋转）
  */

package/dist/utils/shell.js

@@ -40,6 +40,20 @@ export function commandExists(cmd) {
     const checkCmd = isWindows ? `where ${cmd}` : `command -v ${cmd}`;
     return execCommand(checkCmd).success;
 }
+/**
+ * 检查命令依赖，返回逐项结果
+ */
+export function checkDependencies(items) {
+    return items.map((item) => {
+        const installed = commandExists(item.command);
+        return {
+            name: item.name,
+            command: item.command,
+            required: item.required !== false,
+            installed,
+        };
+    });
+}
 /**
  * 异步执行命令（不阻塞事件循环，spinner 可正常旋转）
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticketpro-auto-setup",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "TicketPro Auto Setup Wizard — 一键配置 Claude Code CLI / Codex CLI",
   "type": "module",
   "bin": {