infra-kit 0.1.41 → 0.1.44

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

@@ -4,8 +4,8 @@ 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 { getReleasePRs } from 'src/lib/gh-release-prs'
+import { logger } from 'src/lib/logger'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 interface GhMergeDevArgs extends RequiredConfirmedOptionArg {
@@ -109,8 +109,6 @@ export const ghMergeDev = async (args: GhMergeDevArgs): Promise<ToolsExecutionRe
 }
 
 const mergeDev = async (branch: string): Promise<boolean> => {
-  logger.info(`Merging dev into ${branch}...`)
-
   try {
     await $`git switch ${branch}`
 
@@ -135,21 +133,17 @@ const mergeDev = async (branch: string): Promise<boolean> => {
 }
 
 // MCP Tool Registration
-const ghMergeDevSchema = z.object({
-  all: z.boolean().describe('Merge dev into all release branches without prompting'),
-})
-
-const ghMergeDevOutputSchema = z.object({
-  successfulMerges: z.number().describe('Number of successful merges'),
-  failedMerges: z.number().describe('Number of failed merges'),
-  failedBranches: z.array(z.string()).describe('List of branches that failed to merge'),
-  totalBranches: z.number().describe('Total number of branches processed'),
-})
-
 export const ghMergeDevMcpTool = {
   name: 'gh-merge-dev',
   description: 'Merge dev branch into selected release branches',
-  inputSchema: ghMergeDevSchema,
-  outputSchema: ghMergeDevOutputSchema,
+  inputSchema: {
+    all: z.boolean().describe('Merge dev into all release branches without prompting'),
+  },
+  outputSchema: {
+    successfulMerges: z.number().describe('Number of successful merges'),
+    failedMerges: z.number().describe('Number of failed merges'),
+    failedBranches: z.array(z.string()).describe('List of branches that failed to merge'),
+    totalBranches: z.number().describe('Total number of branches processed'),
+  },
   handler: ghMergeDev,
 }

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

@@ -3,7 +3,7 @@ import process from 'node:process'
 import { z } from 'zod'
 import { $, question } from 'zx'
 
-import { logger } from 'src/shared/logger'
+import { logger } from 'src/lib/logger'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 interface GhReleaseCreateArgs extends RequiredConfirmedOptionArg {
@@ -130,21 +130,17 @@ async function createReleaseBranch(version: string) {
 // #endregion Declarations
 
 // MCP Tool Registration
-const ghReleaseCreateSchema = z.object({
-  versions: z.string().describe('Comma-separated list of versions to create (e.g., "1.2.5, 1.2.6")'),
-  checkout: z.boolean().optional().describe('Checkout to the created branch (only works with single version)'),
-})
-
-const ghReleaseCreateOutputSchema = z.object({
-  createdBranches: z.array(z.string()).describe('List of created release branches'),
-  branchCount: z.number().describe('Number of branches created'),
-  isCheckedOut: z.boolean().describe('Whether the branch was checked out'),
-})
-
 export const ghReleaseCreateMcpTool = {
   name: 'gh-release-create',
   description: 'Create new release branches for specified versions',
-  inputSchema: ghReleaseCreateSchema,
-  outputSchema: ghReleaseCreateOutputSchema,
+  inputSchema: {
+    versions: z.string().describe('Comma-separated list of versions to create (e.g., "1.2.5, 1.2.6")'),
+    checkout: z.boolean().optional().describe('Checkout to the created branch (only works with single version)'),
+  },
+  outputSchema: {
+    createdBranches: z.array(z.string()).describe('List of created release branches'),
+    branchCount: z.number().describe('Number of branches created'),
+    isCheckedOut: z.boolean().describe('Whether the branch was checked out'),
+  },
   handler: ghReleaseCreate,
 }

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

@@ -4,8 +4,8 @@ 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 { getReleasePRs } from 'src/lib/gh-release-prs'
+import { logger } from 'src/lib/logger'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 interface GhReleaseDeliverArgs extends RequiredConfirmedOptionArg {
@@ -88,20 +88,16 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs): Promise<Tool
 }
 
 // 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,
+  inputSchema: {
+    version: z.string().describe('Version to deliver to production (e.g., "1.2.5")'),
+  },
+  outputSchema: {
+    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'),
+  },
   handler: ghReleaseDeliver,
 }

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

@@ -3,9 +3,9 @@ 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 { ENVs } from 'src/lib/constants'
+import { getReleasePRs } from 'src/lib/gh-release-prs'
+import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'
 
 interface GhReleaseDeployArgs {
@@ -97,22 +97,18 @@ export const ghReleaseDeploy = async (args: GhReleaseDeployArgs): Promise<ToolsE
 }
 
 // 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,
+  inputSchema: {
+    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")'),
+  },
+  outputSchema: {
+    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'),
+  },
   handler: ghReleaseDeploy,
 }

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

@@ -1,8 +1,8 @@
 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 { getReleasePRs } from 'src/lib/gh-release-prs'
+import { logger } from 'src/lib/logger'
+import { sortVersions } from 'src/lib/version-utils'
 import type { ToolsExecutionResult } from 'src/types'
 
 /**
@@ -34,17 +34,13 @@ export const ghReleaseList = async (): Promise<ToolsExecutionResult> => {
 }
 
 // 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'),
-})
-
 export const ghReleaseListMcpTool = {
   name: 'gh-release-list',
   description: 'List all open release branches',
-  inputSchema: ghReleaseListSchema,
-  outputSchema: ghReleaseListOutputSchema,
+  inputSchema: {},
+  outputSchema: {
+    releases: z.array(z.string()).describe('List of all release branches'),
+    count: z.number().describe('Number of release branches'),
+  },
   handler: ghReleaseList,
 }

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

@@ -4,10 +4,10 @@ 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 { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
+import { getReleasePRs } from 'src/lib/gh-release-prs'
+import { getCurrentWorktrees, getProjectRoot } from 'src/lib/git-utils'
+import { logger } from 'src/lib/logger'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 // Constants
@@ -153,19 +153,15 @@ const logResults = (created: string[]): void => {
 }
 
 // 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,
+  inputSchema: {
+    all: z.boolean().describe('Add worktrees for all release branches without prompting'),
+  },
+  outputSchema: {
+    createdWorktrees: z.array(z.string()).describe('List of created worktree branches'),
+    count: z.number().describe('Number of worktrees created'),
+  },
   handler: worktreesAdd,
 }

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

@@ -1,8 +1,8 @@
 import { z } from 'zod'
 import { $ } from 'zx'
 
-import { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'
-import { logger } from 'src/shared/logger'
+import { getCurrentWorktrees, getProjectRoot } from 'src/lib/git-utils'
+import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'
 
 interface WorktreeInfo {
@@ -281,32 +281,28 @@ const getStatusIndicator = (status: string): string => {
 }
 
 // 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,
+  inputSchema: {},
+  outputSchema: {
+    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'),
+  },
   handler: worktreesList,
 }

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

@@ -4,9 +4,9 @@ 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 { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
+import { getCurrentWorktrees, getProjectRoot } from 'src/lib/git-utils'
+import { logger } from 'src/lib/logger'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 // Constants
@@ -111,19 +111,15 @@ const logResults = (removed: string[]): void => {
 }
 
 // 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,
+  inputSchema: {
+    all: z.boolean().describe('Remove all worktrees without prompting'),
+  },
+  outputSchema: {
+    removedWorktrees: z.array(z.string()).describe('List of removed worktree branches'),
+    count: z.number().describe('Number of worktrees removed'),
+  },
   handler: worktreesRemove,
 }

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

@@ -3,10 +3,10 @@ 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 { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
+import { getReleasePRs } from 'src/lib/gh-release-prs'
+import { getCurrentWorktrees, getProjectRoot } from 'src/lib/git-utils'
+import { logger } from 'src/lib/logger'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 // Constants
@@ -121,17 +121,13 @@ const logResults = (removed: string[]): void => {
 }
 
 // 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,
+  inputSchema: {},
+  outputSchema: {
+    removedWorktrees: z.array(z.string()).describe('List of removed worktree branches'),
+    count: z.number().describe('Number of worktrees removed during sync'),
+  },
   handler: worktreesSync,
 }

package/src/entry/cli.ts

@@ -9,7 +9,7 @@ import { worktreesAdd } from 'src/commands/worktrees-add'
 import { worktreesList } from 'src/commands/worktrees-list'
 import { worktreesRemove } from 'src/commands/worktrees-remove'
 import { worktreesSync } from 'src/commands/worktrees-sync'
-import { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'
+import { validateGitHubCliAndAuth } from 'src/lib/gh-cli-auth'
 
 const program = new Command()
 

package/src/entry/mcp.ts

@@ -1,4 +1,4 @@
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio'
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import process from 'node:process'
 
 import { setupErrorHandlers } from 'src/lib/error-handlers'
@@ -12,6 +12,8 @@ const startServer = async () => {
   let server
   try {
     server = await createMcpServer()
+
+    logger.info('MCP Server instance created')
   } catch (error) {
     logger.error({ err: error, msg: 'Failed to create MCP server' })
     logger.error(`Fatal error during server creation.`)

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

@@ -1,7 +1,7 @@
 import process from 'node:process'
 import type { Logger } from 'pino'
 
-import { LOG_FILE_PATH } from 'src/shared/constants'
+import { LOG_FILE_PATH } from '../logger/index'
 
 /**
  * Setup error handlers for the application

package/src/{shared → lib}/gh-cli-auth/gh-cli-auth.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
 import { $ } from 'zx'
 
-import { logger } from 'src/shared/logger'
+import { logger } from 'src/lib/logger'
 
 /**
  * Validate GitHub CLI installation and authentication status and throw an error if not valid

package/src/{shared → lib}/gh-release-prs/gh-release-prs.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
 import { $ } from 'zx'
 
-import { logger } from 'src/shared/logger'
+import { logger } from 'src/lib/logger'
 
 interface ReleasePR {
   headRefName: string

package/src/lib/logger/index.ts

@@ -2,12 +2,13 @@ import process from 'node:process'
 import pino from 'pino'
 import pretty from 'pino-pretty'
 
-import { LOG_FILE_PATH } from 'src/shared/constants'
+// eslint-disable-next-line sonarjs/publicly-writable-directories
+export const LOG_FILE_PATH = '/tmp/mcp-infra-kit.log'
 
 export const initLoggerMcp = () => {
   const logLevel = process.argv.includes('--debug') ? 'debug' : 'info'
 
-  const logger = pino({ level: logLevel })
+  const logger = pino({ level: logLevel }, pino.destination({ dest: LOG_FILE_PATH }))
 
   logger.info(`Logger initialized with level: ${logLevel}. Logging to: ${LOG_FILE_PATH}`)
 
@@ -33,3 +34,6 @@ export const initLoggerCLI = () => {
 
   return logger
 }
+
+// Singleton logger instance for CLI usage
+export const logger = initLoggerCLI()

package/src/{shared → lib}/tool-handler/tool-handler.ts

@@ -1,7 +1,6 @@
+import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'
 
-import { logger } from '../logger'
-
 interface ToolHandlerArgs {
   toolName: string
   handler: (params: any) => Promise<ToolsExecutionResult>

package/src/mcp/prompts/index.ts

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

package/src/mcp/resources/index.ts

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

package/src/mcp/server.ts

@@ -1,15 +1,11 @@
-import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-
-import { initLoggerMcp } from 'src/lib/logger'
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 
 import { initializePrompts } from './prompts'
 import { initializeResources } from './resources'
 import { initializeTools } from './tools'
 
-const logger = initLoggerMcp()
-
 export async function createMcpServer() {
-  const server = new Server(
+  const server = new McpServer(
     {
       name: 'infra-kit',
       description: 'Infra Kit is a tool that helps you manage your infrastructure.',
@@ -28,7 +24,5 @@ export async function createMcpServer() {
   await initializeResources(server)
   await initializeTools(server)
 
-  logger.info('MCP Server instance created')
-
   return server
 }

package/src/mcp/tools/index.ts

@@ -1,4 +1,4 @@
-import type { Server } from '@modelcontextprotocol/sdk/server/index'
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 
 import { ghMergeDevMcpTool } from 'src/commands/gh-merge-dev'
 import { ghReleaseCreateMcpTool } from 'src/commands/gh-release-create'
@@ -9,7 +9,7 @@ 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'
+import { createToolHandler } from 'src/lib/tool-handler'
 
 const tools = [
   ghMergeDevMcpTool,
@@ -23,17 +23,14 @@ const tools = [
   worktreesSyncMcpTool,
 ]
 
-export const initializeTools = async (server: Server) => {
+export const initializeTools = async (server: McpServer) => {
   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/types.ts

@@ -1,9 +1,10 @@
 export interface ToolsExecutionResult {
+  [x: string]: unknown
   content: {
     type: 'text'
     text: string
   }[]
-  structuredContent?: unknown
+  structuredContent?: { [x: string]: unknown }
 }
 
 export interface RequiredConfirmedOptionArg {

package/src/shared/logger/index.ts

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