infra-kit 0.1.101 → 0.1.102

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.101",
+  "version": "0.1.102",
   "description": "infra-kit",
   "main": "dist/cli.js",
   "module": "dist/cli.js",

package/src/commands/gh-release-deliver/gh-release-deliver.ts

@@ -7,11 +7,14 @@ import { $ } from 'zx'
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { deliverJiraRelease, loadJiraConfigOptional } from 'src/integrations/jira'
 import { commandEcho } from 'src/lib/command-echo'
+import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
 import { formatZxError } from 'src/lib/errors/format-zx-error'
 import { OperationError } from 'src/lib/errors/operation-error'
+import { getCurrentWorktrees, getProjectRoot, getRepoName } from 'src/lib/git-utils'
 import { logger } from 'src/lib/logger'
 import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
 import type { ReleaseType } from 'src/lib/release-utils'
+import { removeWorktrees } from 'src/lib/worktrees'
 import { defineMcpTool, textContent } from 'src/types'
 import type { RequiredConfirmedOptionArg } from 'src/types'
 
@@ -140,6 +143,30 @@ const resolveTargetInteractively = async (): Promise<ResolvedTarget> => {
   return { selectedReleaseBranch, releasePrTitle: prInfo.title }
 }
 
+/**
+ * `gh pr merge --delete-branch` also deletes the local branch, which fails if a
+ * worktree has it checked out (the actual root cause of the "Failed to merge
+ * release PR" surface error). Pre-remove any worktree for the release branch
+ * so the local delete can succeed.
+ */
+const removeReleaseWorktreeIfPresent = async (releaseBranch: string): Promise<void> => {
+  const worktreeBranches = await getCurrentWorktrees('release')
+
+  if (!worktreeBranches.includes(releaseBranch)) return
+
+  const [projectRoot, repoName] = await Promise.all([getProjectRoot(), getRepoName()])
+  const worktreeDir = `${projectRoot}${WORKTREES_DIR_SUFFIX}`
+
+  const removed = await removeWorktrees({ branches: [releaseBranch], worktreeDir, repoName })
+
+  if (removed.length === 0) {
+    throw new OperationError(undefined, {
+      operation: `remove worktree for ${releaseBranch} before merge`,
+      remediation: `run manually: git worktree remove ${worktreeDir}/${releaseBranch} (use --force if uncommitted changes)`,
+    })
+  }
+}
+
 interface MergeReleasePRArgs {
   selectedReleaseBranch: string
   releaseType: ReleaseType
@@ -147,7 +174,9 @@ interface MergeReleasePRArgs {
 
 const mergeReleasePR = async (args: MergeReleasePRArgs): Promise<void> => {
   const { selectedReleaseBranch, releaseType } = args
+
   const mergeTarget = releaseType === 'hotfix' ? 'main' : 'dev'
+
   const releasePr = await fetchPRByHead(selectedReleaseBranch)
 
   if (!releasePr) {
@@ -330,6 +359,7 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs) => {
 
   $.quiet = true
 
+  await removeReleaseWorktreeIfPresent(selectedReleaseBranch)
   await mergeReleasePR({ selectedReleaseBranch, releaseType })
 
   if (releaseType !== 'hotfix') {

package/src/commands/worktrees-remove/worktrees-remove.ts

@@ -2,9 +2,7 @@ import checkbox from '@inquirer/checkbox'
 import confirm from '@inquirer/confirm'
 import process from 'node:process'
 import { z } from 'zod/v4'
-import { $ } from 'zx'
 
-import { buildCmuxWorkspaceTitle, closeCmuxWorkspaceByTitle } from 'src/integrations/cmux'
 import { removeFoldersFromCursorWorkspace, resolveCursorWorkspacePath } from 'src/integrations/cursor'
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
@@ -15,6 +13,7 @@ import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
 import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
 import type { ReleaseType } from 'src/lib/release-utils'
+import { removeWorktrees } from 'src/lib/worktrees'
 import { defineMcpTool, textContent } from 'src/types'
 import type { RequiredConfirmedOptionArg } from 'src/types'
 
@@ -118,7 +117,7 @@ export const worktreesRemove = async (options: WorktreeManagementArgs) => {
       branches: selectedReleaseBranches,
       worktreeDir,
       repoName,
-      allSelected,
+      pruneFolder: allSelected,
     })
 
     await syncCursorWorkspaceOnRemove({ removedWorktrees, worktreeDir, projectRoot })
@@ -145,60 +144,6 @@ export const worktreesRemove = async (options: WorktreeManagementArgs) => {
   }
 }
 
-interface RemoveWorktreesArgs {
-  branches: string[]
-  worktreeDir: string
-  repoName: string
-  allSelected: boolean
-}
-
-/**
- * Remove worktrees for the specified branches and whole folder
- */
-const removeWorktrees = async (args: RemoveWorktreesArgs): Promise<string[]> => {
-  const { branches, worktreeDir, repoName, allSelected } = args
-
-  const results = await Promise.allSettled(
-    branches.map(async (branch) => {
-      const worktreePath = `${worktreeDir}/${branch}`
-
-      const title = buildCmuxWorkspaceTitle({ repoName, branch })
-
-      await closeCmuxWorkspaceByTitle(title)
-
-      await $`git worktree remove ${worktreePath}`
-
-      return branch
-    }),
-  )
-
-  const removed: string[] = []
-
-  for (const [index, result] of results.entries()) {
-    if (result.status === 'fulfilled') {
-      removed.push(result.value)
-    } else {
-      const branch = branches[index]
-      const err = new OperationError(result.reason, {
-        operation: `remove worktree for ${branch}`,
-        remediation: "check 'git worktree list' for the path; uncommitted changes block removal",
-      })
-
-      logger.error({ error: result.reason, msg: err.message })
-    }
-  }
-
-  if (allSelected && removed.length === branches.length) {
-    await $`git worktree prune`
-    await $`rm -rf ${worktreeDir}`
-
-    logger.info(`🗑️ Removed worktree folder: ${worktreeDir}`)
-    logger.info('')
-  }
-
-  return removed
-}
-
 interface SyncCursorWorkspaceOnRemoveArgs {
   removedWorktrees: string[]
   worktreeDir: string

package/src/lib/worktrees/index.ts

@@ -0,0 +1 @@
+export { removeWorktrees } from './remove-worktrees'

package/src/lib/worktrees/remove-worktrees.ts

@@ -0,0 +1,65 @@
+import { $ } from 'zx'
+
+import { buildCmuxWorkspaceTitle, closeCmuxWorkspaceByTitle } from 'src/integrations/cmux'
+import { OperationError } from 'src/lib/errors/operation-error'
+import { logger } from 'src/lib/logger'
+
+interface RemoveWorktreesArgs {
+  branches: string[]
+  worktreeDir: string
+  repoName: string
+  pruneFolder?: boolean
+}
+
+/**
+ * Close any cmux workspace for each branch and run `git worktree remove`,
+ * returning the branches that were removed cleanly. Failures are logged but
+ * never thrown, so a single bad worktree doesn't poison a batch removal.
+ *
+ * When `pruneFolder` is true and every branch was removed, also prune the
+ * worktree metadata and delete the worktrees folder — used by the
+ * `worktrees-remove` "all" path to leave the filesystem clean.
+ */
+export const removeWorktrees = async (args: RemoveWorktreesArgs): Promise<string[]> => {
+  const { branches, worktreeDir, repoName, pruneFolder = false } = args
+
+  const results = await Promise.allSettled(
+    branches.map(async (branch) => {
+      const worktreePath = `${worktreeDir}/${branch}`
+
+      const title = buildCmuxWorkspaceTitle({ repoName, branch })
+
+      await closeCmuxWorkspaceByTitle(title)
+
+      await $`git worktree remove ${worktreePath}`
+
+      return branch
+    }),
+  )
+
+  const removed: string[] = []
+
+  for (const [index, result] of results.entries()) {
+    if (result.status === 'fulfilled') {
+      removed.push(result.value)
+    } else {
+      const branch = branches[index]
+      const err = new OperationError(result.reason, {
+        operation: `remove worktree for ${branch}`,
+        remediation: "check 'git worktree list' for the path; uncommitted changes block removal",
+      })
+
+      logger.error({ error: result.reason, msg: err.message })
+    }
+  }
+
+  if (pruneFolder && removed.length === branches.length) {
+    await $`git worktree prune`
+    await $`rm -rf ${worktreeDir}`
+
+    logger.info(`🗑️ Removed worktree folder: ${worktreeDir}`)
+    logger.info('')
+  }
+
+  return removed
+}