infra-kit 0.1.90 → 0.1.93

package/package.json

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

package/src/commands/version/index.ts

@@ -0,0 +1 @@
+export { version, versionMcpTool } from './version'

package/src/commands/version/version.ts

@@ -0,0 +1,38 @@
+import { z } from 'zod'
+
+import { logger } from 'src/lib/logger'
+import type { ToolsExecutionResult } from 'src/types'
+
+import packageJson from '../../../package.json' with { type: 'json' }
+
+/**
+ * Print the infra-kit CLI version
+ */
+export const version = async (): Promise<ToolsExecutionResult> => {
+  const cliVersion = packageJson.version
+
+  logger.info(cliVersion)
+
+  const structuredContent = { version: cliVersion }
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: JSON.stringify(structuredContent, null, 2),
+      },
+    ],
+    structuredContent,
+  }
+}
+
+// MCP Tool Registration
+export const versionMcpTool = {
+  name: 'version',
+  description: 'Print the installed infra-kit CLI version',
+  inputSchema: {},
+  outputSchema: {
+    version: z.string().describe('Installed infra-kit CLI version (from package.json)'),
+  },
+  handler: version,
+}

package/src/entry/cli.ts

@@ -15,6 +15,7 @@ import { ghReleaseList } from 'src/commands/gh-release-list'
 import { init } from 'src/commands/init'
 import { releaseCreate } from 'src/commands/release-create'
 import { releaseCreateBatch } from 'src/commands/release-create-batch'
+import { version } from 'src/commands/version'
 import { worktreesAdd } from 'src/commands/worktrees-add'
 import { worktreesList } from 'src/commands/worktrees-list'
 import { worktreesRemove } from 'src/commands/worktrees-remove'
@@ -176,6 +177,13 @@ program
     await doctor()
   })
 
+program
+  .command('version')
+  .description('Print the installed infra-kit CLI version')
+  .action(async () => {
+    await version()
+  })
+
 program
   .command('env-status')
   .description('Show Doppler authentication status and detected project info')
@@ -223,7 +231,7 @@ if (process.argv.length <= 2) {
     'release-deliver',
   ]
   const worktreeCommands = ['worktrees-add', 'worktrees-list', 'worktrees-remove', 'worktrees-sync']
-  const envCommands = ['doctor', 'init', 'env-status', 'env-list', 'env-load', 'env-clear']
+  const envCommands = ['doctor', 'init', 'version', 'env-status', 'env-list', 'env-load', 'env-clear']
 
   const commandMap = new Map(
     program.commands.map((cmd) => {

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/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/infra-kit-config.ts

@@ -7,10 +7,16 @@ import { getProjectRoot } from 'src/lib/git-utils'
 
 const INFRA_KIT_CONFIG_FILE = 'infra-kit.yml'
 
+const jiraTaskManagerProviderSchema = z.object({
+  type: z.literal('jira'),
+  baseUrl: z.string().url(),
+  projectId: z.number().int().positive(),
+})
+
 const infraKitConfigSchema = z.object({
   dopplerProjectName: z.string().min(1),
   environments: z.array(z.string().min(1)).min(1),
-  taskManagerProvider: z.union([z.string(), z.literal(false)]),
+  taskManagerProvider: z.union([z.string(), z.literal(false), jiraTaskManagerProviderSchema]),
 })
 
 export type InfraKitConfig = z.infer<typeof infraKitConfigSchema>

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'
@@ -29,6 +30,7 @@ const tools = [
   ghReleaseDeployAllMcpTool,
   ghReleaseDeploySelectedMcpTool,
   ghReleaseListMcpTool,
+  versionMcpTool,
   worktreesAddMcpTool,
   worktreesListMcpTool,
   worktreesRemoveMcpTool,