ticketpro-auto-setup 1.1.0 → 1.1.2

package/dist/cli.js

@@ -62,7 +62,9 @@ function showSummary(state) {
         lines.push(formatResultLine('Auto-Compact: 155K (78%)', claudeConfigResult?.success ?? false));
         // 扩展结果
         for (const ext of state.claudeExtensions) {
-            const result = state.results.find(r => r.name === ext || r.name.startsWith(ext));
+            const result = state.results.find(r => r.name === ext ||
+                r.name.startsWith(ext) ||
+                (ext === 'grok-search' && r.name.startsWith('GrokSearch')));
             const label = ext === 'code-abyss' ? 'code-abyss 技能'
                 : ext === 'jshook-skill' ? 'jshook-skill 技能'
                     : ext === 'grok-search' ? 'GrokSearch MCP'

package/dist/installers/claude-code.js

@@ -5,7 +5,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import ora from 'ora';
 import { execCommand, execAsync } from '../utils/shell.js';
-import { getPlatform, getClaudeDir } from '../utils/platform.js';
+import { getPlatform, getClaudeDir, getClaudeJsonPath } from '../utils/platform.js';
 import { log } from '../utils/logger.js';
 /**
  * 安装 Claude Code CLI
@@ -32,6 +32,7 @@ export async function installClaudeCode() {
  */
 export function configureClaudeCode(state) {
     const claudeDir = getClaudeDir();
+    const claudeJsonPath = getClaudeJsonPath();
     try {
         // 确保目录存在
         fs.mkdirSync(claudeDir, { recursive: true });
@@ -55,6 +56,20 @@ export function configureClaudeCode(state) {
         };
         fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf-8');
         log.success(`Claude Code config written to ${settingsPath}`);
+        // 写入 ~/.claude.json 以跳过首次 onboarding 登录提示
+        // 保留用户已有字段，只覆盖 hasCompletedOnboarding
+        let claudeMeta = {};
+        if (fs.existsSync(claudeJsonPath)) {
+            try {
+                claudeMeta = JSON.parse(fs.readFileSync(claudeJsonPath, 'utf-8'));
+            }
+            catch {
+                claudeMeta = {};
+            }
+        }
+        claudeMeta.hasCompletedOnboarding = true;
+        fs.writeFileSync(claudeJsonPath, JSON.stringify(claudeMeta, null, 2), 'utf-8');
+        log.success(`Claude onboarding bypass configured at ${claudeJsonPath}`);
         return { name: 'Claude Code Config', success: true };
     }
     catch (err) {

package/dist/installers/code-abyss.js

@@ -80,10 +80,14 @@ function spawnCodeAbyss(command, args) {
     return new Promise((resolve) => {
         const { isWindows } = getPlatform();
         const timeout = 300_000; // 5 min
-        const child = spawn(command, args, {
+        // 用 shell -c 拼接命令字符串，避免 DEP0190 警告
+        // (spawn 同时传 args + shell: true 会触发 Node 弃用警告)
+        const shell = isWindows ? 'cmd.exe' : '/bin/bash';
+        const shellArg = isWindows ? '/c' : '-c';
+        const fullCmd = [command, ...args].join(' ');
+        const child = spawn(shell, [shellArg, fullCmd], {
             env: { ...process.env, CI: 'true', FORCE_COLOR: '0' },
             stdio: ['pipe', 'pipe', 'pipe'],
-            shell: isWindows ? 'cmd.exe' : '/bin/bash',
         });
         let killed = false;
         // 超时保护

package/dist/installers/grok-search.js

@@ -8,19 +8,62 @@ import { execAsync, commandExists } from '../utils/shell.js';
 import { getClaudeDir } from '../utils/platform.js';
 import { appendToCodexConfig } from './codex-cli.js';
 import { log } from '../utils/logger.js';
+/**
+ * 检测 Python 环境并确保 uvx 可用
+ * 流程：
+ *   1. uvx 已存在 → 直接返回 true
+ *   2. uvx 不存在 → 尝试 pip install uv / pip3 install uv
+ *   3. pip/pip3 都不存在 → 报错返回 false（终止 GrokSearch 安装）
+ */
+async function ensureUvx() {
+    // uvx 已可用，直接通过
+    if (commandExists('uvx'))
+        return true;
+    log.warn('uvx 未找到，GrokSearch 需要 Python uv 工具链。');
+    // 检测 pip / pip3
+    const hasPip3 = commandExists('pip3');
+    const hasPip = commandExists('pip');
+    if (!hasPip3 && !hasPip) {
+        log.error('未检测到 Python / pip！无法安装 uvx。');
+        log.error('GrokSearch MCP 需要 Python 环境，请先安装 Python：');
+        log.dim('  Ubuntu/Debian: sudo apt install python3 python3-pip');
+        log.dim('  macOS:         brew install python3');
+        log.dim('  Windows:       https://www.python.org/downloads/');
+        return false;
+    }
+    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 });
+    if (!result.success) {
+        spinner.fail('uv 安装失败');
+        log.error('请手动安装 uv: pip install uv');
+        return false;
+    }
+    spinner.succeed('uv 安装成功');
+    // 安装后再验证 uvx 是否可用
+    if (commandExists('uvx'))
+        return true;
+    // uvx 可能在 ~/.local/bin 等非 PATH 路径，尝试直接用 `uv tool run`
+    log.warn('uvx 命令不在 PATH 中，但 uv 已安装。');
+    log.dim('请执行: export PATH="$HOME/.local/bin:$PATH" 并重启终端');
+    // 仍返回 true，配置文件已写入，uvx 修复 PATH 后即可使用
+    return true;
+}
 /**
  * 为 Claude Code 安装 GrokSearch MCP
  */
 export async function installGrokSearchForClaude(config) {
     const spinner = ora('Configuring GrokSearch MCP for Claude Code...').start();
+    spinner.stop(); // 暂停 spinner，先做 Python 检测
+    // 确保 uvx 可用
+    const uvxOk = await ensureUvx();
+    if (!uvxOk) {
+        log.error('跳过 GrokSearch 配置（缺少 Python 环境）');
+        return { name: 'GrokSearch (Claude)', success: false, error: 'Python/pip not found' };
+    }
+    spinner.start('Configuring GrokSearch MCP for Claude Code...');
     try {
-        // 检查 uvx 是否可用
-        const hasUvx = commandExists('uvx');
-        if (!hasUvx) {
-            spinner.warn('uvx not found. GrokSearch requires Python uv/uvx.');
-            log.dim('Install: pip install uv  or  https://docs.astral.sh/uv/');
-            log.dim('Will configure anyway — please install uvx before using.');
-        }
         // 构建 MCP 配置 JSON
         const mcpConfig = JSON.stringify({
             type: 'stdio',
@@ -57,6 +100,14 @@ export async function installGrokSearchForClaude(config) {
  */
 export async function installGrokSearchForCodex(config) {
     const spinner = ora('Configuring GrokSearch MCP for Codex CLI...').start();
+    spinner.stop();
+    // 确保 uvx 可用
+    const uvxOk = await ensureUvx();
+    if (!uvxOk) {
+        log.error('跳过 GrokSearch 配置（缺少 Python 环境）');
+        return { name: 'GrokSearch (Codex)', success: false, error: 'Python/pip not found' };
+    }
+    spinner.start('Configuring GrokSearch MCP for Codex CLI...');
     try {
         const toml = `
 [[mcp_servers]]

package/dist/utils/platform.d.ts

@@ -2,6 +2,8 @@ import type { PlatformInfo } from '../types/index.js';
 export declare function getPlatform(): PlatformInfo;
 /** 获取 ~/.claude 路径 */
 export declare function getClaudeDir(): string;
+/** 获取 ~/.claude.json 路径（onboarding 状态文件，在 home 目录下，非 .claude/ 目录内） */
+export declare function getClaudeJsonPath(): string;
 /** 获取 ~/.codex 路径 */
 export declare function getCodexDir(): string;
 /** 获取 shell profile 文件路径 */

package/dist/utils/platform.js

@@ -36,6 +36,10 @@ export function getPlatform() {
 export function getClaudeDir() {
     return path.join(getPlatform().homeDir, '.claude');
 }
+/** 获取 ~/.claude.json 路径（onboarding 状态文件，在 home 目录下，非 .claude/ 目录内） */
+export function getClaudeJsonPath() {
+    return path.join(getPlatform().homeDir, '.claude.json');
+}
 /** 获取 ~/.codex 路径 */
 export function getCodexDir() {
     return path.join(getPlatform().homeDir, '.codex');

package/package.json

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