@iloom/cli 0.4.0 → 0.5.0

package/dist/cli.js

@@ -1,97 +1,102 @@
 #!/usr/bin/env node
 import {
   SessionSummaryService
-} from "./chunk-HHDSIE72.js";
+} from "./chunk-HABINPX2.js";
+import {
+  FirstRunManager,
+  IssueTrackerFactory,
+  generateIssueManagementMcpConfig
+} from "./chunk-RFUOIUQF.js";
+import "./chunk-QHA67Q7A.js";
 import {
   CLIIsolationManager,
   DatabaseManager,
   EnvironmentManager,
   LoomManager,
   ResourceCleanup
-} from "./chunk-NFVFVYAP.js";
+} from "./chunk-T5IIUG4Z.js";
+import {
+  detectPackageManager,
+  installDependencies,
+  runScript
+} from "./chunk-VBFDVGAE.js";
+import {
+  ProcessManager
+} from "./chunk-VU3QMIP2.js";
+import {
+  IdentifierParser
+} from "./chunk-AS2IRKLU.js";
+import {
+  createNeonProviderFromSettings
+} from "./chunk-UNXRACJ7.js";
 import {
   InitCommand,
   ShellCompletion
-} from "./chunk-KM3W7YQX.js";
+} from "./chunk-4YTILIIH.js";
 import "./chunk-UYWAESOT.js";
 import {
   IssueEnhancementService,
   capitalizeFirstLetter
-} from "./chunk-S44CHE3G.js";
-import {
-  MergeManager
-} from "./chunk-LTNDJMTH.js";
-import {
-  FirstRunManager,
-  IssueTrackerFactory,
-  generateIssueManagementMcpConfig
-} from "./chunk-HD5SUKI2.js";
-import "./chunk-QHA67Q7A.js";
+} from "./chunk-VTXCGKV5.js";
 import {
   AgentManager
-} from "./chunk-O7WHXLCB.js";
+} from "./chunk-RNZMHJK7.js";
 import {
-  IdentifierParser
-} from "./chunk-HVGQP44L.js";
+  ProjectCapabilityDetector
+} from "./chunk-EBISESAP.js";
 import {
-  ProcessManager
-} from "./chunk-VU3QMIP2.js";
+  hasScript,
+  readPackageJson
+} from "./chunk-2ZPFJQ3B.js";
 import {
-  openBrowser
-} from "./chunk-YETJNRQM.js";
+  MergeManager
+} from "./chunk-GVRO4PWE.js";
 import {
   GitWorktreeManager
-} from "./chunk-M5XUCTTJ.js";
-import {
-  detectPackageManager,
-  installDependencies,
-  runScript
-} from "./chunk-VBFDVGAE.js";
+} from "./chunk-3CMGCRB5.js";
 import {
-  ClaudeContextManager
-} from "./chunk-F4J6KEL6.js";
-import "./chunk-ADDNFQJ4.js";
+  PRManager
+} from "./chunk-P2ZQ5LKB.js";
 import {
-  DefaultBranchNamingService
-} from "./chunk-P2WZIDF3.js";
+  openBrowser
+} from "./chunk-YETJNRQM.js";
 import {
-  ProjectCapabilityDetector
-} from "./chunk-EBISESAP.js";
+  getConfiguredRepoFromSettings,
+  hasMultipleRemotes
+} from "./chunk-PSFVTBM7.js";
 import {
-  hasScript,
-  readPackageJson
-} from "./chunk-2ZPFJQ3B.js";
+  ClaudeContextManager
+} from "./chunk-S65T4O6I.js";
+import "./chunk-CDQEK2WD.js";
+import "./chunk-DKQ4SUII.js";
 import {
   extractSettingsOverrides
 } from "./chunk-GYCR2LOU.js";
 import {
-  createNeonProviderFromSettings
-} from "./chunk-UNXRACJ7.js";
-import {
-  getConfiguredRepoFromSettings,
-  getEffectivePRTargetRemote,
-  hasMultipleRemotes,
-  parseGitRemotes
-} from "./chunk-PSFVTBM7.js";
+  DefaultBranchNamingService
+} from "./chunk-QIUJPPJQ.js";
 import {
   executeGitCommand,
   extractIssueNumber,
   findMainWorktreePathWithSettings,
+  findPlaceholderCommitSha,
+  getMergeTargetBranch,
   getRepoRoot,
-  pushBranchToRemote
-} from "./chunk-TR5MC2U6.js";
-import {
-  MetadataManager
-} from "./chunk-MLS5FAV7.js";
+  isPlaceholderCommit,
+  pushBranchToRemote,
+  removePlaceholderCommitFromHead,
+  removePlaceholderCommitFromHistory
+} from "./chunk-LN4H3A6A.js";
 import {
   SettingsManager
-} from "./chunk-VWNS6DH5.js";
+} from "./chunk-OOU3DKNT.js";
+import {
+  MetadataManager
+} from "./chunk-YZTDGPFB.js";
 import {
   GitHubService
 } from "./chunk-OEGECBFS.js";
-import {
-  executeGhCommand
-} from "./chunk-KO2FOMHL.js";
+import "./chunk-KO2FOMHL.js";
 import {
   promptCommitAction,
   promptConfirmation,
@@ -101,16 +106,15 @@ import "./chunk-WUQQNE63.js";
 import {
   detectClaudeCli,
   launchClaude
-} from "./chunk-75B2HZZ5.js";
-import "./chunk-JJUPY5MM.js";
+} from "./chunk-RUC7OULH.js";
+import "./chunk-VAYGNQTE.js";
 import {
   loadEnvIntoProcess
-} from "./chunk-3NFBZRPR.js";
+} from "./chunk-Z5NXYJIG.js";
 import {
   getLogger,
   withLogger
 } from "./chunk-6UIGZD2N.js";
-import "./chunk-74VMN2KC.js";
 import {
   createStderrLogger,
   logger
@@ -1155,6 +1159,12 @@ 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"], {
@@ -1167,6 +1177,30 @@ async function isVSCodeAvailable() {
     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 {
@@ -1251,8 +1285,12 @@ var CommitManager = class {
           await executeGitCommand(commitArgs, { cwd: worktreePath });
         } else {
           getLogger().info("Opening editor for commit message review...");
-          if (isRunningInVSCode() && await isVSCodeAvailable()) {
-            await this.commitWithVSCodeEditor(worktreePath, message, options);
+          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) {
@@ -1279,10 +1317,11 @@ var CommitManager = class {
     }
   }
   /**
-   * Commit with VSCode editor - handles file creation, editing, and commit ourselves
-   * to ensure the file opens in the current VSCode window (preserves IPC context)
+   * 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 commitWithVSCodeEditor(worktreePath, message, options) {
+  async commitWithExternalEditor(worktreePath, message, options, cliCommand, editorName) {
     const commitMsgPath = join(worktreePath, ".COMMIT_EDITMSG");
     const initialContent = `${message}
 
@@ -1293,8 +1332,8 @@ var CommitManager = class {
 `;
     await writeFile(commitMsgPath, initialContent, "utf-8");
     try {
-      getLogger().debug(`Opening commit message in VSCode: ${commitMsgPath}`);
-      await execa2("code", ["--wait", commitMsgPath], {
+      getLogger().debug(`Opening commit message in ${editorName}: ${commitMsgPath}`);
+      await execa2(cliCommand, ["--wait", commitMsgPath], {
         cwd: worktreePath,
         stdio: "inherit"
       });
@@ -1628,267 +1667,6 @@ Run '${runCommand}' to see detailed errors.`
   }
 };
 
-// src/lib/PRManager.ts
-var PRManager = class {
-  constructor(settings) {
-    this.settings = settings;
-  }
-  /**
-   * Check if a PR already exists for the given branch
-   * @param branchName - Branch to check
-   * @param cwd - Working directory
-   * @returns Existing PR info or null if none found
-   */
-  async checkForExistingPR(branchName, cwd) {
-    try {
-      const prList = await executeGhCommand(
-        ["pr", "list", "--head", branchName, "--state", "open", "--json", "number,url"],
-        cwd ? { cwd } : void 0
-      );
-      if (prList.length > 0) {
-        return prList[0] ?? null;
-      }
-      return null;
-    } catch (error) {
-      getLogger().debug("Error checking for existing PR", { error });
-      return null;
-    }
-  }
-  /**
-   * Generate PR body using Claude if available, otherwise use simple template
-   * @param issueNumber - Issue number to include in body
-   * @param worktreePath - Path to worktree for context
-   * @returns PR body markdown
-   */
-  async generatePRBody(issueNumber, worktreePath) {
-    const hasClaudeCli = await detectClaudeCli();
-    if (hasClaudeCli) {
-      try {
-        const prompt = this.buildPRBodyPrompt(issueNumber);
-        const body2 = await launchClaude(prompt, {
-          headless: true,
-          addDir: worktreePath,
-          timeout: 3e4
-        });
-        if (body2 && typeof body2 === "string" && body2.trim()) {
-          const sanitized = this.sanitizeClaudeOutput(body2);
-          if (sanitized) {
-            return sanitized;
-          }
-        }
-      } catch (error) {
-        getLogger().debug("Claude PR body generation failed, using template", { error });
-      }
-    }
-    let body = "This PR contains changes from the iloom workflow.\n\n";
-    if (issueNumber) {
-      body += `Fixes #${issueNumber}`;
-    }
-    return body;
-  }
-  /**
-   * Build structured XML prompt for PR body generation
-   * Uses XML format for clear task definition and output expectations
-   */
-  buildPRBodyPrompt(issueNumber) {
-    const issueContext = issueNumber ? `
-<IssueContext>
-This PR is associated with GitHub issue #${issueNumber}.
-Include "Fixes #${issueNumber}" at the end of the body on its own line.
-</IssueContext>` : "";
-    return `<Task>
-You are a software engineer writing a pull request body for this repository.
-Examine the changes in the git repository and generate a concise, professional PR description.
-</Task>
-
-<Requirements>
-<Format>Write 2-3 sentences summarizing what was changed and why.${issueNumber ? `
-
-End with "Fixes #${issueNumber}" on its own line.` : ""}</Format>
-<Tone>Professional and concise</Tone>
-<Focus>Summarize the changes and their purpose</Focus>
-<NoMeta>CRITICAL: Do NOT include ANY explanatory text, analysis, or meta-commentary. Output ONLY the raw PR body text.</NoMeta>
-<Examples>
-Good: "Add user authentication with JWT tokens to secure the API endpoints. This includes login and registration endpoints with proper password hashing.
-
-Fixes #42"
-Good: "Fix navigation bug in sidebar menu that caused incorrect highlighting on nested routes."
-Bad: "Here's the PR body:
-
----
-
-Add user authentication..."
-Bad: "Based on the changes, I'll write: Fix navigation bug..."
-</Examples>
-${issueContext}
-</Requirements>
-
-<Output>
-IMPORTANT: Your entire response will be used directly as the GitHub pull request body.
-Do not include any explanatory text, headers, or separators before or after the body.
-Start your response immediately with the PR body 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,
-      /^.*?here.*?is.*?(?:the\s+)?(?:pr|pull request).*?body.*?:/i,
-      /^.*?here's.*?(?:the\s+)?(?:pr|pull request).*?body.*?:/i
-    ];
-    for (const pattern of metaPatterns) {
-      cleaned = cleaned.replace(pattern, "").trim();
-    }
-    cleaned = cleaned.replace(/^[-=]{3,}\s*/m, "").trim();
-    if (cleaned.includes(":")) {
-      const colonIndex = cleaned.indexOf(":");
-      const beforeColon = cleaned.substring(0, colonIndex).trim().toLowerCase();
-      const metaIndicators = [
-        "here is the pr body",
-        "here is the pull request body",
-        "pr body",
-        "pull request body",
-        "here is",
-        "here's",
-        "the body should be",
-        "i suggest",
-        "my suggestion"
-      ];
-      const isMetaCommentary = metaIndicators.some((indicator) => beforeColon.includes(indicator));
-      if (isMetaCommentary) {
-        const afterColon = cleaned.substring(colonIndex + 1).trim();
-        const afterSeparator = afterColon.replace(/^[-=]{3,}\s*/m, "").trim();
-        if (afterSeparator && afterSeparator.length > 10) {
-          cleaned = afterSeparator;
-        }
-      }
-    }
-    if (cleaned.startsWith('"') && cleaned.endsWith('"') || cleaned.startsWith("'") && cleaned.endsWith("'")) {
-      cleaned = cleaned.slice(1, -1).trim();
-    }
-    return cleaned;
-  }
-  /**
-   * Create a GitHub PR for the branch
-   * @param branchName - Branch to create PR from (used as --head)
-   * @param title - PR title
-   * @param body - PR body
-   * @param baseBranch - Base branch to target (usually main/master)
-   * @param cwd - Working directory
-   * @returns PR URL
-   */
-  async createPR(branchName, title, body, baseBranch, cwd) {
-    try {
-      const targetRemote = await getEffectivePRTargetRemote(this.settings, cwd);
-      let headValue = branchName;
-      if (targetRemote !== "origin") {
-        const remotes = await parseGitRemotes(cwd);
-        const originRemote = remotes.find((r) => r.name === "origin");
-        if (originRemote) {
-          headValue = `${originRemote.owner}:${branchName}`;
-          getLogger().debug(`Fork workflow detected, using head: ${headValue}`);
-        }
-      }
-      const args = ["pr", "create", "--head", headValue, "--title", title, "--body", body, "--base", baseBranch];
-      if (targetRemote !== "origin") {
-        const repo = await getConfiguredRepoFromSettings(this.settings, cwd);
-        args.push("--repo", repo);
-      }
-      const result = await executeGhCommand(args, cwd ? { cwd } : void 0);
-      const url = typeof result === "string" ? result.trim() : String(result).trim();
-      if (!url.includes("github.com") || !url.includes("/pull/")) {
-        throw new Error(`Unexpected response from gh pr create: ${url}`);
-      }
-      return url;
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      if (errorMessage.includes("Head sha can't be blank") || errorMessage.includes("No commits between")) {
-        throw new Error(
-          `Failed to create pull request: ${errorMessage}
-
-This error typically occurs when:
-  - The branch was not fully pushed to the remote
-  - There's a race condition between push and PR creation
-  - The branch has no commits ahead of the base branch
-
-Try running: git push -u origin ${branchName}
-Then retry: il finish`
-        );
-      }
-      throw new Error(`Failed to create pull request: ${errorMessage}`);
-    }
-  }
-  /**
-   * Open PR URL in browser
-   * @param url - PR URL to open
-   */
-  async openPRInBrowser(url) {
-    try {
-      await openBrowser(url);
-      getLogger().debug("Opened PR in browser", { url });
-    } catch (error) {
-      getLogger().warn("Failed to open PR in browser", { error });
-    }
-  }
-  /**
-   * Complete PR workflow: check for existing, create if needed, optionally open in browser
-   * @param branchName - Branch to create PR from
-   * @param title - PR title
-   * @param issueNumber - Optional issue number for body generation
-   * @param baseBranch - Base branch to target
-   * @param worktreePath - Path to worktree
-   * @param openInBrowser - Whether to open PR in browser
-   * @returns PR creation result
-   */
-  async createOrOpenPR(branchName, title, issueNumber, baseBranch, worktreePath, openInBrowser) {
-    const existingPR = await this.checkForExistingPR(branchName, worktreePath);
-    if (existingPR) {
-      getLogger().info(`Pull request already exists: ${existingPR.url}`);
-      if (openInBrowser) {
-        await this.openPRInBrowser(existingPR.url);
-      }
-      return {
-        url: existingPR.url,
-        number: existingPR.number,
-        wasExisting: true
-      };
-    }
-    const body = await this.generatePRBody(issueNumber, worktreePath);
-    getLogger().info("Creating pull request...");
-    const url = await this.createPR(branchName, title, body, baseBranch, worktreePath);
-    const prNumber = this.extractPRNumberFromUrl(url);
-    if (openInBrowser) {
-      await this.openPRInBrowser(url);
-    }
-    return {
-      url,
-      number: prNumber,
-      wasExisting: false
-    };
-  }
-  /**
-   * Extract PR number from GitHub PR URL
-   * @param url - PR URL (e.g., https://github.com/owner/repo/pull/123)
-   * @returns PR number
-   */
-  extractPRNumberFromUrl(url) {
-    const match = url.match(/\/pull\/(\d+)/);
-    if (match == null ? void 0 : match[1]) {
-      return parseInt(match[1], 10);
-    }
-    throw new Error(`Could not extract PR number from URL: ${url}`);
-  }
-};
-
 // src/commands/finish.ts
 import path3 from "path";
 var FinishCommand = class {
@@ -1929,7 +1707,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-TOM2KAUT.js");
+    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-GCCWB3LK.js");
     this.loomManager ??= new LoomManager(
       this.gitWorktreeManager,
       this.issueTracker,
@@ -2266,10 +2044,22 @@ var FinishCommand = class {
   }
   /**
    * Execute workflow for issues and branches (merge into main)
-   * This is the traditional workflow: validate → commit → rebase → merge → cleanup
+   * This is the workflow: rebase → validate → commit → merge → cleanup
    */
   async executeIssueWorkflow(parsed, options, worktree, result) {
-    var _a, _b;
+    var _a, _b, _c;
+    getLogger().info("Rebasing branch on main...");
+    const mergeOptions = {
+      dryRun: options.dryRun ?? false,
+      force: options.force ?? false
+    };
+    await this.mergeManager.rebaseOnMain(worktree.path, mergeOptions);
+    getLogger().success("Branch rebased successfully");
+    result.operations.push({
+      type: "rebase",
+      message: "Branch rebased on main",
+      success: true
+    });
     if (!options.dryRun) {
       getLogger().info("Running pre-merge validations...");
       await this.validationRunner.runValidations(worktree.path, {
@@ -2344,18 +2134,92 @@ var FinishCommand = class {
       await this.executeGitHubPRWorkflow(parsed, options, worktree, settings, result);
       return;
     }
-    getLogger().info("Rebasing branch on main...");
-    const mergeOptions = {
-      dryRun: options.dryRun ?? false,
-      force: options.force ?? false
-    };
-    await this.mergeManager.rebaseOnMain(worktree.path, mergeOptions);
-    getLogger().success("Branch rebased successfully");
-    result.operations.push({
-      type: "rebase",
-      message: "Branch rebased on main",
-      success: true
-    });
+    if (mergeBehavior.mode === "github-draft-pr") {
+      if (!this.issueTracker.supportsPullRequests) {
+        throw new Error(
+          `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-WXUVXKUS.js");
+      const metadataManager = new MetadataManager2();
+      const metadata = await metadataManager.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...");
+        await this.executeGitHubPRWorkflow(parsed, options, worktree, settings, result);
+        return;
+      }
+      const isHeadPlaceholder = await isPlaceholderCommit(worktree.path);
+      const placeholderSha = await findPlaceholderCommitSha(worktree.path);
+      getLogger().debug(`Placeholder detection: isHead=${isHeadPlaceholder}, sha=${placeholderSha ?? "none"}`);
+      if (isHeadPlaceholder) {
+        const commitCount = await executeGitCommand(
+          ["rev-list", "--count", "HEAD"],
+          { cwd: worktree.path }
+        );
+        if (parseInt(commitCount.trim(), 10) <= 1) {
+          throw new Error(
+            "Cannot finish draft PR: no changes have been committed.\nPlease make at least one commit before finishing."
+          );
+        }
+        if (!options.dryRun) {
+          getLogger().info("Removing placeholder commit from HEAD...");
+          await removePlaceholderCommitFromHead(worktree.path);
+        } else {
+          getLogger().info("[DRY RUN] Would remove placeholder commit from HEAD");
+        }
+      } else if (placeholderSha) {
+        const commitsAfterPlaceholder = await executeGitCommand(
+          ["rev-list", "--count", `${placeholderSha}..HEAD`],
+          { cwd: worktree.path }
+        );
+        if (parseInt(commitsAfterPlaceholder.trim(), 10) === 0) {
+          throw new Error(
+            "Cannot finish draft PR: no changes have been committed after the placeholder.\nPlease make at least one commit before finishing."
+          );
+        }
+        if (!options.dryRun) {
+          getLogger().info("Removing placeholder commit from history...");
+          await removePlaceholderCommitFromHistory(worktree.path, placeholderSha);
+        } else {
+          getLogger().info("[DRY RUN] Would remove placeholder commit from history");
+        }
+      }
+      const needsForceWithLease = isHeadPlaceholder || placeholderSha;
+      if (!options.dryRun) {
+        getLogger().info("Pushing final commits to remote...");
+        if (needsForceWithLease) {
+          await executeGitCommand(["push", "--force-with-lease", "origin", worktree.branch], { cwd: worktree.path });
+        } else {
+          await pushBranchToRemote(worktree.branch, worktree.path, { dryRun: false });
+        }
+      } else {
+        if (needsForceWithLease) {
+          getLogger().info("[DRY RUN] Would force push final commits to remote (history rewritten)");
+        } else {
+          getLogger().info("[DRY RUN] Would push final commits to remote");
+        }
+      }
+      const prManager = new PRManager(settings);
+      if (!options.dryRun) {
+        await prManager.markPRReady(metadata.draftPrNumber, worktree.path);
+        getLogger().success(`PR #${metadata.draftPrNumber} marked as ready for review`);
+      } 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)];
+      if (prUrl) {
+        result.prUrl = prUrl;
+      }
+      result.operations.push({
+        type: "pr-ready",
+        message: `PR #${metadata.draftPrNumber} marked as ready for review`,
+        success: true
+      });
+      await this.generateSessionSummaryIfConfigured(parsed, worktree, options, metadata.draftPrNumber);
+      await this.handlePRCleanupPrompt(parsed, options, worktree, result);
+      return;
+    }
     getLogger().info("Performing fast-forward merge...");
     await this.mergeManager.performFastForwardMerge(worktree.branch, worktree.path, mergeOptions);
     getLogger().success("Fast-forward merge completed successfully");
@@ -2483,17 +2347,17 @@ var FinishCommand = class {
         getLogger().debug("Could not fetch issue title, using branch name", { error });
       }
     }
+    const baseBranch = await getMergeTargetBranch(worktree.path);
     if (options.dryRun) {
       getLogger().info("[DRY RUN] Would create GitHub PR");
       getLogger().info(`  Title: ${prTitle}`);
-      getLogger().info(`  Base: ${settings.mainBranch ?? "main"}`);
+      getLogger().info(`  Base: ${baseBranch}`);
       finishResult.operations.push({
         type: "pr-creation",
         message: "Would create GitHub PR (dry-run)",
         success: true
       });
     } else {
-      const baseBranch = settings.mainBranch ?? "main";
       const openInBrowser = options.noBrowser !== true;
       const prResult = await prManager.createOrOpenPR(
         worktree.branch,
@@ -2519,7 +2383,7 @@ var FinishCommand = class {
         });
       }
       finishResult.prUrl = prResult.url;
-      await this.generateSessionSummaryIfConfigured(parsed, worktree, options);
+      await this.generateSessionSummaryIfConfigured(parsed, worktree, options, prResult.number);
       await this.handlePRCleanupPrompt(parsed, options, worktree, finishResult);
     }
   }
@@ -2542,8 +2406,8 @@ var FinishCommand = class {
       getLogger().info("");
       const shouldCleanup = await promptConfirmation(
         "Clean up worktree now?",
-        false
-        // Default to keeping worktree (safer option)
+        true
+        // Default to keeping worktree - won't delete if unmerged changes
       );
       if (shouldCleanup) {
         await this.performWorktreeCleanup(parsed, options, worktree, finishResult);
@@ -2684,8 +2548,13 @@ var FinishCommand = class {
    * This ensures the finish workflow continues even if summary generation fails
    *
    * In dry-run mode: generates summary and shows preview, but doesn't post
+   *
+   * @param parsed - The parsed input identifying the issue/PR being finished
+   * @param worktree - The worktree being finished
+   * @param options - Finish options (including dryRun flag)
+   * @param prNumber - Optional PR number - when provided, summary is posted to the PR instead of the issue
    */
-  async generateSessionSummaryIfConfigured(parsed, worktree, options) {
+  async generateSessionSummaryIfConfigured(parsed, worktree, options, prNumber) {
     if (parsed.type === "branch") {
       return;
     }
@@ -2716,7 +2585,8 @@ var FinishCommand = class {
       worktreePath: worktree.path,
       issueNumber: parsed.number ?? 0,
       branchName: worktree.branch,
-      loomType: parsed.type
+      loomType: parsed.type,
+      ...prNumber !== void 0 && { prNumber }
     });
   }
   /**
@@ -2955,7 +2825,10 @@ function formatLoomForJson(worktree, mainWorktreePath, metadata) {
     description: (metadata == null ? void 0 : metadata.description) ?? null,
     created_at: (metadata == null ? void 0 : metadata.created_at) ?? null,
     issueTracker: (metadata == null ? void 0 : metadata.issueTracker) ?? null,
-    colorHex: (metadata == null ? void 0 : metadata.colorHex) ?? null
+    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) ?? {}
   };
 }
 function formatLoomsForJson(worktrees, mainWorktreePath, metadata) {
@@ -3003,6 +2876,7 @@ async function validateSettingsForCommand(command) {
   if (bypassCommands.includes(commandName)) {
     return;
   }
+  const warnOnlyCommands = ["list", "projects"];
   try {
     const settingsManager = new SettingsManager();
     const settings = await settingsManager.loadSettings();
@@ -3012,6 +2886,10 @@ async function validateSettingsForCommand(command) {
       return;
     }
   } catch (error) {
+    if (warnOnlyCommands.includes(commandName)) {
+      logger.warn(`Configuration warning: ${error instanceof Error ? error.message : "Unknown error"}`);
+      return;
+    }
     logger.error(`Configuration error: ${error instanceof Error ? error.message : "Unknown error"}`);
     logger.info("Please fix your .iloom/settings.json file and try again.");
     process.exit(1);
@@ -3081,14 +2959,14 @@ async function autoLaunchInitForMultipleRemotes() {
   await waitForKeypress2("Press any key to start configuration...");
   logger.info("");
   try {
-    const { InitCommand: InitCommand2 } = await import("./init-SCR2LQ4A.js");
+    const { InitCommand: InitCommand2 } = await import("./init-F6PFMSU5.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-FJFU6JJD.js");
+    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-XPR4TEQL.js");
     const settingsManager = new SettingsManager2();
     const settings = await settingsManager.loadSettings();
     const { hasMultipleRemotes: hasMultipleRemotes2 } = await import("./remote-73TZ2ADI.js");
@@ -3182,7 +3060,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>", "Natural language description of feedback (>50 chars, >2 spaces)").option("--body <text>", "Body text for feedback (added after diagnostics)").action(async (description, options) => {
   try {
-    const { FeedbackCommand } = await import("./feedback-562KPG5U.js");
+    const { FeedbackCommand } = await import("./feedback-RVIGHBJG.js");
     const command = new FeedbackCommand();
     const feedbackOptions = {};
     if (options.body !== void 0) {
@@ -3262,7 +3140,7 @@ program.command("finish").alias("dn").description("Merge work and cleanup worksp
 });
 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-55URTXZC.js");
+    const { RebaseCommand } = await import("./rebase-WZHHE5LU.js");
     const command = new RebaseCommand();
     await command.execute(options);
   } catch (error) {
@@ -3274,7 +3152,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-VSIPGKKG.js");
+    const { IgniteCommand } = await import("./ignite-XJALWFAT.js");
     const command = new IgniteCommand();
     await command.execute(options.oneShot ?? "default");
   } catch (error) {
@@ -3285,7 +3163,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-CX7HUE26.js");
+    const { OpenCommand } = await import("./open-KW4NTLXH.js");
     const cmd = new OpenCommand();
     const input = identifier ? { identifier, args } : { args };
     await cmd.execute(input);
@@ -3297,7 +3175,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-DP2U2CA2.js");
+    const { RunCommand } = await import("./run-HRYQ7TR7.js");
     const cmd = new RunCommand();
     const input = identifier ? { identifier, args } : { args };
     await cmd.execute(input);
@@ -3308,7 +3186,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-LOY7YWCP.js");
+    const { DevServerCommand } = await import("./dev-server-ASH7HJVI.js");
     const cmd = new DevServerCommand();
     await cmd.execute({ identifier, json: options == null ? void 0 : options.json });
   } catch (error) {
@@ -3316,10 +3194,20 @@ program.command("dev-server").alias("dev").description("Start dev server for wor
     process.exit(1);
   }
 });
+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-JMU5XTHW.js");
+    const cmd = new ShellCommand();
+    await cmd.execute({ identifier });
+  } catch (error) {
+    logger.error(`Failed to open shell: ${error instanceof Error ? error.message : "Unknown error"}`);
+    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) => {
   const executeAction = async () => {
     try {
-      const { CleanupCommand } = await import("./cleanup-7QVPYBJJ.js");
+      const { CleanupCommand } = await import("./cleanup-MIDJVSIU.js");
       const command = new CleanupCommand();
       const input = {
         options: options ?? {}
@@ -3359,7 +3247,11 @@ program.command("list").description("Show active workspaces").option("--json", "
       metadata.set(worktree.path, loomMetadata);
     }
     if (options.json) {
-      const mainWorktreePath = await findMainWorktreePathWithSettings();
+      let mainWorktreePath;
+      try {
+        mainWorktreePath = await findMainWorktreePathWithSettings();
+      } catch {
+      }
       console.log(JSON.stringify(formatLoomsForJson(worktrees, mainWorktreePath, metadata), null, 2));
       return;
     }
@@ -3393,7 +3285,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-6DTNDVLH.js");
+    const { ProjectsCommand } = await import("./projects-QEAEBAT2.js");
     const command = new ProjectsCommand();
     const result = await command.execute(options);
     console.log(JSON.stringify(result, null, 2));
@@ -3402,9 +3294,9 @@ program.command("projects").description("List configured iloom projects").option
     process.exit(1);
   }
 });
-program.command("init").alias("config").description("Initialize iloom configuration and setup shell autocomplete").argument("[prompt]", 'Custom initial message to send to Claude (defaults to "Help me configure iloom settings.")').action(async (prompt) => {
+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-SCR2LQ4A.js");
+    const { InitCommand: InitCommand2 } = await import("./init-F6PFMSU5.js");
     const command = new InitCommand2();
     const trimmedPrompt = prompt == null ? void 0 : prompt.trim();
     const customPrompt = trimmedPrompt && trimmedPrompt.length > 0 ? trimmedPrompt : void 0;
@@ -3416,7 +3308,7 @@ program.command("init").alias("config").description("Initialize iloom configurat
 });
 program.command("contribute").description("Set up local development environment for contributing to iloom").action(async () => {
   try {
-    const { ContributeCommand } = await import("./contribute-RZYCYUDX.js");
+    const { ContributeCommand } = await import("./contribute-RS3DO3WP.js");
     const command = new ContributeCommand();
     await command.execute();
   } catch (error) {
@@ -3437,7 +3329,7 @@ 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-RPM27GWD.js");
-    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-TOM2KAUT.js");
+    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-GCCWB3LK.js");
     logger.info("Testing GitHub Integration\n");
     const service = new GitHubService2();
     const branchNaming = new DefaultBranchNamingService2({ useClaude: options.claude !== false });
@@ -3495,10 +3387,10 @@ 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-X7EBJRB2.js");
-    const { PromptTemplateManager } = await import("./PromptTemplateManager-2TDZAUC6.js");
-    const { ClaudeService } = await import("./ClaudeService-ICSHJMQ5.js");
-    const { ClaudeContextManager: ClaudeContextManager2 } = await import("./ClaudeContextManager-VEGJTS5E.js");
+    const { detectClaudeCli: detectClaudeCli2, getClaudeVersion, generateBranchName, launchClaude: launchClaude2 } = await import("./claude-ACVXNB6N.js");
+    const { PromptTemplateManager } = await import("./PromptTemplateManager-72FEOGT6.js");
+    const { ClaudeService } = await import("./ClaudeService-CJS32WG2.js");
+    const { ClaudeContextManager: ClaudeContextManager2 } = await import("./ClaudeContextManager-DQFKIMEP.js");
     logger.info("Testing Claude Integration\n");
     if (options.detect) {
       logger.info("Detecting Claude CLI...");
@@ -3646,7 +3538,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-QLAIBJLX.js");
+    const { TestGitCommand } = await import("./test-git-6SAIRBUD.js");
     const command = new TestGitCommand();
     await command.execute();
   } catch (error) {
@@ -3659,7 +3551,7 @@ program.command("test-git").description("Test Git integration - findMainWorktree
 });
 program.command("test-tabs").description("Test iTerm2 dual tab functionality - opens two tabs with test commands").action(async () => {
   try {
-    const { TestTabsCommand } = await import("./test-tabs-JGO3VOXJ.js");
+    const { TestTabsCommand } = await import("./test-tabs-3SCJWRKT.js");
     const command = new TestTabsCommand();
     await command.execute();
   } catch (error) {
@@ -3672,7 +3564,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-6YM2ZOON.js");
+    const { TestPrefixCommand } = await import("./test-prefix-RLVRK5ZD.js");
     const command = new TestPrefixCommand();
     await command.execute();
   } catch (error) {
@@ -3686,7 +3578,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-J3CJSM7L.js");
+      const { SummaryCommand } = await import("./summary-4SSGGH7N.js");
       const command = new SummaryCommand();
       const result = await command.execute({ identifier, options });
       if (options.json && result) {
@@ -3712,10 +3604,39 @@ program.command("summary").description("Generate Claude session summary for a lo
     await executeAction();
   }
 });
+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-33NPZ3ZO.js");
+      const command = new RecapCommand();
+      const result = await command.execute({ identifier, json: options.json });
+      if (options.json && result) {
+        console.log(JSON.stringify(result, null, 2));
+      }
+      process.exit(0);
+    } catch (error) {
+      if (options.json) {
+        console.log(JSON.stringify({ error: error instanceof Error ? error.message : "Unknown error" }, null, 2));
+      } else {
+        logger.error(`Recap failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+        if (error instanceof Error && error.stack) {
+          logger.debug(error.stack);
+        }
+      }
+      process.exit(1);
+    }
+  };
+  if (options.json) {
+    const jsonLogger = createStderrLogger();
+    await withLogger(jsonLogger, executeAction);
+  } else {
+    await executeAction();
+  }
+});
 program.command("test-neon").description("Test Neon integration and debug configuration").action(async () => {
   var _a;
   try {
-    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-FJFU6JJD.js");
+    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-XPR4TEQL.js");
     const { createNeonProviderFromSettings: createNeonProviderFromSettings2 } = await import("./neon-helpers-L5CXQ5CT.js");
     logger.info("Testing Neon Integration\n");
     logger.info("1. Settings Configuration:");