@iloom/cli 0.9.0 → 0.9.2

package/dist/{chunk-6Y3FTRJL.js → chunk-SOSQILHO.js}

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   PRManager
-} from "./chunk-I23OQB4Y.js";
+} from "./chunk-DGG2VY7B.js";
 import {
   calculatePortForBranch,
   calculatePortFromIdentifier
-} from "./chunk-USSL2X4A.js";
+} from "./chunk-NUACL52E.js";
 import {
   installDependencies,
   runScript
@@ -31,16 +31,16 @@ import {
   isBranchMergedIntoMain,
   isFileTrackedByGit,
   pushBranchToRemote
-} from "./chunk-H6ST2TGP.js";
+} from "./chunk-AR5QKYNE.js";
 import {
   SettingsManager
-} from "./chunk-XFEK2X2D.js";
+} from "./chunk-RI2YL6TK.js";
 import {
   MetadataManager
 } from "./chunk-KBEIQP4G.js";
 import {
   GitHubService
-} from "./chunk-PVW6JE7E.js";
+} from "./chunk-OFDN5NKS.js";
 import {
   calculateForegroundColor,
   generateColorFromBranchName,
@@ -244,7 +244,7 @@ var LoomManager = class {
    * NEW: Checks for existing worktrees and reuses them if found
    */
   async createIloom(input) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     getLogger().info("Fetching issue data...");
     const issueData = await this.fetchIssueData(input);
     if (input.type === "issue" || input.type === "pr" || input.type === "branch") {
@@ -259,7 +259,7 @@ var LoomManager = class {
     getLogger().info("Preparing branch name...");
     const branchName = await this.prepareBranchName(input, issueData);
     getLogger().info("Creating git worktree...");
-    const worktreePath = await this.createWorktreeOnly(input, branchName);
+    const worktreePath = await this.createWorktreeOnly(input, branchName, issueData);
     this.loadMainEnvFile();
     const { capabilities, binEntries } = await this.capabilityDetector.detectCapabilities(worktreePath);
     await this.copyEnvironmentFiles(worktreePath);
@@ -375,16 +375,30 @@ var LoomManager = class {
         getLogger().success(`Found existing PR: ${existingPR.url}`);
       } else {
         const prTitle = (issueData == null ? void 0 : issueData.title) ?? `Work on ${branchName}`;
-        const prBody = input.type === "issue" ? `PR for issue #${input.identifier}
+        let prBody;
+        if (input.type === "issue") {
+          const issueBody = (issueData == null ? void 0 : issueData.body) ? `
 
-This PR was created automatically by iloom.` : `Branch: ${branchName}
+## ${issueData.title}
 
-This PR was created automatically by iloom.`;
+${issueData.body}` : "";
+          prBody = `Fixes ${prManager.issuePrefix}${input.identifier}${issueBody}
+
+---
+*This PR was created automatically by iloom.*`;
+        } else {
+          prBody = `Branch: ${branchName}
+
+---
+*This PR was created automatically by iloom.*`;
+        }
+        const draftBaseBranch = ((_e = input.parentLoom) == null ? void 0 : _e.branchName) ?? settingsData.mainBranch ?? "main";
         getLogger().info("Creating draft PR...");
         const prResult = await prManager.createDraftPR(
           branchName,
           prTitle,
           prBody,
+          draftBaseBranch,
           worktreePath
         );
         draftPrNumber = prResult.number;
@@ -418,16 +432,16 @@ This PR was created automatically by iloom.`;
         );
       }
     }
-    const enableClaude = ((_e = input.options) == null ? void 0 : _e.enableClaude) !== false;
-    const enableCode = ((_f = input.options) == null ? void 0 : _f.enableCode) !== false;
-    const enableDevServer = ((_g = input.options) == null ? void 0 : _g.enableDevServer) !== false;
-    const enableTerminal = ((_h = input.options) == null ? void 0 : _h.enableTerminal) ?? false;
-    const oneShot = ((_i = input.options) == null ? void 0 : _i.oneShot) ?? "default";
-    const setArguments = (_j = input.options) == null ? void 0 : _j.setArguments;
-    const executablePath = (_k = input.options) == null ? void 0 : _k.executablePath;
+    const enableClaude = ((_f = input.options) == null ? void 0 : _f.enableClaude) !== false;
+    const enableCode = ((_g = input.options) == null ? void 0 : _g.enableCode) !== false;
+    const enableDevServer = ((_h = input.options) == null ? void 0 : _h.enableDevServer) !== false;
+    const enableTerminal = ((_i = input.options) == null ? void 0 : _i.enableTerminal) ?? false;
+    const oneShot = ((_j = input.options) == null ? void 0 : _j.oneShot) ?? "default";
+    const setArguments = (_k = input.options) == null ? void 0 : _k.setArguments;
+    const executablePath = (_l = input.options) == null ? void 0 : _l.executablePath;
     if (enableClaude || enableCode || enableDevServer || enableTerminal) {
-      const { LoomLauncher } = await import("./LoomLauncher-3I47SUPV.js");
-      const { ClaudeContextManager } = await import("./ClaudeContextManager-X2Y72GRL.js");
+      const { LoomLauncher } = await import("./LoomLauncher-73NXL2CL.js");
+      const { ClaudeContextManager } = await import("./ClaudeContextManager-HR5JQKAI.js");
       const claudeContext = new ClaudeContextManager(void 0, void 0, this.settings);
       const launcher = new LoomLauncher(claudeContext, this.settings);
       await launcher.launchLoom({
@@ -446,7 +460,7 @@ This PR was created automatically by iloom.`;
         ...setArguments && { setArguments },
         ...executablePath && { executablePath },
         sourceEnvOnStart: settingsData.sourceEnvOnStart ?? false,
-        colorTerminal: ((_l = input.options) == null ? void 0 : _l.colorTerminal) ?? ((_m = settingsData.colors) == null ? void 0 : _m.terminal) ?? true,
+        colorTerminal: ((_m = input.options) == null ? void 0 : _m.colorTerminal) ?? ((_n = settingsData.colors) == null ? void 0 : _n.terminal) ?? true,
         colorHex: colorData.hex
       });
     }
@@ -489,7 +503,7 @@ This PR was created automatically by iloom.`;
       prUrls,
       capabilities,
       ...draftPrNumber && { draftPrNumber },
-      ...((_n = input.options) == null ? void 0 : _n.oneShot) && { oneShot: input.options.oneShot },
+      ...((_o = input.options) == null ? void 0 : _o.oneShot) && { oneShot: input.options.oneShot },
       ...input.parentLoom && { parentLoom: input.parentLoom }
     };
     await this.metadataManager.writeMetadata(worktreePath, metadataInput);
@@ -578,7 +592,7 @@ This PR was created automatically by iloom.`;
   async checkAndWarnChildLooms(branchName) {
     let targetBranch = branchName;
     if (!targetBranch) {
-      const { getCurrentBranch } = await import("./git-W3XUIFTR.js");
+      const { getCurrentBranch } = await import("./git-2QDQ2X2S.js");
       targetBranch = await getCurrentBranch();
     }
     if (!targetBranch) {
@@ -646,7 +660,7 @@ This PR was created automatically by iloom.`;
   /**
    * Create worktree for the loom (without dependency installation)
    */
-  async createWorktreeOnly(input, branchName) {
+  async createWorktreeOnly(input, branchName, issueData) {
     var _a;
     getLogger().info("Ensuring repository has initial commit...");
     await ensureRepositoryHasCommits(this.gitWorktree.workingDirectory);
@@ -666,15 +680,31 @@ This PR was created automatically by iloom.`;
       void 0,
       pathOptions
     );
+    const isForkPR = input.type === "pr" && issueData && "isFork" in issueData && issueData.isFork === true;
     if (input.type === "pr") {
-      getLogger().info("Fetching all remote branches...");
-      try {
-        await executeGitCommand(["fetch", "origin"], { cwd: this.gitWorktree.workingDirectory });
-        getLogger().success("Successfully fetched from remote");
-      } catch (error) {
-        throw new Error(
-          `Failed to fetch from remote: ${error instanceof Error ? error.message : "Unknown error"}. Make sure you have access to the repository.`
-        );
+      if (isForkPR) {
+        getLogger().info(`Fetching PR #${input.identifier} ref from origin...`);
+        try {
+          await executeGitCommand(
+            ["fetch", "origin", `refs/pull/${input.identifier}/head`],
+            { cwd: this.gitWorktree.workingDirectory }
+          );
+          getLogger().success("Successfully fetched PR ref from remote");
+        } catch (error) {
+          throw new Error(
+            `Failed to fetch PR ref: ${error instanceof Error ? error.message : "Unknown error"}. Make sure you have access to the repository.`
+          );
+        }
+      } else {
+        getLogger().info("Fetching all remote branches...");
+        try {
+          await executeGitCommand(["fetch", "origin"], { cwd: this.gitWorktree.workingDirectory });
+          getLogger().success("Successfully fetched from remote");
+        } catch (error) {
+          throw new Error(
+            `Failed to fetch from remote: ${error instanceof Error ? error.message : "Unknown error"}. Make sure you have access to the repository.`
+          );
+        }
       }
     }
     const branchExistedLocally = await branchExists(branchName, process.cwd(), false);
@@ -698,21 +728,33 @@ This PR was created automatically by iloom.`;
     } else {
       baseBranch = input.baseBranch;
     }
-    await this.gitWorktree.createWorktree({
-      path: worktreePath,
-      branch: branchName,
-      createBranch: input.type !== "pr",
-      // PRs use existing branches
-      ...baseBranch && { baseBranch }
-    });
-    if (input.type === "pr" && !branchExistedLocally) {
-      getLogger().info("Resetting new PR branch to match remote exactly...");
-      try {
-        await executeGitCommand(["reset", "--hard", `origin/${branchName}`], { cwd: worktreePath });
-        await executeGitCommand(["branch", "--set-upstream-to", `origin/${branchName}`], { cwd: worktreePath });
-        getLogger().success("Successfully reset to match remote");
-      } catch (error) {
-        getLogger().warn(`Failed to reset to match remote: ${error instanceof Error ? error.message : "Unknown error"}`);
+    if (isForkPR) {
+      if (branchExistedLocally) {
+        await executeGitCommand(["branch", "-D", branchName], { cwd: this.gitWorktree.workingDirectory });
+      }
+      await this.gitWorktree.createWorktree({
+        path: worktreePath,
+        branch: branchName,
+        createBranch: true,
+        baseBranch: "FETCH_HEAD"
+      });
+    } else {
+      await this.gitWorktree.createWorktree({
+        path: worktreePath,
+        branch: branchName,
+        createBranch: input.type !== "pr",
+        // PRs use existing branches
+        ...baseBranch && { baseBranch }
+      });
+      if (input.type === "pr" && !branchExistedLocally) {
+        getLogger().info("Resetting new PR branch to match remote exactly...");
+        try {
+          await executeGitCommand(["reset", "--hard", `origin/${branchName}`], { cwd: worktreePath });
+          await executeGitCommand(["branch", "--set-upstream-to", `origin/${branchName}`], { cwd: worktreePath });
+          getLogger().success("Successfully reset to match remote");
+        } catch (error) {
+          getLogger().warn(`Failed to reset to match remote: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
       }
     }
     return worktreePath;
@@ -1098,8 +1140,8 @@ This PR was created automatically by iloom.`;
     const executablePath = (_i = input.options) == null ? void 0 : _i.executablePath;
     if (enableClaude || enableCode || enableDevServer || enableTerminal) {
       getLogger().info("Launching workspace components...");
-      const { LoomLauncher } = await import("./LoomLauncher-3I47SUPV.js");
-      const { ClaudeContextManager } = await import("./ClaudeContextManager-X2Y72GRL.js");
+      const { LoomLauncher } = await import("./LoomLauncher-73NXL2CL.js");
+      const { ClaudeContextManager } = await import("./ClaudeContextManager-HR5JQKAI.js");
       const claudeContext = new ClaudeContextManager(void 0, void 0, this.settings);
       const launcher = new LoomLauncher(claudeContext, this.settings);
       await launcher.launchLoom({
@@ -1950,6 +1992,7 @@ var ResourceCleanup = class {
         rollbackRequired: false
       };
     }
+    let safetyCheckPassed = false;
     if (!options.force) {
       const shouldCheckMergeSafety = options.checkMergeSafety ?? options.deleteBranch === true;
       const shouldCheckRemoteBranch = options.checkRemoteBranch ?? false;
@@ -1960,6 +2003,7 @@ var ResourceCleanup = class {
 
 ${blockerMessage}`);
       }
+      safetyCheckPassed = true;
       if (safety.warnings.length > 0) {
         safety.warnings.forEach((warning) => {
           getLogger().warn(warning);
@@ -2073,7 +2117,8 @@ ${blockerMessage}`);
       } else {
         try {
           const branchOptions = {
-            dryRun: false
+            dryRun: false,
+            safetyVerified: safetyCheckPassed
           };
           if (mergeTargetBranch !== null) {
             branchOptions.mergeTargetBranch = mergeTargetBranch;
@@ -2316,9 +2361,9 @@ ${blockerMessage}`);
       getLogger().info(`[DRY RUN] Would delete branch: ${branchName}`);
       return true;
     }
+    let deleteCwd = workingDir;
     try {
       let deleteFlag = "-d";
-      let deleteCwd = workingDir;
       if (options.force) {
         deleteFlag = "-D";
       } else if (options.mergeTargetBranch) {
@@ -2373,6 +2418,12 @@ ${blockerMessage}`);
         throw error;
       }
       if (errorMessage.includes("not fully merged")) {
+        if (options.safetyVerified) {
+          getLogger().info(`Branch '${branchName}' not merged into HEAD but safety verified - using force delete`);
+          await executeGitCommand(["branch", "-D", branchName], { cwd: deleteCwd });
+          getLogger().info(`Branch deleted: ${branchName}`);
+          return true;
+        }
         throw new Error(
           `Cannot delete unmerged branch '${branchName}'. Use --force to delete anyway.`
         );
@@ -2582,4 +2633,4 @@ export {
   DatabaseManager,
   ResourceCleanup
 };
-//# sourceMappingURL=chunk-6Y3FTRJL.js.map
+//# sourceMappingURL=chunk-SOSQILHO.js.map