infra-kit 0.1.94 → 0.1.97

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.94",
+  "version": "0.1.97",
   "description": "infra-kit",
   "main": "dist/cli.js",
   "module": "dist/cli.js",
@@ -37,7 +37,7 @@
     "commander": "^14.0.3",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
-    "yaml": "^2.8.3",
+    "yaml": "^2.8.4",
     "zod": "^3.25.76",
     "zx": "^8.8.5"
   },
@@ -45,6 +45,6 @@
     "@pkg/eslint-config": "workspace:*",
     "@pkg/vitest-config": "workspace:*",
     "esbuild": "^0.28.0",
-    "typescript": "^5.9.3"
+    "typescript": "catalog:"
   }
 }

package/src/commands/doctor/doctor.ts

@@ -1,9 +1,17 @@
-import { z } from 'zod'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { z } from 'zod/v4'
 import { $ } from 'zx'
 
+import { MARKER_END, MARKER_START, buildShellBlock } from 'src/commands/init/init'
+import { getProjectRoot } from 'src/lib/git-utils/git-utils'
+import { getInfraKitConfig, resetInfraKitConfigCache } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'
 
+const LOCAL_CONFIG_FILE = 'infra-kit.local.yml'
+
 interface CheckResult {
   name: string
   status: 'pass' | 'fail'
@@ -25,6 +33,112 @@ const checkCommand = async (
   }
 }
 
+const checkZshrcInitialized = (): CheckResult => {
+  const name = 'zshrc init block'
+  const zshrcPath = path.join(os.homedir(), '.zshrc')
+
+  if (!fs.existsSync(zshrcPath)) {
+    return { name, status: 'fail', message: '~/.zshrc not found. Run: infra-kit init' }
+  }
+
+  const content = fs.readFileSync(zshrcPath, 'utf-8')
+  const startIdx = content.indexOf(MARKER_START)
+  const endIdx = content.indexOf(MARKER_END)
+
+  if (startIdx === -1 || endIdx === -1 || endIdx < startIdx) {
+    return {
+      name,
+      status: 'fail',
+      message: 'infra-kit shell block missing from ~/.zshrc. Run: infra-kit init',
+    }
+  }
+
+  const installedBlock = content.slice(startIdx, endIdx + MARKER_END.length).trim()
+  const expectedBlock = buildShellBlock().trim()
+
+  if (installedBlock !== expectedBlock) {
+    return {
+      name,
+      status: 'fail',
+      message: 'infra-kit shell block in ~/.zshrc is out of date. Run: infra-kit init',
+    }
+  }
+
+  return { name, status: 'pass', message: 'infra-kit shell block in ~/.zshrc is up to date' }
+}
+
+const checkPnpmWorkspaceVirtualStore = async (): Promise<CheckResult> => {
+  const name = 'pnpm enableGlobalVirtualStore'
+
+  try {
+    const root = await getProjectRoot()
+    const yamlPath = path.join(root, 'pnpm-workspace.yaml')
+
+    if (!fs.existsSync(yamlPath)) {
+      return { name, status: 'fail', message: `pnpm-workspace.yaml not found at ${yamlPath}` }
+    }
+
+    const content = fs.readFileSync(yamlPath, 'utf-8')
+    // eslint-disable-next-line sonarjs/slow-regex
+    const enabled = /^\s*enableGlobalVirtualStore\s*:\s*true\s*$/m.test(content)
+
+    if (!enabled) {
+      return {
+        name,
+        status: 'fail',
+        message: 'enableGlobalVirtualStore: true is missing in pnpm-workspace.yaml',
+      }
+    }
+
+    return { name, status: 'pass', message: 'enableGlobalVirtualStore: true is set' }
+  } catch (err) {
+    return {
+      name,
+      status: 'fail',
+      message: `Failed to read pnpm-workspace.yaml: ${(err as Error).message}`,
+    }
+  }
+}
+
+const checkInfraKitConfigValid = async (): Promise<CheckResult> => {
+  const name = 'infra-kit config valid'
+
+  try {
+    resetInfraKitConfigCache()
+    await getInfraKitConfig()
+
+    return {
+      name,
+      status: 'pass',
+      message: 'infra-kit.yml is valid (infra-kit.local.yml overrides applied if present)',
+    }
+  } catch (err) {
+    return { name, status: 'fail', message: (err as Error).message }
+  }
+}
+
+const checkLocalConfigGitignored = async (): Promise<CheckResult> => {
+  const name = 'infra-kit.local.yml gitignored'
+
+  try {
+    const root = await getProjectRoot()
+
+    await $({ cwd: root, nothrow: true })`git check-ignore -q ${LOCAL_CONFIG_FILE}`.then((result) => {
+      if (result.exitCode !== 0) {
+        throw new Error('not ignored')
+      }
+    })
+
+    return { name, status: 'pass', message: `${LOCAL_CONFIG_FILE} is covered by .gitignore` }
+  } catch {
+    return {
+      name,
+      status: 'fail',
+      message: `${LOCAL_CONFIG_FILE} is not gitignored. Add "${LOCAL_CONFIG_FILE}" to .gitignore.`,
+    }
+  }
+}
+
 /**
  * Check installation and authentication status of gh, doppler, and aws CLIs
  */
@@ -67,6 +181,10 @@ export const doctor = async (): Promise<ToolsExecutionResult> => {
     //   'AWS CLI is authenticated',
     //   'AWS CLI is not authenticated. Run: aws configure (or aws sso login)',
     // ),
+    Promise.resolve(checkZshrcInitialized()),
+    checkPnpmWorkspaceVirtualStore(),
+    checkInfraKitConfigValid(),
+    checkLocalConfigGitignored(),
   ])
 
   logger.info('Doctor check results:\n')

package/src/commands/env-clear/env-clear.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import {
   ENV_CLEAR_FILE,

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

@@ -1,4 +1,4 @@
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import { getDopplerProject } from 'src/integrations/doppler/doppler-project'
 import { getInfraKitConfig } from 'src/lib/infra-kit-config'

package/src/commands/env-load/env-load.ts

@@ -3,7 +3,7 @@ import { Buffer } from 'node:buffer'
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { $ } from 'zx'
 
 import { validateDopplerCliAndAuth } from 'src/integrations/doppler'

package/src/commands/env-status/env-status.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import { validateDopplerCliAndAuth } from 'src/integrations/doppler'
 import {

package/src/commands/gh-merge-dev/gh-merge-dev.ts

@@ -2,7 +2,7 @@
 import checkbox from '@inquirer/checkbox'
 import confirm from '@inquirer/confirm'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'

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

@@ -1,7 +1,7 @@
 import confirm from '@inquirer/confirm'
 import select from '@inquirer/select'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'

package/src/commands/gh-release-deploy-all/gh-release-deploy-all.ts

@@ -1,6 +1,6 @@
 import select from '@inquirer/select'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'

package/src/commands/gh-release-deploy-selected/gh-release-deploy-selected.ts

@@ -4,7 +4,7 @@ import fs from 'node:fs/promises'
 import { resolve } from 'node:path'
 import process from 'node:process'
 import yaml from 'yaml'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'

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

@@ -1,4 +1,4 @@
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { logger } from 'src/lib/logger'

package/src/commands/init/init.ts

@@ -4,8 +4,8 @@ import path from 'node:path'
 
 import { logger } from 'src/lib/logger'
 
-const MARKER_START = '# -- infra-kit:begin --'
-const MARKER_END = '# -- infra-kit:end --'
+export const MARKER_START = '# -- infra-kit:begin --'
+export const MARKER_END = '# -- infra-kit:end --'
 
 const LEGACY_PAIRED: [start: string, end: string][] = [['# region infra-kit', '# endregion infra-kit']]
 const LEGACY_SINGLE = '# infra-kit shell functions'
@@ -94,7 +94,7 @@ const removeExistingBlock = (content: string): string => {
   return before + (remaining ? `\n${remaining}` : '')
 }
 
-const buildShellBlock = (): string => {
+export const buildShellBlock = (): string => {
   const runCmd = 'pnpm exec infra-kit'
 
   return [

package/src/commands/release-create/release-create.ts

@@ -1,7 +1,7 @@
 import confirm from '@inquirer/confirm'
 import select from '@inquirer/select'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { $, question } from 'zx'
 
 import { loadJiraConfig } from 'src/integrations/jira'

package/src/commands/release-create-batch/release-create-batch.ts

@@ -1,7 +1,7 @@
 import confirm from '@inquirer/confirm'
 import select from '@inquirer/select'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { question } from 'zx'
 
 import { loadJiraConfig } from 'src/integrations/jira'

package/src/commands/version/version.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'

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

@@ -1 +1,2 @@
-export { worktreesAdd, worktreesAddMcpTool } from './worktrees-add'
+export { CURSOR_MODES, worktreesAdd, worktreesAddMcpTool } from './worktrees-add'
+export type { CursorMode } from './worktrees-add'

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

@@ -1,15 +1,18 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import checkbox from '@inquirer/checkbox'
 import confirm from '@inquirer/confirm'
+import select from '@inquirer/select'
 import process from 'node:process'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 import { $ } from 'zx'
 
 import { buildCmuxWorkspaceTitle, openCmuxWorkspaceWithLayout } from 'src/integrations/cmux'
+import { addFoldersToCursorWorkspace, resolveCursorWorkspacePath } from 'src/integrations/cursor'
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
 import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
 import { getCurrentWorktrees, getProjectRoot, getRepoName } from 'src/lib/git-utils'
+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'
@@ -20,10 +23,13 @@ const FEATURE_DIR = 'feature'
 const RELEASE_DIR = 'release'
 const RELEASE_BRANCH_PREFIX = 'release/v'
 
+export const CURSOR_MODES = ['workspace', 'windows', 'none'] as const
+export type CursorMode = (typeof CURSOR_MODES)[number]
+
 interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
   all: boolean
   versions?: string
-  cursor?: boolean
+  cursor?: CursorMode
   githubDesktop?: boolean
   cmux?: boolean
 }
@@ -124,17 +130,31 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
       commandEcho.addOption('--yes', true)
     }
 
-    const openInCursor = cursor ?? (await confirm({ message: 'Open created worktrees in Cursor?' }))
+    const cursorMode: CursorMode =
+      cursor ??
+      (await select<CursorMode>({
+        message: 'Cursor mode for created worktrees?',
+        default: 'workspace',
+        choices: [
+          {
+            name: 'Add to workspace file',
+            value: 'workspace',
+            description: 'Append each worktree as a folder in ide.config.workspaceConfigPath, then open the workspace',
+          },
+          {
+            name: 'Open separate windows',
+            value: 'windows',
+            description: 'Open each created worktree in its own Cursor window',
+          },
+          { name: 'Skip', value: 'none', description: 'Do not open Cursor' },
+        ],
+      }))
 
     if (typeof cursor === 'undefined') {
       commandEcho.setInteractive()
     }
 
-    if (openInCursor) {
-      commandEcho.addOption('--cursor', true)
-    } else {
-      commandEcho.addOption('--no-cursor', true)
-    }
+    commandEcho.addOption('--cursor', cursorMode)
 
     const openInGithubDesktop =
       githubDesktop ?? (await confirm({ message: 'Open created worktrees in GitHub Desktop?' }))
@@ -170,7 +190,28 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
 
     logResults(createdWorktrees)
 
-    if (openInCursor) {
+    if (cursorMode === 'workspace') {
+      const config = await getInfraKitConfig()
+      const cursorConfig = config.ide?.provider === 'cursor' ? config.ide.config : undefined
+
+      if (!cursorConfig?.workspaceConfigPath) {
+        logger.warn('⚠️ Skipping Cursor: ide.config.workspaceConfigPath is not set in infra-kit.yml')
+      } else {
+        const workspacePath = resolveCursorWorkspacePath(cursorConfig.workspaceConfigPath, projectRoot)
+
+        const folderPaths = createdWorktrees.map((branch) => {
+          return `${worktreeDir}/${branch}`
+        })
+
+        const { added, skipped } = await addFoldersToCursorWorkspace({ workspacePath, folderPaths })
+
+        const skippedSuffix = skipped.length > 0 ? ` (${skipped.length} already present)` : ''
+
+        logger.info(`✅ Added ${added.length} folder(s) to ${workspacePath}${skippedSuffix}`)
+
+        await $`cursor ${workspacePath}`
+      }
+    } else if (cursorMode === 'windows') {
       for (const branch of createdWorktrees) {
         await $`cursor ${worktreeDir}/${branch}`
       }
@@ -311,10 +352,10 @@ export const worktreesAddMcpTool = {
         'Comma-separated release versions to target (e.g. "1.2.5, 1.2.6"). Either "versions" or all=true must be provided for MCP calls. Overrides "all" when set.',
       ),
     cursor: z
-      .boolean()
+      .enum(CURSOR_MODES)
       .optional()
       .describe(
-        'Open each created worktree in Cursor. Defaults to false in MCP mode (the follow-up prompt is not shown).',
+        'Cursor open mode for created worktrees. "workspace" (default behavior when set interactively) appends each worktree as a folder to "ide.config.workspaceConfigPath" in infra-kit.yml and opens the workspace. "windows" opens each worktree in its own Cursor window. "none" skips Cursor. Defaults to "none" in MCP mode (the follow-up prompt is not shown).',
       ),
     githubDesktop: z
       .boolean()

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

@@ -1,4 +1,4 @@
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { getCurrentWorktrees } from 'src/lib/git-utils'

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

@@ -0,0 +1 @@
+export { worktreesOpen, worktreesOpenMcpTool } from './worktrees-open'

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

@@ -0,0 +1,197 @@
+import { z } from 'zod/v4'
+import { $ } from 'zx'
+
+import { buildCmuxWorkspaceTitle, listCmuxWorkspaceTitles, openCmuxWorkspaceWithLayout } from 'src/integrations/cmux'
+import { reconcileCursorWorkspaceFolders, resolveCursorWorkspacePath } from 'src/integrations/cursor'
+import { commandEcho } from 'src/lib/command-echo'
+import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
+import { getCurrentWorktrees, getProjectRoot, getRepoName } from 'src/lib/git-utils'
+import { getInfraKitConfig } from 'src/lib/infra-kit-config'
+import { logger } from 'src/lib/logger'
+import type { ToolsExecutionResult } from 'src/types'
+
+interface WorktreesOpenResult {
+  openedCmux: string[]
+  skippedCmux: string[]
+  cursorFoldersAdded: number
+  cursorFoldersRemoved: number
+}
+
+/**
+ * Cold-start restore command: reconciles `Main.code-workspace` against the set
+ * of release worktrees on disk, opens Cursor against it, and ensures one cmux
+ * workspace exists per worktree. Idempotent and additive — never removes
+ * worktrees, never recreates running cmux workspaces.
+ */
+export const worktreesOpen = async (): Promise<ToolsExecutionResult> => {
+  commandEcho.start('worktrees-open')
+
+  try {
+    const projectRoot = await getProjectRoot()
+    const worktreeDir = `${projectRoot}${WORKTREES_DIR_SUFFIX}`
+    const currentBranches = await getCurrentWorktrees('release')
+
+    const cursorOutcome = await openCursor({ projectRoot, worktreeDir, currentBranches })
+    const cmuxOutcome = await openCmux({ worktreeDir, currentBranches })
+
+    const result: WorktreesOpenResult = {
+      openedCmux: cmuxOutcome.opened,
+      skippedCmux: cmuxOutcome.skipped,
+      cursorFoldersAdded: cursorOutcome.added,
+      cursorFoldersRemoved: cursorOutcome.removed,
+    }
+
+    logResults(result, { cursorRan: cursorOutcome.ran, cmuxRan: cmuxOutcome.ran })
+
+    commandEcho.print()
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
+      structuredContent: { ...result },
+    }
+  } catch (error) {
+    logger.error({ error }, '❌ Error opening worktrees')
+    throw error
+  }
+}
+
+interface OpenCursorArgs {
+  projectRoot: string
+  worktreeDir: string
+  currentBranches: string[]
+}
+
+interface OpenCursorOutcome {
+  ran: boolean
+  added: number
+  removed: number
+}
+
+const openCursor = async (args: OpenCursorArgs): Promise<OpenCursorOutcome> => {
+  const { projectRoot, worktreeDir, currentBranches } = args
+
+  const config = await getInfraKitConfig()
+  const cursorConfig = config.ide?.provider === 'cursor' ? config.ide.config : undefined
+
+  if (!cursorConfig || cursorConfig.mode !== 'workspace' || !cursorConfig.workspaceConfigPath) {
+    logger.warn('⚠️ Skipping Cursor: ide.provider must be "cursor", mode "workspace", and workspaceConfigPath set.')
+
+    return { ran: false, added: 0, removed: 0 }
+  }
+
+  const workspacePath = resolveCursorWorkspacePath(cursorConfig.workspaceConfigPath, projectRoot)
+
+  try {
+    const { added, removed } = await reconcileCursorWorkspaceFolders({
+      workspacePath,
+      worktreeDir,
+      currentBranches,
+    })
+
+    await $`cursor ${workspacePath}`
+
+    return { ran: true, added: added.length, removed: removed.length }
+  } catch (error) {
+    logger.warn({ error }, `⚠️ Failed to reconcile/open Cursor workspace at ${workspacePath}`)
+
+    return { ran: false, added: 0, removed: 0 }
+  }
+}
+
+interface OpenCmuxArgs {
+  worktreeDir: string
+  currentBranches: string[]
+}
+
+interface OpenCmuxOutcome {
+  ran: boolean
+  opened: string[]
+  skipped: string[]
+}
+
+const openCmux = async (args: OpenCmuxArgs): Promise<OpenCmuxOutcome> => {
+  const { worktreeDir, currentBranches } = args
+
+  if (currentBranches.length === 0) {
+    return { ran: true, opened: [], skipped: [] }
+  }
+
+  const repoName = await getRepoName()
+  const existingTitles = await listCmuxWorkspaceTitles()
+
+  const opened: string[] = []
+  const skipped: string[] = []
+
+  for (const branch of currentBranches) {
+    const title = buildCmuxWorkspaceTitle({ repoName, branch })
+
+    if (existingTitles.has(title)) {
+      skipped.push(title)
+      continue
+    }
+
+    try {
+      await openCmuxWorkspaceWithLayout({ cwd: `${worktreeDir}/${branch}`, title })
+      opened.push(title)
+    } catch (error) {
+      logger.warn({ error, title }, `⚠️ Failed to open cmux workspace for ${branch}`)
+    }
+  }
+
+  return { ran: true, opened, skipped }
+}
+
+interface LogResultsContext {
+  cursorRan: boolean
+  cmuxRan: boolean
+}
+
+const logResults = (result: WorktreesOpenResult, context: LogResultsContext): void => {
+  if (context.cursorRan) {
+    if (result.cursorFoldersAdded > 0) {
+      logger.info(`✅ Added ${result.cursorFoldersAdded} folder(s) to Cursor workspace`)
+    }
+
+    if (result.cursorFoldersRemoved > 0) {
+      logger.info(`🧹 Removed ${result.cursorFoldersRemoved} dangling folder(s) from Cursor workspace`)
+    }
+  }
+
+  if (result.openedCmux.length > 0) {
+    logger.info('✅ Opened cmux workspaces:')
+    for (const title of result.openedCmux) {
+      logger.info(title)
+    }
+  }
+
+  if (result.skippedCmux.length > 0) {
+    logger.info(`ℹ️ Skipped ${result.skippedCmux.length} cmux workspace(s) already open`)
+  }
+
+  if (
+    !context.cursorRan &&
+    result.openedCmux.length === 0 &&
+    result.skippedCmux.length === 0 &&
+    result.cursorFoldersAdded === 0 &&
+    result.cursorFoldersRemoved === 0
+  ) {
+    logger.info('ℹ️ Nothing to open')
+  }
+}
+
+// MCP Tool Registration
+export const worktreesOpenMcpTool = {
+  name: 'worktrees-open',
+  description:
+    'Open Cursor against the configured workspace file and ensure a cmux workspace exists for each existing release worktree. Idempotent and additive — never removes worktrees, never recreates running cmux workspaces. Use after a cold start (Cursor + cmux closed). For stale-worktree cleanup, use worktrees-sync.',
+  inputSchema: {},
+  outputSchema: {
+    openedCmux: z.array(z.string()).describe('Titles of cmux workspaces opened during this run'),
+    skippedCmux: z.array(z.string()).describe('Titles of cmux workspaces that were already open'),
+    cursorFoldersAdded: z.number().describe('Number of worktree folders added to the Cursor workspace file'),
+    cursorFoldersRemoved: z
+      .number()
+      .describe('Number of dangling worktree folders removed from the Cursor workspace file'),
+  },
+  handler: worktreesOpen,
+}