infra-kit 0.1.128 → 0.1.129

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

@@ -1,366 +0,0 @@
-/* eslint-disable sonarjs/cognitive-complexity */
-import checkbox from '@inquirer/checkbox'
-import confirm from '@inquirer/confirm'
-import process from 'node:process'
-import { z } from 'zod'
-import { $ } from 'zx'
-
-import {
-  buildCmuxWorkspaceTitle,
-  canonicalizeCmuxTitle,
-  listCmuxWorkspaceTitles,
-  openCmuxWorkspaceWithLayout,
-} from 'src/integrations/cmux'
-import { getReleasePRsWithInfo } from 'src/integrations/gh'
-import { IDE_MODES, addIdeWorktreeFolders } from 'src/integrations/ide'
-import type { IdeMode } from 'src/integrations/ide'
-import { commandEcho } from 'src/lib/command-echo'
-import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
-import { isPromptCancellation } from 'src/lib/errors/is-prompt-cancellation'
-import { OperationError } from 'src/lib/errors/operation-error'
-import { assertManagementContext } from 'src/lib/git-guard'
-import { getCurrentWorktrees, getProjectRoot, getRepoName } from 'src/lib/git-utils'
-import { getInfraKitConfig, resolveConfiguredIdes } from 'src/lib/infra-kit-config'
-import { logger } from 'src/lib/logger'
-import { formatBranchName, isReleaseBranch, parseReleaseRef } from 'src/lib/release-id'
-import { detectReleaseType, formatBranchChoices, getJiraDescriptions, releaseBranchLabels } from 'src/lib/release-utils'
-import type { ReleaseType } from 'src/lib/release-utils'
-import { defineMcpTool, textContent } from 'src/types'
-import type { RequiredConfirmedOptionArg } from 'src/types'
-
-// Constants
-const FEATURE_DIR = 'feature'
-const RELEASE_DIR = 'release'
-
-interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
-  all?: boolean
-  versions?: string
-  ide?: IdeMode
-  /** @deprecated Alias for `ide`, kept for back-compat. Ignored when `ide` is set. */
-  cursor?: IdeMode
-  githubDesktop?: boolean
-  cmux?: boolean
-}
-
-/**
- * Manage git worktrees for release branches
- * Creates worktrees for active release branches and removes unused ones
- */
-export const worktreesAdd = async (options: WorktreeManagementArgs) => {
-  const { confirmedCommand, all, versions, githubDesktop, cmux } = options
-  // `cursor` is the deprecated alias for `ide`; `ide` wins when both are present.
-  const ide = options.ide ?? options.cursor
-
-  commandEcho.start('worktrees-add')
-
-  await assertManagementContext({ operation: 'create worktrees', requiredBranch: 'dev' })
-
-  try {
-    const currentWorktrees = await getCurrentWorktrees('release')
-    const projectRoot = await getProjectRoot()
-
-    const worktreeDir = `${projectRoot}${WORKTREES_DIR_SUFFIX}`
-
-    await ensureWorktreeDirectory(`${worktreeDir}/${RELEASE_DIR}`)
-    await ensureWorktreeDirectory(`${worktreeDir}/${FEATURE_DIR}`)
-
-    let selectedReleaseBranches: string[] = []
-
-    if (versions) {
-      selectedReleaseBranches = versions.split(',').map((v) => {
-        return formatBranchName(parseReleaseRef(v.trim()))
-      })
-    } else {
-      const releasePRsInfo = await getReleasePRsWithInfo()
-
-      const releasePRsList = releasePRsInfo.map((pr) => {
-        return pr.branch
-      })
-
-      if (releasePRsList.length === 0) {
-        logger.info('ℹ️ No open release branches found')
-
-        commandEcho.print()
-
-        return {
-          content: textContent(JSON.stringify({ createdWorktrees: [], count: 0 }, null, 2)),
-          structuredContent: { createdWorktrees: [], count: 0 },
-        }
-      }
-
-      if (all) {
-        selectedReleaseBranches = releasePRsList
-      } else {
-        commandEcho.setInteractive()
-
-        const releaseTypes = new Map<string, ReleaseType>(
-          releasePRsInfo.map((pr) => {
-            return [pr.branch, detectReleaseType(pr.title)]
-          }),
-        )
-
-        const descriptions = await getJiraDescriptions()
-
-        selectedReleaseBranches = await checkbox({
-          required: true,
-          message: '🌿 Select release branches',
-          choices: formatBranchChoices({ branches: releasePRsList, descriptions, types: releaseTypes }),
-        })
-      }
-    }
-
-    // Track --all flag if all branches were selected (either via flag or interactively)
-    if (all) {
-      commandEcho.addOption('--all', true)
-    } else {
-      commandEcho.addOption('--versions', releaseBranchLabels(selectedReleaseBranches))
-    }
-
-    // Ask for confirmation
-    const answer = confirmedCommand
-      ? true
-      : await confirm({
-          message: 'Are you sure you want to proceed with these worktree changes?',
-        })
-
-    if (!confirmedCommand) {
-      commandEcho.setInteractive()
-    }
-
-    if (!answer) {
-      logger.info('Operation cancelled. Exiting...')
-      process.exit(0)
-    }
-
-    // Track --yes flag if confirmation was interactive (user confirmed)
-    if (!confirmedCommand) {
-      commandEcho.addOption('--yes', true)
-    }
-
-    const config = await getInfraKitConfig()
-
-    // One attach style: every configured editor gets the worktrees added to its
-    // workspace. Per-run skip is `--ide none` / `--no-ide`; no editor configured
-    // means there's nothing to open.
-    const ideMode: IdeMode = ide ?? (resolveConfiguredIdes(config).length > 0 ? 'workspace' : 'none')
-
-    commandEcho.addOption('--ide', ideMode)
-
-    const openInGithubDesktop =
-      githubDesktop ??
-      config.worktrees?.openInGithubDesktop ??
-      (await confirm({ message: 'Open created worktrees in GitHub Desktop?' }))
-
-    if (typeof githubDesktop === 'undefined' && config.worktrees?.openInGithubDesktop === undefined) {
-      commandEcho.setInteractive()
-    }
-
-    if (openInGithubDesktop) {
-      commandEcho.addOption('--github-desktop', true)
-    } else {
-      commandEcho.addOption('--no-github-desktop', true)
-    }
-
-    const openInCmux =
-      cmux ?? config.worktrees?.openInCmux ?? (await confirm({ message: 'Open created worktrees in cmux?' }))
-
-    if (typeof cmux === 'undefined' && config.worktrees?.openInCmux === undefined) {
-      commandEcho.setInteractive()
-    }
-
-    if (openInCmux) {
-      commandEcho.addOption('--cmux', true)
-    } else {
-      commandEcho.addOption('--no-cmux', true)
-    }
-
-    const { branchesToCreate } = categorizeWorktrees({
-      selectedReleaseBranches,
-      currentWorktrees,
-    })
-
-    const createdWorktrees = await createWorktrees(branchesToCreate, worktreeDir)
-
-    logResults(createdWorktrees)
-
-    if (ideMode === 'workspace') {
-      await addIdeWorktreeFolders({ projectRoot, worktreeDir, branches: createdWorktrees })
-    }
-
-    if (openInGithubDesktop) {
-      for (const branch of createdWorktrees) {
-        await $`github ${worktreeDir}/${branch}`
-        await $`sleep 5`
-      }
-    }
-
-    if (openInCmux) {
-      const repoName = await getRepoName()
-      const existingTitles = await listCmuxWorkspaceTitles()
-
-      for (const branch of createdWorktrees) {
-        const title = buildCmuxWorkspaceTitle({ repoName, branch })
-
-        // Skip branches whose cmux workspace is already open (canonical match),
-        // so re-running worktrees-add never duplicates an existing workspace.
-        if (existingTitles.has(canonicalizeCmuxTitle(title))) {
-          continue
-        }
-
-        await openCmuxWorkspaceWithLayout({
-          cwd: `${worktreeDir}/${branch}`,
-          title,
-        })
-      }
-    }
-
-    commandEcho.print()
-
-    const structuredContent = {
-      createdWorktrees,
-      count: createdWorktrees.length,
-    }
-
-    return {
-      content: textContent(JSON.stringify(structuredContent, null, 2)),
-      structuredContent,
-    }
-  } catch (error) {
-    // A cancelled prompt (Ctrl-C / Esc) is a user back-out, not a failure: let it
-    // reach the top-level boundary untouched so it exits cleanly, instead of being
-    // logged as an error with a misleading "branches already exist" remediation.
-    if (isPromptCancellation(error)) throw error
-
-    logger.error({ error }, '❌ Error managing worktrees')
-    throw new OperationError(error, {
-      operation: 'create worktrees',
-      remediation: "verify branches don't already exist as worktrees: 'git worktree list'",
-    })
-  }
-}
-
-/**
- * Ensure the worktree directory exists
- */
-const ensureWorktreeDirectory = async (worktreeDir: string): Promise<void> => {
-  await $`mkdir -p ${worktreeDir}`
-}
-
-interface CategorizeWorktreesArgs {
-  selectedReleaseBranches: string[]
-  currentWorktrees: string[]
-}
-
-/**
- * Categorize release worktrees into those that need to be created or removed
- */
-const categorizeWorktrees = (args: CategorizeWorktreesArgs): { branchesToCreate: string[] } => {
-  const { selectedReleaseBranches, currentWorktrees } = args
-
-  const currentBranchNames = currentWorktrees.filter((branch) => {
-    return isReleaseBranch(branch)
-  })
-
-  const branchesToCreate = selectedReleaseBranches.filter((branch) => {
-    return !currentBranchNames.includes(branch)
-  })
-
-  return { branchesToCreate }
-}
-
-/**
- * Create worktrees for the specified branches
- */
-const createWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {
-  const results = await Promise.allSettled(
-    branches.map(async (branch) => {
-      const worktreePath = `${worktreeDir}/${branch}`
-
-      await $`git worktree add ${worktreePath} ${branch}`
-      await $({ cwd: worktreePath })`pnpm install`
-
-      return branch
-    }),
-  )
-
-  const created: string[] = []
-
-  for (const [index, result] of results.entries()) {
-    if (result.status === 'fulfilled') {
-      created.push(result.value)
-    } else {
-      const branch = branches[index]
-      const err = new OperationError(result.reason, {
-        operation: `git worktree add for ${branch}`,
-        remediation: 'check the branch name and that the parent dir is writable',
-      })
-
-      logger.error({ error: result.reason, msg: err.message })
-    }
-  }
-
-  return created
-}
-
-/**
- * Log the results of worktree management
- */
-const logResults = (created: string[]): void => {
-  if (created.length > 0) {
-    logger.info('✅ Created git worktrees:')
-    for (const branch of created) {
-      logger.info(branch)
-    }
-    logger.info('')
-  } else {
-    logger.info('ℹ️ No new git worktrees to create')
-  }
-}
-
-// MCP Tool Registration
-export const worktreesAddMcpTool = defineMcpTool({
-  name: 'worktrees-add',
-  description:
-    'Create local git worktrees for release branches under the worktrees directory and run "pnpm install" in each. Mutates the local filesystem. When invoked via MCP, pass either "versions" (comma-separated) or all=true — the branch picker and "open in Cursor / GitHub Desktop / cmux" follow-up prompts are unreachable without a TTY, and the CLI confirmation is auto-skipped for MCP calls.',
-  inputSchema: {
-    all: z
-      .boolean()
-      .optional()
-      .describe(
-        'Add worktrees for every open release branch. Either "all" or "versions" must be provided for MCP calls (the interactive picker is unavailable without a TTY). Ignored if "versions" is provided.',
-      ),
-    versions: z
-      .string()
-      .optional()
-      .describe(
-        'Comma-separated release versions or names to target (e.g. "1.2.5, 1.2.6" or "checkout-redesign, 1.2.5"). Either "versions" or all=true must be provided for MCP calls. Overrides "all" when set.',
-      ),
-    ide: z
-      .enum(IDE_MODES)
-      .optional()
-      .describe(
-        'Editor open mode for created worktrees, applied to all configured editors (Cursor and/or Zed, per the "ide" config). "workspace" (the only attach style) adds each worktree to every configured editor workspace and opens it. "none" skips the editor. Resolution order: this flag → "workspace" when at least one "ide" is configured → "none" otherwise.',
-      ),
-    cursor: z
-      .enum(IDE_MODES)
-      .optional()
-      .describe('Deprecated alias for "ide". Prefer "ide". Ignored when "ide" is provided.'),
-    githubDesktop: z
-      .boolean()
-      .optional()
-      .describe(
-        'Open each created worktree in GitHub Desktop. Resolution order: this flag → "worktrees.openInGithubDesktop" from infra-kit config → interactive prompt (CLI) / false (MCP, no TTY).',
-      ),
-    cmux: z
-      .boolean()
-      .optional()
-      .describe(
-        'Open each created worktree in a new cmux workspace, all rooted at the worktree directory. Pane layout follows "worktrees.cmux.layout" (default "two-columns": left | right; or "three-pane": left split top/bottom + full-height right). Resolution order: this flag → "worktrees.openInCmux" from infra-kit config → interactive prompt (CLI) / false (MCP, no TTY).',
-      ),
-  },
-  outputSchema: {
-    createdWorktrees: z.array(z.string()).describe('List of created git worktree branches'),
-    count: z.number().describe('Number of git worktrees created'),
-  },
-  handler: worktreesAdd,
-})

package/src/commands/worktrees-list/index.ts

@@ -1 +0,0 @@
-export { worktreesList, worktreesListMcpTool } from './worktrees-list'

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

@@ -1,105 +0,0 @@
-import { z } from 'zod'
-
-import { getReleasePRsWithInfo } from 'src/integrations/gh'
-import { getCurrentWorktrees } from 'src/lib/git-utils'
-import { logger } from 'src/lib/logger'
-import { displayLabel, formatJiraName, parseBranchName } from 'src/lib/release-id'
-import { detectReleaseType, formatVersionLabel, getJiraDescriptions } from 'src/lib/release-utils'
-import type { ReleaseType } from 'src/lib/release-utils'
-import { defineMcpTool, textContent } from 'src/types'
-
-interface WorktreeInfo {
-  version: string
-  type: ReleaseType
-  description: string | null
-}
-
-/**
- * List all release git worktrees with version, type, and Jira description
- */
-export const worktreesList = async () => {
-  const currentWorktrees = await getCurrentWorktrees('release')
-
-  if (currentWorktrees.length === 0) {
-    logger.info('ℹ️ No active worktrees found')
-
-    return {
-      content: textContent(JSON.stringify({ worktrees: [], count: 0 }, null, 2)),
-      structuredContent: { worktrees: [], count: 0 },
-    }
-  }
-
-  const [releasePRsInfo, jiraDescriptions] = await Promise.all([getReleasePRsWithInfo(), getJiraDescriptions()])
-
-  const releaseTypes = new Map<string, ReleaseType>(
-    releasePRsInfo.map((pr) => {
-      return [pr.branch, detectReleaseType(pr.title)]
-    }),
-  )
-
-  // Skip worktrees whose branch does not parse as a release id (lenient source).
-  const worktrees: WorktreeInfo[] = currentWorktrees.flatMap((branch) => {
-    const id = parseBranchName(branch)
-
-    if (!id) return []
-
-    // Human label `1.2.3` | `<name>`; Jira-descriptions map is keyed by the
-    // Jira version NAME (`v1.2.3` | `<name>`) — same split as formatBranchChoices.
-    const version = displayLabel(id)
-    const type = releaseTypes.get(branch) || 'regular'
-    const description = jiraDescriptions.get(formatJiraName(id)) || null
-
-    return [{ version, type, description }]
-  })
-
-  // Log formatted output
-  const maxVersionLength = Math.max(
-    ...worktrees.map((w) => {
-      return w.version.length
-    }),
-  )
-
-  const formattedLines = worktrees.map((worktree) => {
-    const label = formatVersionLabel(worktree.version, worktree.type, maxVersionLength)
-
-    if (worktree.description) {
-      return `${label}  ${worktree.description}`
-    }
-
-    return label
-  })
-
-  logger.info('🌿 Active worktrees:')
-  logger.info(`\n${formattedLines.join('\n')}\n`)
-
-  const structuredContent = {
-    worktrees,
-    count: worktrees.length,
-  }
-
-  return {
-    content: textContent(JSON.stringify(structuredContent, null, 2)),
-    structuredContent,
-  }
-}
-
-// MCP Tool Registration
-export const worktreesListMcpTool = defineMcpTool({
-  name: 'worktrees-list',
-  description:
-    'List existing release-branch worktrees with version, release type (regular / hotfix), and Jira fix-version description. Read-only.',
-  inputSchema: {},
-  outputSchema: {
-    worktrees: z
-      .array(
-        z.object({
-          version: z.string().describe('Release version'),
-          type: z.enum(['regular', 'hotfix']).describe('Release type'),
-          description: z.string().nullable().describe('Jira version description'),
-        }),
-      )
-      .describe('List of all worktrees with details'),
-    count: z.number().describe('Number of worktrees'),
-  },
-  handler: worktreesList,
-})

package/src/commands/worktrees-reload/__tests__/reload-cmux.test.ts

@@ -1,119 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { closeCmuxWorkspaceByTitle, listCmuxWorkspaceTitles, openCmuxWorkspaceWithLayout } from 'src/integrations/cmux'
-import { getRepoName } from 'src/lib/git-utils'
-
-import { closeCmux, reopenCmux } from '../worktrees-reload'
-
-vi.mock('src/integrations/cmux', async (importActual) => {
-  const actual = await importActual<typeof import('src/integrations/cmux')>()
-
-  return {
-    ...actual,
-    listCmuxWorkspaceTitles: vi.fn(),
-    closeCmuxWorkspaceByTitle: vi.fn(),
-    openCmuxWorkspaceWithLayout: vi.fn(),
-  }
-})
-
-vi.mock('src/lib/git-utils', () => {
-  return {
-    getRepoName: vi.fn(),
-    getProjectRoot: vi.fn(),
-    getCurrentWorktrees: vi.fn(),
-  }
-})
-
-const REPO = 'hulyo-monorepo'
-const WORKTREE_DIR = '/repos/project-worktrees'
-const BRANCHES = ['release/v1.48.0', 'release/checkout-redesign']
-
-const titleFor = {
-  versioned: `${REPO} 1.48.0`,
-  named: `${REPO} checkout-redesign`,
-}
-
-describe('closeCmux', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.mocked(getRepoName).mockResolvedValue(REPO)
-    vi.mocked(closeCmuxWorkspaceByTitle).mockResolvedValue(undefined)
-  })
-
-  it('closes only the branches whose workspace is open in the snapshot', async () => {
-    vi.mocked(listCmuxWorkspaceTitles).mockResolvedValue(new Set([titleFor.versioned]))
-
-    const closed = await closeCmux({ currentBranches: BRANCHES, repoName: REPO })
-
-    expect(closed).toEqual([titleFor.versioned])
-    expect(closeCmuxWorkspaceByTitle).toHaveBeenCalledTimes(1)
-    expect(closeCmuxWorkspaceByTitle).toHaveBeenCalledWith(titleFor.versioned)
-  })
-
-  it('closes every open branch when all are present in the snapshot', async () => {
-    vi.mocked(listCmuxWorkspaceTitles).mockResolvedValue(new Set([titleFor.versioned, titleFor.named]))
-
-    const closed = await closeCmux({ currentBranches: BRANCHES, repoName: REPO })
-
-    expect(closed).toEqual([titleFor.versioned, titleFor.named])
-    expect(closeCmuxWorkspaceByTitle).toHaveBeenCalledTimes(2)
-  })
-
-  it('closes nothing when none are open', async () => {
-    vi.mocked(listCmuxWorkspaceTitles).mockResolvedValue(new Set())
-
-    const closed = await closeCmux({ currentBranches: BRANCHES, repoName: REPO })
-
-    expect(closed).toEqual([])
-    expect(closeCmuxWorkspaceByTitle).not.toHaveBeenCalled()
-  })
-
-  it('returns [] and skips the snapshot when there are no worktrees', async () => {
-    const closed = await closeCmux({ currentBranches: [], repoName: REPO })
-
-    expect(closed).toEqual([])
-    expect(listCmuxWorkspaceTitles).not.toHaveBeenCalled()
-    expect(closeCmuxWorkspaceByTitle).not.toHaveBeenCalled()
-  })
-})
-
-describe('reopenCmux', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.mocked(getRepoName).mockResolvedValue(REPO)
-    vi.mocked(openCmuxWorkspaceWithLayout).mockResolvedValue(undefined)
-  })
-
-  it('force-opens a workspace for every branch (no dedup)', async () => {
-    const result = await reopenCmux({ worktreeDir: WORKTREE_DIR, currentBranches: BRANCHES, repoName: REPO })
-
-    expect(result.opened).toEqual([titleFor.versioned, titleFor.named])
-    expect(openCmuxWorkspaceWithLayout).toHaveBeenCalledTimes(2)
-    expect(openCmuxWorkspaceWithLayout).toHaveBeenCalledWith({
-      cwd: `${WORKTREE_DIR}/release/v1.48.0`,
-      title: titleFor.versioned,
-    })
-    expect(openCmuxWorkspaceWithLayout).toHaveBeenCalledWith({
-      cwd: `${WORKTREE_DIR}/release/checkout-redesign`,
-      title: titleFor.named,
-    })
-  })
-
-  it('continues past a per-branch failure and reopens the rest', async () => {
-    vi.mocked(openCmuxWorkspaceWithLayout)
-      .mockRejectedValueOnce(new Error('cmux boom'))
-      .mockResolvedValueOnce(undefined)
-
-    const result = await reopenCmux({ worktreeDir: WORKTREE_DIR, currentBranches: BRANCHES, repoName: REPO })
-
-    expect(result.opened).toEqual([titleFor.named])
-    expect(openCmuxWorkspaceWithLayout).toHaveBeenCalledTimes(2)
-  })
-
-  it('opens nothing when there are no worktrees', async () => {
-    const result = await reopenCmux({ worktreeDir: WORKTREE_DIR, currentBranches: [], repoName: REPO })
-
-    expect(result.opened).toEqual([])
-    expect(openCmuxWorkspaceWithLayout).not.toHaveBeenCalled()
-  })
-})

package/src/commands/worktrees-reload/index.ts

@@ -1 +0,0 @@
-export { worktreesReload, worktreesReloadMcpTool } from './worktrees-reload'