infra-kit 0.1.44 → 0.1.50

package/scripts/build.js

@@ -9,7 +9,6 @@ const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 
 const OUT_DIR = resolve(__dirname, '../dist')
-
 const ENTRY_DIR = resolve(__dirname, '../src/entry')
 
 const entryPoints = fs.readdirSync(ENTRY_DIR).map((file) => resolve(ENTRY_DIR, file))

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

@@ -76,13 +76,11 @@ export const ghMergeDev = async (args: GhMergeDevArgs): Promise<ToolsExecutionRe
     logger.info('📋 Manual merge script for failed branches:\n')
     logger.info('```bash')
     for (const branch of failedBranches) {
-      logger.info(`# Merge dev into ${branch}`)
+      logger.info(`# Phase #1: Merge dev into ${branch}`)
       logger.info(`git switch ${branch} && git pull origin ${branch} && git merge origin/dev`)
-      logger.info(`# Resolve conflicts if any, then:`)
+      logger.info(`# Phase #2:Resolve conflicts if any, then:`)
       logger.info(`git push origin ${branch} && git switch dev`)
-      logger.info('')
     }
-    logger.info('```\n')
     logger.info(
       `✅ ${selectedReleaseBranches.length - failedBranches.length}/${selectedReleaseBranches.length} merges completed successfully.`,
     )
@@ -120,11 +118,11 @@ const mergeDev = async (branch: string): Promise<boolean> => {
 
     await $`git switch dev`
 
-    logger.info(`✔️ Successfully merged dev into ${branch}`)
+    logger.info(`Successfully merged dev into ${branch}`)
 
     return true
   } catch (error: unknown) {
-    logger.error({ error, branch }, `❌ Error merging dev into ${branch}`)
+    logger.error({ error, branch }, `Error merging dev into ${branch}`)
 
     await $`git reset --merge HEAD~1`
 

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

@@ -58,6 +58,8 @@ export const ghReleaseCreate = async (args: GhReleaseCreateArgs): Promise<ToolsE
     process.exit(0)
   }
 
+  $.quiet = true
+
   await $`git fetch origin`
 
   await $`git switch dev`
@@ -75,14 +77,14 @@ export const ghReleaseCreate = async (args: GhReleaseCreateArgs): Promise<ToolsE
   if (isCheckedOut) {
     const branchName = `release/v${versionsList[0]}`
 
-    logger.info(`🔄 Checking out to ${branchName}...`)
-
     await $`git switch ${branchName}`
 
-    logger.info(`✅ Switched to branch ${branchName}`)
+    logger.info(`🔄 Switched to branch ${branchName}`)
   }
 
-  logger.info('✅ All release branches were created successfully.')
+  logger.info(`${versionsList.length} release branches were created successfully.`)
+
+  $.quiet = false
 
   const structuredContent = {
     createdBranches: versionsList.map((version) => `release/v${version}`),
@@ -107,8 +109,6 @@ export const ghReleaseCreate = async (args: GhReleaseCreateArgs): Promise<ToolsE
 async function createReleaseBranch(version: string) {
   const branchName = `release/v${version}`
 
-  logger.info(`Creating release branch ${branchName}...`)
-
   try {
     await $`git switch dev`
     await $`git pull origin dev`
@@ -122,7 +122,7 @@ async function createReleaseBranch(version: string) {
     await $`gh pr create --title "Release v${version}" --body "Release v${version}" --base dev --head ${branchName}`
 
     await $`git switch dev`
-    logger.info(`✔️ Successfully created release branch: ${branchName}`)
+    logger.info(`Successfully created release branch: ${branchName}`)
   } catch (error: unknown) {
     logger.error({ error, branchName }, `Error creating release branch ${branchName}`)
   }

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

@@ -52,19 +52,26 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs): Promise<Tool
   }
 
   try {
+    $.quiet = true
+
     await $`gh pr merge ${selectedReleaseBranch} --squash --admin --delete-branch` // TODO: add --body (AI for generate message)
 
     await $`gh pr create --base main --head dev --title "Release v${selectedReleaseBranch.replace('release/v', '')} (RC)" --body ""`
 
     await $`gh pr merge dev --squash --admin`
 
+    $.quiet = false
+
     await $`gh workflow run deploy-all.yml --ref main -f environment=prod`
 
+    $.quiet = true
+
     // Merge main into dev
     await $`git switch main && git pull && git switch dev && git pull && git merge main --no-edit && git push`
 
-    logger.info('\n')
-    logger.info(`✔️ Successfully delivered ${selectedReleaseBranch} to production!`)
+    $.quiet = false
+
+    logger.info(`Successfully delivered ${selectedReleaseBranch} to production!`)
 
     const structuredContent = {
       releaseBranch: selectedReleaseBranch,

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

@@ -67,11 +67,14 @@ export const ghReleaseDeploy = async (args: GhReleaseDeployArgs): Promise<ToolsE
   }
 
   try {
+    $.quiet = true
+
     await $`gh workflow run deploy-all.yml --ref ${selectedReleaseBranch} -f environment=${selectedEnv}`
 
-    logger.info('\n')
+    $.quiet = false
+
     logger.info(
-      `✅ Successfully launched deploy-all workflow_dispatch for release branch: ${selectedReleaseBranch} and environment: ${selectedEnv}`,
+      `Successfully launched deploy-all workflow_dispatch for release branch: ${selectedReleaseBranch} and environment: ${selectedEnv}`,
     )
 
     const structuredContent = {

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

@@ -2,7 +2,6 @@ import { z } from 'zod'
 
 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'
 
 /**
@@ -12,14 +11,13 @@ export const ghReleaseList = async (): Promise<ToolsExecutionResult> => {
   const releasePRs = await getReleasePRs()
 
   const releasePRsList = releasePRs.map((pr) => pr.replace('release/', ''))
-  const sortedReleases = sortVersions(releasePRsList)
 
   logger.info('All release branches: \n')
-  logger.info(sortedReleases.join('\n'))
+  logger.info(`\n${releasePRsList.join('\n')}`)
 
   const structuredContent = {
-    releases: sortedReleases,
-    count: sortedReleases.length,
+    releases: releasePRsList,
+    count: releasePRsList.length,
   }
 
   return {

package/src/entry/cli.ts

@@ -1,5 +1,6 @@
 import { Command } from 'commander'
 
+// Commands
 import { ghMergeDev } from 'src/commands/gh-merge-dev'
 import { ghReleaseCreate } from 'src/commands/gh-release-create'
 import { ghReleaseDeliver } from 'src/commands/gh-release-deliver'
@@ -9,7 +10,8 @@ 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/lib/gh-cli-auth'
+// Integrations
+import { validateGitHubCliAndAuth } from 'src/integrations/gh'
 
 const program = new Command()
 

package/src/integrations/acli/acli-auth/acli-auth.ts

@@ -0,0 +1,25 @@
+import process from 'node:process'
+import { $ } from 'zx'
+
+import { logger } from 'src/lib/logger'
+
+/**
+ * Validate Atlassian CLI installation and authentication status and throw an error if not valid
+ */
+export const validateAtlassianCliAndAuth = async () => {
+  try {
+    await $`acli --version`
+  } catch (error: unknown) {
+    logger.error({ error }, 'Error: Atlassian CLI (atlassian) is not installed.')
+    logger.error('Please install it from: https://developer.atlassian.com/cloud/acli/guides/install-macos/')
+    process.exit(1)
+  }
+
+  try {
+    await $`gh auth status`
+  } catch (error: unknown) {
+    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/integrations/acli/acli-auth/index.ts

@@ -0,0 +1 @@
+export { validateAtlassianCliAndAuth } from './acli-auth'

package/src/integrations/acli/index.ts

@@ -0,0 +1 @@
+export { validateAtlassianCliAndAuth } from './acli-auth'

package/src/integrations/gh/index.ts

@@ -0,0 +1 @@
+export { validateGitHubCliAndAuth } from './gh-cli-auth'

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

@@ -2,6 +2,7 @@ import process from 'node:process'
 import { $ } from 'zx'
 
 import { logger } from 'src/lib/logger'
+import { sortVersions } from 'src/lib/version-utils'
 
 interface ReleasePR {
   headRefName: string
@@ -13,10 +14,10 @@ interface ReleasePR {
 
 /**
  * Fetch open release PRs from GitHub with 'Release' in the title and base 'dev'.
- * Returns an array of headRefName strings.
+ * Returns an array of headRefName strings sorted by semver in ascending order.
  * Throws an error if fetching fails.
  *
- * @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24]
+ * @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24] (sorted by semver)
  */
 export const getReleasePRs = async (): Promise<string[]> => {
   try {
@@ -31,7 +32,8 @@ export const getReleasePRs = async (): Promise<string[]> => {
       process.exit(1)
     }
 
-    return releasePRsArray.map((pr) => pr.headRefName)
+    const headRefNames = releasePRsArray.map((pr) => pr.headRefName)
+    return sortVersions(headRefNames)
   } catch (error) {
     logger.error({ error }, '❌ Error fetching release PRs')
     process.exit(1)

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

@@ -7,9 +7,10 @@ export const parseVersion = (versionStr: string): [number, number, number] => {
 
 /**
  * Sort version strings in ascending order
+ * Note: Returns a new sorted array without mutating the original
  */
 export const sortVersions = (versions: string[]): string[] => {
-  return versions.sort((a, b) => {
+  return [...versions].sort((a, b) => {
     const [majA, minA, patchA] = parseVersion(a)
     const [majB, minB, patchB] = parseVersion(b)
 

package/src/mcp/server.ts

@@ -8,7 +8,6 @@ export async function createMcpServer() {
   const server = new McpServer(
     {
       name: 'infra-kit',
-      description: 'Infra Kit is a tool that helps you manage your infrastructure.',
       version: '0.1.0',
     },
     {

package/tsconfig.json

@@ -8,7 +8,7 @@
     "lib": ["ESNext"],
     "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "allowJs": true,

package/vitest.config.ts

@@ -0,0 +1,16 @@
+import react from '@vitejs/plugin-react-swc'
+import path from 'node:path'
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig(() => ({
+  plugins: [react()],
+  resolve: {
+    alias: {
+      '#root': path.resolve(__dirname, './src'),
+    },
+  },
+  test: {
+    environment: 'jsdom',
+    setupFiles: ['./vitest.setup.ts'],
+  },
+}))

package/vitest.setup.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom/vitest'