create-claude-workspace 2.3.23 → 2.3.25

package/dist/scheduler/git/ci-watcher.mjs

@@ -1,6 +1,7 @@
 // ─── CI pipeline status polling ───
 // Uses gh/glab CLI to watch pipeline status after push.
 import { execFileSync } from 'node:child_process';
+import { resolve } from 'node:path';
 const POLL_INTERVAL = 15_000;
 const MAX_POLL_TIME = 30 * 60_000; // 30 minutes
 const CLI_TIMEOUT = 15_000;
@@ -20,38 +21,80 @@ export function detectCIPlatform(projectDir) {
 }
 /**
  * Check if the CLI tool for a given platform is installed and authenticated.
- * Returns null if OK, or an error message describing what's missing.
+ * Tries the CLI name directly, then known install paths (for freshly installed tools
+ * not yet in the current process PATH).
  */
 export function checkPlatformCLI(platform) {
     if (platform === 'none')
-        return null;
+        return { status: 'ok' };
     const cli = platform === 'github' ? 'gh' : 'glab';
-    // Check if binary exists
-    try {
-        execFileSync(cli, ['--version'], { stdio: 'pipe', timeout: 10_000 });
-    }
-    catch (err) {
-        const code = err.code;
-        if (code === 'ENOENT') {
-            return `${cli} CLI is not installed`;
-        }
-        return `${cli} CLI error: ${err.message?.split('\n')[0]}`;
-    }
+    const bin = resolveCLIBinary(cli);
+    if (!bin)
+        return { status: 'not-installed' };
     // Check if authenticated
     try {
         if (platform === 'github') {
-            execFileSync('gh', ['auth', 'status'], { stdio: 'pipe', timeout: 10_000 });
+            execFileSync(bin, ['auth', 'status'], { stdio: 'pipe', timeout: 10_000 });
         }
         else {
-            // glab doesn't have a clean auth status command — try a harmless API call
-            execFileSync('glab', ['api', 'version'], { stdio: 'pipe', timeout: 10_000 });
+            execFileSync(bin, ['auth', 'status'], { stdio: 'pipe', timeout: 10_000 });
         }
     }
     catch {
-        return `${cli} CLI is installed but not authenticated — run: ${cli} auth login`;
+        return { status: 'not-authenticated', command: `${cli} auth login` };
+    }
+    return { status: 'ok' };
+}
+/**
+ * Resolve the full path to a CLI binary.
+ * First tries the bare name (in PATH), then checks known installation directories
+ * for freshly installed tools that aren't in the current process PATH.
+ */
+export function resolveCLIBinary(cli) {
+    // Try bare name first (already in PATH)
+    try {
+        execFileSync(cli, ['--version'], { stdio: 'pipe', timeout: 10_000 });
+        return cli;
+    }
+    catch (err) {
+        if (err.code !== 'ENOENT')
+            return cli; // Found but errored
+    }
+    // Try known installation paths (winget, scoop, choco, brew, etc.)
+    const candidates = getKnownCLIPaths(cli);
+    for (const path of candidates) {
+        try {
+            execFileSync(path, ['--version'], { stdio: 'pipe', timeout: 10_000 });
+            return path;
+        }
+        catch (err) {
+            if (err.code !== 'ENOENT')
+                return path;
+        }
     }
     return null;
 }
+function getKnownCLIPaths(cli) {
+    const paths = [];
+    const isWindows = process.platform === 'win32';
+    const home = process.env.HOME || process.env.USERPROFILE || '';
+    if (isWindows) {
+        const localApps = process.env.LOCALAPPDATA || resolve(home, 'AppData', 'Local');
+        const progFiles = process.env.ProgramFiles || 'C:\\Program Files';
+        const progFilesX86 = process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)';
+        if (cli === 'gh') {
+            paths.push(resolve(progFiles, 'GitHub CLI', 'gh.exe'), resolve(progFilesX86, 'GitHub CLI', 'gh.exe'), resolve(localApps, 'Microsoft', 'WinGet', 'Links', 'gh.exe'), resolve(home, 'scoop', 'shims', 'gh.exe'));
+        }
+        else if (cli === 'glab') {
+            paths.push(resolve(progFiles, 'glab', 'bin', 'glab.exe'), resolve(localApps, 'Microsoft', 'WinGet', 'Links', 'glab.exe'), resolve(home, 'scoop', 'shims', 'glab.exe'));
+        }
+    }
+    else {
+        // macOS / Linux
+        paths.push(`/usr/local/bin/${cli}`, `/opt/homebrew/bin/${cli}`, resolve(home, '.local', 'bin', cli));
+    }
+    return paths;
+}
 /**
  * Attempt to install the CLI tool for a given platform.
  * Returns true if installation succeeded, false otherwise.

package/dist/scheduler/index.mjs

@@ -259,33 +259,42 @@ export async function runScheduler(opts) {
     // Ensure platform CLI is available before task mode detection
     const detectedPlatform = detectCIPlatform(opts.projectDir);
     if (detectedPlatform !== 'none') {
-        const cliError = checkPlatformCLI(detectedPlatform);
-        if (cliError) {
-            const cli = detectedPlatform === 'github' ? 'gh' : 'glab';
-            logger.warn(`${cliError} — attempting auto-install of ${cli}`);
+        const cli = detectedPlatform === 'github' ? 'gh' : 'glab';
+        let cliCheck = checkPlatformCLI(detectedPlatform);
+        if (cliCheck.status === 'not-installed') {
+            logger.warn(`${cli} CLI is not installed — attempting auto-install`);
             const installResult = installPlatformCLI(detectedPlatform);
             if (installResult.success) {
                 logger.info(`Installed ${cli} via ${installResult.method}`);
-                const authError = checkPlatformCLI(detectedPlatform);
-                if (authError?.includes('not authenticated')) {
-                    logger.warn(`${cli} installed but needs authentication. Run: ${cli} auth login`);
-                }
+                cliCheck = checkPlatformCLI(detectedPlatform);
             }
             else {
                 logger.error(`Failed to install ${cli}: ${installResult.error}`);
+                logger.error(`Install ${cli} manually and re-run the scheduler.`);
+                process.exit(1);
             }
         }
+        if (cliCheck.status === 'not-authenticated') {
+            logger.error(`${cli} CLI is installed but not authenticated.`);
+            logger.error(`Run this command to authenticate, then re-run the scheduler:`);
+            logger.error(`  ${cliCheck.command}`);
+            process.exit(1);
+        }
+        if (cliCheck.status === 'error') {
+            logger.error(`${cli} CLI error: ${cliCheck.message}`);
+            process.exit(1);
+        }
     }
-    // Task mode detection
+    // Task mode detection — always re-detect unless user explicitly set --task-mode
+    // (stored state may be stale if CLI was installed/authenticated since last run)
     if (opts.taskMode) {
         state.taskMode = opts.taskMode;
+        logger.info(`Task mode (from flag): ${state.taskMode}`);
     }
-    else if (!existing) {
-        // Auto-detect: platform mode if remote has issues with status:: labels
+    else {
         state.taskMode = detectTaskMode(opts.projectDir);
-        logger.info(`Task mode auto-detected: ${state.taskMode}`);
+        logger.info(`Task mode: ${state.taskMode}`);
     }
-    // If resuming existing state, keep the stored taskMode
     // Platform mode: shorter idle poll interval (30s vs 5min)
     const mutableOpts = opts;
     if (state.taskMode === 'platform' && !opts.taskMode && opts.idlePollInterval === SCHEDULER_DEFAULTS.idlePollInterval) {

package/dist/scheduler/loop.mjs

@@ -785,6 +785,15 @@ export async function recoverOrphanedWorktrees(projectDir, state, logger, _deps)
     // Phase 1: Orphaned worktrees → re-inject into pipelines
     for (const worktreePath of orphans) {
         try {
+            // If the worktree directory was manually deleted, prune it from git and skip
+            if (!existsSync(worktreePath)) {
+                logger.info(`[recovery] Worktree directory missing: ${worktreePath} — pruning from git`);
+                try {
+                    execFileSync('git', ['worktree', 'prune'], { cwd: projectDir, stdio: 'pipe', timeout: 10_000 });
+                }
+                catch { /* ignore */ }
+                continue;
+            }
             const branch = getCurrentBranch(worktreePath);
             const alreadyMerged = isBranchMerged(projectDir, branch);
             if (alreadyMerged) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-workspace",
-  "version": "2.3.23",
+  "version": "2.3.25",
   "author": "",
   "repository": {
     "type": "git",