infra-kit 0.1.91 → 0.1.94

package/package.json

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

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

@@ -5,7 +5,7 @@ import process from 'node:process'
 import { z } from 'zod'
 import { $ } from 'zx'
 
-import { openCmuxWorkspaceWithLayout } from 'src/integrations/cmux'
+import { buildCmuxWorkspaceTitle, openCmuxWorkspaceWithLayout } from 'src/integrations/cmux'
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
 import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
@@ -187,11 +187,11 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
       const repoName = await getRepoName()
 
       for (const branch of createdWorktrees) {
-        const version = branch.replace('release/', '')
+        const title = buildCmuxWorkspaceTitle({ repoName, branch })
 
         await openCmuxWorkspaceWithLayout({
           cwd: `${worktreeDir}/${branch}`,
-          title: `${repoName} ${version}`,
+          title,
         })
       }
     }

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

@@ -4,10 +4,11 @@ import process from 'node:process'
 import { z } from 'zod'
 import { $ } from 'zx'
 
+import { buildCmuxWorkspaceTitle, closeCmuxWorkspaceByTitle } from 'src/integrations/cmux'
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
 import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
-import { getCurrentWorktrees, getProjectRoot } from 'src/lib/git-utils'
+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'
@@ -107,7 +108,13 @@ export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<
       commandEcho.addOption('--yes', true)
     }
 
-    const removedWorktrees = await removeWorktrees(selectedReleaseBranches, worktreeDir)
+    const repoName = await getRepoName()
+
+    const removedWorktrees = await removeWorktrees({
+      branches: selectedReleaseBranches,
+      worktreeDir,
+      repoName,
+    })
 
     logResults(removedWorktrees)
 
@@ -133,14 +140,26 @@ export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<
   }
 }
 
+interface RemoveWorktreesArgs {
+  branches: string[]
+  worktreeDir: string
+  repoName: string
+}
+
 /**
  * Remove worktrees for the specified branches and whole folder
  */
-const removeWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {
+const removeWorktrees = async (args: RemoveWorktreesArgs): Promise<string[]> => {
+  const { branches, worktreeDir, repoName } = 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

package/src/integrations/cmux/close-workspace-by-title.ts

@@ -0,0 +1,51 @@
+import { $ } from 'zx'
+
+import { logger } from 'src/lib/logger'
+
+/**
+ * Best-effort close of the cmux workspace whose title exactly matches `title`.
+ * Silently no-ops if cmux isn't running, the workspace isn't found, or close fails.
+ */
+export const closeCmuxWorkspaceByTitle = async (title: string): Promise<void> => {
+  try {
+    const listOutput = (await $`cmux list-workspaces`.quiet()).stdout
+
+    const ref = findWorkspaceRefByTitle(listOutput, title)
+
+    if (!ref) {
+      return
+    }
+
+    await $`cmux close-workspace --workspace ${ref}`.quiet()
+  } catch (error) {
+    logger.debug({ error, title }, 'cmux: skipped closing workspace')
+  }
+}
+
+/**
+ * Parses `cmux list-workspaces` output and returns the workspace ref whose
+ * title exactly matches `title`, or undefined if no match.
+ *
+ * Each line looks like:
+ *   "  workspace:8  hulyo-monorepo v1.48.0"
+ *   "* workspace:6  obsidian-workspace  [selected]"
+ */
+const findWorkspaceRefByTitle = (output: string, title: string): string | undefined => {
+  for (const rawLine of output.split('\n')) {
+    // eslint-disable-next-line sonarjs/slow-regex, regexp/no-super-linear-backtracking
+    const match = rawLine.match(/^[* ]\s*(workspace:\d+)\s+(.+?)(?:\s+\[selected\])?\s*$/)
+
+    if (!match) {
+      continue
+    }
+
+    const ref = match[1]
+    const lineTitle = match[2]?.trim() ?? ''
+
+    if (lineTitle === title) {
+      return ref
+    }
+  }
+
+  return undefined
+}

package/src/integrations/cmux/index.ts

@@ -1 +1,3 @@
+export { closeCmuxWorkspaceByTitle } from './close-workspace-by-title'
 export { openCmuxWorkspaceWithLayout } from './open-workspace-with-layout'
+export { buildCmuxWorkspaceTitle } from './workspace-title'

package/src/integrations/cmux/open-workspace-with-layout.ts

@@ -14,9 +14,9 @@ interface OpenCmuxWorkspaceArgs {
 export const openCmuxWorkspaceWithLayout = async (args: OpenCmuxWorkspaceArgs): Promise<void> => {
   const { cwd, title } = args
 
-  await $`cmux new-workspace --cwd ${cwd}`
+  const newWorkspaceOutput = (await $`cmux new-workspace --cwd ${cwd}`).stdout
 
-  const workspaceRef = (await $`cmux current-workspace`).stdout.trim()
+  const workspaceRef = parseWorkspaceRef(newWorkspaceOutput)
 
   const surfacesOutput = (await $`cmux list-pane-surfaces --workspace ${workspaceRef}`).stdout
 
@@ -30,6 +30,15 @@ export const openCmuxWorkspaceWithLayout = async (args: OpenCmuxWorkspaceArgs):
   }
 }
 
+/**
+ * Extracts the first `surface:<id>` reference from the output of
+ * `cmux list-pane-surfaces`. Used to locate the initial (primary) pane
+ * surface so subsequent splits can be anchored relative to it.
+ *
+ * @example
+ * const output = 'surface:12 (active)\nsurface:13\n'
+ * parseFirstSurfaceRef(output) // => 'surface:12'
+ */
 const parseFirstSurfaceRef = (output: string): string => {
   const match = output.match(/surface:\d+/)
 
@@ -39,3 +48,22 @@ const parseFirstSurfaceRef = (output: string): string => {
 
   return match[0]
 }
+
+/**
+ * Extracts the `workspace:<id>` reference from the output of
+ * `cmux new-workspace`. The returned ref is used to target the newly
+ * created workspace in follow-up `cmux` commands (splits, rename, etc.).
+ *
+ * @example
+ * const output = 'created workspace:7\n'
+ * parseWorkspaceRef(output) // => 'workspace:7'
+ */
+const parseWorkspaceRef = (output: string): string => {
+  const match = output.match(/workspace:\d+/)
+
+  if (!match) {
+    throw new Error('cmux: could not locate workspace ref in new-workspace output')
+  }
+
+  return match[0]
+}

package/src/integrations/cmux/workspace-title.ts

@@ -0,0 +1,17 @@
+interface BuildCmuxWorkspaceTitleArgs {
+  repoName: string
+  branch: string
+}
+
+/**
+ * Builds the cmux workspace title used by `worktrees-add` and looked up by
+ * `worktrees-remove`. The `release/` prefix is stripped so the title reads
+ * e.g. `"hulyo-monorepo v1.48.0"` for branch `"release/v1.48.0"`.
+ */
+export const buildCmuxWorkspaceTitle = (args: BuildCmuxWorkspaceTitleArgs): string => {
+  const { repoName, branch } = args
+
+  const version = branch.replace('release/', '')
+
+  return `${repoName} ${version}`
+}

package/src/integrations/gh/gh-release-prs/gh-release-prs.ts

@@ -113,18 +113,21 @@ interface CreateReleaseBranchArgs {
   version: string
   jiraVersionUrl: string
   type: ReleaseType
+  description?: string
 }
 
 // Function to create a release branch
 export const createReleaseBranch = async (
   args: CreateReleaseBranchArgs,
 ): Promise<{ branchName: string; prUrl: string }> => {
-  const { version, jiraVersionUrl, type } = args
+  const { version, jiraVersionUrl, type, description } = args
   const titlePrefix = type === 'hotfix' ? 'Hotfix' : 'Release'
   const baseBranch = getBaseBranch(type)
 
   const branchName = `release/v${version}`
 
+  const body = description && description.trim() !== '' ? `${jiraVersionUrl}\n\n${description}` : `${jiraVersionUrl} \n`
+
   try {
     $.quiet = true
 
@@ -137,7 +140,7 @@ export const createReleaseBranch = async (
 
     // Create PR and capture URL
     const prResult =
-      await $`gh pr create --title "${titlePrefix} v${version}" --body "${jiraVersionUrl} \n" --base ${baseBranch} --head ${branchName}`
+      await $`gh pr create --title "${titlePrefix} v${version}" --body ${body} --base ${baseBranch} --head ${branchName}`
 
     const prLink = prResult.stdout.trim()
 

package/src/lib/release-utils/release-utils.ts

@@ -68,7 +68,7 @@ export const createSingleRelease = async (args: CreateSingleReleaseArgs): Promis
   const jiraVersionUrl = `${jiraConfig.baseUrl}/projects/${result.version!.projectId}/versions/${result.version!.id}/tab/release-report-all-issues`
 
   // 2. Create GitHub release branch
-  const releaseInfo = await createReleaseBranch({ version, jiraVersionUrl, type })
+  const releaseInfo = await createReleaseBranch({ version, jiraVersionUrl, type, description })
 
   return {
     version,

package/src/mcp/tools/index.ts

@@ -11,6 +11,7 @@ import { ghReleaseDeploySelectedMcpTool } from 'src/commands/gh-release-deploy-s
 import { ghReleaseListMcpTool } from 'src/commands/gh-release-list'
 import { releaseCreateMcpTool } from 'src/commands/release-create'
 import { releaseCreateBatchMcpTool } from 'src/commands/release-create-batch'
+import { versionMcpTool } from 'src/commands/version'
 import { worktreesAddMcpTool } from 'src/commands/worktrees-add'
 import { worktreesListMcpTool } from 'src/commands/worktrees-list'
 import { worktreesRemoveMcpTool } from 'src/commands/worktrees-remove'