@iloom/cli 0.3.4 → 0.4.0

package/dist/{chunk-2MAIX45J.js → chunk-LTNDJMTH.js}

@@ -1,32 +1,41 @@
 #!/usr/bin/env node
 import {
   executeGitCommand,
-  findMainWorktreePathWithSettings
-} from "./chunk-5Q3NDNNV.js";
+  findMainWorktreePathWithSettings,
+  findWorktreeForBranch,
+  getMergeTargetBranch
+} from "./chunk-TR5MC2U6.js";
+import {
+  MetadataManager
+} from "./chunk-MLS5FAV7.js";
 import {
   SettingsManager
-} from "./chunk-CDZERT7Z.js";
+} from "./chunk-VWNS6DH5.js";
 import {
   detectClaudeCli,
   launchClaude
-} from "./chunk-OYF4VIFI.js";
+} from "./chunk-75B2HZZ5.js";
 import {
-  logger
-} from "./chunk-GEHQXLEI.js";
+  getLogger
+} from "./chunk-6UIGZD2N.js";
 
 // src/lib/MergeManager.ts
 var MergeManager = class {
-  constructor(settingsManager) {
+  constructor(settingsManager, metadataManager) {
     this.settingsManager = settingsManager ?? new SettingsManager();
+    this.metadataManager = metadataManager ?? new MetadataManager();
   }
   /**
-   * Get the main branch name from settings (defaults to 'main')
-   * @param worktreePath - Optional path to load settings from (defaults to process.cwd())
+   * Get the merge target branch for a loom
+   * Priority: parent loom metadata > configured main branch > 'main'
+   * @param worktreePath - Optional path to load settings/metadata from (defaults to process.cwd())
    * @private
    */
   async getMainBranch(worktreePath) {
-    const settings = await this.settingsManager.loadSettings(worktreePath);
-    return settings.mainBranch ?? "main";
+    return getMergeTargetBranch(worktreePath ?? process.cwd(), {
+      settingsManager: this.settingsManager,
+      metadataManager: this.metadataManager
+    });
   }
   /**
    * Rebase current branch on main with fail-fast on conflicts
@@ -39,7 +48,7 @@ var MergeManager = class {
   async rebaseOnMain(worktreePath, options = {}) {
     const { dryRun = false, force = false } = options;
     const mainBranch = await this.getMainBranch(worktreePath);
-    logger.info(`Starting rebase on ${mainBranch} branch...`);
+    getLogger().info(`Starting rebase on ${mainBranch} branch...`);
     try {
       await executeGitCommand(["show-ref", "--verify", "--quiet", `refs/heads/${mainBranch}`], {
         cwd: worktreePath
@@ -53,10 +62,11 @@ Ensure the repository has a "${mainBranch}" branch or create it first.`
     const statusOutput = await executeGitCommand(["status", "--porcelain"], {
       cwd: worktreePath
     });
+    let wipCommitHash = null;
     if (statusOutput.trim()) {
-      throw new Error(
-        "Uncommitted changes detected. Please commit or stash changes before rebasing.\nRun: git status to see uncommitted changes\nOr: il finish will automatically commit them for you"
-      );
+      getLogger().info("Uncommitted changes detected, creating temporary WIP commit...");
+      wipCommitHash = await this.createWipCommit(worktreePath);
+      getLogger().debug(`Created WIP commit: ${wipCommitHash}`);
     }
     const mergeBase = await executeGitCommand(["merge-base", mainBranch, "HEAD"], {
       cwd: worktreePath
@@ -67,7 +77,7 @@ Ensure the repository has a "${mainBranch}" branch or create it first.`
     const mergeBaseTrimmed = mergeBase.trim();
     const mainHeadTrimmed = mainHead.trim();
     if (mergeBaseTrimmed === mainHeadTrimmed) {
-      logger.success(`Branch is already up to date with ${mainBranch}. No rebase needed.`);
+      getLogger().success(`Branch is already up to date with ${mainBranch}. No rebase needed.`);
       return;
     }
     const commitsOutput = await executeGitCommand(["log", "--oneline", `${mainBranch}..HEAD`], {
@@ -76,34 +86,40 @@ Ensure the repository has a "${mainBranch}" branch or create it first.`
     const commits = commitsOutput.trim();
     const commitLines = commits ? commits.split("\n") : [];
     if (commits) {
-      logger.info(`Found ${commitLines.length} commit(s) to rebase:`);
-      commitLines.forEach((commit) => logger.info(`  ${commit}`));
+      getLogger().info(`Found ${commitLines.length} commit(s) to rebase:`);
+      commitLines.forEach((commit) => getLogger().info(`  ${commit}`));
     } else {
-      logger.info(`${mainBranch} branch has moved forward. Rebasing to update branch...`);
+      getLogger().info(`${mainBranch} branch has moved forward. Rebasing to update branch...`);
     }
     if (!force && !dryRun) {
-      logger.info("Proceeding with rebase... (use --force to skip confirmations)");
+      getLogger().info("Proceeding with rebase... (use --force to skip confirmations)");
     }
     if (dryRun) {
-      logger.info(`[DRY RUN] Would execute: git rebase ${mainBranch}`);
+      getLogger().info(`[DRY RUN] Would execute: git rebase ${mainBranch}`);
       if (commitLines.length > 0) {
-        logger.info(`[DRY RUN] This would rebase ${commitLines.length} commit(s)`);
+        getLogger().info(`[DRY RUN] This would rebase ${commitLines.length} commit(s)`);
       }
       return;
     }
     try {
       await executeGitCommand(["rebase", mainBranch], { cwd: worktreePath });
-      logger.success("Rebase completed successfully!");
+      getLogger().success("Rebase completed successfully!");
+      if (wipCommitHash) {
+        await this.restoreWipCommit(worktreePath, wipCommitHash);
+      }
     } catch (error) {
       const conflictedFiles = await this.detectConflictedFiles(worktreePath);
       if (conflictedFiles.length > 0) {
-        logger.info("Merge conflicts detected, attempting Claude-assisted resolution...");
+        getLogger().info("Merge conflicts detected, attempting Claude-assisted resolution...");
         const resolved = await this.attemptClaudeConflictResolution(
           worktreePath,
           conflictedFiles
         );
         if (resolved) {
-          logger.success("Conflicts resolved with Claude assistance, rebase completed");
+          getLogger().success("Conflicts resolved with Claude assistance, rebase completed");
+          if (wipCommitHash) {
+            await this.restoreWipCommit(worktreePath, wipCommitHash);
+          }
           return;
         }
         const conflictError = this.formatConflictError(conflictedFiles);
@@ -158,10 +174,20 @@ To fix this:
    */
   async performFastForwardMerge(branchName, worktreePath, options = {}) {
     const { dryRun = false, force = false } = options;
-    logger.info("Starting fast-forward merge...");
-    const mainWorktreePath = options.repoRoot ?? await findMainWorktreePathWithSettings(worktreePath, this.settingsManager);
+    getLogger().info("Starting fast-forward merge...");
     const mainBranch = await this.getMainBranch(worktreePath);
-    logger.debug(`Using ${mainBranch} branch location: ${mainWorktreePath}`);
+    let mainWorktreePath;
+    if (options.repoRoot) {
+      mainWorktreePath = options.repoRoot;
+    } else {
+      try {
+        mainWorktreePath = await findWorktreeForBranch(mainBranch, worktreePath);
+      } catch {
+        getLogger().debug(`No worktree found for branch '${mainBranch}', falling back to settings-based lookup`);
+        mainWorktreePath = await findMainWorktreePathWithSettings(worktreePath, this.settingsManager);
+      }
+    }
+    getLogger().debug(`Using ${mainBranch} branch location: ${mainWorktreePath}`);
     const currentBranch = await executeGitCommand(["branch", "--show-current"], {
       cwd: mainWorktreePath
     });
@@ -178,24 +204,24 @@ This indicates the main worktree detection failed.`
     });
     const commits = commitsOutput.trim();
     if (!commits) {
-      logger.success(`Branch is already merged into ${mainBranch}. No merge needed.`);
+      getLogger().success(`Branch has no commits ahead of ${mainBranch}. No merge needed.`);
       return;
     }
     const commitLines = commits.split("\n");
-    logger.info(`Found ${commitLines.length} commit(s) to merge:`);
-    commitLines.forEach((commit) => logger.info(`  ${commit}`));
+    getLogger().info(`Found ${commitLines.length} commit(s) to merge:`);
+    commitLines.forEach((commit) => getLogger().info(`  ${commit}`));
     if (!force && !dryRun) {
-      logger.info("Proceeding with fast-forward merge... (use --force to skip confirmations)");
+      getLogger().info("Proceeding with fast-forward merge... (use --force to skip confirmations)");
     }
     if (dryRun) {
-      logger.info(`[DRY RUN] Would execute: git merge --ff-only ${branchName}`);
-      logger.info(`[DRY RUN] This would merge ${commitLines.length} commit(s)`);
+      getLogger().info(`[DRY RUN] Would execute: git merge --ff-only ${branchName}`);
+      getLogger().info(`[DRY RUN] This would merge ${commitLines.length} commit(s)`);
       return;
     }
     try {
-      logger.debug(`Executing fast-forward merge of ${branchName} into ${mainBranch} using cwd: ${mainWorktreePath}...`);
+      getLogger().debug(`Executing fast-forward merge of ${branchName} into ${mainBranch} using cwd: ${mainWorktreePath}...`);
       await executeGitCommand(["merge", "--ff-only", branchName], { cwd: mainWorktreePath });
-      logger.success(`Fast-forward merge completed! Merged ${commitLines.length} commit(s).`);
+      getLogger().success(`Fast-forward merge completed! Merged ${commitLines.length} commit(s).`);
     } catch (error) {
       throw new Error(
         `Fast-forward merge failed: ${error instanceof Error ? error.message : String(error)}
@@ -222,6 +248,39 @@ To recover:
       return [];
     }
   }
+  /**
+   * Create a temporary WIP commit to preserve uncommitted changes during rebase
+   * Stages all changes (tracked, untracked) using git add -A
+   * @param worktreePath - Path to the worktree
+   * @returns The commit hash of the WIP commit
+   * @private
+   */
+  async createWipCommit(worktreePath) {
+    await executeGitCommand(["add", "-A"], { cwd: worktreePath });
+    await executeGitCommand(["commit", "-m", "WIP: Auto-stash for rebase"], { cwd: worktreePath });
+    const hash = await executeGitCommand(["rev-parse", "HEAD"], { cwd: worktreePath });
+    return hash.trim();
+  }
+  /**
+   * Restore uncommitted changes from WIP commit via soft reset
+   * Logs warning but does not fail if soft reset fails (changes are safe in commit history)
+   * @param worktreePath - Path to the worktree
+   * @param wipCommitHash - Original WIP commit hash for verification logging
+   * @private
+   */
+  async restoreWipCommit(worktreePath, wipCommitHash) {
+    getLogger().info("Restoring uncommitted changes from WIP commit...");
+    try {
+      await executeGitCommand(["reset", "--soft", "HEAD~1"], { cwd: worktreePath });
+      await executeGitCommand(["reset", "HEAD"], { cwd: worktreePath });
+      getLogger().success("Restored uncommitted changes from WIP commit");
+    } catch (error) {
+      getLogger().warn(
+        `Failed to restore WIP commit (${wipCommitHash}). Your changes are safe in the commit history. Manual recovery: git reset --soft HEAD~1`,
+        { error: error instanceof Error ? error.message : String(error) }
+      );
+    }
+  }
   /**
    * Helper: Format conflict error message with manual resolution steps
    * @private
@@ -242,32 +301,34 @@ To recover:
   async attemptClaudeConflictResolution(worktreePath, conflictedFiles) {
     const isClaudeAvailable = await detectClaudeCli();
     if (!isClaudeAvailable) {
-      logger.debug("Claude CLI not available, skipping conflict resolution");
+      getLogger().debug("Claude CLI not available, skipping conflict resolution");
       return false;
     }
-    logger.info(`Launching Claude to resolve conflicts in ${conflictedFiles.length} file(s)...`);
-    const prompt = `Please help resolve the git rebase conflicts in this repository. Analyze the conflicted files, understand the changes from both branches, fix the conflicts, then run 'git add .' to stage the resolved files, and finally run 'git rebase --continue' to continue the rebase process. Handle the entire workflow for me.`;
+    getLogger().info(`Launching Claude to resolve conflicts in ${conflictedFiles.length} file(s)...`);
+    const systemPrompt = `Please help resolve the git rebase conflicts in this repository. Analyze the conflicted files, understand the changes from both branches, fix the conflicts, then run 'git add .' to stage the resolved files, and finally run 'git rebase --continue' to continue the rebase process. Once the issue is resolved, tell the user they can use /exit to continue with the process.`;
+    const prompt = `Help me with this rebase please.`;
     try {
       await launchClaude(prompt, {
+        appendSystemPrompt: systemPrompt,
         addDir: worktreePath,
         headless: false
         // Interactive - runs in current terminal with stdio: inherit
       });
       const remainingConflicts = await this.detectConflictedFiles(worktreePath);
       if (remainingConflicts.length > 0) {
-        logger.warn(
+        getLogger().warn(
           `Conflicts still exist in ${remainingConflicts.length} file(s) after Claude assistance`
         );
         return false;
       }
       const rebaseInProgress = await this.isRebaseInProgress(worktreePath);
       if (rebaseInProgress) {
-        logger.warn("Rebase still in progress after Claude assistance");
+        getLogger().warn("Rebase still in progress after Claude assistance");
         return false;
       }
       return true;
     } catch (error) {
-      logger.warn("Claude conflict resolution failed", {
+      getLogger().warn("Claude conflict resolution failed", {
         error: error instanceof Error ? error.message : String(error)
       });
       return false;
@@ -304,4 +365,4 @@ To recover:
 export {
   MergeManager
 };
-//# sourceMappingURL=chunk-2MAIX45J.js.map
+//# sourceMappingURL=chunk-LTNDJMTH.js.map

package/dist/chunk-LTNDJMTH.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/lib/MergeManager.ts"],"sourcesContent":["import { executeGitCommand, findMainWorktreePathWithSettings, findWorktreeForBranch, getMergeTargetBranch } from '../utils/git.js'\nimport { getLogger } from '../utils/logger-context.js'\nimport { detectClaudeCli, launchClaude } from '../utils/claude.js'\nimport { SettingsManager } from './SettingsManager.js'\nimport { MetadataManager } from './MetadataManager.js'\nimport type { MergeOptions } from '../types/index.js'\n\n/**\n * MergeManager handles Git rebase and fast-forward merge operations\n * Implements fail-fast behavior for conflicts (Phase 1 - no Claude assistance)\n *\n * Ports bash/merge-and-clean.sh lines 781-1090\n */\nexport class MergeManager {\n\tprivate settingsManager: SettingsManager\n\tprivate metadataManager: MetadataManager\n\n\tconstructor(settingsManager?: SettingsManager, metadataManager?: MetadataManager) {\n\t\tthis.settingsManager = settingsManager ?? new SettingsManager()\n\t\tthis.metadataManager = metadataManager ?? new MetadataManager()\n\t}\n\n\t/**\n\t * Get the merge target branch for a loom\n\t * Priority: parent loom metadata > configured main branch > 'main'\n\t * @param worktreePath - Optional path to load settings/metadata from (defaults to process.cwd())\n\t * @private\n\t */\n\tprivate async getMainBranch(worktreePath?: string): Promise<string> {\n\t\t// Delegate to shared utility function\n\t\treturn getMergeTargetBranch(worktreePath ?? process.cwd(), {\n\t\t\tsettingsManager: this.settingsManager,\n\t\t\tmetadataManager: this.metadataManager,\n\t\t})\n\t}\n\n\t/**\n\t * Rebase current branch on main with fail-fast on conflicts\n\t * Ports bash/merge-and-clean.sh lines 781-913\n\t *\n\t * @param worktreePath - Path to the worktree\n\t * @param options - Merge options (dryRun, force)\n\t * @throws Error if main branch doesn't exist, uncommitted changes exist, or conflicts occur\n\t */\n\tasync rebaseOnMain(worktreePath: string, options: MergeOptions = {}): Promise<void> {\n\t\tconst { dryRun = false, force = false } = options\n\t\tconst mainBranch = await this.getMainBranch(worktreePath)\n\n\t\tgetLogger().info(`Starting rebase on ${mainBranch} branch...`)\n\n\t\t// Step 1: Check if main branch exists\n\t\ttry {\n\t\t\tawait executeGitCommand(['show-ref', '--verify', '--quiet', `refs/heads/${mainBranch}`], {\n\t\t\t\tcwd: worktreePath,\n\t\t\t})\n\t\t} catch {\n\t\t\tthrow new Error(\n\t\t\t\t`Main branch \"${mainBranch}\" does not exist. Cannot rebase.\\n` +\n\t\t\t\t\t`Ensure the repository has a \"${mainBranch}\" branch or create it first.`\n\t\t\t)\n\t\t}\n\n\t\t// Step 2: Check for uncommitted changes and create WIP commit if needed\n\t\tconst statusOutput = await executeGitCommand(['status', '--porcelain'], {\n\t\t\tcwd: worktreePath,\n\t\t})\n\n\t\tlet wipCommitHash: string | null = null\n\t\tif (statusOutput.trim()) {\n\t\t\tgetLogger().info('Uncommitted changes detected, creating temporary WIP commit...')\n\t\t\twipCommitHash = await this.createWipCommit(worktreePath)\n\t\t\tgetLogger().debug(`Created WIP commit: ${wipCommitHash}`)\n\t\t}\n\n\t\t// Step 3: Check if rebase is needed by comparing merge-base with main HEAD\n\t\tconst mergeBase = await executeGitCommand(['merge-base', mainBranch, 'HEAD'], {\n\t\t\tcwd: worktreePath,\n\t\t})\n\n\t\tconst mainHead = await executeGitCommand(['rev-parse', mainBranch], {\n\t\t\tcwd: worktreePath,\n\t\t})\n\n\t\tconst mergeBaseTrimmed = mergeBase.trim()\n\t\tconst mainHeadTrimmed = mainHead.trim()\n\n\t\t// If merge-base matches main HEAD, branch is already up to date\n\t\tif (mergeBaseTrimmed === mainHeadTrimmed) {\n\t\t\tgetLogger().success(`Branch is already up to date with ${mainBranch}. No rebase needed.`)\n\t\t\treturn\n\t\t}\n\n\t\t// Step 4: Show commits to be rebased (for informational purposes)\n\t\tconst commitsOutput = await executeGitCommand(['log', '--oneline', `${mainBranch}..HEAD`], {\n\t\t\tcwd: worktreePath,\n\t\t})\n\n\t\tconst commits = commitsOutput.trim()\n\t\tconst commitLines = commits ? commits.split('\\n') : []\n\n\t\tif (commits) {\n\t\t\t// Show commits that will be rebased\n\t\t\tgetLogger().info(`Found ${commitLines.length} commit(s) to rebase:`)\n\t\t\tcommitLines.forEach((commit) => getLogger().info(`  ${commit}`))\n\t\t} else {\n\t\t\t// Main has moved forward but branch has no new commits\n\t\t\tgetLogger().info(`${mainBranch} branch has moved forward. Rebasing to update branch...`)\n\t\t}\n\n\t\t// Step 5: User confirmation (unless force mode or dry-run)\n\t\tif (!force && !dryRun) {\n\t\t\t// TODO: Implement interactive prompt for confirmation\n\t\t\t// For now, proceeding automatically (use --force to skip this message)\n\t\t\tgetLogger().info('Proceeding with rebase... (use --force to skip confirmations)')\n\t\t}\n\n\t\t// Step 6: Execute rebase (unless dry-run)\n\t\tif (dryRun) {\n\t\t\tgetLogger().info(`[DRY RUN] Would execute: git rebase ${mainBranch}`)\n\t\t\tif (commitLines.length > 0) {\n\t\t\t\tgetLogger().info(`[DRY RUN] This would rebase ${commitLines.length} commit(s)`)\n\t\t\t}\n\t\t\treturn\n\t\t}\n\n\t\t// Execute rebase\n\t\ttry {\n\t\t\tawait executeGitCommand(['rebase', mainBranch], { cwd: worktreePath })\n\t\t\tgetLogger().success('Rebase completed successfully!')\n\n\t\t\t// Restore WIP commit if created\n\t\t\tif (wipCommitHash) {\n\t\t\t\tawait this.restoreWipCommit(worktreePath, wipCommitHash)\n\t\t\t}\n\t\t} catch (error) {\n\t\t\t// Detect conflicts\n\t\t\tconst conflictedFiles = await this.detectConflictedFiles(worktreePath)\n\n\t\t\tif (conflictedFiles.length > 0) {\n\t\t\t\t// Try Claude-assisted resolution first\n\t\t\t\tgetLogger().info('Merge conflicts detected, attempting Claude-assisted resolution...')\n\n\t\t\t\tconst resolved = await this.attemptClaudeConflictResolution(\n\t\t\t\t\tworktreePath,\n\t\t\t\t\tconflictedFiles\n\t\t\t\t)\n\n\t\t\t\tif (resolved) {\n\t\t\t\t\tgetLogger().success('Conflicts resolved with Claude assistance, rebase completed')\n\n\t\t\t\t\t// Restore WIP commit if created\n\t\t\t\t\tif (wipCommitHash) {\n\t\t\t\t\t\tawait this.restoreWipCommit(worktreePath, wipCommitHash)\n\t\t\t\t\t}\n\t\t\t\t\treturn // Continue with successful rebase\n\t\t\t\t}\n\n\t\t\t\t// Claude couldn't resolve or not available - fail fast\n\t\t\t\tconst conflictError = this.formatConflictError(conflictedFiles)\n\t\t\t\tthrow new Error(conflictError)\n\t\t\t}\n\n\t\t\t// If not a conflict, re-throw the original error\n\t\t\tthrow new Error(\n\t\t\t\t`Rebase failed: ${error instanceof Error ? error.message : String(error)}\\n` +\n\t\t\t\t\t'Run: git status for more details\\n' +\n\t\t\t\t\t'Or: git rebase --abort to cancel the rebase'\n\t\t\t)\n\t\t}\n\t}\n\n\t/**\n\t * Validate that fast-forward merge is possible\n\t * Ports bash/merge-and-clean.sh lines 957-968\n\t *\n\t * @param branchName - Name of the branch to merge\n\t * @param mainWorktreePath - Path where main branch is checked out\n\t * @throws Error if fast-forward is not possible\n\t */\n\tasync validateFastForwardPossible(mainBranch: string, branchName: string, mainWorktreePath: string): Promise<void> {\n\n\t\t// Step 1: Get merge-base between main and branch\n\t\tconst mergeBase = await executeGitCommand(['merge-base', mainBranch, branchName], {\n\t\t\tcwd: mainWorktreePath,\n\t\t})\n\n\t\t// Step 2: Get current HEAD of main\n\t\tconst mainHead = await executeGitCommand(['rev-parse', mainBranch], {\n\t\t\tcwd: mainWorktreePath,\n\t\t})\n\n\t\t// Step 3: Compare - they must match for fast-forward\n\t\tconst mergeBaseTrimmed = mergeBase.trim()\n\t\tconst mainHeadTrimmed = mainHead.trim()\n\n\t\tif (mergeBaseTrimmed !== mainHeadTrimmed) {\n\t\t\tthrow new Error(\n\t\t\t\t'Cannot perform fast-forward merge.\\n' +\n\t\t\t\t\t`The ${mainBranch} branch has moved forward since this branch was created.\\n` +\n\t\t\t\t\t`Merge base: ${mergeBaseTrimmed}\\n` +\n\t\t\t\t\t`Main HEAD:  ${mainHeadTrimmed}\\n\\n` +\n\t\t\t\t\t'To fix this:\\n' +\n\t\t\t\t\t`  1. Rebase the branch on ${mainBranch}: git rebase ${mainBranch}\\n` +\n\t\t\t\t\t`  2. Or use: il finish to automatically rebase and merge\\n`\n\t\t\t)\n\t\t}\n\t}\n\n\t/**\n\t * Perform fast-forward only merge\n\t * Ports bash/merge-and-clean.sh lines 938-994\n\t *\n\t * @param branchName - Name of the branch to merge\n\t * @param worktreePath - Path to the worktree\n\t * @param options - Merge options (dryRun, force)\n\t * @throws Error if checkout, validation, or merge fails\n\t */\n\tasync performFastForwardMerge(\n\t\tbranchName: string,\n\t\tworktreePath: string,\n\t\toptions: MergeOptions = {}\n\t): Promise<void> {\n\t\tconst { dryRun = false, force = false } = options\n\n\t\tgetLogger().info('Starting fast-forward merge...')\n\n\t\t// Step 1: Get the merge target branch FIRST\n\t\t// For child looms, this will be the parent branch from metadata\n\t\t// For regular looms, this falls back to settings.mainBranch or 'main'\n\t\tconst mainBranch = await this.getMainBranch(worktreePath)\n\n\t\t// Step 2: Find where the merge target branch is checked out\n\t\t// CRITICAL: We must find the worktree for the MERGE TARGET, not settings.mainBranch\n\t\t// This fixes the child loom bug where we'd find the 'main' worktree instead of the parent branch worktree\n\t\tlet mainWorktreePath: string\n\t\tif (options.repoRoot) {\n\t\t\tmainWorktreePath = options.repoRoot\n\t\t} else {\n\t\t\ttry {\n\t\t\t\t// First try to find worktree with the exact merge target branch checked out\n\t\t\t\tmainWorktreePath = await findWorktreeForBranch(mainBranch, worktreePath)\n\t\t\t} catch {\n\t\t\t\t// Fallback: if no worktree has the branch checked out, use settings-based lookup\n\t\t\t\t// This handles edge cases like bare repos or detached HEAD states\n\t\t\t\tgetLogger().debug(`No worktree found for branch '${mainBranch}', falling back to settings-based lookup`)\n\t\t\t\tmainWorktreePath = await findMainWorktreePathWithSettings(worktreePath, this.settingsManager)\n\t\t\t}\n\t\t}\n\n\t\t// Step 3: No need to checkout - the merge target branch is already checked out in mainWorktreePath\n\t\tgetLogger().debug(`Using ${mainBranch} branch location: ${mainWorktreePath}`)\n\n\t\t// Step 4: Verify we're on the correct branch\n\t\tconst currentBranch = await executeGitCommand(['branch', '--show-current'], {\n\t\t\tcwd: mainWorktreePath,\n\t\t})\n\n\t\tif (currentBranch.trim() !== mainBranch) {\n\t\t\tthrow new Error(\n\t\t\t\t`Expected ${mainBranch} branch but found: ${currentBranch.trim()}\\n` +\n\t\t\t\t\t`At location: ${mainWorktreePath}\\n` +\n\t\t\t\t\t'This indicates the main worktree detection failed.'\n\t\t\t)\n\t\t}\n\n\t\t// Step 5: Validate fast-forward is possible\n\t\tawait this.validateFastForwardPossible(mainBranch, branchName, mainWorktreePath)\n\n\t\t// Step 6: Show commits to be merged\n\t\tconst commitsOutput = await executeGitCommand(['log', '--oneline', `${mainBranch}..${branchName}`], {\n\t\t\tcwd: mainWorktreePath,\n\t\t})\n\n\t\tconst commits = commitsOutput.trim()\n\n\t\t// If no commits, branch has no changes ahead of main\n\t\tif (!commits) {\n\t\t\tgetLogger().success(`Branch has no commits ahead of ${mainBranch}. No merge needed.`)\n\t\t\treturn\n\t\t}\n\n\t\t// Show commits that will be merged\n\t\tconst commitLines = commits.split('\\n')\n\t\tgetLogger().info(`Found ${commitLines.length} commit(s) to merge:`)\n\t\tcommitLines.forEach((commit) => getLogger().info(`  ${commit}`))\n\n\t\t// Step 7: User confirmation (unless force mode or dry-run)\n\t\tif (!force && !dryRun) {\n\t\t\t// TODO: Implement interactive prompt for confirmation\n\t\t\t// For now, proceeding automatically (use --force to skip this message)\n\t\t\tgetLogger().info('Proceeding with fast-forward merge... (use --force to skip confirmations)')\n\t\t}\n\n\t\t// Step 8: Execute merge (unless dry-run)\n\t\tif (dryRun) {\n\t\t\tgetLogger().info(`[DRY RUN] Would execute: git merge --ff-only ${branchName}`)\n\t\t\tgetLogger().info(`[DRY RUN] This would merge ${commitLines.length} commit(s)`)\n\t\t\treturn\n\t\t}\n\n\t\t// Execute fast-forward merge\n\t\ttry {\n\t\t\tgetLogger().debug(`Executing fast-forward merge of ${branchName} into ${mainBranch} using cwd: ${mainWorktreePath}...`)\n\t\t\tawait executeGitCommand(['merge', '--ff-only', branchName], { cwd: mainWorktreePath })\n\t\t\tgetLogger().success(`Fast-forward merge completed! Merged ${commitLines.length} commit(s).`)\n\t\t} catch (error) {\n\t\t\tthrow new Error(\n\t\t\t\t`Fast-forward merge failed: ${error instanceof Error ? error.message : String(error)}\\n\\n` +\n\t\t\t\t\t'To recover:\\n' +\n\t\t\t\t\t'  1. Check merge status: git status\\n' +\n\t\t\t\t\t'  2. Abort merge if needed: git merge --abort\\n' +\n\t\t\t\t\t'  3. Verify branch is rebased: git rebase main\\n' +\n\t\t\t\t\t'  4. Try merge again: il finish'\n\t\t\t)\n\t\t}\n\t}\n\n\t/**\n\t * Helper: Detect conflicted files after failed rebase\n\t * @private\n\t */\n\tprivate async detectConflictedFiles(worktreePath: string): Promise<string[]> {\n\t\ttry {\n\t\t\tconst output = await executeGitCommand(['diff', '--name-only', '--diff-filter=U'], {\n\t\t\t\tcwd: worktreePath,\n\t\t\t})\n\n\t\t\treturn output\n\t\t\t\t.trim()\n\t\t\t\t.split('\\n')\n\t\t\t\t.filter((file) => file.length > 0)\n\t\t} catch {\n\t\t\t// If command fails, return empty array (might not be a conflict)\n\t\t\treturn []\n\t\t}\n\t}\n\n\t/**\n\t * Create a temporary WIP commit to preserve uncommitted changes during rebase\n\t * Stages all changes (tracked, untracked) using git add -A\n\t * @param worktreePath - Path to the worktree\n\t * @returns The commit hash of the WIP commit\n\t * @private\n\t */\n\tprivate async createWipCommit(worktreePath: string): Promise<string> {\n\t\t// Stage all changes including untracked files\n\t\tawait executeGitCommand(['add', '-A'], { cwd: worktreePath })\n\n\t\t// Create WIP commit with distinctive message\n\t\tawait executeGitCommand(['commit', '-m', 'WIP: Auto-stash for rebase'], { cwd: worktreePath })\n\n\t\t// Get and return the commit hash\n\t\tconst hash = await executeGitCommand(['rev-parse', 'HEAD'], { cwd: worktreePath })\n\t\treturn hash.trim()\n\t}\n\n\t/**\n\t * Restore uncommitted changes from WIP commit via soft reset\n\t * Logs warning but does not fail if soft reset fails (changes are safe in commit history)\n\t * @param worktreePath - Path to the worktree\n\t * @param wipCommitHash - Original WIP commit hash for verification logging\n\t * @private\n\t */\n\tprivate async restoreWipCommit(worktreePath: string, wipCommitHash: string): Promise<void> {\n\t\tgetLogger().info('Restoring uncommitted changes from WIP commit...')\n\n\t\ttry {\n\t\t\t// Soft reset to parent - changes become staged\n\t\t\tawait executeGitCommand(['reset', '--soft', 'HEAD~1'], { cwd: worktreePath })\n\n\t\t\t// Unstage files to restore to original working directory state\n\t\t\tawait executeGitCommand(['reset', 'HEAD'], { cwd: worktreePath })\n\n\t\t\tgetLogger().success('Restored uncommitted changes from WIP commit')\n\t\t} catch (error) {\n\t\t\t// Log warning but consider rebase successful - work is not lost\n\t\t\tgetLogger().warn(\n\t\t\t\t`Failed to restore WIP commit (${wipCommitHash}). ` +\n\t\t\t\t\t`Your changes are safe in the commit history. ` +\n\t\t\t\t\t`Manual recovery: git reset --soft HEAD~1`,\n\t\t\t\t{ error: error instanceof Error ? error.message : String(error) }\n\t\t\t)\n\t\t}\n\t}\n\n\t/**\n\t * Helper: Format conflict error message with manual resolution steps\n\t * @private\n\t */\n\tprivate formatConflictError(conflictedFiles: string[]): string {\n\t\tconst fileList = conflictedFiles.map((file) => `  • ${file}`).join('\\n')\n\n\t\treturn (\n\t\t\t'Rebase failed - merge conflicts detected in:\\n' +\n\t\t\tfileList +\n\t\t\t'\\n\\n' +\n\t\t\t'To resolve manually:\\n' +\n\t\t\t'  1. Fix conflicts in the files above\\n' +\n\t\t\t'  2. Stage resolved files: git add <files>\\n' +\n\t\t\t'  3. Continue rebase: git rebase --continue\\n' +\n\t\t\t'  4. Or abort rebase: git rebase --abort\\n' +\n\t\t\t'  5. Then re-run: il finish <issue-number>'\n\t\t)\n\t}\n\n\t/**\n\t * Attempt to resolve conflicts using Claude\n\t * Ports bash/merge-and-clean.sh lines 839-894\n\t *\n\t * @param worktreePath - Path to the worktree\n\t * @param conflictedFiles - List of files with conflicts\n\t * @returns true if conflicts resolved, false otherwise\n\t * @private\n\t */\n\tprivate async attemptClaudeConflictResolution(\n\t\tworktreePath: string,\n\t\tconflictedFiles: string[]\n\t): Promise<boolean> {\n\t\t// Check if Claude CLI is available\n\t\tconst isClaudeAvailable = await detectClaudeCli()\n\t\tif (!isClaudeAvailable) {\n\t\t\tgetLogger().debug('Claude CLI not available, skipping conflict resolution')\n\t\t\treturn false\n\t\t}\n\n\t\tgetLogger().info(`Launching Claude to resolve conflicts in ${conflictedFiles.length} file(s)...`)\n\n\t\t// Hard-coded prompt matching bash script line 844\n\t\t// No templates, no complexity - just the essential instruction\n\t\tconst systemPrompt =\n\t\t\t`Please help resolve the git rebase conflicts in this repository. ` +\n\t\t\t`Analyze the conflicted files, understand the changes from both branches, ` +\n\t\t\t`fix the conflicts, then run 'git add .' to stage the resolved files, ` +\n\t\t\t`and finally run 'git rebase --continue' to continue the rebase process. ` +\n\t\t\t`Once the issue is resolved, tell the user they can use /exit to continue with the process.`\n\n\t\tconst prompt =\n\t\t\t`Help me with this rebase please.`\n\n\t\ttry {\n\t\t\t// Launch Claude interactively in current terminal\n\t\t\t// User will interact directly with Claude to resolve conflicts\n\t\t\tawait launchClaude(prompt, {\n\t\t\t\tappendSystemPrompt: systemPrompt,\n\t\t\t\taddDir: worktreePath,\n\t\t\t\theadless: false, // Interactive - runs in current terminal with stdio: inherit\n\t\t\t})\n\n\t\t\t// After Claude interaction completes, check if conflicts resolved\n\t\t\tconst remainingConflicts = await this.detectConflictedFiles(worktreePath)\n\n\t\t\tif (remainingConflicts.length > 0) {\n\t\t\t\tgetLogger().warn(\n\t\t\t\t\t`Conflicts still exist in ${remainingConflicts.length} file(s) after Claude assistance`\n\t\t\t\t)\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Check if rebase completed or still in progress\n\t\t\tconst rebaseInProgress = await this.isRebaseInProgress(worktreePath)\n\n\t\t\tif (rebaseInProgress) {\n\t\t\t\tgetLogger().warn('Rebase still in progress after Claude assistance')\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\treturn true\n\t\t} catch (error) {\n\t\t\tgetLogger().warn('Claude conflict resolution failed', {\n\t\t\t\terror: error instanceof Error ? error.message : String(error),\n\t\t\t})\n\t\t\treturn false\n\t\t}\n\t}\n\n\t/**\n\t * Check if a git rebase is currently in progress\n\t * Checks for .git/rebase-merge or .git/rebase-apply directories\n\t * Ports bash script logic from lines 853-856\n\t *\n\t * @param worktreePath - Path to the worktree\n\t * @returns true if rebase in progress, false otherwise\n\t * @private\n\t */\n\tprivate async isRebaseInProgress(worktreePath: string): Promise<boolean> {\n\t\tconst fs = await import('node:fs/promises')\n\t\tconst path = await import('node:path')\n\n\t\tconst rebaseMergePath = path.join(worktreePath, '.git', 'rebase-merge')\n\t\tconst rebaseApplyPath = path.join(worktreePath, '.git', 'rebase-apply')\n\n\t\t// Check for rebase-merge directory\n\t\ttry {\n\t\t\tawait fs.access(rebaseMergePath)\n\t\t\treturn true\n\t\t} catch {\n\t\t\t// Directory doesn't exist, continue checking\n\t\t}\n\n\t\t// Check for rebase-apply directory\n\t\ttry {\n\t\t\tawait fs.access(rebaseApplyPath)\n\t\t\treturn true\n\t\t} catch {\n\t\t\t// Directory doesn't exist\n\t\t}\n\n\t\treturn false\n\t}\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-2CXREBLZ.js → chunk-M5XUCTTJ.js}

@@ -11,7 +11,10 @@ import {
   isPRBranch,
   isValidGitRepo,
   parseWorktreeList
-} from "./chunk-5Q3NDNNV.js";
+} from "./chunk-TR5MC2U6.js";
+import {
+  getLogger
+} from "./chunk-6UIGZD2N.js";
 
 // src/lib/GitWorktreeManager.ts
 import path from "path";
@@ -113,11 +116,10 @@ var GitWorktreeManager = class {
     const worktrees = await this.listWorktrees({ porcelain: true });
     const worktree = worktrees.find((wt) => wt.path === worktreePath);
     if (!worktree) {
-      const { logger } = await import("./logger-MKYH4UDV.js");
-      logger.debug(`Looking for worktree path: ${worktreePath}`);
-      logger.debug(`Found ${worktrees.length} worktrees:`);
+      getLogger().debug(`Looking for worktree path: ${worktreePath}`);
+      getLogger().debug(`Found ${worktrees.length} worktrees:`);
       worktrees.forEach((wt, i) => {
-        logger.debug(`  ${i}: path="${wt.path}", branch="${wt.branch}"`);
+        getLogger().debug(`  ${i}: path="${wt.path}", branch="${wt.branch}"`);
       });
       throw new Error(`Worktree not found: ${worktreePath}`);
     }
@@ -386,4 +388,4 @@ var GitWorktreeManager = class {
 export {
   GitWorktreeManager
 };
-//# sourceMappingURL=chunk-2CXREBLZ.js.map
+//# sourceMappingURL=chunk-M5XUCTTJ.js.map

package/dist/chunk-M5XUCTTJ.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/lib/GitWorktreeManager.ts"],"sourcesContent":["import path from 'path'\nimport fs from 'fs-extra'\nimport {\n  type GitWorktree,\n  type WorktreeCreateOptions,\n  type WorktreeListOptions,\n  type WorktreeValidation,\n  type WorktreeStatus,\n  type WorktreeCleanupOptions,\n} from '../types/worktree.js'\nimport {\n  executeGitCommand,\n  parseWorktreeList,\n  isPRBranch,\n  extractPRNumber,\n  generateWorktreePath,\n  isValidGitRepo,\n  getCurrentBranch,\n  getRepoRoot,\n  hasUncommittedChanges,\n  getDefaultBranch,\n  findMainWorktreePathWithSettings,\n} from '../utils/git.js'\nimport { getLogger } from '../utils/logger-context.js'\nimport type { SettingsManager } from './SettingsManager.js'\n\n/**\n * Manages Git worktrees for the iloom CLI\n * Ports functionality from bash scripts into TypeScript\n */\nexport class GitWorktreeManager {\n  private readonly _workingDirectory: string\n\n  constructor(workingDirectory: string = process.cwd()) {\n    this._workingDirectory = workingDirectory\n  }\n\n  /**\n   * Get the working directory for git operations (main worktree path)\n   */\n  get workingDirectory(): string {\n    return this._workingDirectory\n  }\n\n  /**\n   * List all worktrees in the repository\n   * Defaults to porcelain format for reliable machine parsing\n   * Equivalent to: git worktree list --porcelain\n   */\n  async listWorktrees(options: WorktreeListOptions = {}): Promise<GitWorktree[]> {\n    const args = ['worktree', 'list']\n    // Default to porcelain format for consistent parsing (can be disabled with porcelain: false)\n    if (options.porcelain !== false) args.push('--porcelain')\n    if (options.verbose) args.push('-v')\n\n    const output = await executeGitCommand(args, { cwd: this._workingDirectory })\n    return parseWorktreeList(output)\n  }\n\n  /**\n   * Find worktree for a specific branch\n   * Ports: find_worktree_for_branch() from find-worktree-for-branch.sh\n   */\n  async findWorktreeForBranch(branchName: string): Promise<GitWorktree | null> {\n    const worktrees = await this.listWorktrees()\n    return worktrees.find(wt => wt.branch === branchName) ?? null\n  }\n\n  /**\n   * Check if a worktree is the main repository worktree\n   * Uses findMainWorktreePathWithSettings to determine the main worktree based on settings.\n   *\n   * @param worktree - The worktree to check\n   * @param settingsManager - SettingsManager instance for loading settings\n   * @returns true if the worktree is the main worktree\n   */\n  async isMainWorktree(worktree: GitWorktree, settingsManager: SettingsManager): Promise<boolean> {\n    const mainWorktreePath = await findMainWorktreePathWithSettings(worktree.path, settingsManager)\n    return worktree.path === mainWorktreePath\n  }\n\n  /**\n   * Check if a worktree is a PR worktree based on naming patterns\n   * Ports: is_pr_worktree() from worktree-utils.sh\n   */\n  isPRWorktree(worktree: GitWorktree): boolean {\n    return isPRBranch(worktree.branch)\n  }\n\n  /**\n   * Get PR number from worktree branch name\n   * Ports: get_pr_number_from_worktree() from worktree-utils.sh\n   */\n  getPRNumberFromWorktree(worktree: GitWorktree): number | null {\n    return extractPRNumber(worktree.branch)\n  }\n\n  /**\n   * Create a new worktree\n   * Ports worktree creation logic from new-branch-workflow.sh\n   * @returns The absolute path to the created worktree\n   */\n  async createWorktree(options: WorktreeCreateOptions): Promise<string> {\n    // Validate inputs\n    if (!options.branch) {\n      throw new Error('Branch name is required')\n    }\n\n    // Ensure path is absolute\n    const absolutePath = path.resolve(options.path)\n\n    // Check if path already exists and handle force flag\n    if (await fs.pathExists(absolutePath)) {\n      if (!options.force) {\n        throw new Error(`Path already exists: ${absolutePath}`)\n      }\n      // Remove existing directory if force is true\n      await fs.remove(absolutePath)\n    }\n\n    // Build git worktree add command\n    const args = ['worktree', 'add']\n\n    if (options.createBranch) {\n      args.push('-b', options.branch)\n    }\n\n    if (options.force) {\n      args.push('--force')\n    }\n\n    args.push(absolutePath)\n\n    // Add branch name if not creating new branch\n    if (!options.createBranch) {\n      args.push(options.branch)\n    } else if (options.baseBranch) {\n      args.push(options.baseBranch)\n    }\n\n    await executeGitCommand(args, { cwd: this._workingDirectory })\n    return absolutePath\n  }\n\n  /**\n   * Remove a worktree and optionally clean up associated files\n   * Ports worktree removal logic from cleanup-worktree.sh\n   * @returns A message describing what was done (for dry-run mode)\n   */\n  async removeWorktree(\n    worktreePath: string,\n    options: WorktreeCleanupOptions = {}\n  ): Promise<string | void> {\n    // Validate worktree exists - use porcelain format for consistent parsing\n    const worktrees = await this.listWorktrees({ porcelain: true })\n    const worktree = worktrees.find(wt => wt.path === worktreePath)\n\n    if (!worktree) {\n      // Add debug logging to help diagnose the issue\n      getLogger().debug(`Looking for worktree path: ${worktreePath}`)\n      getLogger().debug(`Found ${worktrees.length} worktrees:`)\n      worktrees.forEach((wt, i) => {\n        getLogger().debug(`  ${i}: path=\"${wt.path}\", branch=\"${wt.branch}\"`)\n      })\n      throw new Error(`Worktree not found: ${worktreePath}`)\n    }\n\n    // Check for uncommitted changes unless force is specified\n    if (!options.force && !options.dryRun) {\n      const hasChanges = await hasUncommittedChanges(worktreePath)\n      if (hasChanges) {\n        throw new Error(`Worktree has uncommitted changes: ${worktreePath}. Use --force to override.`)\n      }\n    }\n\n    if (options.dryRun) {\n      const actions = ['Remove worktree registration']\n      if (options.removeDirectory) actions.push('Remove directory from disk')\n      if (options.removeBranch) actions.push(`Remove branch: ${worktree.branch}`)\n\n      return `Would perform: ${actions.join(', ')}`\n    }\n\n    // Remove worktree registration\n    const args = ['worktree', 'remove']\n    if (options.force) args.push('--force')\n    args.push(worktreePath)\n\n    await executeGitCommand(args, { cwd: this._workingDirectory })\n\n    // Remove directory if requested\n    if (options.removeDirectory && (await fs.pathExists(worktreePath))) {\n      await fs.remove(worktreePath)\n    }\n\n    // Remove branch if requested and safe to do so\n    if (options.removeBranch && !worktree.bare) {\n      try {\n        await executeGitCommand(['branch', '-D', worktree.branch], {\n          cwd: this._workingDirectory,\n        })\n      } catch (error) {\n        // Don't fail the whole operation if branch deletion fails\n        // Just log a warning (caller can handle this)\n        throw new Error(\n          `Worktree removed but failed to delete branch ${worktree.branch}: ${error instanceof Error ? error.message : 'Unknown error'}`\n        )\n      }\n    }\n  }\n\n  /**\n   * Validate worktree state and integrity\n   */\n  async validateWorktree(worktreePath: string): Promise<WorktreeValidation> {\n    const issues: string[] = []\n    let existsOnDisk = false\n    let isValidRepo = false\n    let hasValidBranch = false\n\n    try {\n      // Check if path exists on disk\n      existsOnDisk = await fs.pathExists(worktreePath)\n      if (!existsOnDisk) {\n        issues.push('Worktree directory does not exist on disk')\n      }\n\n      // Check if it's a valid Git repository\n      if (existsOnDisk) {\n        isValidRepo = await isValidGitRepo(worktreePath)\n        if (!isValidRepo) {\n          issues.push('Directory is not a valid Git repository')\n        }\n      }\n\n      // Check if branch reference is valid\n      if (isValidRepo) {\n        const currentBranch = await getCurrentBranch(worktreePath)\n        hasValidBranch = currentBranch !== null\n        if (!hasValidBranch) {\n          issues.push('Could not determine current branch')\n        }\n      }\n\n      // Check if worktree is registered with Git\n      const worktrees = await this.listWorktrees()\n      const isRegistered = worktrees.some(wt => wt.path === worktreePath)\n      if (!isRegistered) {\n        issues.push('Worktree is not registered with Git')\n      }\n    } catch (error) {\n      issues.push(`Validation error: ${error instanceof Error ? error.message : 'Unknown error'}`)\n    }\n\n    return {\n      isValid: issues.length === 0,\n      issues,\n      existsOnDisk,\n      isValidRepo,\n      hasValidBranch,\n    }\n  }\n\n  /**\n   * Get detailed status information for a worktree\n   */\n  async getWorktreeStatus(worktreePath: string): Promise<WorktreeStatus> {\n    const statusOutput = await executeGitCommand(['status', '--porcelain=v1'], {\n      cwd: worktreePath,\n    })\n\n    let modified = 0\n    let staged = 0\n    let deleted = 0\n    let untracked = 0\n\n    const lines = statusOutput.trim().split('\\n').filter(Boolean)\n    for (const line of lines) {\n      const status = line.substring(0, 2)\n      if (status[0] === 'M' || status[1] === 'M') modified++\n      if (status[0] === 'A' || status[0] === 'D' || status[0] === 'R') staged++\n      if (status[0] === 'D' || status[1] === 'D') deleted++\n      if (status === '??') untracked++\n    }\n\n    const currentBranch = (await getCurrentBranch(worktreePath)) ?? 'unknown'\n    const detached = currentBranch === 'unknown'\n\n    // Get ahead/behind information\n    let ahead = 0\n    let behind = 0\n    try {\n      const aheadBehindOutput = await executeGitCommand(\n        ['rev-list', '--left-right', '--count', `origin/${currentBranch}...HEAD`],\n        { cwd: worktreePath }\n      )\n      const parts = aheadBehindOutput.trim().split('\\t')\n      const behindStr = parts[0]\n      const aheadStr = parts[1]\n      behind = behindStr ? parseInt(behindStr, 10) || 0 : 0\n      ahead = aheadStr ? parseInt(aheadStr, 10) || 0 : 0\n    } catch {\n      // Ignore errors for ahead/behind calculation\n    }\n\n    return {\n      modified,\n      staged,\n      deleted,\n      untracked,\n      hasChanges: modified + staged + deleted + untracked > 0,\n      branch: currentBranch,\n      detached,\n      ahead,\n      behind,\n    }\n  }\n\n  /**\n   * Generate a suggested worktree path for a branch\n   */\n  generateWorktreePath(\n    branchName: string,\n    customRoot?: string,\n    options?: { isPR?: boolean; prNumber?: number; prefix?: string }\n  ): string {\n    const root = customRoot ?? this._workingDirectory\n    return generateWorktreePath(branchName, root, options)\n  }\n\n  /**\n   * Sanitize a branch name for use as a directory name\n   * Replaces slashes with dashes and removes invalid filesystem characters\n   * Ports logic from bash script line 593: ${BRANCH_NAME//\\\\//-}\n   */\n  sanitizeBranchName(branchName: string): string {\n    return branchName\n      .replace(/\\//g, '-')  // Replace slashes with dashes\n      .replace(/[^a-zA-Z0-9-]/g, '-')  // Replace invalid chars (including underscores) with dashes\n      .replace(/-+/g, '-')  // Collapse multiple dashes\n      .replace(/^-|-$/g, '')  // Remove leading/trailing dashes\n      .toLowerCase()\n  }\n\n  /**\n   * Check if repository is in a valid state for worktree operations\n   */\n  async isRepoReady(): Promise<boolean> {\n    try {\n      const repoRoot = await getRepoRoot(this._workingDirectory)\n      return repoRoot !== null\n    } catch {\n      return false\n    }\n  }\n\n  /**\n   * Get repository information\n   */\n  async getRepoInfo(): Promise<{\n    root: string | null\n    defaultBranch: string\n    currentBranch: string | null\n  }> {\n    const root = await getRepoRoot(this._workingDirectory)\n    const defaultBranch = await getDefaultBranch(this._workingDirectory)\n    const currentBranch = await getCurrentBranch(this._workingDirectory)\n\n    return {\n      root,\n      defaultBranch,\n      currentBranch,\n    }\n  }\n\n  /**\n   * Prune stale worktree entries (worktrees that no longer exist on disk)\n   */\n  async pruneWorktrees(): Promise<void> {\n    await executeGitCommand(['worktree', 'prune', '-v'], { cwd: this._workingDirectory })\n  }\n\n  /**\n   * Lock a worktree to prevent it from being pruned or moved\n   */\n  async lockWorktree(worktreePath: string, reason?: string): Promise<void> {\n    const args = ['worktree', 'lock', worktreePath]\n    if (reason) args.push('--reason', reason)\n\n    await executeGitCommand(args, { cwd: this._workingDirectory })\n  }\n\n  /**\n   * Unlock a previously locked worktree\n   */\n  async unlockWorktree(worktreePath: string): Promise<void> {\n    await executeGitCommand(['worktree', 'unlock', worktreePath], { cwd: this._workingDirectory })\n  }\n\n  /**\n   * Find worktrees matching an identifier (branch name, path, or PR number)\n   */\n  async findWorktreesByIdentifier(identifier: string): Promise<GitWorktree[]> {\n    const worktrees = await this.listWorktrees({ porcelain: true })\n    return worktrees.filter(\n      wt =>\n        wt.branch.includes(identifier) ||\n        wt.path.includes(identifier) ||\n        this.getPRNumberFromWorktree(wt)?.toString() === identifier\n    )\n  }\n\n  /**\n   * Find worktree for a specific issue number using exact pattern matching\n   * Matches: issue-{N} at start OR after /, -, _ (but NOT issue-{N}X where X is a digit)\n   * Supports patterns like: issue-44, feat/issue-44-feature, feat-issue-44, bugfix_issue-44, etc.\n   * Avoids false matches like: tissue-44, myissue-44\n   * Ports: find_existing_worktree() from bash script lines 131-165\n   */\n  async findWorktreeForIssue(issueNumber: string | number): Promise<GitWorktree | null> {\n    const worktrees = await this.listWorktrees({ porcelain: true })\n\n    // Pattern: starts with 'issue-{N}' OR has '/issue-{N}', '-issue-{N}', '_issue-{N}' but not 'issue-{N}{digit}'\n    // Case-insensitive to handle Linear IDs (MARK-1 vs mark-1)\n    const pattern = new RegExp(`(?:^|[/_-])issue-${issueNumber}(?:-|__|$)`, 'i')\n\n    return worktrees.find(wt => pattern.test(wt.branch)) ?? null\n  }\n\n  /**\n   * Find worktree for a specific PR by branch name\n   * Ports: find_existing_worktree() for PR type from bash script lines 149-160\n   */\n  async findWorktreeForPR(prNumber: number, branchName: string): Promise<GitWorktree | null> {\n    const worktrees = await this.listWorktrees({ porcelain: true })\n\n    // Find by exact branch name match (prioritized)\n    const byBranch = worktrees.find(wt => wt.branch === branchName)\n    if (byBranch) return byBranch\n\n    // Also check directory name pattern: *_pr_{N}\n    const pathPattern = new RegExp(`_pr_${prNumber}$`)\n    return worktrees.find(wt => pathPattern.test(wt.path)) ?? null\n  }\n\n  /**\n   * Remove multiple worktrees\n   * Returns a summary of successes and failures\n   * Automatically filters out the main worktree\n   *\n   * @param worktrees - Array of worktrees to remove\n   * @param settingsManager - SettingsManager instance for determining main worktree\n   * @param options - Cleanup options\n   */\n  async removeWorktrees(\n    worktrees: GitWorktree[],\n    settingsManager: SettingsManager,\n    options: WorktreeCleanupOptions = {}\n  ): Promise<{\n    successes: Array<{ worktree: GitWorktree }>\n    failures: Array<{ worktree: GitWorktree; error: string }>\n    skipped: Array<{ worktree: GitWorktree; reason: string }>\n  }> {\n    const successes: Array<{ worktree: GitWorktree }> = []\n    const failures: Array<{ worktree: GitWorktree; error: string }> = []\n    const skipped: Array<{ worktree: GitWorktree; reason: string }> = []\n\n    for (const worktree of worktrees) {\n      // Skip main worktree\n      if (await this.isMainWorktree(worktree, settingsManager)) {\n        skipped.push({ worktree, reason: 'Cannot remove main worktree' })\n        continue\n      }\n\n      try {\n        await this.removeWorktree(worktree.path, {\n          ...options,\n          removeDirectory: true,\n        })\n        successes.push({ worktree })\n      } catch (error) {\n        failures.push({\n          worktree,\n          error: error instanceof Error ? error.message : 'Unknown error',\n        })\n      }\n    }\n\n    return { successes, failures, skipped }\n  }\n\n  /**\n   * Format worktree information for display\n   */\n  formatWorktree(worktree: GitWorktree): {\n    title: string\n    path: string\n    commit: string\n  } {\n    const prNumber = this.getPRNumberFromWorktree(worktree)\n    const prLabel = prNumber ? ` (PR #${prNumber})` : ''\n    const bareLabel = worktree.bare ? ' [main]' : ''\n\n    return {\n      title: `${worktree.branch}${prLabel}${bareLabel}`,\n      path: worktree.path,\n      commit: worktree.commit.substring(0, 7),\n    }\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-4XIDC3NF.js → chunk-MD6HA5IK.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   logger
-} from "./chunk-GEHQXLEI.js";
+} from "./chunk-UYVWLISQ.js";
 
 // src/utils/update-notifier.ts
 import os from "os";
@@ -200,4 +200,4 @@ export {
   UpdateNotifier,
   checkAndNotifyUpdate
 };
-//# sourceMappingURL=chunk-4XIDC3NF.js.map
+//# sourceMappingURL=chunk-MD6HA5IK.js.map

package/dist/chunk-MLS5FAV7.js

@@ -0,0 +1,189 @@
+#!/usr/bin/env node
+import {
+  getLogger
+} from "./chunk-6UIGZD2N.js";
+
+// src/lib/MetadataManager.ts
+import path from "path";
+import os from "os";
+import fs from "fs-extra";
+var MetadataManager = class {
+  constructor() {
+    this.loomsDir = path.join(os.homedir(), ".config", "iloom-ai", "looms");
+  }
+  /**
+   * Convert worktree path to filename slug per spec section 2.2
+   *
+   * Algorithm:
+   * 1. Trim trailing slashes
+   * 2. Replace all path separators (/ or \) with __ (double underscore)
+   * 3. Replace any other non-alphanumeric characters (except _ and -) with -
+   * 4. Append .json
+   *
+   * Example:
+   * - Worktree: /Users/jane/dev/repo
+   * - Filename: _Users__jane__dev__repo.json
+   */
+  slugifyPath(worktreePath) {
+    let slug = worktreePath.replace(/[/\\]+$/, "");
+    slug = slug.replace(/[/\\]/g, "___");
+    slug = slug.replace(/[^a-zA-Z0-9_-]/g, "-");
+    return `${slug}.json`;
+  }
+  /**
+   * Get the full path to the metadata file for a worktree
+   */
+  getFilePath(worktreePath) {
+    const filename = this.slugifyPath(worktreePath);
+    return path.join(this.loomsDir, filename);
+  }
+  /**
+   * Write metadata for a worktree (spec section 3.1)
+   *
+   * @param worktreePath - Absolute path to the worktree (used for file naming)
+   * @param input - Metadata to write (description plus additional fields)
+   */
+  async writeMetadata(worktreePath, input) {
+    try {
+      await fs.ensureDir(this.loomsDir, { mode: 493 });
+      const content = {
+        description: input.description,
+        created_at: (/* @__PURE__ */ new Date()).toISOString(),
+        version: 1,
+        branchName: input.branchName,
+        worktreePath: input.worktreePath,
+        issueType: input.issueType,
+        issue_numbers: input.issue_numbers,
+        pr_numbers: input.pr_numbers,
+        issueTracker: input.issueTracker,
+        colorHex: input.colorHex,
+        sessionId: input.sessionId,
+        ...input.parentLoom && { parentLoom: input.parentLoom }
+      };
+      const filePath = this.getFilePath(worktreePath);
+      await fs.writeFile(filePath, JSON.stringify(content, null, 2), { mode: 420 });
+      getLogger().debug(`Metadata written for worktree: ${worktreePath}`);
+    } catch (error) {
+      getLogger().warn(
+        `Failed to write metadata for worktree: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  /**
+   * Read metadata for a worktree (spec section 3.2)
+   *
+   * @param worktreePath - Absolute path to the worktree
+   * @returns The metadata object with all fields, or null if not found/invalid
+   */
+  async readMetadata(worktreePath) {
+    try {
+      const filePath = this.getFilePath(worktreePath);
+      if (!await fs.pathExists(filePath)) {
+        return null;
+      }
+      const content = await fs.readFile(filePath, "utf8");
+      const data = JSON.parse(content);
+      if (!data.description) {
+        return null;
+      }
+      return {
+        description: data.description,
+        created_at: data.created_at ?? null,
+        branchName: data.branchName ?? null,
+        worktreePath: data.worktreePath ?? null,
+        issueType: data.issueType ?? null,
+        issue_numbers: data.issue_numbers ?? [],
+        pr_numbers: data.pr_numbers ?? [],
+        issueTracker: data.issueTracker ?? null,
+        colorHex: data.colorHex ?? null,
+        sessionId: data.sessionId ?? null,
+        parentLoom: data.parentLoom ?? null
+      };
+    } catch (error) {
+      getLogger().debug(
+        `Could not read metadata for worktree ${worktreePath}: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return null;
+    }
+  }
+  /**
+   * List all stored loom metadata files
+   *
+   * Returns an array of LoomMetadata objects for all valid metadata files
+   * in the looms directory. Invalid or unreadable files are skipped.
+   *
+   * @returns Array of LoomMetadata objects from all stored files
+   */
+  async listAllMetadata() {
+    const results = [];
+    try {
+      if (!await fs.pathExists(this.loomsDir)) {
+        return results;
+      }
+      const files = await fs.readdir(this.loomsDir);
+      for (const file of files) {
+        if (!file.endsWith(".json")) {
+          continue;
+        }
+        try {
+          const filePath = path.join(this.loomsDir, file);
+          const content = await fs.readFile(filePath, "utf8");
+          const data = JSON.parse(content);
+          if (!data.description) {
+            continue;
+          }
+          results.push({
+            description: data.description,
+            created_at: data.created_at ?? null,
+            branchName: data.branchName ?? null,
+            worktreePath: data.worktreePath ?? null,
+            issueType: data.issueType ?? null,
+            issue_numbers: data.issue_numbers ?? [],
+            pr_numbers: data.pr_numbers ?? [],
+            issueTracker: data.issueTracker ?? null,
+            colorHex: data.colorHex ?? null,
+            sessionId: data.sessionId ?? null,
+            parentLoom: data.parentLoom ?? null
+          });
+        } catch (error) {
+          getLogger().debug(
+            `Skipping metadata file ${file}: ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
+      }
+    } catch (error) {
+      getLogger().debug(
+        `Could not list metadata files: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+    return results;
+  }
+  /**
+   * Delete metadata for a worktree (spec section 3.3)
+   *
+   * Idempotent: silently succeeds if file doesn't exist
+   * Non-fatal: logs warning on permission errors but doesn't throw
+   *
+   * @param worktreePath - Absolute path to the worktree
+   */
+  async deleteMetadata(worktreePath) {
+    try {
+      const filePath = this.getFilePath(worktreePath);
+      if (!await fs.pathExists(filePath)) {
+        getLogger().debug(`No metadata file to delete for worktree: ${worktreePath}`);
+        return;
+      }
+      await fs.unlink(filePath);
+      getLogger().debug(`Metadata deleted for worktree: ${worktreePath}`);
+    } catch (error) {
+      getLogger().warn(
+        `Failed to delete metadata for worktree: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+};
+
+export {
+  MetadataManager
+};
+//# sourceMappingURL=chunk-MLS5FAV7.js.map