ticketpro-auto-setup 1.1.5 → 1.1.6

package/dist/installers/code-abyss.js

@@ -7,7 +7,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
 import ora from 'ora';
-import { execAsync } from '../utils/shell.js';
+import { execAsync, execCommand } from '../utils/shell.js';
 import { getPlatform, getClaudeDir } from '../utils/platform.js';
 import { log } from '../utils/logger.js';
 /**
@@ -133,26 +133,13 @@ function spawnCodeAbyss(command, args) {
 /**
  * 兜底确保 statusLine 指向 ccline。
  * 某些环境下 code-abyss 可能因配置合并策略未写入该字段，
- * 这里做最小补丁，不覆盖用户其它配置。
+ * 或写入了 ~/.claude/ccline/ccline 但该路径实际不存在（例如 nvm 全局安装）。
  */
 function ensureCclineStatusLine() {
     try {
+        const { homeDir } = getPlatform();
         const claudeDir = getClaudeDir();
         const settingsPath = path.join(claudeDir, 'settings.json');
-        // 兜底：如果 ~/.claude/ccline/ccline 不存在，但系统 PATH 有 ccline，
-        // 创建一个软链接到 ~/.claude/ccline/ccline，确保 statusLine 路径稳定可用。
-        const cclineDir = path.join(claudeDir, 'ccline');
-        const localCcline = path.join(cclineDir, 'ccline');
-        if (!fs.existsSync(localCcline)) {
-            const globalPath = '/usr/local/bin/ccline';
-            if (fs.existsSync(globalPath)) {
-                fs.mkdirSync(cclineDir, { recursive: true });
-                try {
-                    fs.symlinkSync(globalPath, localCcline);
-                }
-                catch { /* ignore */ }
-            }
-        }
         if (!fs.existsSync(settingsPath))
             return;
         let settings = {};
@@ -162,20 +149,46 @@ function ensureCclineStatusLine() {
         catch {
             return;
         }
-        const desired = {
-            type: 'command',
-            command: '~/.claude/ccline/ccline',
-            padding: 0,
-        };
+        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)) {
+            fs.mkdirSync(cclineDir, { recursive: true });
+            try {
+                fs.symlinkSync(resolvedGlobal, localCcline);
+                log.success(`ccline linked: ${localCcline} -> ${resolvedGlobal}`);
+            }
+            catch {
+                // ignore
+            }
+        }
         const current = settings.statusLine;
-        const hasCcline = current &&
-            typeof current === 'object' &&
-            typeof current.command === 'string' &&
-            current.command.includes('ccline');
-        if (!hasCcline) {
-            settings.statusLine = desired;
+        const currentCommand = current && typeof current === 'object' && typeof current.command === 'string'
+            ? current.command
+            : '';
+        const localCmd = '~/.claude/ccline/ccline';
+        const fallbackCmd = resolvedGlobal && fs.existsSync(resolvedGlobal) ? resolvedGlobal : localCmd;
+        // 需要补丁的条件：
+        // 1) 没有 statusLine
+        // 2) statusLine 不是 ccline
+        // 3) statusLine 指向本地 ccline 但本地文件不存在（坏链路）
+        const needPatch = !currentCommand ||
+            !currentCommand.includes('ccline') ||
+            (currentCommand.includes('~/.claude/ccline/ccline') && !fs.existsSync(localCcline));
+        if (needPatch) {
+            settings.statusLine = {
+                type: 'command',
+                command: fs.existsSync(localCcline) ? localCmd : fallbackCmd,
+                padding: 0,
+            };
             fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf-8');
-            log.success('ccline statusLine patched in ~/.claude/settings.json');
+            log.success(`ccline statusLine patched: ${settings.statusLine.command}`);
         }
     }
     catch {

package/package.json

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