infra-kit 0.1.38 → 0.1.41

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

@@ -1,21 +1,22 @@
-/* eslint-disable no-console */
 import confirm from '@inquirer/confirm'
 import select from '@inquirer/select'
 import process from 'node:process'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { getReleasePRs } from 'src/shared/gh-release-prs'
+import { logger } from 'src/shared/logger'
+import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
-interface GhReleaseDeliverArgs {
+interface GhReleaseDeliverArgs extends RequiredConfirmedOptionArg {
   version: string
-  yes: boolean
 }
 
 /**
  * Deliver a release branch to production
  */
-export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs): Promise<void> => {
-  const { version, yes } = args
+export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs): Promise<ToolsExecutionResult> => {
+  const { version, confirmedCommand } = args
 
   const releasePRsList = await getReleasePRs()
 
@@ -35,18 +36,18 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs): Promise<void
 
   // Check if release branch exists in the list
   if (!releasePRsList.includes(selectedReleaseBranch)) {
-    console.error(`❌ Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)
+    logger.error(`❌ Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)
     process.exit(1)
   }
 
-  const answer = yes
+  const answer = confirmedCommand
     ? true
     : await confirm({
         message: `Are you sure you want to deliver version ${selectedReleaseBranch} to production?`,
       })
 
   if (!answer) {
-    console.log('Operation cancelled. Exiting...')
+    logger.info('Operation cancelled. Exiting...')
     process.exit(0)
   }
 
@@ -62,10 +63,45 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs): Promise<void
     // Merge main into dev
     await $`git switch main && git pull && git switch dev && git pull && git merge main --no-edit && git push`
 
-    console.log('\n')
-    console.log(`✔️ Successfully delivered ${selectedReleaseBranch} to production!`)
+    logger.info('\n')
+    logger.info(`✔️ Successfully delivered ${selectedReleaseBranch} to production!`)
+
+    const structuredContent = {
+      releaseBranch: selectedReleaseBranch,
+      version: selectedReleaseBranch.replace('release/v', ''),
+      success: true,
+    }
+
+    return {
+      content: [
+        {
+          type: 'text',
+          text: JSON.stringify(structuredContent, null, 2),
+        },
+      ],
+      structuredContent,
+    }
   } catch (error: unknown) {
-    console.error('❌ Error merging release branch into dev:', error instanceof Error ? error.message : 'Unknown error')
+    logger.error({ error }, '❌ Error merging release branch into dev')
     process.exit(1)
   }
 }
+
+// MCP Tool Registration
+const ghReleaseDeliverSchema = z.object({
+  version: z.string().describe('Version to deliver to production (e.g., "1.2.5")'),
+})
+
+const ghReleaseDeliverOutputSchema = z.object({
+  releaseBranch: z.string().describe('The release branch that was delivered'),
+  version: z.string().describe('The version that was delivered'),
+  success: z.boolean().describe('Whether the delivery was successful'),
+})
+
+export const ghReleaseDeliverMcpTool = {
+  name: 'gh-release-deliver',
+  description: 'Deliver a release branch to production',
+  inputSchema: ghReleaseDeliverSchema,
+  outputSchema: ghReleaseDeliverOutputSchema,
+  handler: ghReleaseDeliver,
+}

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

@@ -1 +1 @@
-export { ghReleaseDeliver } from './gh-release-deliver'
+export { ghReleaseDeliver, ghReleaseDeliverMcpTool } from './gh-release-deliver'

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

@@ -1,10 +1,12 @@
-/* eslint-disable no-console */
 import select from '@inquirer/select'
 import process from 'node:process'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { ENVs } from 'src/shared/constants'
 import { getReleasePRs } from 'src/shared/gh-release-prs'
+import { logger } from 'src/shared/logger'
+import type { ToolsExecutionResult } from 'src/types'
 
 interface GhReleaseDeployArgs {
   version: string
@@ -14,7 +16,7 @@ interface GhReleaseDeployArgs {
 /**
  * Deploy a release branch to an environment
  */
-export const ghReleaseDeploy = async (args: GhReleaseDeployArgs): Promise<void> => {
+export const ghReleaseDeploy = async (args: GhReleaseDeployArgs): Promise<ToolsExecutionResult> => {
   const { version, env } = args
 
   // TODO: add validation for semver version for version variable
@@ -41,7 +43,7 @@ export const ghReleaseDeploy = async (args: GhReleaseDeployArgs): Promise<void>
 
   // Check if release branch exists in the list
   if (!releasePRsList.includes(selectedReleaseBranch)) {
-    console.error(`❌ Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)
+    logger.error(`❌ Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)
     process.exit(1)
   }
 
@@ -60,19 +62,57 @@ export const ghReleaseDeploy = async (args: GhReleaseDeployArgs): Promise<void>
   }
 
   if (!ENVs.includes(selectedEnv)) {
-    console.error(`❌ Invalid environment: ${selectedEnv}. Exiting...`)
+    logger.error(`❌ Invalid environment: ${selectedEnv}. Exiting...`)
     process.exit(1)
   }
 
   try {
     await $`gh workflow run deploy-all.yml --ref ${selectedReleaseBranch} -f environment=${selectedEnv}`
 
-    console.log('\n')
-    console.log(
+    logger.info('\n')
+    logger.info(
       `✅ Successfully launched deploy-all workflow_dispatch for release branch: ${selectedReleaseBranch} and environment: ${selectedEnv}`,
     )
+
+    const structuredContent = {
+      releaseBranch: selectedReleaseBranch,
+      version: selectedReleaseBranch.replace('release/v', ''),
+      environment: selectedEnv,
+      success: true,
+    }
+
+    return {
+      content: [
+        {
+          type: 'text',
+          text: JSON.stringify(structuredContent, null, 2),
+        },
+      ],
+      structuredContent,
+    }
   } catch (error: unknown) {
-    console.error('❌ Error launching workflow:', error instanceof Error ? error.message : 'Unknown error')
+    logger.error({ error }, '❌ Error launching workflow')
     process.exit(1)
   }
 }
+
+// MCP Tool Registration
+const ghReleaseDeploySchema = z.object({
+  version: z.string().describe('Version to deploy (e.g., "1.2.5")'),
+  env: z.string().describe('Environment to deploy to (e.g., "dev", "renana", "oriana")'),
+})
+
+const ghReleaseDeployOutputSchema = z.object({
+  releaseBranch: z.string().describe('The release branch that was deployed'),
+  version: z.string().describe('The version that was deployed'),
+  environment: z.string().describe('The environment deployed to'),
+  success: z.boolean().describe('Whether the deployment was successful'),
+})
+
+export const ghReleaseDeployMcpTool = {
+  name: 'gh-release-deploy',
+  description: 'Deploy a release branch to a specified environment',
+  inputSchema: ghReleaseDeploySchema,
+  outputSchema: ghReleaseDeployOutputSchema,
+  handler: ghReleaseDeploy,
+}

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

@@ -1 +1 @@
-export { ghReleaseDeploy } from './gh-release-deploy'
+export { ghReleaseDeploy, ghReleaseDeployMcpTool } from './gh-release-deploy'

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

@@ -1,18 +1,50 @@
-/* eslint-disable no-console */
+import { z } from 'zod'
+
 import { getReleasePRs } from 'src/shared/gh-release-prs'
+import { logger } from 'src/shared/logger'
 import { sortVersions } from 'src/shared/version-utils'
+import type { ToolsExecutionResult } from 'src/types'
 
 /**
  * List all open release branches
  */
-export const ghReleaseList = async () => {
+export const ghReleaseList = async (): Promise<ToolsExecutionResult> => {
   const releasePRs = await getReleasePRs()
 
   const releasePRsList = releasePRs.map((pr) => pr.replace('release/', ''))
   const sortedReleases = sortVersions(releasePRsList)
 
-  console.log('All release branches: \n')
-  console.log(sortedReleases.join('\n'))
+  logger.info('All release branches: \n')
+  logger.info(sortedReleases.join('\n'))
+
+  const structuredContent = {
+    releases: sortedReleases,
+    count: sortedReleases.length,
+  }
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: JSON.stringify(structuredContent, null, 2),
+      },
+    ],
+    structuredContent,
+  }
+}
+
+// MCP Tool Registration
+const ghReleaseListSchema = z.object({})
+
+const ghReleaseListOutputSchema = z.object({
+  releases: z.array(z.string()).describe('List of all release branches'),
+  count: z.number().describe('Number of release branches'),
+})
 
-  return sortedReleases
+export const ghReleaseListMcpTool = {
+  name: 'gh-release-list',
+  description: 'List all open release branches',
+  inputSchema: ghReleaseListSchema,
+  outputSchema: ghReleaseListOutputSchema,
+  handler: ghReleaseList,
 }

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

@@ -1 +1 @@
-export { ghReleaseList } from './gh-release-list'
+export { ghReleaseList, ghReleaseListMcpTool } from './gh-release-list'

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

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

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

@@ -1,33 +1,30 @@
-/* eslint-disable no-console */
 import checkbox from '@inquirer/checkbox'
 import confirm from '@inquirer/confirm'
 import process from 'node:process'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { WORKTREES_DIR_SUFFIX } from 'src/shared/constants'
 import { getReleasePRs } from 'src/shared/gh-release-prs'
 import { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'
+import { logger } from 'src/shared/logger'
+import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 // Constants
 const FEATURE_DIR = 'feature'
 const RELEASE_DIR = 'release'
 const RELEASE_BRANCH_PREFIX = 'release/v'
 
-interface WorktreeManagementArgs {
-  yes: boolean
+interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
   all: boolean
 }
 
-interface WorktreeManagementResult {
-  created: string[]
-}
-
 /**
  * Manage git worktrees for release branches
  * Creates worktrees for active release branches and removes unused ones
  */
-export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<WorktreeManagementResult> => {
-  const { yes, all } = options
+export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<ToolsExecutionResult> => {
+  const { confirmedCommand, all } = options
 
   try {
     const currentWorktrees = await getCurrentWorktrees('release')
@@ -55,14 +52,14 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Wor
     }
 
     // Ask for confirmation
-    const answer = yes
+    const answer = confirmedCommand
       ? true
       : await confirm({
           message: 'Are you sure you want to proceed with these worktree changes?',
         })
 
     if (!answer) {
-      console.log('Operation cancelled. Exiting...')
+      logger.info('Operation cancelled. Exiting...')
       process.exit(0)
     }
 
@@ -75,11 +72,22 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Wor
 
     logResults(createdWorktrees)
 
+    const structuredContent = {
+      createdWorktrees,
+      count: createdWorktrees.length,
+    }
+
     return {
-      created: createdWorktrees,
+      content: [
+        {
+          type: 'text',
+          text: JSON.stringify(structuredContent, null, 2),
+        },
+      ],
+      structuredContent,
     }
   } catch (error) {
-    console.error('❌ Error managing worktrees:', error)
+    logger.error({ error }, '❌ Error managing worktrees')
     throw error
   }
 }
@@ -123,7 +131,7 @@ const createWorktrees = async (branches: string[], worktreeDir: string): Promise
 
       created.push(branch)
     } catch (error) {
-      console.error(`❌ Failed to create worktree for ${branch}:`, error)
+      logger.error({ error, branch }, `❌ Failed to create worktree for ${branch}`)
     }
   }
 
@@ -135,11 +143,29 @@ const createWorktrees = async (branches: string[], worktreeDir: string): Promise
  */
 const logResults = (created: string[]): void => {
   if (created.length > 0) {
-    console.log('\n')
-    console.log('✅ Created worktrees:')
-    console.log(created.join('\n'))
-    console.log()
+    logger.info('\n')
+    logger.info('✅ Created worktrees:')
+    logger.info(created.join('\n'))
+    logger.info('')
   } else {
-    console.log('ℹ️ No new worktrees to create')
+    logger.info('ℹ️ No new worktrees to create')
   }
 }
+
+// MCP Tool Registration
+const worktreesAddSchema = z.object({
+  all: z.boolean().describe('Add worktrees for all release branches without prompting'),
+})
+
+const worktreesAddOutputSchema = z.object({
+  createdWorktrees: z.array(z.string()).describe('List of created worktree branches'),
+  count: z.number().describe('Number of worktrees created'),
+})
+
+export const worktreesAddMcpTool = {
+  name: 'worktrees-add',
+  description: 'Create worktrees for selected release branches',
+  inputSchema: worktreesAddSchema,
+  outputSchema: worktreesAddOutputSchema,
+  handler: worktreesAdd,
+}

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

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

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

@@ -1,7 +1,9 @@
-/* eslint-disable no-console */
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'
+import { logger } from 'src/shared/logger'
+import type { ToolsExecutionResult } from 'src/types'
 
 interface WorktreeInfo {
   branch: string
@@ -14,17 +16,10 @@ interface WorktreeInfo {
   aheadBehind: string
 }
 
-interface WorktreesListResult {
-  worktrees: WorktreeInfo[]
-  total: number
-  releases: number
-  features: number
-}
-
 /**
  * List all (features and releases) git worktrees with detailed information
  */
-export const worktreesList = async (): Promise<WorktreesListResult> => {
+export const worktreesList = async (): Promise<ToolsExecutionResult> => {
   try {
     const [releaseWorktrees, featureWorktrees] = await Promise.all([
       getCurrentWorktrees('release'),
@@ -36,14 +31,24 @@ export const worktreesList = async (): Promise<WorktreesListResult> => {
 
     logResults(worktreesInfo)
 
-    return {
+    const structuredContent = {
       worktrees: worktreesInfo,
-      total: worktreesInfo.length,
-      releases: releaseWorktrees.length,
-      features: featureWorktrees.length,
+      totalCount: worktreesInfo.length,
+      releaseCount: releaseWorktrees.length,
+      featureCount: featureWorktrees.length,
+    }
+
+    return {
+      content: [
+        {
+          type: 'text',
+          text: JSON.stringify(structuredContent, null, 2),
+        },
+      ],
+      structuredContent,
     }
   } catch (error) {
-    console.error('❌ Error listing worktrees:', error)
+    logger.error({ error }, '❌ Error listing worktrees')
     throw error
   }
 }
@@ -83,7 +88,7 @@ const processWorktrees = async (
         aheadBehind,
       })
     } catch (error) {
-      console.warn(`⚠️  Could not process worktree ${branch}:`, error)
+      logger.warn({ error, branch }, `⚠️  Could not process worktree ${branch}`)
     }
   }
 
@@ -176,15 +181,15 @@ const getAheadBehind = async (worktreePath: string): Promise<string> => {
  */
 const logResults = (worktrees: WorktreeInfo[]): void => {
   if (worktrees.length === 0) {
-    console.log('\n🌿 Git Worktrees')
-    console.log('─'.repeat(80))
-    console.log('ℹ️  No worktrees found')
-    console.log('─'.repeat(80))
+    logger.info('\n🌿 Git Worktrees')
+    logger.info('─'.repeat(80))
+    logger.info('ℹ️  No worktrees found')
+    logger.info('─'.repeat(80))
     return
   }
 
-  console.log('\n🌿 Git Worktrees')
-  console.log('═'.repeat(100))
+  logger.info('\n🌿 Git Worktrees')
+  logger.info('═'.repeat(100))
 
   // Separate releases and features
   const releases = worktrees.filter((w) => w.type === 'release')
@@ -195,23 +200,23 @@ const logResults = (worktrees: WorktreeInfo[]): void => {
 
   // Display features second
   if (features.length > 0 && releases.length > 0) {
-    console.log('')
+    logger.info('')
   }
 
   displayWorktreeSection('✨ Features', features)
 
   // Summary
   const current = worktrees.find((w) => w.isCurrent)
-  console.log(`\n${'═'.repeat(100)}`)
-  console.log(
+  logger.info(`\n${'═'.repeat(100)}`)
+  logger.info(
     `📊 Summary: ${worktrees.length} total worktrees (${releases.length} releases, ${features.length} features)`,
   )
 
   if (current) {
-    console.log(`📍 Currently on: ${current.branch}`)
+    logger.info(`📍 Currently on: ${current.branch}`)
   }
 
-  console.log('')
+  logger.info('')
 }
 
 /**
@@ -220,14 +225,14 @@ const logResults = (worktrees: WorktreeInfo[]): void => {
 const displayWorktreeSection = (sectionTitle: string, worktrees: WorktreeInfo[]): void => {
   if (worktrees.length === 0) return
 
-  console.log(`\n${sectionTitle}`)
-  console.log('─'.repeat(50))
+  logger.info(`\n${sectionTitle}`)
+  logger.info('─'.repeat(50))
 
   for (const [index, worktree] of worktrees.entries()) {
     displayWorktree(worktree)
 
     if (index < worktrees.length - 1) {
-      console.log('')
+      logger.info('')
     }
   }
 }
@@ -245,18 +250,18 @@ const displayWorktree = (worktree: WorktreeInfo): void => {
   // Branch name with color coding
   const branchDisplay = `${typeIcon} ${worktree.branch}`
 
-  console.log(`${currentIndicator} ${statusIndicator} ${branchDisplay}`)
+  logger.info(`${currentIndicator} ${statusIndicator} ${branchDisplay}`)
 
   // Commit and sync info
   const syncInfo = worktree.aheadBehind !== 'unknown' ? ` | ${worktree.aheadBehind}` : ''
-  console.log(`   📝 ${worktree.commit}${syncInfo}`)
+  logger.info(`   📝 ${worktree.commit}${syncInfo}`)
 
   // Last commit message
-  console.log(`   💬 ${worktree.lastCommitMessage}`)
+  logger.info(`   💬 ${worktree.lastCommitMessage}`)
 
   // Path (shortened for display)
   const shortPath = worktree.path.split('/').slice(-2).join('/')
-  console.log(`   📁 ${shortPath}`)
+  logger.info(`   📁 ${shortPath}`)
 }
 
 /**
@@ -274,3 +279,34 @@ const getStatusIndicator = (status: string): string => {
       return '❓'
   }
 }
+
+// MCP Tool Registration
+const worktreesListSchema = z.object({})
+
+const worktreesListOutputSchema = z.object({
+  worktrees: z
+    .array(
+      z.object({
+        branch: z.string(),
+        path: z.string(),
+        commit: z.string(),
+        isCurrent: z.boolean(),
+        type: z.enum(['release', 'feature']),
+        status: z.string(),
+        lastCommitMessage: z.string(),
+        aheadBehind: z.string(),
+      }),
+    )
+    .describe('List of all worktrees with details'),
+  totalCount: z.number().describe('Total number of worktrees'),
+  releaseCount: z.number().describe('Number of release worktrees'),
+  featureCount: z.number().describe('Number of feature worktrees'),
+})
+
+export const worktreesListMcpTool = {
+  name: 'worktrees-list',
+  description: 'List all git worktrees with detailed information',
+  inputSchema: worktreesListSchema,
+  outputSchema: worktreesListOutputSchema,
+  handler: worktreesList,
+}

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

@@ -1 +1 @@
-export { worktreesRemove } from './worktrees-remove'
+export { worktreesRemove, worktreesRemoveMcpTool } from './worktrees-remove'