infra-kit 0.1.94 → 0.1.97

package/src/lib/__tests__/infra-kit-config.test.ts

@@ -14,17 +14,21 @@ vi.mock('src/lib/git-utils', () => {
   }
 })
 
-const VALID_YML = `dopplerProjectName: my-project
-environments:
+const VALID_YML = `environments:
   - dev
   - staging
-taskManagerProvider: linear
+envManagement:
+  provider: doppler
+  config:
+    name: my-project
 `
 
-const ALTERNATE_YML = `dopplerProjectName: other-project
-environments:
+const ALTERNATE_YML = `environments:
   - dev
-taskManagerProvider: false
+envManagement:
+  provider: doppler
+  config:
+    name: other-project
 `
 
 const withTmpRepo = async (fn: (tmp: string) => Promise<void>): Promise<void> => {
@@ -57,19 +61,65 @@ describe('getInfraKitConfig', () => {
 
       const cfg = await getInfraKitConfig()
 
-      expect(cfg.dopplerProjectName).toBe('my-project')
+      expect(cfg.envManagement.config.name).toBe('my-project')
       expect(cfg.environments).toEqual(['dev', 'staging'])
-      expect(cfg.taskManagerProvider).toBe('linear')
+      expect(cfg.taskManager).toBeUndefined()
+      expect(cfg.ide).toBeUndefined()
     })
   })
 
-  it('accepts taskManagerProvider: false as a literal boolean', async () => {
+  it('accepts ide and taskManager when provided', async () => {
     await withTmpRepo(async (tmp) => {
-      fs.writeFileSync(path.join(tmp, 'infra-kit.yml'), ALTERNATE_YML)
+      fs.writeFileSync(
+        path.join(tmp, 'infra-kit.yml'),
+        `environments: [dev]
+envManagement:
+  provider: doppler
+  config:
+    name: p
+ide:
+  provider: cursor
+  config:
+    mode: workspace
+    workspaceConfigPath: ./ws.code-workspace
+taskManager:
+  provider: jira
+  config:
+    baseUrl: https://example.atlassian.net
+    projectId: 123
+`,
+      )
 
       const cfg = await getInfraKitConfig()
 
-      expect(cfg.taskManagerProvider).toBe(false)
+      expect(cfg.ide?.provider).toBe('cursor')
+
+      if (cfg.ide?.provider === 'cursor') {
+        expect(cfg.ide.config.mode).toBe('workspace')
+        expect(cfg.ide.config.workspaceConfigPath).toBe('./ws.code-workspace')
+      }
+
+      expect(cfg.taskManager?.provider).toBe('jira')
+    })
+  })
+
+  it('rejects ide.cursor mode=workspace without workspaceConfigPath', async () => {
+    await withTmpRepo(async (tmp) => {
+      fs.writeFileSync(
+        path.join(tmp, 'infra-kit.yml'),
+        `environments: [dev]
+envManagement:
+  provider: doppler
+  config:
+    name: p
+ide:
+  provider: cursor
+  config:
+    mode: workspace
+`,
+      )
+
+      await expect(getInfraKitConfig()).rejects.toThrow(/workspaceConfigPath/)
     })
   })
 
@@ -83,7 +133,7 @@ describe('getInfraKitConfig', () => {
     await withTmpRepo(async (tmp) => {
       fs.writeFileSync(
         path.join(tmp, 'infra-kit.yml'),
-        'dopplerProjectName: ""\nenvironments: []\ntaskManagerProvider: false\n',
+        'environments: []\nenvManagement:\n  provider: doppler\n  config:\n    name: ""\n',
       )
 
       await expect(getInfraKitConfig()).rejects.toThrow(/Invalid infra-kit.yml/)
@@ -98,7 +148,7 @@ describe('getInfraKitConfig', () => {
 
       const first = await getInfraKitConfig()
 
-      expect(first.dopplerProjectName).toBe('my-project')
+      expect(first.envManagement.config.name).toBe('my-project')
 
       // Advance mtime past the previous stat to simulate an edit; write new content.
       const future = new Date(Date.now() + 2_000)
@@ -108,7 +158,7 @@ describe('getInfraKitConfig', () => {
 
       const second = await getInfraKitConfig()
 
-      expect(second.dopplerProjectName).toBe('other-project')
+      expect(second.envManagement.config.name).toBe('other-project')
       expect(second.environments).toEqual(['dev'])
     })
   })

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

@@ -21,6 +21,29 @@ export const getCurrentWorktrees = async (type: 'release' | 'feature'): Promise<
   })
 }
 
+/**
+ * Extract the branch name from a `git worktree list` output line.
+ *
+ * `git worktree list` formats each line as:
+ *   <path>  <hash> [<branch>]
+ *
+ * Reads the branch from the trailing `[branch]` token so it works for the
+ * main checkout too (whose path does not encode the branch name).
+ */
+const parseWorktreeBranch = (line: string): string | null => {
+  const trimmed = line.trimEnd()
+
+  if (!trimmed.endsWith(']')) return null
+
+  const open = trimmed.lastIndexOf('[')
+
+  if (open === -1) return null
+
+  const branch = trimmed.slice(open + 1, -1)
+
+  return branch.length > 0 ? branch : null
+}
+
 /**
  * Extract a release branch name from a `git worktree list` output line.
  *
@@ -35,11 +58,9 @@ export const getCurrentWorktrees = async (type: 'release' | 'feature'): Promise<
  * // => null
  */
 const releaseWorktreePredicate = (line: string): string | null => {
-  const parts = line.split(' ').filter(Boolean)
-
-  if (parts.length < 3 || !parts[0]?.includes('release/v')) return null
+  const branch = parseWorktreeBranch(line)
 
-  return `release/${parts[0]?.split('/').pop() || ''}`
+  return branch?.startsWith('release/v') ? branch : null
 }
 
 /**
@@ -56,11 +77,9 @@ const releaseWorktreePredicate = (line: string): string | null => {
  * // => null
  */
 const featureWorktreePredicate = (line: string): string | null => {
-  const parts = line.split(' ').filter(Boolean)
-
-  if (parts.length < 3 || !parts[0]?.includes('feature/')) return null
+  const branch = parseWorktreeBranch(line)
 
-  return `feature/${parts[0]?.split('/').pop() || ''}`
+  return branch?.startsWith('feature/') ? branch : null
 }
 
 /**

package/src/lib/infra-kit-config/index.ts

@@ -0,0 +1,2 @@
+export { getInfraKitConfig, resetInfraKitConfigCache } from './infra-kit-config'
+export type { InfraKitConfig } from './infra-kit-config'

package/src/lib/infra-kit-config/infra-kit-config.ts

@@ -0,0 +1,143 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import yaml from 'yaml'
+import { z } from 'zod/v4'
+
+import { getProjectRoot } from 'src/lib/git-utils'
+
+const INFRA_KIT_CONFIG_FILE = 'infra-kit.yml'
+const INFRA_KIT_LOCAL_CONFIG_FILE = 'infra-kit.local.yml'
+
+// envManagement
+const dopplerEnvManagementSchema = z.object({
+  provider: z.literal('doppler'),
+  config: z.object({
+    name: z.string().min(1),
+  }),
+})
+
+const envManagementSchema = z.discriminatedUnion('provider', [dopplerEnvManagementSchema])
+
+// ide
+const cursorIdeConfigSchema = z
+  .object({
+    mode: z.enum(['workspace', 'windows']).default('workspace'),
+    workspaceConfigPath: z.string().min(1).optional(),
+  })
+  .refine(
+    (v) => {
+      return v.mode !== 'workspace' || !!v.workspaceConfigPath
+    },
+    {
+      message: 'workspaceConfigPath is required when mode is "workspace"',
+      path: ['workspaceConfigPath'],
+    },
+  )
+
+const cursorIdeSchema = z.object({
+  provider: z.literal('cursor'),
+  config: cursorIdeConfigSchema,
+})
+
+const ideSchema = z.discriminatedUnion('provider', [cursorIdeSchema])
+
+// taskManager
+const jiraTaskManagerSchema = z.object({
+  provider: z.literal('jira'),
+  config: z.object({
+    baseUrl: z.string().url(),
+    projectId: z.number().int().positive(),
+  }),
+})
+
+const taskManagerSchema = z.discriminatedUnion('provider', [jiraTaskManagerSchema])
+
+const infraKitConfigSchema = z.object({
+  environments: z.array(z.string().min(1)).min(1),
+  envManagement: envManagementSchema,
+  ide: ideSchema.optional(),
+  taskManager: taskManagerSchema.optional(),
+})
+
+const infraKitLocalConfigSchema = infraKitConfigSchema.partial()
+
+export type InfraKitConfig = z.infer<typeof infraKitConfigSchema>
+
+interface CacheEntry {
+  mainMtimeMs: number
+  localMtimeMs: number | null
+  value: InfraKitConfig
+}
+
+let cached: CacheEntry | null = null
+
+/**
+ * Read and validate `infra-kit.yml`, with optional `infra-kit.local.yml` overrides
+ * shallow-merged on top (per-developer, gitignored). Top-level keys (entire
+ * capability sections like `ide`, `envManagement`) replace wholesale. Results are
+ * cached per file mtimes so the long-running MCP server picks up edits without a
+ * restart.
+ */
+export const getInfraKitConfig = async (): Promise<InfraKitConfig> => {
+  const projectRoot = await getProjectRoot()
+  const mainPath = path.join(projectRoot, INFRA_KIT_CONFIG_FILE)
+  const localPath = path.join(projectRoot, INFRA_KIT_LOCAL_CONFIG_FILE)
+
+  let mainStat: Awaited<ReturnType<typeof fs.stat>>
+
+  try {
+    mainStat = await fs.stat(mainPath)
+  } catch {
+    cached = null
+    throw new Error(`infra-kit.yml not found at ${mainPath}`)
+  }
+
+  const localStat = await statIfExists(localPath)
+  const mainMtimeMs = Number(mainStat.mtimeMs)
+  const localMtimeMs = localStat ? Number(localStat.mtimeMs) : null
+
+  if (cached && cached.mainMtimeMs === mainMtimeMs && cached.localMtimeMs === localMtimeMs) {
+    return cached.value
+  }
+
+  const mainRaw = await fs.readFile(mainPath, 'utf-8')
+  const mainParsed = yaml.parse(mainRaw)
+
+  let merged: unknown = mainParsed
+
+  if (localStat) {
+    const localRaw = await fs.readFile(localPath, 'utf-8')
+    const localParsedRaw = yaml.parse(localRaw) ?? {}
+
+    const localResult = infraKitLocalConfigSchema.safeParse(localParsedRaw)
+
+    if (!localResult.success) {
+      throw new Error(`Invalid infra-kit.local.yml at ${localPath}: ${z.prettifyError(localResult.error)}`)
+    }
+
+    merged = { ...(mainParsed as object), ...localResult.data }
+  }
+
+  const result = infraKitConfigSchema.safeParse(merged)
+
+  if (!result.success) {
+    throw new Error(`Invalid infra-kit.yml at ${mainPath}: ${z.prettifyError(result.error)}`)
+  }
+
+  cached = { mainMtimeMs, localMtimeMs, value: result.data }
+
+  return result.data
+}
+
+/** For tests — drops the in-memory cache. */
+export const resetInfraKitConfigCache = (): void => {
+  cached = null
+}
+
+const statIfExists = async (filePath: string): Promise<Awaited<ReturnType<typeof fs.stat>> | null> => {
+  try {
+    return await fs.stat(filePath)
+  } catch {
+    return null
+  }
+}

package/src/mcp/tools/index.ts

@@ -14,6 +14,7 @@ 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 { worktreesOpenMcpTool } from 'src/commands/worktrees-open'
 import { worktreesRemoveMcpTool } from 'src/commands/worktrees-remove'
 import { worktreesSyncMcpTool } from 'src/commands/worktrees-sync'
 import { createToolHandler } from 'src/lib/tool-handler'
@@ -33,6 +34,7 @@ const tools = [
   versionMcpTool,
   worktreesAddMcpTool,
   worktreesListMcpTool,
+  worktreesOpenMcpTool,
   worktreesRemoveMcpTool,
   worktreesSyncMcpTool,
 ]

package/tsconfig.json

@@ -6,9 +6,11 @@
     "composite": true,
     "target": "ESNext",
     "lib": ["ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
     "moduleResolution": "bundler",
+    "paths": {
+      "src/*": ["./src/*"]
+    },
     "resolveJsonModule": true,
     "types": ["node"],
     "allowJs": true,
@@ -31,7 +33,6 @@
     "noStrictGenericChecks": false,
     "suppressExcessPropertyErrors": false,
     "suppressImplicitAnyIndexErrors": false,
-    "downlevelIteration": true,
     "noEmit": true,
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,