infra-kit 0.1.39 → 0.1.41

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

@@ -1,28 +1,25 @@
-/* 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 { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'
+import { logger } from 'src/shared/logger'
+import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 // Constants
-interface WorktreeManagementArgs {
-  yes: boolean
+interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
   all: boolean
 }
 
-interface WorktreeManagementResult {
-  removed: string[]
-}
-
 /**
  * Manage git worktrees for release branches
  * Creates worktrees for active release branches and removes unused ones
  */
-export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<WorktreeManagementResult> => {
-  const { yes, all } = options
+export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<ToolsExecutionResult> => {
+  const { confirmedCommand, all } = options
 
   try {
     const currentWorktrees = await getCurrentWorktrees('release')
@@ -46,14 +43,14 @@ export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<
     }
 
     // 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)
     }
 
@@ -61,11 +58,22 @@ export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<
 
     logResults(removedWorktrees)
 
+    const structuredContent = {
+      removedWorktrees,
+      count: removedWorktrees.length,
+    }
+
     return {
-      removed: removedWorktrees,
+      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
   }
 }
@@ -82,7 +90,7 @@ const removeWorktrees = async (branches: string[], worktreeDir: string): Promise
       await $`git worktree remove ${worktreePath}`
       removed.push(branch)
     } catch (error) {
-      console.error(`❌ Failed to remove worktree for ${branch}:`, error)
+      logger.error({ error, branch }, `❌ Failed to remove worktree for ${branch}`)
     }
   }
 
@@ -94,10 +102,28 @@ const removeWorktrees = async (branches: string[], worktreeDir: string): Promise
  */
 const logResults = (removed: string[]): void => {
   if (removed.length > 0) {
-    console.log('❌ Removed worktrees:')
-    console.log(removed.join('\n'))
-    console.log()
+    logger.info('❌ Removed worktrees:')
+    logger.info(removed.join('\n'))
+    logger.info('')
   } else {
-    console.log('ℹ️ No unused worktrees to remove')
+    logger.info('ℹ️ No unused worktrees to remove')
   }
 }
+
+// MCP Tool Registration
+const worktreesRemoveSchema = z.object({
+  all: z.boolean().describe('Remove all worktrees without prompting'),
+})
+
+const worktreesRemoveOutputSchema = z.object({
+  removedWorktrees: z.array(z.string()).describe('List of removed worktree branches'),
+  count: z.number().describe('Number of worktrees removed'),
+})
+
+export const worktreesRemoveMcpTool = {
+  name: 'worktrees-remove',
+  description: 'Remove selected worktrees',
+  inputSchema: worktreesRemoveSchema,
+  outputSchema: worktreesRemoveOutputSchema,
+  handler: worktreesRemove,
+}

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

@@ -1 +1 @@
-export { worktreesSync } from './worktrees-sync'
+export { worktreesSync, worktreesSyncMcpTool } from './worktrees-sync'

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

@@ -1,29 +1,25 @@
-/* eslint-disable no-console */
 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 RELEASE_BRANCH_PREFIX = 'release/v'
 
-interface WorktreeManagementResult {
-  removed: string[]
-}
-
-interface WorktreeSyncArgs {
-  yes: boolean
-}
+interface WorktreeSyncArgs extends RequiredConfirmedOptionArg {}
 
 /**
  * Manage git worktrees for release branches
  * Creates worktrees for active release branches and removes unused ones
  */
-export const worktreesSync = async (options: WorktreeSyncArgs): Promise<WorktreeManagementResult> => {
-  const { yes } = options
+export const worktreesSync = async (options: WorktreeSyncArgs): Promise<ToolsExecutionResult> => {
+  const { confirmedCommand } = options
 
   try {
     const currentWorktrees = await getCurrentWorktrees('release')
@@ -34,14 +30,14 @@ export const worktreesSync = async (options: WorktreeSyncArgs): Promise<Worktree
     const releasePRsList = await getReleasePRs()
 
     // 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)
     }
 
@@ -54,11 +50,22 @@ export const worktreesSync = async (options: WorktreeSyncArgs): Promise<Worktree
 
     logResults(removedWorktrees)
 
+    const structuredContent = {
+      removedWorktrees,
+      count: removedWorktrees.length,
+    }
+
     return {
-      removed: removedWorktrees,
+      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
   }
 }
@@ -93,7 +100,7 @@ const removeWorktrees = async (branches: string[], worktreeDir: string): Promise
       await $`git worktree remove ${worktreePath}`
       removed.push(branch)
     } catch (error) {
-      console.error(`❌ Failed to remove worktree for ${branch}:`, error)
+      logger.error({ error, branch }, `❌ Failed to remove worktree for ${branch}`)
     }
   }
 
@@ -105,10 +112,26 @@ const removeWorktrees = async (branches: string[], worktreeDir: string): Promise
  */
 const logResults = (removed: string[]): void => {
   if (removed.length > 0) {
-    console.log('❌ Removed worktrees:')
-    console.log(removed.join('\n'))
-    console.log()
+    logger.info('❌ Removed worktrees:')
+    logger.info(removed.join('\n'))
+    logger.info('')
   } else {
-    console.log('ℹ️ No unused worktrees to remove')
+    logger.info('ℹ️ No unused worktrees to remove')
   }
 }
+
+// MCP Tool Registration
+const worktreesSyncSchema = z.object({})
+
+const worktreesSyncOutputSchema = z.object({
+  removedWorktrees: z.array(z.string()).describe('List of removed worktree branches'),
+  count: z.number().describe('Number of worktrees removed during sync'),
+})
+
+export const worktreesSyncMcpTool = {
+  name: 'worktrees-sync',
+  description: 'Synchronize worktrees with active release branches',
+  inputSchema: worktreesSyncSchema,
+  outputSchema: worktreesSyncOutputSchema,
+  handler: worktreesSync,
+}

package/src/entry/cli.ts

@@ -19,7 +19,7 @@ program
   .option('-a, --all', 'Select all active release branches')
   .option('-y, --yes', 'Skip confirmation prompt')
   .action(async (options) => {
-    await ghMergeDev({ all: options.all, yes: options.yes })
+    await ghMergeDev({ all: options.all, confirmedCommand: options.yes })
   })
 
 program
@@ -36,7 +36,7 @@ program
   .option('-y, --yes', 'Skip confirmation prompt')
   .option('-c, --checkout', 'Checkout the created branch after creation (only works when creating a single branch)')
   .action(async (options) => {
-    await ghReleaseCreate({ versions: options.versions, yes: options.yes, checkout: options.checkout })
+    await ghReleaseCreate({ versions: options.versions, confirmedCommand: options.yes, checkout: options.checkout })
   })
 
 program
@@ -54,7 +54,7 @@ program
   .option('-v, --version <version>', 'Specify the version to release, e.g. 1.2.5')
   .option('-y, --yes', 'Skip confirmation prompt')
   .action(async (options) => {
-    await ghReleaseDeliver({ version: options.version, yes: options.yes })
+    await ghReleaseDeliver({ version: options.version, confirmedCommand: options.yes })
   })
 
 program
@@ -62,7 +62,7 @@ program
   .description('Sync git worktrees for release branches')
   .option('-y, --yes', 'Skip confirmation prompt')
   .action(async (options) => {
-    await worktreesSync({ yes: options.yes })
+    await worktreesSync({ confirmedCommand: options.yes })
   })
 
 program
@@ -71,7 +71,7 @@ program
   .option('-y, --yes', 'Skip confirmation prompt')
   .option('-a, --all', 'Select all active release branches')
   .action(async (options) => {
-    await worktreesAdd({ yes: options.yes, all: options.all })
+    await worktreesAdd({ confirmedCommand: options.yes, all: options.all })
   })
 
 program
@@ -87,7 +87,7 @@ program
   .option('-y, --yes', 'Skip confirmation prompt')
   .option('-a, --all', 'Select all active release branches')
   .action(async (options) => {
-    await worktreesRemove({ yes: options.yes, all: options.all })
+    await worktreesRemove({ confirmedCommand: options.yes, all: options.all })
   })
 
 await validateGitHubCliAndAuth()

package/src/entry/mcp.ts

@@ -2,11 +2,11 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio'
 import process from 'node:process'
 
 import { setupErrorHandlers } from 'src/lib/error-handlers'
-import { initLogger } from 'src/lib/logger'
+import { initLoggerMcp } from 'src/lib/logger'
 
 import { createMcpServer } from '../mcp/server'
 
-const logger = initLogger()
+const logger = initLoggerMcp()
 
 const startServer = async () => {
   let server
@@ -14,7 +14,7 @@ const startServer = async () => {
     server = await createMcpServer()
   } catch (error) {
     logger.error({ err: error, msg: 'Failed to create MCP server' })
-    console.error(`Fatal error during server creation.`)
+    logger.error(`Fatal error during server creation.`)
 
     process.exit(1)
   }
@@ -27,7 +27,7 @@ const startServer = async () => {
     logger.info({ msg: 'Server connected to transport. Ready.' })
   } catch (error) {
     logger.error({ err: error, msg: 'Failed to initialize server' })
-    console.error(`Fatal error during server transport init.`)
+    logger.error(`Fatal error during server transport init.`)
 
     process.exit(1)
   }

package/src/lib/error-handlers/index.ts

@@ -3,6 +3,12 @@ import type { Logger } from 'pino'
 
 import { LOG_FILE_PATH } from 'src/shared/constants'
 
+/**
+ * Setup error handlers for the application
+ * @param logger - The logger instance
+ *
+ * ONLY FOR SERVER!
+ */
 export const setupErrorHandlers = (logger: Logger) => {
   process.on('SIGINT', () => {
     logger.info({ msg: 'Received SIGINT. Shutting down...' })
@@ -16,14 +22,14 @@ export const setupErrorHandlers = (logger: Logger) => {
 
   process.on('uncaughtException', (error) => {
     logger.fatal({ err: error, msg: 'Uncaught Exception' })
-    console.error(`Uncaught Exception! Check ${LOG_FILE_PATH}. Shutting down...`)
+    logger.error(`Uncaught Exception! Check ${LOG_FILE_PATH}. Shutting down...`)
     logger.flush()
     process.exit(1)
   })
 
   process.on('unhandledRejection', (reason, promise) => {
     logger.fatal({ reason, promise, msg: 'Unhandled Rejection' })
-    console.error(`Unhandled Rejection! Check ${LOG_FILE_PATH}. Shutting down...`)
+    logger.error(`Unhandled Rejection! Check ${LOG_FILE_PATH}. Shutting down...`)
     logger.flush()
     process.exit(1)
   })

package/src/lib/logger/index.ts

@@ -1,14 +1,35 @@
 import process from 'node:process'
 import pino from 'pino'
+import pretty from 'pino-pretty'
 
 import { LOG_FILE_PATH } from 'src/shared/constants'
 
-export const initLogger = () => {
+export const initLoggerMcp = () => {
   const logLevel = process.argv.includes('--debug') ? 'debug' : 'info'
 
-  const logger = pino({ level: logLevel }, pino.destination(LOG_FILE_PATH))
+  const logger = pino({ level: logLevel })
 
   logger.info(`Logger initialized with level: ${logLevel}. Logging to: ${LOG_FILE_PATH}`)
 
   return logger
 }
+
+export const initLoggerCLI = () => {
+  const logLevel = process.argv.includes('--debug') ? 'debug' : 'info'
+
+  const ignoreFields = ['time', 'pid', 'hostname']
+
+  if (logLevel === 'debug') {
+    ignoreFields.push('level')
+  }
+
+  const logger = pino(
+    { level: logLevel },
+    pretty({
+      ignore: ignoreFields.join(','),
+      colorize: true,
+    }),
+  )
+
+  return logger
+}

package/src/mcp/prompts/index.ts

@@ -1,3 +1,3 @@
 import type { Server } from '@modelcontextprotocol/sdk/server/index'
 
-export const initializePrompts = async (server: Server) => {}
+export const initializePrompts = async (_server: Server) => {}

package/src/mcp/resources/index.ts

@@ -1,3 +1,3 @@
 import type { Server } from '@modelcontextprotocol/sdk/server/index'
 
-export const initializeResources = async (server: Server) => {}
+export const initializeResources = async (_server: Server) => {}

package/src/mcp/server.ts

@@ -1,12 +1,12 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 
-import { initLogger } from 'src/lib/logger'
+import { initLoggerMcp } from 'src/lib/logger'
 
 import { initializePrompts } from './prompts'
 import { initializeResources } from './resources'
 import { initializeTools } from './tools'
 
-const logger = initLogger()
+const logger = initLoggerMcp()
 
 export async function createMcpServer() {
   const server = new Server(

package/src/mcp/tools/index.ts

@@ -1,3 +1,41 @@
 import type { Server } from '@modelcontextprotocol/sdk/server/index'
 
-export const initializeTools = async (server: Server) => {}
+import { ghMergeDevMcpTool } from 'src/commands/gh-merge-dev'
+import { ghReleaseCreateMcpTool } from 'src/commands/gh-release-create'
+import { ghReleaseDeliverMcpTool } from 'src/commands/gh-release-deliver'
+import { ghReleaseDeployMcpTool } from 'src/commands/gh-release-deploy'
+import { ghReleaseListMcpTool } from 'src/commands/gh-release-list'
+import { worktreesAddMcpTool } from 'src/commands/worktrees-add'
+import { worktreesListMcpTool } from 'src/commands/worktrees-list'
+import { worktreesRemoveMcpTool } from 'src/commands/worktrees-remove'
+import { worktreesSyncMcpTool } from 'src/commands/worktrees-sync'
+import { createToolHandler } from 'src/shared/tool-handler'
+
+const tools = [
+  ghMergeDevMcpTool,
+  ghReleaseCreateMcpTool,
+  ghReleaseDeliverMcpTool,
+  ghReleaseDeployMcpTool,
+  ghReleaseListMcpTool,
+  worktreesAddMcpTool,
+  worktreesListMcpTool,
+  worktreesRemoveMcpTool,
+  worktreesSyncMcpTool,
+]
+
+export const initializeTools = async (server: Server) => {
+  for (const tool of tools) {
+    // eslint-disable-next-line ts/ban-ts-comment
+    // @ts-expect-error
+    server.registerTool(
+      tool.name,
+      {
+        description: tool.description,
+        inputSchema: tool.inputSchema,
+        outputSchema: tool.outputSchema,
+        handler: tool.handler,
+      },
+      createToolHandler({ toolName: tool.name, handler: tool.handler }),
+    )
+  }
+}

package/src/shared/gh-cli-auth/gh-cli-auth.ts

@@ -1,6 +1,8 @@
 import process from 'node:process'
 import { $ } from 'zx'
 
+import { logger } from 'src/shared/logger'
+
 /**
  * Validate GitHub CLI installation and authentication status and throw an error if not valid
  */
@@ -8,16 +10,16 @@ export const validateGitHubCliAndAuth = async () => {
   try {
     await $`gh --version`
   } catch (error: unknown) {
-    console.error('Error: GitHub CLI (gh) is not installed.', (error as Error)?.message)
-    console.error('Please install it from: https://cli.github.com/')
+    logger.error({ error }, 'Error: GitHub CLI (gh) is not installed.')
+    logger.error('Please install it from: https://cli.github.com/')
     process.exit(1)
   }
 
   try {
     await $`gh auth status`
   } catch (error: unknown) {
-    console.error('Error: GitHub CLI (gh) is not authenticated.', (error as Error)?.message)
-    console.error('Please authenticate it from: https://cli.github.com/manual/gh_auth_login or type "gh auth login"')
+    logger.error({ error }, 'Error: GitHub CLI (gh) is not authenticated.')
+    logger.error('Please authenticate it from: https://cli.github.com/manual/gh_auth_login or type "gh auth login"')
     process.exit(1)
   }
 }

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

@@ -1,6 +1,8 @@
 import process from 'node:process'
 import { $ } from 'zx'
 
+import { logger } from 'src/shared/logger'
+
 interface ReleasePR {
   headRefName: string
   number: number
@@ -25,13 +27,13 @@ export const getReleasePRs = async (): Promise<string[]> => {
     const releasePRsArray: ReleasePR[] = JSON.parse(releasePRs.stdout)
 
     if (releasePRsArray.length === 0) {
-      console.error('❌ No release PRs found. Check the project folder for the script. Exiting...')
+      logger.error('❌ No release PRs found. Check the project folder for the script. Exiting...')
       process.exit(1)
     }
 
     return releasePRsArray.map((pr) => pr.headRefName)
   } catch (error) {
-    console.error('❌ Error fetching release PRs:', error instanceof Error ? error.message : String(error))
+    logger.error({ error }, '❌ Error fetching release PRs')
     process.exit(1)
   }
 }

package/src/shared/logger/index.ts

@@ -0,0 +1,4 @@
+import { initLoggerCLI } from 'src/lib/logger'
+
+// INFO: This is a logger for NPM CLI package
+export const logger = initLoggerCLI()

package/src/shared/tool-handler/index.ts

@@ -0,0 +1 @@
+export { createToolHandler } from './tool-handler'

package/src/shared/tool-handler/tool-handler.ts

@@ -0,0 +1,29 @@
+import type { ToolsExecutionResult } from 'src/types'
+
+import { logger } from '../logger'
+
+interface ToolHandlerArgs {
+  toolName: string
+  handler: (params: any) => Promise<ToolsExecutionResult>
+}
+
+export const createToolHandler = (args: ToolHandlerArgs) => async (params: unknown) => {
+  const { toolName, handler } = args
+
+  logger.info({ msg: `Tool execution started: ${toolName}`, params })
+  try {
+    const payload = await handler({ ...(params as object), confirmedCommand: true })
+
+    logger.info({ msg: `Tool execution successful: ${toolName}` })
+
+    return payload
+  } catch (error) {
+    logger.error({
+      err: error,
+      params,
+      msg: `Tool execution failed: ${toolName}`,
+    })
+
+    throw error
+  }
+}

package/src/types.ts

@@ -0,0 +1,11 @@
+export interface ToolsExecutionResult {
+  content: {
+    type: 'text'
+    text: string
+  }[]
+  structuredContent?: unknown
+}
+
+export interface RequiredConfirmedOptionArg {
+  confirmedCommand: boolean
+}