infra-kit 0.1.45 → 0.1.50

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'