@iloom/cli 0.6.0 → 0.7.0

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   SessionSummaryService
-} from "./chunk-K7SEEHKO.js";
+} from "./chunk-CNSTXBJ3.js";
 import "./chunk-NXMDEL3F.js";
 import {
   CLIIsolationManager,
@@ -9,30 +9,28 @@ import {
   EnvironmentManager,
   LoomManager,
   ResourceCleanup
-} from "./chunk-PMVWQBWS.js";
+} from "./chunk-S7YMZQUD.js";
+import {
+  BuildRunner,
+  MergeManager
+} from "./chunk-LQBLDI47.js";
 import {
   IssueTrackerFactory,
   generateIssueManagementMcpConfig
-} from "./chunk-6YSFTPKW.js";
-import "./chunk-7Q66W4OH.js";
+} from "./chunk-FM4KBPVA.js";
 import {
   ProcessManager
-} from "./chunk-VU3QMIP2.js";
-import {
-  detectPackageManager,
-  installDependencies,
-  runScript
-} from "./chunk-AXX3QIKK.js";
+} from "./chunk-453NC377.js";
 import {
   IdentifierParser
-} from "./chunk-UQIXZ3BA.js";
+} from "./chunk-5V74K5ZA.js";
 import {
   createNeonProviderFromSettings
 } from "./chunk-7LSSNB7Y.js";
 import {
   InitCommand,
   ShellCompletion
-} from "./chunk-UB4TFAXJ.js";
+} from "./chunk-FEAJR6PN.js";
 import {
   FirstRunManager
 } from "./chunk-Q7POFB5Q.js";
@@ -40,29 +38,35 @@ import "./chunk-F2PWIRV4.js";
 import {
   IssueEnhancementService,
   capitalizeFirstLetter
-} from "./chunk-7HIRPCKU.js";
+} from "./chunk-HVQNVRAF.js";
 import {
   ProjectCapabilityDetector
-} from "./chunk-ZPSTA5PR.js";
-import {
-  getPackageConfig,
-  hasScript
-} from "./chunk-BXCPJJYM.js";
+} from "./chunk-3CDWFEGL.js";
 import {
   AgentManager
-} from "./chunk-SN3Z6EZO.js";
+} from "./chunk-N7FVXZNI.js";
 import {
-  MergeManager
-} from "./chunk-WIJWIKAN.js";
+  CommitManager,
+  UserAbortedCommitError,
+  ValidationRunner
+} from "./chunk-NTIZLX42.js";
+import {
+  installDependencies
+} from "./chunk-LLWX3PCW.js";
 import {
   GitWorktreeManager
-} from "./chunk-EK3XCAAS.js";
+} from "./chunk-UDRZY65Y.js";
+import "./chunk-ITN64ENQ.js";
 import {
   PRManager
-} from "./chunk-5IWU3HXE.js";
+} from "./chunk-EPPPDVHD.js";
 import {
   openBrowser
 } from "./chunk-YETJNRQM.js";
+import {
+  IssueManagementProviderFactory
+} from "./chunk-GJMEKEI5.js";
+import "./chunk-HBJITKSZ.js";
 import {
   getConfiguredRepoFromSettings,
   hasMultipleRemotes
@@ -74,16 +78,17 @@ import {
 } from "./chunk-O7VL5N6S.js";
 import {
   ClaudeContextManager
-} from "./chunk-7WANFUIK.js";
-import "./chunk-6U6VI4SZ.js";
-import "./chunk-W6WVRHJ6.js";
+} from "./chunk-6TL3BYH6.js";
+import "./chunk-KVS4XGBQ.js";
+import "./chunk-TIYJEEVO.js";
 import {
   extractSettingsOverrides
 } from "./chunk-GYCR2LOU.js";
 import {
   DefaultBranchNamingService
-} from "./chunk-5TXLVEXT.js";
+} from "./chunk-C3AKFAIR.js";
 import {
+  GitCommandError,
   executeGitCommand,
   extractIssueNumber,
   findMainWorktreePathWithSettings,
@@ -91,30 +96,29 @@ import {
   getMergeTargetBranch,
   getRepoRoot,
   isPlaceholderCommit,
+  isValidGitRepo,
   pushBranchToRemote,
   removePlaceholderCommitFromHead,
   removePlaceholderCommitFromHistory
-} from "./chunk-GEXP5IOF.js";
+} from "./chunk-ZA575VLF.js";
 import {
   SettingsManager
-} from "./chunk-F6WVM437.js";
+} from "./chunk-WFQ5CLTR.js";
 import {
   MetadataManager
-} from "./chunk-CFUWQHCJ.js";
+} from "./chunk-VWGKGNJP.js";
 import {
   GitHubService
-} from "./chunk-3PT7RKL5.js";
-import "./chunk-LT3SGBR7.js";
+} from "./chunk-USJSNHGG.js";
+import "./chunk-GCPAZSGV.js";
 import {
-  promptCommitAction,
   promptConfirmation,
   waitForKeypress
 } from "./chunk-ZX3GTM7O.js";
 import "./chunk-433MOLAU.js";
 import {
-  detectClaudeCli,
   launchClaude
-} from "./chunk-AEIMYF4P.js";
+} from "./chunk-FP7G7DG3.js";
 import {
   getLogger,
   withLogger
@@ -687,7 +691,8 @@ var EnhanceCommand = class {
         "mcp__issue_management__get_issue",
         "mcp__issue_management__get_comment",
         "mcp__issue_management__create_comment",
-        "mcp__issue_management__update_comment"
+        "mcp__issue_management__update_comment",
+        "mcp__issue_management__create_issue"
       ];
       disallowedTools = ["Bash(gh api:*)"];
       getLogger().debug("Configured tool filtering for issue workflow", { allowedTools, disallowedTools });
@@ -815,860 +820,6 @@ IMPORTANT: When you create your analysis comment, tag @${author} in the "Questio
   }
 };
 
-// src/lib/ValidationRunner.ts
-var ValidationRunner = class {
-  constructor() {
-  }
-  /**
-   * Run all validations in sequence: typecheck → lint → test
-   * Fails fast on first error
-   */
-  async runValidations(worktreePath, options = {}) {
-    const startTime = Date.now();
-    const steps = [];
-    if (!options.skipTypecheck) {
-      const typecheckResult = await this.runTypecheck(
-        worktreePath,
-        options.dryRun ?? false
-      );
-      steps.push(typecheckResult);
-      if (!typecheckResult.passed && !typecheckResult.skipped) {
-        return {
-          success: false,
-          steps,
-          totalDuration: Date.now() - startTime
-        };
-      }
-    }
-    if (!options.skipLint) {
-      const lintResult = await this.runLint(worktreePath, options.dryRun ?? false);
-      steps.push(lintResult);
-      if (!lintResult.passed && !lintResult.skipped) {
-        return { success: false, steps, totalDuration: Date.now() - startTime };
-      }
-    }
-    if (!options.skipTests) {
-      const testResult = await this.runTests(
-        worktreePath,
-        options.dryRun ?? false
-      );
-      steps.push(testResult);
-      if (!testResult.passed && !testResult.skipped) {
-        return { success: false, steps, totalDuration: Date.now() - startTime };
-      }
-    }
-    return { success: true, steps, totalDuration: Date.now() - startTime };
-  }
-  /**
-   * Run typecheck validation
-   * Prefers 'compile' script over 'typecheck' if both exist
-   */
-  async runTypecheck(worktreePath, dryRun) {
-    const stepStartTime = Date.now();
-    let scriptToRun = null;
-    try {
-      const pkgJson = await getPackageConfig(worktreePath);
-      const hasCompileScript = hasScript(pkgJson, "compile");
-      const hasTypecheckScript = hasScript(pkgJson, "typecheck");
-      if (hasCompileScript) {
-        scriptToRun = "compile";
-      } else if (hasTypecheckScript) {
-        scriptToRun = "typecheck";
-      }
-      if (!scriptToRun) {
-        getLogger().debug("Skipping typecheck - no compile or typecheck script found");
-        return {
-          step: "typecheck",
-          passed: true,
-          skipped: true,
-          duration: Date.now() - stepStartTime
-        };
-      }
-    } catch (error) {
-      if (error instanceof Error && error.message.includes("package.json not found")) {
-        getLogger().debug("Skipping typecheck - no package.json found (non-Node.js project)");
-        return {
-          step: "typecheck",
-          passed: true,
-          skipped: true,
-          duration: Date.now() - stepStartTime
-        };
-      }
-      throw error;
-    }
-    const packageManager = await detectPackageManager(worktreePath);
-    if (dryRun) {
-      const command = packageManager === "npm" ? `npm run ${scriptToRun}` : `${packageManager} ${scriptToRun}`;
-      getLogger().info(`[DRY RUN] Would run: ${command}`);
-      return {
-        step: scriptToRun,
-        passed: true,
-        skipped: false,
-        duration: Date.now() - stepStartTime
-      };
-    }
-    getLogger().info(`Running ${scriptToRun}...`);
-    try {
-      await runScript(scriptToRun, worktreePath, [], { quiet: true });
-      getLogger().success(`${scriptToRun.charAt(0).toUpperCase() + scriptToRun.slice(1)} passed`);
-      return {
-        step: scriptToRun,
-        passed: true,
-        skipped: false,
-        duration: Date.now() - stepStartTime
-      };
-    } catch {
-      const fixed = await this.attemptClaudeFix(
-        scriptToRun,
-        worktreePath,
-        packageManager
-      );
-      if (fixed) {
-        return {
-          step: scriptToRun,
-          passed: true,
-          skipped: false,
-          duration: Date.now() - stepStartTime
-        };
-      }
-      const runCommand = packageManager === "npm" ? `npm run ${scriptToRun}` : `${packageManager} ${scriptToRun}`;
-      const stepLabel = scriptToRun.charAt(0).toUpperCase() + scriptToRun.slice(1);
-      throw new Error(
-        `Error: ${stepLabel} failed.
-Fix type errors before merging.
-
-Run '${runCommand}' to see detailed errors.`
-      );
-    }
-  }
-  /**
-   * Run lint validation
-   */
-  async runLint(worktreePath, dryRun) {
-    const stepStartTime = Date.now();
-    try {
-      const pkgJson = await getPackageConfig(worktreePath);
-      const hasLintScript = hasScript(pkgJson, "lint");
-      if (!hasLintScript) {
-        getLogger().debug("Skipping lint - no lint script found");
-        return {
-          step: "lint",
-          passed: true,
-          skipped: true,
-          duration: Date.now() - stepStartTime
-        };
-      }
-    } catch (error) {
-      if (error instanceof Error && error.message.includes("package.json not found")) {
-        getLogger().debug("Skipping lint - no package.json found (non-Node.js project)");
-        return {
-          step: "lint",
-          passed: true,
-          skipped: true,
-          duration: Date.now() - stepStartTime
-        };
-      }
-      throw error;
-    }
-    const packageManager = await detectPackageManager(worktreePath);
-    if (dryRun) {
-      const command = packageManager === "npm" ? "npm run lint" : `${packageManager} lint`;
-      getLogger().info(`[DRY RUN] Would run: ${command}`);
-      return {
-        step: "lint",
-        passed: true,
-        skipped: false,
-        duration: Date.now() - stepStartTime
-      };
-    }
-    getLogger().info("Running lint...");
-    try {
-      await runScript("lint", worktreePath, [], { quiet: true });
-      getLogger().success("Linting passed");
-      return {
-        step: "lint",
-        passed: true,
-        skipped: false,
-        duration: Date.now() - stepStartTime
-      };
-    } catch {
-      const fixed = await this.attemptClaudeFix(
-        "lint",
-        worktreePath,
-        packageManager
-      );
-      if (fixed) {
-        return {
-          step: "lint",
-          passed: true,
-          skipped: false,
-          duration: Date.now() - stepStartTime
-        };
-      }
-      const runCommand = packageManager === "npm" ? "npm run lint" : `${packageManager} lint`;
-      throw new Error(
-        `Error: Linting failed.
-Fix linting errors before merging.
-
-Run '${runCommand}' to see detailed errors.`
-      );
-    }
-  }
-  /**
-   * Run test validation
-   */
-  async runTests(worktreePath, dryRun) {
-    const stepStartTime = Date.now();
-    try {
-      const pkgJson = await getPackageConfig(worktreePath);
-      const hasTestScript = hasScript(pkgJson, "test");
-      if (!hasTestScript) {
-        getLogger().debug("Skipping tests - no test script found");
-        return {
-          step: "test",
-          passed: true,
-          skipped: true,
-          duration: Date.now() - stepStartTime
-        };
-      }
-    } catch (error) {
-      if (error instanceof Error && error.message.includes("package.json not found")) {
-        getLogger().debug("Skipping tests - no package.json found (non-Node.js project)");
-        return {
-          step: "test",
-          passed: true,
-          skipped: true,
-          duration: Date.now() - stepStartTime
-        };
-      }
-      throw error;
-    }
-    const packageManager = await detectPackageManager(worktreePath);
-    if (dryRun) {
-      const command = packageManager === "npm" ? "npm run test" : `${packageManager} test`;
-      getLogger().info(`[DRY RUN] Would run: ${command}`);
-      return {
-        step: "test",
-        passed: true,
-        skipped: false,
-        duration: Date.now() - stepStartTime
-      };
-    }
-    getLogger().info("Running tests...");
-    try {
-      await runScript("test", worktreePath, [], { quiet: true });
-      getLogger().success("Tests passed");
-      return {
-        step: "test",
-        passed: true,
-        skipped: false,
-        duration: Date.now() - stepStartTime
-      };
-    } catch {
-      const fixed = await this.attemptClaudeFix(
-        "test",
-        worktreePath,
-        packageManager
-      );
-      if (fixed) {
-        return {
-          step: "test",
-          passed: true,
-          skipped: false,
-          duration: Date.now() - stepStartTime
-        };
-      }
-      const runCommand = packageManager === "npm" ? "npm run test" : `${packageManager} test`;
-      throw new Error(
-        `Error: Tests failed.
-Fix test failures before merging.
-
-Run '${runCommand}' to see detailed errors.`
-      );
-    }
-  }
-  /**
-   * Attempt to fix validation errors using Claude
-   * Pattern based on MergeManager.attemptClaudeConflictResolution
-   *
-   * @param validationType - Type of validation that failed ('compile' | 'typecheck' | 'lint' | 'test')
-   * @param worktreePath - Path to the worktree
-   * @param packageManager - Detected package manager
-   * @returns true if Claude fixed the issue, false otherwise
-   */
-  async attemptClaudeFix(validationType, worktreePath, packageManager) {
-    const isClaudeAvailable = await detectClaudeCli();
-    if (!isClaudeAvailable) {
-      getLogger().debug("Claude CLI not available, skipping auto-fix");
-      return false;
-    }
-    const validationCommand = this.getValidationCommand(validationType, packageManager);
-    const prompt = this.getClaudePrompt(validationType, validationCommand);
-    const validationTypeCapitalized = validationType.charAt(0).toUpperCase() + validationType.slice(1);
-    getLogger().info(`Launching Claude to help fix ${validationTypeCapitalized} errors...`);
-    try {
-      await launchClaude(prompt, {
-        addDir: worktreePath,
-        headless: false,
-        // Interactive mode
-        permissionMode: "acceptEdits",
-        // Auto-accept edits
-        model: "sonnet"
-        // Use Sonnet model
-      });
-      getLogger().info(`Re-running ${validationTypeCapitalized} after Claude's fixes...`);
-      try {
-        await runScript(validationType, worktreePath, [], { quiet: true });
-        getLogger().success(`${validationTypeCapitalized} passed after Claude auto-fix`);
-        return true;
-      } catch {
-        getLogger().warn(`${validationTypeCapitalized} still failing after Claude's help`);
-        return false;
-      }
-    } catch (error) {
-      getLogger().warn("Claude auto-fix failed", {
-        error: error instanceof Error ? error.message : String(error)
-      });
-      return false;
-    }
-  }
-  /**
-   * Get validation command string for prompts
-   * Uses il commands for multi-language project support
-   */
-  getValidationCommand(validationType, _packageManager) {
-    return `il ${validationType}`;
-  }
-  /**
-   * Get Claude prompt for specific validation type
-   * Matches bash script prompts exactly
-   */
-  getClaudePrompt(validationType, validationCommand) {
-    switch (validationType) {
-      case "compile":
-      case "typecheck":
-        return `There are TypeScript errors in this codebase. Please analyze the ${validationType} output, identify all type errors, and fix them. Run '${validationCommand}' to see the errors, then make the necessary code changes to resolve all type issues. When you are done, tell the user to quit using /exit to continue the validation process.`;
-      case "lint":
-        return `There are ESLint errors in this codebase. Please analyze the linting output, identify all linting issues, and fix them. Run '${validationCommand}' to see the errors, then make the necessary code changes to resolve all linting issues. Focus on code quality, consistency, and following the project's linting rules. When you are done, tell the user to quit using /exit to continue the validation process.`;
-      case "test":
-        return `There are unit test failures in this codebase. Please analyze the test output to understand what's failing, then fix the issues. This might involve updating test code, fixing bugs in the source code, or updating tests to match new behavior. Run '${validationCommand}' to see the detailed test failures, then make the necessary changes to get all tests passing. When you are done, tell the user to quit using /exit to continue the validation process.`;
-    }
-  }
-};
-
-// src/utils/vscode.ts
-import { execa } from "execa";
-function isRunningInVSCode() {
-  return process.env.TERM_PROGRAM === "vscode";
-}
-function isRunningInCursor() {
-  return !!process.env.CURSOR_TRACE_ID;
-}
-function isRunningInAntigravity() {
-  return !!process.env.ANTIGRAVITY_CLI_ALIAS;
-}
-async function isVSCodeAvailable() {
-  try {
-    await execa("command", ["-v", "code"], {
-      shell: true,
-      timeout: 5e3
-    });
-    return true;
-  } catch (error) {
-    logger.debug("VSCode CLI not available", { error });
-    return false;
-  }
-}
-async function isCursorAvailable() {
-  try {
-    await execa("command", ["-v", "cursor"], {
-      shell: true,
-      timeout: 5e3
-    });
-    return true;
-  } catch (error) {
-    logger.debug("Cursor CLI not available", { error });
-    return false;
-  }
-}
-async function isAntigravityAvailable() {
-  try {
-    await execa("command", ["-v", "agy"], {
-      shell: true,
-      timeout: 5e3
-    });
-    return true;
-  } catch (error) {
-    logger.debug("Antigravity CLI not available", { error });
-    return false;
-  }
-}
-
-// src/types/index.ts
-var UserAbortedCommitError = class extends Error {
-  constructor(message = "User aborted the commit") {
-    super(message);
-    this.name = "UserAbortedCommitError";
-  }
-};
-
-// src/lib/CommitManager.ts
-import { writeFile, readFile as readFile2, unlink } from "fs/promises";
-import { join } from "path";
-import { execa as execa2 } from "execa";
-var CommitManager = class {
-  constructor() {
-  }
-  /**
-   * Detect uncommitted changes in a worktree
-   * Parses git status --porcelain output into structured GitStatus
-   */
-  async detectUncommittedChanges(worktreePath) {
-    const porcelainOutput = await executeGitCommand(["status", "--porcelain"], {
-      cwd: worktreePath
-    });
-    const { stagedFiles, unstagedFiles } = this.parseGitStatus(porcelainOutput);
-    const currentBranch = await executeGitCommand(["branch", "--show-current"], {
-      cwd: worktreePath
-    });
-    return {
-      hasUncommittedChanges: stagedFiles.length > 0 || unstagedFiles.length > 0,
-      unstagedFiles,
-      stagedFiles,
-      currentBranch: currentBranch.trim(),
-      // Defer these to future enhancement
-      isAheadOfRemote: false,
-      isBehindRemote: false
-    };
-  }
-  /**
-   * Stage all changes and commit with Claude-generated or simple message
-   * Tries Claude first, falls back to simple message if Claude unavailable or fails
-   */
-  async commitChanges(worktreePath, options) {
-    if (options.dryRun) {
-      getLogger().info("[DRY RUN] Would run: git add -A");
-      getLogger().info("[DRY RUN] Would generate commit message with Claude (if available)");
-      const fallbackMessage = this.generateFallbackMessage(options);
-      const verifyFlag = options.skipVerify ? " --no-verify" : "";
-      getLogger().info(`[DRY RUN] Would commit with message${verifyFlag}: ${fallbackMessage}`);
-      return;
-    }
-    await executeGitCommand(["add", "-A"], { cwd: worktreePath });
-    let message = null;
-    if (!options.message) {
-      try {
-        message = await this.generateClaudeCommitMessage(worktreePath, options.issueNumber);
-      } catch (error) {
-        getLogger().debug("Claude commit message generation failed, using fallback", { error });
-      }
-    }
-    message ??= this.generateFallbackMessage(options);
-    if (options.skipVerify) {
-      getLogger().warn("Skipping pre-commit hooks (--no-verify configured in settings)");
-    }
-    try {
-      if (options.noReview || options.message) {
-        const commitArgs = ["commit", "-m", message];
-        if (options.skipVerify) {
-          commitArgs.push("--no-verify");
-        }
-        await executeGitCommand(commitArgs, { cwd: worktreePath });
-      } else {
-        const action = await promptCommitAction(message);
-        if (action === "abort") {
-          throw new UserAbortedCommitError();
-        }
-        if (action === "accept") {
-          const commitArgs = ["commit", "-m", message];
-          if (options.skipVerify) {
-            commitArgs.push("--no-verify");
-          }
-          await executeGitCommand(commitArgs, { cwd: worktreePath });
-        } else {
-          getLogger().info("Opening editor for commit message review...");
-          if (isRunningInAntigravity() && await isAntigravityAvailable()) {
-            await this.commitWithExternalEditor(worktreePath, message, options, "agy", "Antigravity");
-          } else if (isRunningInCursor() && await isCursorAvailable()) {
-            await this.commitWithExternalEditor(worktreePath, message, options, "cursor", "Cursor");
-          } else if (isRunningInVSCode() && await isVSCodeAvailable()) {
-            await this.commitWithExternalEditor(worktreePath, message, options, "code", "VSCode");
-          } else {
-            const commitArgs = ["commit", "-e", "-m", message];
-            if (options.skipVerify) {
-              commitArgs.push("--no-verify");
-            }
-            await executeGitCommand(commitArgs, {
-              cwd: worktreePath,
-              stdio: "inherit",
-              timeout: 3e5
-              // 5 minutes for interactive editing
-            });
-          }
-        }
-      }
-    } catch (error) {
-      if (error instanceof UserAbortedCommitError) {
-        throw error;
-      }
-      if (error instanceof Error && error.message.includes("nothing to commit")) {
-        getLogger().info("No changes to commit");
-        return;
-      }
-      throw error;
-    }
-  }
-  /**
-   * Commit with external editor CLI (VSCode, Cursor, Antigravity, etc.)
-   * Handles file creation, editing, and commit to ensure the file opens
-   * in the current editor window (preserves IPC context)
-   */
-  async commitWithExternalEditor(worktreePath, message, options, cliCommand, editorName) {
-    const commitMsgPath = join(worktreePath, ".COMMIT_EDITMSG");
-    const initialContent = `${message}
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Save and close the file to complete the commit.
-`;
-    await writeFile(commitMsgPath, initialContent, "utf-8");
-    try {
-      getLogger().debug(`Opening commit message in ${editorName}: ${commitMsgPath}`);
-      await execa2(cliCommand, ["--wait", commitMsgPath], {
-        cwd: worktreePath,
-        stdio: "inherit"
-      });
-      const editedContent = await readFile2(commitMsgPath, "utf-8");
-      const finalMessage = editedContent.split("\n").filter((line) => !line.startsWith("#")).join("\n").trim();
-      if (!finalMessage) {
-        throw new UserAbortedCommitError();
-      }
-      const commitArgs = ["commit", "-F", commitMsgPath];
-      if (options.skipVerify) {
-        commitArgs.push("--no-verify");
-      }
-      await writeFile(commitMsgPath, finalMessage, "utf-8");
-      await executeGitCommand(commitArgs, { cwd: worktreePath });
-    } finally {
-      try {
-        await unlink(commitMsgPath);
-      } catch {
-      }
-    }
-  }
-  /**
-   * Generate simple fallback commit message when Claude unavailable
-   * Used as fallback for Claude-powered commit messages
-   */
-  generateFallbackMessage(options) {
-    if (options.message) {
-      return options.message;
-    }
-    if (options.issueNumber) {
-      return `WIP: Auto-commit for issue #${options.issueNumber}
-
-Fixes #${options.issueNumber}`;
-    } else {
-      return "WIP: Auto-commit uncommitted changes";
-    }
-  }
-  /**
-   * Parse git status --porcelain output
-   * Format: "XY filename" where X=index, Y=worktree
-   * Examples:
-   *   "M  file.ts" - staged modification
-   *   " M file.ts" - unstaged modification
-   *   "MM file.ts" - both staged and unstaged
-   *   "?? file.ts" - untracked
-   */
-  parseGitStatus(porcelainOutput) {
-    const stagedFiles = [];
-    const unstagedFiles = [];
-    if (!porcelainOutput.trim()) {
-      return { stagedFiles, unstagedFiles };
-    }
-    const lines = porcelainOutput.split("\n").filter((line) => line.trim());
-    for (const line of lines) {
-      if (line.length < 3) continue;
-      const indexStatus = line[0];
-      const worktreeStatus = line[1];
-      const filename = line.substring(3);
-      if (indexStatus !== " " && indexStatus !== "?") {
-        stagedFiles.push(filename);
-      }
-      if (worktreeStatus !== " " || line.startsWith("??")) {
-        unstagedFiles.push(filename);
-      }
-    }
-    return { stagedFiles, unstagedFiles };
-  }
-  /**
-   * Generate commit message using Claude Code
-   * Claude examines the git repository directly via --add-dir option
-   * Returns null if Claude unavailable or fails validation
-   */
-  async generateClaudeCommitMessage(worktreePath, issueNumber) {
-    const startTime = Date.now();
-    getLogger().info("Starting Claude commit message generation...", {
-      worktreePath: worktreePath.split("/").pop(),
-      // Just show the folder name for privacy
-      issueNumber
-    });
-    getLogger().debug("Checking Claude CLI availability...");
-    const isClaudeAvailable = await detectClaudeCli();
-    if (!isClaudeAvailable) {
-      getLogger().info("Claude CLI not available, skipping Claude commit message generation");
-      return null;
-    }
-    getLogger().debug("Claude CLI is available");
-    getLogger().debug("Building commit message prompt...");
-    const prompt = this.buildCommitMessagePrompt(issueNumber);
-    getLogger().debug("Prompt built", { promptLength: prompt.length });
-    getLogger().debug("Claude prompt content:", {
-      prompt,
-      truncatedPreview: prompt.substring(0, 500) + (prompt.length > 500 ? "...[truncated]" : "")
-    });
-    try {
-      getLogger().info("Calling Claude CLI for commit message generation...");
-      const claudeStartTime = Date.now();
-      const claudeOptions = {
-        headless: true,
-        addDir: worktreePath,
-        model: "claude-haiku-4-5-20251001",
-        // Fast, cost-effective model
-        timeout: 12e4,
-        // 120 second timeout
-        appendSystemPrompt: "Output only the requested content. Never include preamble, analysis, or meta-commentary. Your response is used verbatim."
-      };
-      getLogger().debug("Claude CLI call parameters:", {
-        options: claudeOptions,
-        worktreePathForAnalysis: worktreePath,
-        addDirContents: "Will include entire worktree directory for analysis"
-      });
-      const result = await launchClaude(prompt, claudeOptions);
-      const claudeDuration = Date.now() - claudeStartTime;
-      getLogger().debug("Claude API call completed", { duration: `${claudeDuration}ms` });
-      if (typeof result !== "string") {
-        getLogger().warn("Claude returned non-string result", { resultType: typeof result });
-        return null;
-      }
-      getLogger().debug("Raw Claude output received", {
-        outputLength: result.length,
-        preview: result.substring(0, 200) + (result.length > 200 ? "..." : "")
-      });
-      getLogger().debug("Sanitizing Claude output...");
-      const sanitized = this.sanitizeClaudeOutput(result);
-      getLogger().debug("Output sanitized", {
-        originalLength: result.length,
-        sanitizedLength: sanitized.length,
-        sanitized: sanitized.substring(0, 200) + (sanitized.length > 200 ? "..." : "")
-      });
-      if (!sanitized) {
-        getLogger().warn("Claude returned empty message after sanitization");
-        return null;
-      }
-      let finalMessage = sanitized;
-      if (issueNumber) {
-        if (!finalMessage.includes(`Fixes #${issueNumber}`)) {
-          finalMessage = `${finalMessage}
-
-Fixes #${issueNumber}`;
-          getLogger().debug(`Added "Fixes #${issueNumber}" trailer to commit message`);
-        } else {
-          getLogger().debug(`"Fixes #${issueNumber}" already present in commit message`);
-        }
-      }
-      const totalDuration = Date.now() - startTime;
-      getLogger().info("Claude commit message generated successfully", {
-        message: finalMessage,
-        totalDuration: `${totalDuration}ms`,
-        claudeApiDuration: `${claudeDuration}ms`
-      });
-      return finalMessage;
-    } catch (error) {
-      const totalDuration = Date.now() - startTime;
-      const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      if (errorMessage.includes("timed out") || errorMessage.includes("timeout")) {
-        getLogger().warn("Claude commit message generation timed out after 45 seconds", {
-          totalDuration: `${totalDuration}ms`,
-          worktreePath: worktreePath.split("/").pop()
-        });
-      } else {
-        getLogger().warn("Failed to generate commit message with Claude", {
-          error: errorMessage,
-          totalDuration: `${totalDuration}ms`,
-          worktreePath: worktreePath.split("/").pop()
-        });
-      }
-      return null;
-    }
-  }
-  /**
-   * Build structured XML prompt for commit message generation
-   * Uses XML format for clear task definition and output expectations
-   */
-  buildCommitMessagePrompt(issueNumber) {
-    const issueContext = issueNumber ? `
-<IssueContext>
-This commit is associated with GitHub issue #${issueNumber}.
-If the changes appear to resolve the issue, include "Fixes #${issueNumber}" at the end of the first line of commit message.
-</IssueContext>` : "";
-    return `<Task>
-You are a software engineer writing a commit message for this repository.
-Examine the staged changes in the git repository and generate a concise, meaningful commit message.
-</Task>
-
-<Requirements>
-<Format>The first line must be a brief summary of the changes made as a full sentence. If it references an issue, include "Fixes #N" at the end of this line.
-
-Add 2 newlines, then add a bullet-point form description of the changes made, each change on a new line.</Format>
-<Mood>Use imperative mood (e.g., "Add feature" not "Added feature")</Mood>
-<Focus>Be specific about what was changed and why</Focus>
-<Conciseness>Keep message under 72 characters for subject line when possible</Conciseness>
-<NoMeta>CRITICAL: Do NOT include ANY explanatory text, analysis, or meta-commentary. Output ONLY the raw commit message.</NoMeta>
-<Examples>
-Good: "Add user authentication with JWT tokens. Fixes #42
-
-- Implement login and registration endpoints
-- Secure routes with JWT middleware
-- Update user model to store hashed passwords"
-Good: "Fix navigation bug in sidebar menu."
-Bad: "Based on the changes, I'll create: Add user authentication"
-Bad: "Looking at the files, this commit should be: Fix navigation bug"
-</Examples>
-${issueContext}
-</Requirements>
-
-<Output>
-IMPORTANT: Your entire response will be used directly as the git commit message.
-Do not include any explanatory text before or after the commit message.
-Start your response immediately with the commit message text.
-</Output>`;
-  }
-  /**
-   * Sanitize Claude output to remove meta-commentary and clean formatting
-   * Handles cases where Claude includes explanatory text despite instructions
-   */
-  sanitizeClaudeOutput(rawOutput) {
-    let cleaned = rawOutput.trim();
-    const metaPatterns = [
-      /^.*?based on.*?changes.*?:/i,
-      /^.*?looking at.*?files.*?:/i,
-      /^.*?examining.*?:/i,
-      /^.*?analyzing.*?:/i,
-      /^.*?i'll.*?generate.*?:/i,
-      /^.*?let me.*?:/i,
-      /^.*?the commit message.*?should be.*?:/i,
-      /^.*?here.*?is.*?commit.*?message.*?:/i
-    ];
-    for (const pattern of metaPatterns) {
-      cleaned = cleaned.replace(pattern, "").trim();
-    }
-    if (cleaned.includes(":")) {
-      const colonIndex = cleaned.indexOf(":");
-      const beforeColon = cleaned.substring(0, colonIndex).trim().toLowerCase();
-      const metaIndicators = [
-        "here is the commit message",
-        "commit message",
-        "here is",
-        "the message should be",
-        "i suggest",
-        "my suggestion"
-      ];
-      const isMetaCommentary = metaIndicators.some((indicator) => beforeColon.includes(indicator));
-      if (isMetaCommentary) {
-        const afterColon = cleaned.substring(colonIndex + 1).trim();
-        if (afterColon && afterColon.length > 10) {
-          cleaned = afterColon;
-        }
-      }
-    }
-    if (cleaned.startsWith('"') && cleaned.endsWith('"') || cleaned.startsWith("'") && cleaned.endsWith("'")) {
-      cleaned = cleaned.slice(1, -1).trim();
-    }
-    return cleaned;
-  }
-};
-
-// src/lib/BuildRunner.ts
-var BuildRunner = class {
-  constructor(capabilityDetector) {
-    this.capabilityDetector = capabilityDetector ?? new ProjectCapabilityDetector();
-  }
-  /**
-   * Run build verification in the specified directory
-   * @param buildPath - Path where build should run (typically main worktree path)
-   * @param options - Build options
-   */
-  async runBuild(buildPath, options = {}) {
-    const startTime = Date.now();
-    try {
-      const pkgJson = await getPackageConfig(buildPath);
-      const hasBuildScript = hasScript(pkgJson, "build");
-      if (!hasBuildScript) {
-        getLogger().debug("Skipping build - no build script found");
-        return {
-          success: true,
-          skipped: true,
-          reason: "No build script found in package configuration",
-          duration: Date.now() - startTime
-        };
-      }
-    } catch (error) {
-      if (error instanceof Error && error.message.includes("package.json not found")) {
-        getLogger().debug("Skipping build - no package configuration found");
-        return {
-          success: true,
-          skipped: true,
-          reason: "No package configuration found in project",
-          duration: Date.now() - startTime
-        };
-      }
-      throw error;
-    }
-    const capabilities = await this.capabilityDetector.detectCapabilities(buildPath);
-    const isCLIProject = capabilities.capabilities.includes("cli");
-    if (!isCLIProject) {
-      getLogger().debug("Skipping build - not a CLI project (no bin field)");
-      return {
-        success: true,
-        skipped: true,
-        reason: "Project is not a CLI project (no bin field in package.json)",
-        duration: Date.now() - startTime
-      };
-    }
-    const packageManager = await detectPackageManager(buildPath);
-    if (options.dryRun) {
-      const command = packageManager === "npm" ? "npm run build" : `${packageManager} build`;
-      getLogger().info(`[DRY RUN] Would run: ${command}`);
-      return {
-        success: true,
-        skipped: false,
-        duration: Date.now() - startTime
-      };
-    }
-    getLogger().info("Running build...");
-    try {
-      await runScript("build", buildPath, [], { quiet: true });
-      getLogger().success("Build completed successfully");
-      return {
-        success: true,
-        skipped: false,
-        duration: Date.now() - startTime
-      };
-    } catch {
-      const runCommand = packageManager === "npm" ? "npm run build" : `${packageManager} build`;
-      throw new Error(
-        `Error: Build failed.
-Fix build errors before proceeding.
-
-Run '${runCommand}' to see detailed errors.`
-      );
-    }
-  }
-};
-
 // src/commands/finish.ts
 import path3 from "path";
 var FinishCommand = class {
@@ -1709,7 +860,7 @@ var FinishCommand = class {
     const neonProvider = createNeonProviderFromSettings(settings);
     const databaseManager = new DatabaseManager(neonProvider, environmentManager, databaseUrlEnvVarName);
     const cliIsolationManager = new CLIIsolationManager();
-    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-B5PVRR7F.js");
+    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-FLPUUFOB.js");
     this.loomManager ??= new LoomManager(
       this.gitWorktreeManager,
       this.issueTracker,
@@ -1768,6 +919,7 @@ var FinishCommand = class {
    */
   async execute(input) {
     var _a, _b, _c, _d;
+    process.env.ILOOM = "1";
     const isJsonMode = input.options.json === true;
     const result = {
       success: false,
@@ -2049,7 +1201,7 @@ var FinishCommand = class {
    * This is the workflow: rebase → validate → commit → merge → cleanup
    */
   async executeIssueWorkflow(parsed, options, worktree, result) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     getLogger().info("Rebasing branch on main...");
     const mergeOptions = {
       dryRun: options.dryRun ?? false,
@@ -2094,9 +1246,12 @@ var FinishCommand = class {
         getLogger().info("Validation passed, auto-committing uncommitted changes...");
         const settings2 = await this.settingsManager.loadSettings(worktree.path);
         const skipVerify = ((_b = (_a = settings2.workflows) == null ? void 0 : _a.issue) == null ? void 0 : _b.noVerify) ?? false;
+        const providerType = ((_c = settings2.issueManagement) == null ? void 0 : _c.provider) ?? "github";
+        const issuePrefix = IssueManagementProviderFactory.create(providerType).issuePrefix;
         const commitOptions = {
           dryRun: options.dryRun ?? false,
-          skipVerify
+          skipVerify,
+          issuePrefix
         };
         if (parsed.type === "issue" && parsed.number) {
           commitOptions.issueNumber = parsed.number;
@@ -2142,9 +1297,9 @@ var FinishCommand = class {
           `The 'github-draft-pr' merge mode requires a GitHub-compatible issue tracker. Your provider (${this.issueTracker.providerName}) does not support pull requests.`
         );
       }
-      const { MetadataManager: MetadataManager2 } = await import("./MetadataManager-DFI73J3G.js");
-      const metadataManager = new MetadataManager2();
-      const metadata = await metadataManager.readMetadata(worktree.path);
+      const { MetadataManager: MetadataManager3 } = await import("./MetadataManager-XJ2YB762.js");
+      const metadataManager2 = new MetadataManager3();
+      const metadata = await metadataManager2.readMetadata(worktree.path);
       getLogger().debug(`Draft PR mode: worktree=${worktree.path}, draftPrNumber=${(metadata == null ? void 0 : metadata.draftPrNumber) ?? "none"}`);
       if (!(metadata == null ? void 0 : metadata.draftPrNumber)) {
         getLogger().warn("No draft PR found in metadata, creating new PR...");
@@ -2209,7 +1364,7 @@ var FinishCommand = class {
       } else {
         getLogger().info(`[DRY RUN] Would mark PR #${metadata.draftPrNumber} as ready for review`);
       }
-      const prUrl = (_c = metadata.prUrls) == null ? void 0 : _c[String(metadata.draftPrNumber)];
+      const prUrl = (_d = metadata.prUrls) == null ? void 0 : _d[String(metadata.draftPrNumber)];
       if (prUrl) {
         result.prUrl = prUrl;
       }
@@ -2243,7 +1398,17 @@ var FinishCommand = class {
       getLogger().debug("Skipping build verification (--skip-build flag provided)");
     }
     await this.generateSessionSummaryIfConfigured(parsed, worktree, options);
-    await this.performPostMergeCleanup(parsed, options, worktree, result);
+    const { MetadataManager: MetadataManager2 } = await import("./MetadataManager-XJ2YB762.js");
+    const metadataManager = new MetadataManager2();
+    if (!options.dryRun) {
+      await metadataManager.archiveMetadata(worktree.path);
+    }
+    if (options.cleanup === false) {
+      getLogger().info("Worktree kept active (--no-cleanup flag)");
+      getLogger().info(`To cleanup later: il cleanup ${parsed.originalInput}`);
+    } else {
+      await this.performPostMergeCleanup(parsed, options, worktree, result);
+    }
   }
   /**
    * Execute workflow for Pull Requests
@@ -2252,7 +1417,7 @@ var FinishCommand = class {
    * - CLOSED/MERGED: Skip to cleanup
    */
   async executePRWorkflow(parsed, options, worktree, pr, result) {
-    var _a, _b;
+    var _a, _b, _c;
     if (pr.state === "closed" || pr.state === "merged") {
       getLogger().info(`PR #${parsed.number} is ${pr.state.toUpperCase()} - skipping to cleanup`);
       const gitStatus = await this.commitManager.detectUncommittedChanges(worktree.path);
@@ -2262,6 +1427,11 @@ var FinishCommand = class {
           "Cannot cleanup PR with uncommitted changes. Commit or stash changes, then run again with --force to cleanup anyway."
         );
       }
+      const { MetadataManager: MetadataManager2 } = await import("./MetadataManager-XJ2YB762.js");
+      const metadataManager = new MetadataManager2();
+      if (!options.dryRun) {
+        await metadataManager.archiveMetadata(worktree.path);
+      }
       await this.performPRCleanup(parsed, options, worktree, pr.state, result);
       getLogger().success(`PR #${parsed.number} cleanup completed`);
       result.operations.push({
@@ -2284,10 +1454,13 @@ var FinishCommand = class {
           getLogger().info("Committing uncommitted changes...");
           const settings = await this.settingsManager.loadSettings(worktree.path);
           const skipVerify = ((_b = (_a = settings.workflows) == null ? void 0 : _a.pr) == null ? void 0 : _b.noVerify) ?? false;
+          const providerType = ((_c = settings.issueManagement) == null ? void 0 : _c.provider) ?? "github";
+          const issuePrefix = IssueManagementProviderFactory.create(providerType).issuePrefix;
           try {
             await this.commitManager.commitChanges(worktree.path, {
               dryRun: false,
-              skipVerify
+              skipVerify,
+              issuePrefix
               // Do NOT pass issueNumber for PRs - no "Fixes #" trailer needed
             });
             getLogger().success("Changes committed");
@@ -2386,6 +1559,11 @@ var FinishCommand = class {
       }
       finishResult.prUrl = prResult.url;
       await this.generateSessionSummaryIfConfigured(parsed, worktree, options, prResult.number);
+      const { MetadataManager: MetadataManager2 } = await import("./MetadataManager-XJ2YB762.js");
+      const metadataManager = new MetadataManager2();
+      if (!options.dryRun) {
+        await metadataManager.archiveMetadata(worktree.path);
+      }
       await this.handlePRCleanupPrompt(parsed, options, worktree, finishResult);
     }
   }
@@ -2740,7 +1918,7 @@ var FinishCommand = class {
 // src/utils/package-info.ts
 import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
-import { dirname, join as join2 } from "path";
+import { dirname, join } from "path";
 function getPackageInfo(scriptPath) {
   try {
     let basePath;
@@ -2751,7 +1929,7 @@ function getPackageInfo(scriptPath) {
       basePath = __filename2;
     }
     const __dirname = dirname(basePath);
-    const packageJsonPath = join2(__dirname, "..", "package.json");
+    const packageJsonPath = join(__dirname, "..", "package.json");
     const packageJsonContent = readFileSync(packageJsonPath, "utf8");
     const packageJson2 = JSON.parse(packageJsonContent);
     return packageJson2;
@@ -2778,12 +1956,12 @@ function determineLoomType(worktree) {
   }
   return "branch";
 }
-function extractPRNumbers(path4) {
-  if (!path4) {
+function extractPRNumbers(path6) {
+  if (!path6) {
     return [];
   }
   const prPathPattern = /_pr_(\d+)$/;
-  const match = path4.match(prPathPattern);
+  const match = path6.match(prPathPattern);
   if (match == null ? void 0 : match[1]) {
     return [match[1]];
   }
@@ -2830,12 +2008,199 @@ function formatLoomForJson(worktree, mainWorktreePath, metadata) {
     colorHex: (metadata == null ? void 0 : metadata.colorHex) ?? null,
     projectPath: (metadata == null ? void 0 : metadata.projectPath) ?? null,
     issueUrls: (metadata == null ? void 0 : metadata.issueUrls) ?? {},
-    prUrls: (metadata == null ? void 0 : metadata.prUrls) ?? {}
+    prUrls: (metadata == null ? void 0 : metadata.prUrls) ?? {},
+    capabilities: (metadata == null ? void 0 : metadata.capabilities) ?? []
   };
 }
 function formatLoomsForJson(worktrees, mainWorktreePath, metadata) {
   return worktrees.map((wt) => formatLoomForJson(wt, mainWorktreePath, metadata == null ? void 0 : metadata.get(wt.path)));
 }
+function formatFinishedLoomForJson(metadata) {
+  const loomType = metadata.issueType ?? "branch";
+  return {
+    name: metadata.branchName ?? metadata.worktreePath ?? "unknown",
+    worktreePath: null,
+    // Finished looms no longer have a worktree
+    branch: metadata.branchName,
+    type: loomType,
+    issue_numbers: metadata.issue_numbers,
+    pr_numbers: metadata.pr_numbers,
+    isMainWorktree: false,
+    // Finished looms are never the main worktree
+    description: metadata.description ?? null,
+    created_at: metadata.created_at ?? null,
+    issueTracker: metadata.issueTracker ?? null,
+    colorHex: metadata.colorHex ?? null,
+    projectPath: metadata.projectPath ?? null,
+    issueUrls: metadata.issueUrls ?? {},
+    prUrls: metadata.prUrls ?? {},
+    capabilities: metadata.capabilities ?? [],
+    status: metadata.status ?? "finished",
+    finishedAt: metadata.finishedAt ?? null
+  };
+}
+
+// src/cli.ts
+import fs3 from "fs-extra";
+
+// src/lib/VersionMigrationManager.ts
+import fs2 from "fs-extra";
+import path5 from "path";
+import os2 from "os";
+
+// src/migrations/index.ts
+import fs from "fs-extra";
+import path4 from "path";
+import os from "os";
+var migrations = [
+  // v0.6.0 is the baseline - no migrations needed
+  {
+    version: "0.6.1",
+    description: "Add global gitignore for .iloom/settings.local.json",
+    migrate: async () => {
+      const globalIgnorePath = path4.join(os.homedir(), ".config", "git", "ignore");
+      const pattern = "**/.iloom/settings.local.json";
+      await fs.ensureDir(path4.dirname(globalIgnorePath));
+      let content = "";
+      try {
+        content = await fs.readFile(globalIgnorePath, "utf-8");
+      } catch {
+      }
+      if (content.includes(pattern)) {
+        return;
+      }
+      const separator = content.endsWith("\n") || content === "" ? "" : "\n";
+      const newContent = content + separator + "\n# Added by iloom CLI\n" + pattern + "\n";
+      await fs.writeFile(globalIgnorePath, newContent, "utf-8");
+    }
+  }
+];
+
+// src/lib/VersionMigrationManager.ts
+var VersionMigrationManager = class {
+  constructor() {
+    this.DEFAULT_VERSION = "0.6.0";
+    this.VERSION_OVERRIDE_ENV = "ILOOM_VERSION_OVERRIDE";
+  }
+  // Return path to migration state file
+  getMigrationStatePath() {
+    return path5.join(os2.homedir(), ".config", "iloom-ai", "migration-state.json");
+  }
+  // Get effective version, respecting ILOOM_VERSION_OVERRIDE env var
+  // packageVersion is the version from package.json passed by caller
+  getEffectiveVersion(packageVersion) {
+    const override = process.env[this.VERSION_OVERRIDE_ENV];
+    if (override && override.trim() !== "") {
+      logger.debug(`[VersionMigrationManager] Using version override: ${override} (package.json: ${packageVersion})`);
+      return override.trim();
+    }
+    return packageVersion;
+  }
+  // Load full migration state from file
+  // Returns state with DEFAULT_VERSION if file missing/invalid
+  async loadFullMigrationState() {
+    const statePath = this.getMigrationStatePath();
+    try {
+      const content = await fs2.readFile(statePath, "utf-8");
+      const state = JSON.parse(content);
+      if (typeof state.lastMigratedVersion === "string") {
+        return state;
+      }
+    } catch {
+      logger.debug(`[VersionMigrationManager] Migration state not found, using default version: ${this.DEFAULT_VERSION}`);
+    }
+    return {
+      lastMigratedVersion: this.DEFAULT_VERSION,
+      migratedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+  }
+  // Load last migrated version from state file
+  // Returns DEFAULT_VERSION if file missing/invalid
+  async loadMigrationState() {
+    const state = await this.loadFullMigrationState();
+    return state.lastMigratedVersion;
+  }
+  // Save current version to state file, preserving and appending to existing failures
+  async saveMigrationState(version, newFailures = []) {
+    const statePath = this.getMigrationStatePath();
+    try {
+      await fs2.ensureDir(path5.dirname(statePath));
+      const existingState = await this.loadFullMigrationState();
+      const existingFailures = existingState.failedMigrations ?? [];
+      const allFailures = [...existingFailures];
+      for (const newFailure of newFailures) {
+        const existingIndex = allFailures.findIndex((f) => f.version === newFailure.version);
+        if (existingIndex >= 0) {
+          allFailures[existingIndex] = newFailure;
+        } else {
+          allFailures.push(newFailure);
+        }
+      }
+      const state = {
+        lastMigratedVersion: version,
+        migratedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        ...allFailures.length > 0 && { failedMigrations: allFailures }
+      };
+      await fs2.writeFile(statePath, JSON.stringify(state, null, 2), "utf-8");
+    } catch (error) {
+      logger.warn(`[VersionMigrationManager] Failed to save migration state: ${error}`);
+    }
+  }
+  // Compare semver versions: returns negative if v1 < v2, positive if v1 > v2, 0 if equal
+  // Pattern from update-notifier.ts:190-221
+  compareVersions(v1, v2) {
+    try {
+      const parts1 = v1.split(".").map((p) => parseInt(p, 10));
+      const parts2 = v2.split(".").map((p) => parseInt(p, 10));
+      for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+        const p1 = parts1[i] ?? 0;
+        const p2 = parts2[i] ?? 0;
+        if (p1 !== p2) return p1 - p2;
+      }
+      return 0;
+    } catch {
+      return 0;
+    }
+  }
+  // Get migrations that need to run (version > lastMigrated, version <= current)
+  getPendingMigrations(lastMigratedVersion, currentVersion) {
+    return migrations.filter(
+      (m) => this.compareVersions(m.version, lastMigratedVersion) > 0 && this.compareVersions(m.version, currentVersion) <= 0
+    ).sort((a, b) => this.compareVersions(a.version, b.version));
+  }
+  // Main entry point - run any pending migrations
+  // packageVersion is the version from package.json; may be overridden by ILOOM_VERSION_OVERRIDE
+  async runMigrationsIfNeeded(packageVersion) {
+    const currentVersion = this.getEffectiveVersion(packageVersion);
+    const lastMigratedVersion = await this.loadMigrationState();
+    if (this.compareVersions(lastMigratedVersion, currentVersion) >= 0) {
+      return;
+    }
+    const pending = this.getPendingMigrations(lastMigratedVersion, currentVersion);
+    if (pending.length === 0) {
+      logger.debug(`[VersionMigrationManager] No migrations to run, updating state to ${currentVersion}`);
+      await this.saveMigrationState(currentVersion);
+      return;
+    }
+    const failedMigrations = [];
+    for (const migration of pending) {
+      logger.debug(`[VersionMigrationManager] Running migration to ${migration.version}: ${migration.description}`);
+      try {
+        await migration.migrate();
+        logger.debug(`[VersionMigrationManager] Migration to ${migration.version} completed`);
+      } catch (error) {
+        logger.warn(`[VersionMigrationManager] Migration to ${migration.version} failed: ${error}`);
+        failedMigrations.push({
+          version: migration.version,
+          description: migration.description,
+          failedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+    await this.saveMigrationState(currentVersion, failedMigrations);
+  }
+};
 
 // src/cli.ts
 var __filename = fileURLToPath2(import.meta.url);
@@ -2868,6 +2233,12 @@ program.name("iloom").description(packageJson.description).version(packageJson.v
   } catch (error) {
     logger.debug(`Settings migration failed: ${error instanceof Error ? error.message : "Unknown"}`);
   }
+  try {
+    const versionMigrationManager = new VersionMigrationManager();
+    await versionMigrationManager.runMigrationsIfNeeded(packageJson.version);
+  } catch (error) {
+    logger.warn(`Version migration failed: ${error instanceof Error ? error.message : "Unknown"}`);
+  }
   await validateSettingsForCommand(actionCommand);
   await validateGhCliForCommand(actionCommand);
   await validateIdeForStartCommand(thisCommand);
@@ -2997,14 +2368,14 @@ async function autoLaunchInitForMultipleRemotes() {
   await waitForKeypress2("Press any key to start configuration...");
   logger.info("");
   try {
-    const { InitCommand: InitCommand2 } = await import("./init-HB34Q5FH.js");
+    const { InitCommand: InitCommand2 } = await import("./init-XQQMFDM6.js");
     const initCommand = new InitCommand2();
     const customInitialMessage = "Help me configure which git remote iloom should use for GitHub operations. I have multiple remotes and need to select the correct one.";
     await initCommand.execute(customInitialMessage);
     logger.info("");
     logger.info("Configuration complete! Continuing with your original command...");
     logger.info("");
-    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-35F5RUJH.js");
+    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-YU4VYPTW.js");
     const settingsManager = new SettingsManager2();
     const settings = await settingsManager.loadSettings();
     const { hasMultipleRemotes: hasMultipleRemotes2 } = await import("./remote-IJAMOEAP.js");
@@ -3098,7 +2469,7 @@ program.command("add-issue").alias("a").description("Create and enhance GitHub i
 });
 program.command("feedback").alias("f").description("Submit feedback/bug report to iloom-cli repository").argument("<description>", "Feedback title (>30 chars, >2 spaces; or any non-empty text when --body provided)").option("--body <text>", "Body text for feedback (added after diagnostics)").action(async (description, options) => {
   try {
-    const { FeedbackCommand } = await import("./feedback-O4Q55SVS.js");
+    const { FeedbackCommand } = await import("./feedback-G7G5QCY4.js");
     const command = new FeedbackCommand();
     const feedbackOptions = {};
     if (options.body !== void 0) {
@@ -3148,7 +2519,7 @@ program.command("enhance").description("Apply enhancement agent to existing GitH
     await executeAction();
   }
 });
-program.command("finish").alias("dn").description("Merge work and cleanup workspace").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").option("-f, --force", "Skip confirmation prompts").option("-n, --dry-run", "Preview actions without executing").option("--pr <number>", "Treat input as PR number", parseFloat).option("--skip-build", "Skip post-merge build verification").option("--no-browser", "Skip opening PR in browser (github-pr mode only)").option("--cleanup", "Clean up worktree after PR creation (github-pr mode only)").option("--no-cleanup", "Keep worktree after PR creation (github-pr mode only)").option("--json", "Output result as JSON").action(async (identifier, options) => {
+program.command("finish").alias("dn").description("Merge work and cleanup workspace").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").option("-f, --force", "Skip confirmation prompts").option("-n, --dry-run", "Preview actions without executing").option("--pr <number>", "Treat input as PR number", parseFloat).option("--skip-build", "Skip post-merge build verification").option("--no-browser", "Skip opening PR in browser (github-pr mode only)").option("--cleanup", "Clean up worktree after finishing (default in local mode)").option("--no-cleanup", "Keep worktree after finishing").option("--json", "Output result as JSON").action(async (identifier, options) => {
   const executeAction = async () => {
     try {
       const settingsManager = new SettingsManager();
@@ -3179,9 +2550,45 @@ program.command("finish").alias("dn").description("Merge work and cleanup worksp
     await executeAction();
   }
 });
+program.command("commit").alias("c").description("Commit all uncommitted files with issue reference").option("-m, --message <text>", "Custom commit message (skip Claude generation)").option("--fixes", 'Use "Fixes #N" trailer instead of "Refs #N" (closes issue)').option("--no-review", "Skip commit message review prompt").option("--json", "Output result as JSON (implies --no-review)").option("--wip-commit", "Quick WIP commit: skip validations and pre-commit hooks").action(async (options) => {
+  const executeAction = async () => {
+    try {
+      const { CommitCommand } = await import("./commit-6S2RIA2K.js");
+      const command = new CommitCommand();
+      const noReview = options.review === false || options.json === true;
+      const result = await command.execute({
+        message: options.message,
+        fixes: options.fixes ?? false,
+        noReview,
+        json: options.json ?? false,
+        wipCommit: options.wipCommit ?? false
+      });
+      if (options.json && result) {
+        console.log(JSON.stringify(result, null, 2));
+      }
+      process.exit(0);
+    } catch (error) {
+      if (error instanceof UserAbortedCommitError) {
+        process.exit(130);
+      }
+      if (options.json) {
+        console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : "Unknown error" }, null, 2));
+      } else {
+        logger.error(`Commit failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+      }
+      process.exit(1);
+    }
+  };
+  if (options.json) {
+    const jsonLogger = createStderrLogger();
+    await withLogger(jsonLogger, executeAction);
+  } else {
+    await executeAction();
+  }
+});
 program.command("rebase").description("Rebase current branch on main with Claude-assisted conflict resolution").option("-f, --force", "Skip confirmation prompts").option("-n, --dry-run", "Preview actions without executing").action(async (options) => {
   try {
-    const { RebaseCommand } = await import("./rebase-5EY3Q6XP.js");
+    const { RebaseCommand } = await import("./rebase-RKQED567.js");
     const command = new RebaseCommand();
     await command.execute(options);
   } catch (error) {
@@ -3193,7 +2600,7 @@ program.command("spin").alias("ignite").description("Launch Claude with auto-det
   new Option("--one-shot <mode>", "One-shot automation mode").choices(["default", "noReview", "bypassPermissions"]).default("default")
 ).action(async (options) => {
   try {
-    const { IgniteCommand } = await import("./ignite-VHV65WEZ.js");
+    const { IgniteCommand } = await import("./ignite-YUAOJ5PP.js");
     const command = new IgniteCommand();
     await command.execute(options.oneShot ?? "default");
   } catch (error) {
@@ -3204,7 +2611,7 @@ program.command("spin").alias("ignite").description("Launch Claude with auto-det
 program.command("open").description("Open workspace in browser or run CLI tool").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").allowUnknownOption().action(async (identifier, _options, command) => {
   try {
     const args = (command == null ? void 0 : command.args) ? command.args.slice(identifier ? 1 : 0) : [];
-    const { OpenCommand } = await import("./open-WHVUYGPY.js");
+    const { OpenCommand } = await import("./open-MCWQAPSZ.js");
     const cmd = new OpenCommand();
     const input = identifier ? { identifier, args } : { args };
     await cmd.execute(input);
@@ -3216,7 +2623,7 @@ program.command("open").description("Open workspace in browser or run CLI tool")
 program.command("run").description("Run CLI tool or open workspace in browser").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").allowUnknownOption().action(async (identifier, _options, command) => {
   try {
     const args = (command == null ? void 0 : command.args) ? command.args.slice(identifier ? 1 : 0) : [];
-    const { RunCommand } = await import("./run-NCRK5NPR.js");
+    const { RunCommand } = await import("./run-CCG24PBC.js");
     const cmd = new RunCommand();
     const input = identifier ? { identifier, args } : { args };
     await cmd.execute(input);
@@ -3227,7 +2634,7 @@ program.command("run").description("Run CLI tool or open workspace in browser").
 });
 program.command("dev-server").alias("dev").description("Start dev server for workspace (foreground)").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").option("--json", "Output as JSON").action(async (identifier, options) => {
   try {
-    const { DevServerCommand } = await import("./dev-server-4RCDJ5MU.js");
+    const { DevServerCommand } = await import("./dev-server-GREJUEKW.js");
     const cmd = new DevServerCommand();
     await cmd.execute({ identifier, json: options == null ? void 0 : options.json });
   } catch (error) {
@@ -3237,7 +2644,7 @@ program.command("dev-server").alias("dev").description("Start dev server for wor
 });
 program.command("shell").alias("terminal").description("Open interactive shell with workspace environment").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").action(async (identifier) => {
   try {
-    const { ShellCommand } = await import("./shell-SBLXVOVJ.js");
+    const { ShellCommand } = await import("./shell-2NNSIU34.js");
     const cmd = new ShellCommand();
     await cmd.execute({ identifier });
   } catch (error) {
@@ -3247,7 +2654,7 @@ program.command("shell").alias("terminal").description("Open interactive shell w
 });
 program.command("build").description("Run the build script").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").action(async (identifier) => {
   try {
-    const { BuildCommand } = await import("./build-FJVYP7EV.js");
+    const { BuildCommand } = await import("./build-O2EJHDEW.js");
     const cmd = new BuildCommand();
     await cmd.execute(identifier ? { identifier } : {});
   } catch (error) {
@@ -3257,7 +2664,7 @@ program.command("build").description("Run the build script").argument("[identifi
 });
 program.command("lint").description("Run the lint script").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").action(async (identifier) => {
   try {
-    const { LintCommand } = await import("./lint-5JMCWE4Y.js");
+    const { LintCommand } = await import("./lint-OFVN7FT6.js");
     const cmd = new LintCommand();
     await cmd.execute(identifier ? { identifier } : {});
   } catch (error) {
@@ -3267,7 +2674,7 @@ program.command("lint").description("Run the lint script").argument("[identifier
 });
 program.command("test").description("Run the test script").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").action(async (identifier) => {
   try {
-    const { TestCommand } = await import("./test-3KIVXI6J.js");
+    const { TestCommand } = await import("./test-QZDOEUIO.js");
     const cmd = new TestCommand();
     await cmd.execute(identifier ? { identifier } : {});
   } catch (error) {
@@ -3277,7 +2684,7 @@ program.command("test").description("Run the test script").argument("[identifier
 });
 program.command("compile").alias("typecheck").description("Run the compile or typecheck script (prefers compile if both exist)").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").action(async (identifier) => {
   try {
-    const { CompileCommand } = await import("./compile-ULNO5F7Q.js");
+    const { CompileCommand } = await import("./compile-LRMAADUT.js");
     const cmd = new CompileCommand();
     await cmd.execute(identifier ? { identifier } : {});
   } catch (error) {
@@ -3285,10 +2692,10 @@ program.command("compile").alias("typecheck").description("Run the compile or ty
     process.exit(1);
   }
 });
-program.command("cleanup").alias("remove").alias("clean").description("Remove workspaces").argument("[identifier]", "Branch name or issue number to cleanup (auto-detected)").option("-l, --list", "List all worktrees").option("-a, --all", "Remove all worktrees (interactive confirmation)").option("-i, --issue <number>", "Cleanup by issue number", parseInt).option("-f, --force", "Skip confirmations and force removal").option("--dry-run", "Show what would be done without doing it").option("--json", "Output result as JSON").action(async (identifier, options) => {
+program.command("cleanup").alias("remove").alias("clean").description("Remove workspaces").argument("[identifier]", "Branch name or issue number to cleanup (auto-detected)").option("-l, --list", "List all worktrees").option("-a, --all", "Remove all worktrees (interactive confirmation)").option("-i, --issue <number>", "Cleanup by issue number", parseInt).option("-f, --force", "Skip confirmations and force removal").option("--dry-run", "Show what would be done without doing it").option("--json", "Output result as JSON").option("--defer <ms>", "Wait specified milliseconds before cleanup", parseInt).action(async (identifier, options) => {
   const executeAction = async () => {
     try {
-      const { CleanupCommand } = await import("./cleanup-OU2HFOOG.js");
+      const { CleanupCommand } = await import("./cleanup-ZPOMRSNN.js");
       const command = new CleanupCommand();
       const input = {
         options: options ?? {}
@@ -3317,15 +2724,78 @@ program.command("cleanup").alias("remove").alias("clean").description("Remove wo
     await executeAction();
   }
 });
-program.command("list").description("Show active workspaces").option("--json", "Output as JSON").action(async (options) => {
+program.command("list").description("Show active workspaces").option("--json", "Output as JSON").option("--finished", "Show only finished looms (sorted by finish time, latest first)").option("--all", "Show both active and finished looms").option("--global", "Show looms from all projects (default: current project only)").action(async (options) => {
   try {
     const manager = new GitWorktreeManager();
     const metadataManager = new MetadataManager();
-    const worktrees = await manager.listWorktrees({ porcelain: true });
+    let currentProjectPath = null;
+    if (!options.global) {
+      try {
+        currentProjectPath = await findMainWorktreePathWithSettings();
+      } catch (error) {
+        if (error instanceof GitCommandError && (error.exitCode === 128 || /fatal: not a git repository/i.test(error.stderr))) {
+          currentProjectPath = null;
+        } else if (error instanceof Error && error.message.includes("Invalid settings")) {
+          currentProjectPath = null;
+        } else {
+          throw error;
+        }
+      }
+    }
+    const showActive = !options.finished;
+    const showFinished = Boolean(options.finished) || Boolean(options.all);
+    let worktrees = [];
     const metadata = /* @__PURE__ */ new Map();
-    for (const worktree of worktrees) {
-      const loomMetadata = await metadataManager.readMetadata(worktree.path);
-      metadata.set(worktree.path, loomMetadata);
+    let globalActiveLooms = [];
+    if (showActive) {
+      if (options.global) {
+        const allMetadata = await metadataManager.listAllMetadata();
+        for (const loom of allMetadata) {
+          if (!loom.worktreePath) {
+            continue;
+          }
+          const pathExists = await fs3.pathExists(loom.worktreePath);
+          if (!pathExists) {
+            continue;
+          }
+          const isValid = await isValidGitRepo(loom.worktreePath);
+          if (!isValid) {
+            continue;
+          }
+          globalActiveLooms.push(loom);
+          metadata.set(loom.worktreePath, loom);
+        }
+      } else {
+        try {
+          worktrees = await manager.listWorktrees({ porcelain: true });
+          for (const worktree of worktrees) {
+            const loomMetadata = await metadataManager.readMetadata(worktree.path);
+            metadata.set(worktree.path, loomMetadata);
+          }
+        } catch (error) {
+          if (error instanceof GitCommandError && (error.exitCode === 128 || /fatal: not a git repository/i.test(error.stderr))) {
+            worktrees = [];
+          } else {
+            throw error;
+          }
+        }
+      }
+    }
+    let finishedLooms = [];
+    if (showFinished) {
+      finishedLooms = await metadataManager.listFinishedMetadata();
+    }
+    let filteredWorktrees = worktrees;
+    let filteredGlobalActiveLooms = globalActiveLooms;
+    let filteredFinishedLooms = finishedLooms;
+    if (currentProjectPath) {
+      filteredWorktrees = worktrees.filter((wt) => {
+        const loomMetadata = metadata.get(wt.path);
+        return (loomMetadata == null ? void 0 : loomMetadata.projectPath) == null || (loomMetadata == null ? void 0 : loomMetadata.projectPath) === currentProjectPath;
+      });
+      filteredFinishedLooms = finishedLooms.filter(
+        (loom) => loom.projectPath == null || loom.projectPath === currentProjectPath
+      );
     }
     if (options.json) {
       let mainWorktreePath;
@@ -3333,26 +2803,108 @@ program.command("list").description("Show active workspaces").option("--json", "
         mainWorktreePath = await findMainWorktreePathWithSettings();
       } catch {
       }
-      console.log(JSON.stringify(formatLoomsForJson(worktrees, mainWorktreePath, metadata), null, 2));
+      let activeJson = [];
+      if (showActive) {
+        if (options.global) {
+          activeJson = globalActiveLooms.map((loom) => ({
+            name: loom.branchName ?? loom.worktreePath ?? "unknown",
+            worktreePath: loom.worktreePath,
+            branch: loom.branchName,
+            type: loom.issueType ?? "branch",
+            issue_numbers: loom.issue_numbers,
+            pr_numbers: loom.pr_numbers,
+            isMainWorktree: false,
+            // Global looms from other projects are never the main worktree
+            description: loom.description ?? null,
+            created_at: loom.created_at ?? null,
+            issueTracker: loom.issueTracker ?? null,
+            colorHex: loom.colorHex ?? null,
+            projectPath: loom.projectPath ?? null,
+            issueUrls: loom.issueUrls ?? {},
+            prUrls: loom.prUrls ?? {},
+            status: "active",
+            finishedAt: null
+          }));
+        } else {
+          activeJson = formatLoomsForJson(worktrees, mainWorktreePath, metadata).map((loom) => ({
+            ...loom,
+            status: "active",
+            finishedAt: null
+          }));
+        }
+      }
+      if (currentProjectPath && !options.global) {
+        activeJson = activeJson.filter(
+          (loom) => loom.projectPath == null || loom.projectPath === currentProjectPath
+        );
+      }
+      let finishedJson = finishedLooms.map(formatFinishedLoomForJson);
+      if (currentProjectPath) {
+        finishedJson = finishedJson.filter(
+          (loom) => loom.projectPath == null || loom.projectPath === currentProjectPath
+        );
+      }
+      const allLooms = [...activeJson, ...finishedJson];
+      console.log(JSON.stringify(allLooms, null, 2));
       return;
     }
-    if (worktrees.length === 0) {
-      logger.info("No worktrees found");
+    const hasActive = options.global ? filteredGlobalActiveLooms.length > 0 : filteredWorktrees.length > 0;
+    const hasFinished = filteredFinishedLooms.length > 0;
+    if (!hasActive && !hasFinished) {
+      if (options.finished) {
+        logger.info("No finished looms found");
+      } else if (options.all) {
+        logger.info("No looms found");
+      } else {
+        logger.info("No worktrees found");
+      }
       return;
     }
-    logger.info("Active workspaces:");
-    for (const worktree of worktrees) {
-      const formatted = manager.formatWorktree(worktree);
-      const loomMetadata = metadata.get(worktree.path);
-      logger.info(`  ${formatted.title}`);
-      if (loomMetadata == null ? void 0 : loomMetadata.description) {
-        logger.info(`    Description: ${loomMetadata.description}`);
+    if (showActive && hasActive) {
+      logger.info("Active workspaces:");
+      if (options.global) {
+        for (const loom of filteredGlobalActiveLooms) {
+          logger.info(`  ${loom.branchName ?? "unknown"}`);
+          if (loom.description) {
+            logger.info(`    Description: ${loom.description}`);
+          }
+          if (loom.worktreePath) {
+            logger.info(`    Path: ${loom.worktreePath}`);
+          }
+          if (loom.projectPath) {
+            logger.info(`    Project: ${loom.projectPath}`);
+          }
+        }
+      } else {
+        for (const worktree of filteredWorktrees) {
+          const formatted = manager.formatWorktree(worktree);
+          const loomMetadata = metadata.get(worktree.path);
+          logger.info(`  ${formatted.title}`);
+          if (loomMetadata == null ? void 0 : loomMetadata.description) {
+            logger.info(`    Description: ${loomMetadata.description}`);
+          }
+          logger.info(`    Path: ${formatted.path}`);
+          logger.info(`    Commit: ${formatted.commit}`);
+        }
+      }
+    }
+    if (showFinished && hasFinished) {
+      if (showActive && hasActive) {
+        logger.info("");
+      }
+      logger.info("Finished looms:");
+      for (const loom of filteredFinishedLooms) {
+        logger.info(`  ${loom.branchName ?? "unknown"}`);
+        if (loom.description) {
+          logger.info(`    Description: ${loom.description}`);
+        }
+        if (loom.finishedAt) {
+          logger.info(`    Finished: ${new Date(loom.finishedAt).toLocaleString()}`);
+        }
       }
-      logger.info(`    Path: ${formatted.path}`);
-      logger.info(`    Commit: ${formatted.commit}`);
     }
   } catch (error) {
-    if (error instanceof Error && error.message.includes("not a git repository")) {
+    if (error instanceof GitCommandError && (error.exitCode === 128 || /fatal: not a git repository/i.test(error.stderr))) {
       if (options.json) {
         console.log("[]");
       } else {
@@ -3366,7 +2918,7 @@ program.command("list").description("Show active workspaces").option("--json", "
 });
 program.command("projects").description("List configured iloom projects").option("--json", "Output as JSON (default behavior)").action(async (options) => {
   try {
-    const { ProjectsCommand } = await import("./projects-SA76I4TZ.js");
+    const { ProjectsCommand } = await import("./projects-PQOTWUII.js");
     const command = new ProjectsCommand();
     const result = await command.execute(options);
     console.log(JSON.stringify(result, null, 2));
@@ -3377,7 +2929,7 @@ program.command("projects").description("List configured iloom projects").option
 });
 program.command("init").alias("config").description("Initialize iloom configuration").argument("[prompt]", 'Custom initial message to send to Claude (defaults to "Help me configure iloom settings.")').action(async (prompt) => {
   try {
-    const { InitCommand: InitCommand2 } = await import("./init-HB34Q5FH.js");
+    const { InitCommand: InitCommand2 } = await import("./init-XQQMFDM6.js");
     const command = new InitCommand2();
     const trimmedPrompt = prompt == null ? void 0 : prompt.trim();
     const customPrompt = trimmedPrompt && trimmedPrompt.length > 0 ? trimmedPrompt : void 0;
@@ -3387,11 +2939,11 @@ program.command("init").alias("config").description("Initialize iloom configurat
     process.exit(1);
   }
 });
-program.command("contribute").description("Set up local development environment for contributing to iloom").action(async () => {
+program.command("contribute").description("Set up local development environment for contributing to a GitHub project").argument("[repository]", "GitHub repository (owner/repo, github.com/owner/repo, or full URL). Defaults to iloom-ai/iloom-cli").action(async (repository) => {
   try {
-    const { ContributeCommand } = await import("./contribute-T7ENST5N.js");
+    const { ContributeCommand } = await import("./contribute-GXKOIA42.js");
     const command = new ContributeCommand();
-    await command.execute();
+    await command.execute(repository);
   } catch (error) {
     logger.error(`Failed to set up contributor environment: ${error instanceof Error ? error.message : "Unknown error"}`);
     process.exit(1);
@@ -3409,8 +2961,8 @@ program.command("update").description("Update iloom-cli to the latest version").
 });
 program.command("test-github").description("Test GitHub integration (Issue #3)").argument("<identifier>", "Issue number or PR number").option("--no-claude", "Skip Claude for branch name generation").action(async (identifier, options) => {
   try {
-    const { GitHubService: GitHubService2 } = await import("./GitHubService-S2OGUTDR.js");
-    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-B5PVRR7F.js");
+    const { GitHubService: GitHubService2 } = await import("./GitHubService-O7U4UQ7N.js");
+    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-FLPUUFOB.js");
     logger.info("Testing GitHub Integration\n");
     const service = new GitHubService2();
     const branchNaming = new DefaultBranchNamingService2({ useClaude: options.claude !== false });
@@ -3468,14 +3020,14 @@ program.command("test-github").description("Test GitHub integration (Issue #3)")
 });
 program.command("test-claude").description("Test Claude integration (Issue #10)").option("--detect", "Test Claude CLI detection").option("--version", "Get Claude CLI version").option("--branch <title>", "Test branch name generation with given title").option("--issue <number>", "Issue number for branch generation", "123").option("--launch <prompt>", "Launch Claude with a prompt (headless)").option("--interactive", "Launch Claude interactively (requires --launch)").option("--template <name>", "Test template loading").action(async (options) => {
   try {
-    const { detectClaudeCli: detectClaudeCli2, getClaudeVersion, generateBranchName, launchClaude: launchClaude2 } = await import("./claude-H33OQMXO.js");
-    const { PromptTemplateManager } = await import("./PromptTemplateManager-C3DK6XZL.js");
-    const { ClaudeService } = await import("./ClaudeService-O2PB22GX.js");
-    const { ClaudeContextManager: ClaudeContextManager2 } = await import("./ClaudeContextManager-6J2EB4QU.js");
+    const { detectClaudeCli, getClaudeVersion, generateBranchName, launchClaude: launchClaude2 } = await import("./claude-6H36IBHO.js");
+    const { PromptTemplateManager } = await import("./PromptTemplateManager-7L3HJQQU.js");
+    const { ClaudeService } = await import("./ClaudeService-CRSETT3A.js");
+    const { ClaudeContextManager: ClaudeContextManager2 } = await import("./ClaudeContextManager-KE5TBZVZ.js");
     logger.info("Testing Claude Integration\n");
     if (options.detect) {
       logger.info("Detecting Claude CLI...");
-      const isAvailable = await detectClaudeCli2();
+      const isAvailable = await detectClaudeCli();
       if (isAvailable) {
         logger.success("   Claude CLI is available");
       } else {
@@ -3531,7 +3083,7 @@ program.command("test-claude").description("Test Claude integration (Issue #10)"
     if (!options.detect && !options.version && !options.branch && !options.launch && !options.template) {
       logger.info("Running full Claude integration test suite...\n");
       logger.info("1. Testing Claude CLI detection...");
-      const isAvailable = await detectClaudeCli2();
+      const isAvailable = await detectClaudeCli();
       if (isAvailable) {
         logger.success("   Claude CLI is available");
       } else {
@@ -3606,7 +3158,7 @@ program.command("test-claude").description("Test Claude integration (Issue #10)"
 });
 program.command("test-webserver").description("Test if a web server is running on a workspace port").argument("<issue-number>", "Issue number (port will be calculated as 3000 + issue number)", parseInt).option("--kill", "Kill the web server if detected").action(async (issueNumber, options) => {
   try {
-    const { TestWebserverCommand } = await import("./test-webserver-YVQD42W6.js");
+    const { TestWebserverCommand } = await import("./test-webserver-NRMGT2HB.js");
     const command = new TestWebserverCommand();
     await command.execute({ issueNumber, options });
   } catch (error) {
@@ -3619,7 +3171,7 @@ program.command("test-webserver").description("Test if a web server is running o
 });
 program.command("test-git").description("Test Git integration - findMainWorktreePath() function (reads .iloom/settings.json)").action(async () => {
   try {
-    const { TestGitCommand } = await import("./test-git-ZB6AGGRW.js");
+    const { TestGitCommand } = await import("./test-git-E2BLXR6M.js");
     const command = new TestGitCommand();
     await command.execute();
   } catch (error) {
@@ -3645,7 +3197,7 @@ program.command("test-tabs").description("Test iTerm2 dual tab functionality - o
 });
 program.command("test-prefix").description("Test worktree prefix configuration - preview worktree paths (reads .iloom/settings.json)").action(async () => {
   try {
-    const { TestPrefixCommand } = await import("./test-prefix-FBGXKMPA.js");
+    const { TestPrefixCommand } = await import("./test-prefix-A7JGGYAA.js");
     const command = new TestPrefixCommand();
     await command.execute();
   } catch (error) {
@@ -3659,7 +3211,7 @@ program.command("test-prefix").description("Test worktree prefix configuration -
 program.command("summary").description("Generate Claude session summary for a loom").argument("[identifier]", "Issue number, PR number (pr/123), or branch name (auto-detected if omitted)").option("--with-comment", "Post summary as a comment to the issue/PR").option("--json", "Output result as JSON").action(async (identifier, options) => {
   const executeAction = async () => {
     try {
-      const { SummaryCommand } = await import("./summary-CVFAMDOJ.js");
+      const { SummaryCommand } = await import("./summary-G6L3VAKK.js");
       const command = new SummaryCommand();
       const result = await command.execute({ identifier, options });
       if (options.json && result) {
@@ -3688,7 +3240,7 @@ program.command("summary").description("Generate Claude session summary for a lo
 program.command("recap").description("Get recap for a loom (defaults to current directory)").argument("[identifier]", "Issue number, PR number (pr/123), or branch name (auto-detected if omitted)").option("--json", "Output as JSON with filePath for file watching").action(async (identifier, options) => {
   const executeAction = async () => {
     try {
-      const { RecapCommand } = await import("./recap-VOOUXOGP.js");
+      const { RecapCommand } = await import("./recap-ZKGHZCX6.js");
       const command = new RecapCommand();
       const result = await command.execute({ identifier, json: options.json });
       if (options.json && result) {
@@ -3717,7 +3269,7 @@ program.command("recap").description("Get recap for a loom (defaults to current
 program.command("test-neon").description("Test Neon integration and debug configuration").action(async () => {
   var _a;
   try {
-    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-35F5RUJH.js");
+    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-YU4VYPTW.js");
     const { createNeonProviderFromSettings: createNeonProviderFromSettings2 } = await import("./neon-helpers-3KBC4A3Y.js");
     logger.info("Testing Neon Integration\n");
     logger.info("1. Settings Configuration:");