@iloom/cli 0.8.3 → 0.9.1

package/dist/{chunk-GWONJE3X.js → chunk-4ZIHFUPN.js}

@@ -1,39 +1,46 @@
 #!/usr/bin/env node
 import {
-  installDependencies,
-  runScript
-} from "./chunk-RD7I2Q2F.js";
+  PRManager
+} from "./chunk-I3HMNWQQ.js";
 import {
   calculatePortForBranch,
   calculatePortFromIdentifier
-} from "./chunk-52MVUK5V.js";
+} from "./chunk-USSL2X4A.js";
+import {
+  installDependencies,
+  runScript
+} from "./chunk-4LKGCFGG.js";
 import {
   getPackageConfig,
   hasScript
-} from "./chunk-XPKN3QWY.js";
+} from "./chunk-VOGGLPG5.js";
 import {
+  GitCommandError,
+  PLACEHOLDER_COMMIT_PREFIX,
   branchExists,
   checkRemoteBranchStatus,
   ensureRepositoryHasCommits,
   executeGitCommand,
   extractIssueNumber,
   extractPRNumber,
+  fetchOrigin,
   findMainWorktreePathWithSettings,
   findWorktreeForBranch,
   getMergeTargetBranch,
   hasUncommittedChanges,
   isBranchMergedIntoMain,
-  isFileTrackedByGit
-} from "./chunk-GDS2HXSW.js";
+  isFileTrackedByGit,
+  pushBranchToRemote
+} from "./chunk-H6ST2TGP.js";
 import {
   SettingsManager
-} from "./chunk-IWIIOFEB.js";
+} from "./chunk-XFEK2X2D.js";
 import {
   MetadataManager
 } from "./chunk-KBEIQP4G.js";
 import {
   GitHubService
-} from "./chunk-PVW6JE7E.js";
+} from "./chunk-Y5HSSIK2.js";
 import {
   calculateForegroundColor,
   generateColorFromBranchName,
@@ -44,7 +51,7 @@ import {
 } from "./chunk-433MOLAU.js";
 import {
   generateRandomSessionId
-} from "./chunk-IGKPPACU.js";
+} from "./chunk-FO5GGFOV.js";
 import {
   getLogger
 } from "./chunk-6MLEBAYZ.js";
@@ -237,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") {
@@ -325,38 +332,79 @@ var LoomManager = class {
     let draftPrNumber = void 0;
     let draftPrUrl = void 0;
     const mergeBehavior = settingsData.mergeBehavior ?? { mode: "local" };
-    if (mergeBehavior.mode === "github-draft-pr" && input.type === "issue") {
-      getLogger().info("Creating placeholder commit for draft PR...");
-      const { executeGitCommand: executeGitCommand2, PLACEHOLDER_COMMIT_PREFIX, pushBranchToRemote } = await import("./git-GUNOPP4Q.js");
-      await executeGitCommand2(
-        [
-          "commit",
-          "--allow-empty",
-          "--no-verify",
-          "-m",
-          `${PLACEHOLDER_COMMIT_PREFIX} Temporary commit for draft PR (will be removed on finish)`
-        ],
-        { cwd: worktreePath }
-      );
-      getLogger().debug("Placeholder commit created");
-      getLogger().info("Pushing branch to remote for draft PR...");
-      await pushBranchToRemote(branchName, worktreePath, { dryRun: false });
-      const { PRManager } = await import("./PRManager-A63LT3NF.js");
+    if (mergeBehavior.mode === "github-draft-pr" && (input.type === "issue" || input.type === "branch")) {
       const prManager = new PRManager(settingsData);
-      const prTitle = (issueData == null ? void 0 : issueData.title) ?? `Work on ${branchName}`;
-      const prBody = `PR for issue #${input.identifier}
+      getLogger().info("Fetching from origin...");
+      await executeGitCommand(["fetch", "origin"], { cwd: worktreePath });
+      let remoteBranchExists = false;
+      try {
+        await executeGitCommand(["rev-parse", "--verify", `origin/${branchName}`], { cwd: worktreePath });
+        remoteBranchExists = true;
+        getLogger().info(`Remote branch origin/${branchName} already exists, resetting local to match...`);
+      } catch (error) {
+        if (error instanceof GitCommandError && (error.stderr.includes("unknown revision") || error.stderr.includes("Needed a single revision") || error.stderr.includes("bad revision"))) {
+          getLogger().debug(`Remote branch origin/${branchName} does not exist`);
+        } else {
+          throw error;
+        }
+      }
+      if (remoteBranchExists) {
+        await executeGitCommand(["reset", "--hard", `origin/${branchName}`], { cwd: worktreePath });
+        await executeGitCommand(["branch", "--set-upstream-to", `origin/${branchName}`], { cwd: worktreePath });
+        getLogger().success("Local branch reset to match remote");
+      } else {
+        getLogger().info("Creating placeholder commit for draft PR...");
+        await executeGitCommand(
+          [
+            "commit",
+            "--allow-empty",
+            "--no-verify",
+            "-m",
+            `${PLACEHOLDER_COMMIT_PREFIX} Temporary commit for draft PR (will be removed on finish)`
+          ],
+          { cwd: worktreePath }
+        );
+        getLogger().debug("Placeholder commit created");
+        getLogger().info("Pushing branch to remote for draft PR...");
+        await pushBranchToRemote(branchName, worktreePath, { dryRun: false });
+      }
+      const existingPR = await prManager.checkForExistingPR(branchName, worktreePath);
+      if (existingPR) {
+        draftPrNumber = existingPR.number;
+        draftPrUrl = existingPR.url;
+        getLogger().success(`Found existing PR: ${existingPR.url}`);
+      } else {
+        const prTitle = (issueData == null ? void 0 : issueData.title) ?? `Work on ${branchName}`;
+        let prBody;
+        if (input.type === "issue") {
+          const issueBody = (issueData == null ? void 0 : issueData.body) ? `
 
-This PR was created automatically by iloom.`;
-      getLogger().info("Creating draft PR...");
-      const prResult = await prManager.createDraftPR(
-        branchName,
-        prTitle,
-        prBody,
-        worktreePath
-      );
-      draftPrNumber = prResult.number;
-      draftPrUrl = prResult.url;
-      getLogger().success(`Draft PR created: ${prResult.url}`);
+## ${issueData.title}
+
+${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;
+        draftPrUrl = prResult.url;
+        getLogger().success(`Draft PR created: ${prResult.url}`);
+      }
     }
     const allMetadata = await this.metadataManager.listAllMetadata();
     const usedHexColors = allMetadata.filter((metadata) => metadata.colorHex !== null).map((metadata) => metadata.colorHex);
@@ -384,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-NHZMEVTQ.js");
-      const { ClaudeContextManager } = await import("./ClaudeContextManager-RDP6CLK6.js");
+      const { LoomLauncher } = await import("./LoomLauncher-3I47SUPV.js");
+      const { ClaudeContextManager } = await import("./ClaudeContextManager-X2Y72GRL.js");
       const claudeContext = new ClaudeContextManager(void 0, void 0, this.settings);
       const launcher = new LoomLauncher(claudeContext, this.settings);
       await launcher.launchLoom({
@@ -412,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
       });
     }
@@ -428,6 +476,9 @@ This PR was created automatically by iloom.`;
       }
     }
     const pr_numbers = input.type === "pr" ? [String(input.identifier)] : [];
+    if (draftPrNumber && !pr_numbers.includes(String(draftPrNumber))) {
+      pr_numbers.push(String(draftPrNumber));
+    }
     const sessionId = generateRandomSessionId();
     let issueUrls = {};
     if (input.type === "issue" && (issueData == null ? void 0 : issueData.url)) {
@@ -452,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);
@@ -541,7 +592,7 @@ This PR was created automatically by iloom.`;
   async checkAndWarnChildLooms(branchName) {
     let targetBranch = branchName;
     if (!targetBranch) {
-      const { getCurrentBranch } = await import("./git-GUNOPP4Q.js");
+      const { getCurrentBranch } = await import("./git-W3XUIFTR.js");
       targetBranch = await getCurrentBranch();
     }
     if (!targetBranch) {
@@ -640,13 +691,27 @@ This PR was created automatically by iloom.`;
         );
       }
     }
-    const branchExistedLocally = await branchExists(branchName);
+    const branchExistedLocally = await branchExists(branchName, process.cwd(), false);
     if (input.type !== "pr" && branchExistedLocally) {
       throw new Error(
         `Cannot create worktree: branch '${branchName}' already exists. Use 'git branch -D ${branchName}' to delete it first if needed.`
       );
     }
-    const baseBranch = ((_a = input.parentLoom) == null ? void 0 : _a.branchName) ?? input.baseBranch;
+    const mergeBehavior = settingsData.mergeBehavior ?? { mode: "local" };
+    const isPRMode = mergeBehavior.mode === "github-pr" || mergeBehavior.mode === "github-draft-pr";
+    const isChildLoom = !!input.parentLoom;
+    let baseBranch;
+    if (isChildLoom) {
+      baseBranch = ((_a = input.parentLoom) == null ? void 0 : _a.branchName) ?? input.baseBranch;
+    } else if (isPRMode && input.type !== "pr") {
+      getLogger().info("Fetching from origin to ensure latest main branch...");
+      await fetchOrigin(this.gitWorktree.workingDirectory);
+      const mainBranch = settingsData.mainBranch ?? "main";
+      baseBranch = `origin/${mainBranch}`;
+      getLogger().info(`Branching from ${baseBranch}`);
+    } else {
+      baseBranch = input.baseBranch;
+    }
     await this.gitWorktree.createWorktree({
       path: worktreePath,
       branch: branchName,
@@ -1047,8 +1112,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-NHZMEVTQ.js");
-      const { ClaudeContextManager } = await import("./ClaudeContextManager-RDP6CLK6.js");
+      const { LoomLauncher } = await import("./LoomLauncher-3I47SUPV.js");
+      const { ClaudeContextManager } = await import("./ClaudeContextManager-X2Y72GRL.js");
       const claudeContext = new ClaudeContextManager(void 0, void 0, this.settings);
       const launcher = new LoomLauncher(claudeContext, this.settings);
       await launcher.launchLoom({
@@ -1783,7 +1848,41 @@ var DatabaseManager = class {
 };
 
 // src/lib/ResourceCleanup.ts
+import path5 from "path";
+
+// src/utils/recap-archiver.ts
 import path4 from "path";
+import os2 from "os";
+import fs6 from "fs-extra";
+var RECAPS_DIR = path4.join(os2.homedir(), ".config", "iloom-ai", "recaps");
+var ARCHIVED_DIR = path4.join(RECAPS_DIR, "archived");
+function slugifyPath(loomPath) {
+  let slug = loomPath.replace(/[/\\]+$/, "");
+  slug = slug.replace(/[/\\]/g, "___");
+  slug = slug.replace(/[^a-zA-Z0-9_-]/g, "-");
+  return `${slug}.json`;
+}
+async function archiveRecap(worktreePath) {
+  const filename = slugifyPath(worktreePath);
+  const sourcePath = path4.join(RECAPS_DIR, filename);
+  if (!await fs6.pathExists(sourcePath)) {
+    getLogger().debug(`No recap file to archive for worktree: ${worktreePath}`);
+    return;
+  }
+  const content = await fs6.readFile(sourcePath, "utf8");
+  const data = JSON.parse(content);
+  const archivedData = {
+    ...data,
+    archivedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  await fs6.ensureDir(ARCHIVED_DIR, { mode: 493 });
+  const destPath = path4.join(ARCHIVED_DIR, filename);
+  await fs6.writeFile(destPath, JSON.stringify(archivedData, null, 2), { mode: 420 });
+  await fs6.unlink(sourcePath);
+  getLogger().debug(`Recap archived for worktree: ${worktreePath}`);
+}
+
+// src/lib/ResourceCleanup.ts
 var ResourceCleanup = class {
   constructor(gitWorktree, processManager, database, cliIsolation, settingsManager) {
     this.gitWorktree = gitWorktree;
@@ -1865,6 +1964,7 @@ var ResourceCleanup = class {
         rollbackRequired: false
       };
     }
+    let safetyCheckPassed = false;
     if (!options.force) {
       const shouldCheckMergeSafety = options.checkMergeSafety ?? options.deleteBranch === true;
       const shouldCheckRemoteBranch = options.checkRemoteBranch ?? false;
@@ -1875,6 +1975,7 @@ var ResourceCleanup = class {
 
 ${blockerMessage}`);
       }
+      safetyCheckPassed = true;
       if (safety.warnings.length > 0) {
         safety.warnings.forEach((warning) => {
           getLogger().warn(warning);
@@ -1883,7 +1984,7 @@ ${blockerMessage}`);
     }
     let databaseConfig = null;
     if (!options.keepDatabase && worktree) {
-      const envFilePath = path4.join(worktree.path, ".env");
+      const envFilePath = path5.join(worktree.path, ".env");
       try {
         const shouldCleanup = this.database ? await this.database.shouldUseDatabaseBranching(envFilePath) : false;
         databaseConfig = { shouldCleanup, envFilePath };
@@ -1951,6 +2052,33 @@ ${blockerMessage}`);
         });
       }
     }
+    if (worktree) {
+      if (options.dryRun) {
+        operations.push({
+          type: "recap",
+          success: true,
+          message: `[DRY RUN] Would archive recap file for: ${worktree.path}`
+        });
+      } else {
+        try {
+          await archiveRecap(worktree.path);
+          operations.push({
+            type: "recap",
+            success: true,
+            message: `Recap file archived`
+          });
+        } catch (error) {
+          const err = error instanceof Error ? error : new Error("Unknown error");
+          getLogger().warn(`Recap archival failed: ${err.message}`);
+          operations.push({
+            type: "recap",
+            success: false,
+            message: "Recap archival failed (non-fatal)",
+            error: err.message
+          });
+        }
+      }
+    }
     if (options.deleteBranch && worktree) {
       if (options.dryRun) {
         operations.push({
@@ -1961,7 +2089,8 @@ ${blockerMessage}`);
       } else {
         try {
           const branchOptions = {
-            dryRun: false
+            dryRun: false,
+            safetyVerified: safetyCheckPassed
           };
           if (mergeTargetBranch !== null) {
             branchOptions.mergeTargetBranch = mergeTargetBranch;
@@ -2115,6 +2244,35 @@ ${blockerMessage}`);
         }
       }
     }
+    if (worktree) {
+      if (options.dryRun) {
+        operations.push({
+          type: "metadata",
+          success: true,
+          message: `[DRY RUN] Would delete metadata for worktree: ${worktree.path}`
+        });
+      } else {
+        try {
+          await this.metadataManager.deleteMetadata(worktree.path);
+          getLogger().info(`Metadata deleted for worktree: ${worktree.path}`);
+          operations.push({
+            type: "metadata",
+            success: true,
+            message: "Metadata deleted"
+          });
+        } catch (error) {
+          const err = error instanceof Error ? error : new Error(String(error));
+          errors.push(err);
+          getLogger().warn(`Metadata deletion failed: ${err.message}`);
+          operations.push({
+            type: "metadata",
+            success: false,
+            message: "Metadata deletion failed (non-fatal)",
+            error: err.message
+          });
+        }
+      }
+    }
     const success = errors.length === 0;
     return {
       identifier: displayIdentifier,
@@ -2175,9 +2333,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) {
@@ -2232,6 +2390,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.`
         );
@@ -2257,7 +2421,7 @@ ${blockerMessage}`);
       return false;
     }
     try {
-      const envFilePath = path4.join(worktreePath, ".env");
+      const envFilePath = path5.join(worktreePath, ".env");
       const shouldCleanup = await this.database.shouldUseDatabaseBranching(envFilePath);
       let cwd;
       try {
@@ -2441,4 +2605,4 @@ export {
   DatabaseManager,
   ResourceCleanup
 };
-//# sourceMappingURL=chunk-GWONJE3X.js.map
+//# sourceMappingURL=chunk-4ZIHFUPN.js.map