@ankhorage/infra 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ankhorage/infra
 
+## 0.3.2
+
+### Patch Changes
+
+- f407622: Move the standalone infrastructure CLI and its tests under the canonical `src/cli/` package boundary while preserving the published `ankhorage-infra` binary.
+
+## 0.3.1
+
+### Patch Changes
+
+- 997af24: Release package command entry changes.
+
 ## 0.3.0
 
 ### Minor Changes

package/README.md

@@ -3,7 +3,7 @@
 
 # INFRA
 
-![license: MIT](././paradox/badges/license.svg) ![npm: v0.2.1](././paradox/badges/npm.svg) ![runtime: bun](././paradox/badges/runtime.svg) ![typescript: strict](././paradox/badges/typescript.svg) ![eslint: checked](././paradox/badges/eslint.svg) ![prettier: checked](././paradox/badges/prettier.svg) ![build: checked](././paradox/badges/build.svg) ![tests: checked](././paradox/badges/tests.svg) ![docs: paradox](././paradox/badges/docs.svg)
+![license: MIT](././paradox/badges/license.svg) ![npm: v0.3.0](././paradox/badges/npm.svg) ![runtime: bun](././paradox/badges/runtime.svg) ![typescript: strict](././paradox/badges/typescript.svg) ![eslint: checked](././paradox/badges/eslint.svg) ![prettier: checked](././paradox/badges/prettier.svg) ![build: checked](././paradox/badges/build.svg) ![tests: checked](././paradox/badges/tests.svg) ![docs: paradox](././paradox/badges/docs.svg)
 
 Executable infra provider and standalone CLI for Ankhorage project workflows.
 

package/dist/{cli.d.ts → cli/bin.d.ts}

@@ -1,10 +1,10 @@
 #!/usr/bin/env bun
-import type { InfraCommandContext, InfraCommandRunResult } from './commandContext.js';
-import { type InfraCommandServices, type RunInfraCommandImpl } from './commands.js';
+import type { InfraCommandContext, InfraCommandRunResult } from '../commandContext.js';
+import { type InfraCommandServices, type RunInfraCommandImpl } from '../commands.js';
 export interface InfraCliOptions {
     readonly context?: InfraCommandContext;
     readonly runCommandImpl?: RunInfraCommandImpl;
     readonly services?: Partial<InfraCommandServices>;
 }
 export declare function runCli(argv: readonly string[], options?: InfraCliOptions): Promise<InfraCommandRunResult>;
-//# sourceMappingURL=cli.d.ts.map
+//# sourceMappingURL=bin.d.ts.map

package/dist/cli/bin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../../src/cli/bin.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEvF,OAAO,EAEL,KAAK,oBAAoB,EAIzB,KAAK,mBAAmB,EACzB,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACnD;AAED,wBAAsB,MAAM,CAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,qBAAqB,CAAC,CA+BhC"}

package/dist/{cli.js → cli/bin.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
-import { createDefaultCommandContext } from './commandContext.js';
-import { findInfraCommandByStandaloneName, renderRootHelp, renderUnknownCommand, runInfraCommand, } from './commands.js';
+import { createDefaultCommandContext } from '../commandContext.js';
+import { findInfraCommandByStandaloneName, renderRootHelp, renderUnknownCommand, runInfraCommand, } from '../commands.js';
 export async function runCli(argv, options = {}) {
     const context = options.context ?? createDefaultCommandContext();
     const runCommand = options.runCommandImpl ?? runInfraCommand;
@@ -36,4 +36,4 @@ if (import.meta.main) {
     const result = await runCli(process.argv.slice(2));
     process.exit(result.exitCode);
 }
-//# sourceMappingURL=cli.js.map
+//# sourceMappingURL=bin.js.map

package/dist/cli/bin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin.js","sourceRoot":"","sources":["../../src/cli/bin.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EACL,gCAAgC,EAEhC,cAAc,EACd,oBAAoB,EACpB,eAAe,GAEhB,MAAM,gBAAgB,CAAC;AAQxB,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,IAAuB,EACvB,UAA2B,EAAE;IAE7B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,2BAA2B,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,IAAI,eAAe,CAAC;IAC7D,MAAM,CAAC,UAAU,EAAE,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC;IAEzC,IAAI,UAAU,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACrD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,OAAO,GAAG,gCAAgC,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,UAAU,CACf;QACE,IAAI,EAAE,UAAU;QAChB,OAAO;QACP,OAAO;KACR,EACD;QACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,MAAM,CAAC;AAClE,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AACxE,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAChC,CAAC","sourcesContent":["#!/usr/bin/env bun\n\nimport type { InfraCommandContext, InfraCommandRunResult } from '../commandContext.js';\nimport { createDefaultCommandContext } from '../commandContext.js';\nimport {\n  findInfraCommandByStandaloneName,\n  type InfraCommandServices,\n  renderRootHelp,\n  renderUnknownCommand,\n  runInfraCommand,\n  type RunInfraCommandImpl,\n} from '../commands.js';\n\nexport interface InfraCliOptions {\n  readonly context?: InfraCommandContext;\n  readonly runCommandImpl?: RunInfraCommandImpl;\n  readonly services?: Partial<InfraCommandServices>;\n}\n\nexport async function runCli(\n  argv: readonly string[],\n  options: InfraCliOptions = {},\n): Promise<InfraCommandRunResult> {\n  const context = options.context ?? createDefaultCommandContext();\n  const runCommand = options.runCommandImpl ?? runInfraCommand;\n  const [firstToken, ...restTokens] = argv;\n\n  if (firstToken === undefined || isHelpToken(firstToken)) {\n    context.writeStdout(renderRootHelp(context.version));\n    return { exitCode: 0 };\n  }\n\n  if (isVersionToken(firstToken)) {\n    context.writeStdout(`${context.version}\\n`);\n    return { exitCode: 0 };\n  }\n\n  const command = findInfraCommandByStandaloneName(firstToken);\n  if (command === null) {\n    context.writeStderr(renderUnknownCommand(firstToken));\n    return { exitCode: 1 };\n  }\n\n  return runCommand(\n    {\n      argv: restTokens,\n      command,\n      context,\n    },\n    {\n      services: options.services,\n    },\n  );\n}\n\nfunction isHelpToken(value: string): boolean {\n  return value === '--help' || value === '-h' || value === 'help';\n}\n\nfunction isVersionToken(value: string): boolean {\n  return value === '--version' || value === '-v' || value === 'version';\n}\n\nif (import.meta.main) {\n  const result = await runCli(process.argv.slice(2));\n  process.exit(result.exitCode);\n}\n"]}

package/dist/{ankh.provider.d.ts → cli/index.d.ts}

@@ -1,5 +1,5 @@
 import type { AnkhRuntimeCommandProvider } from '@ankhorage/ankh';
-import { type InfraCommandServices, type RunInfraCommandImpl } from './commands.js';
+import { type InfraCommandServices, type RunInfraCommandImpl } from '../commands.js';
 export interface CreateInfraRuntimeProviderOptions {
     readonly runCommandImpl?: RunInfraCommandImpl;
     readonly services?: Partial<InfraCommandServices>;
@@ -7,4 +7,4 @@ export interface CreateInfraRuntimeProviderOptions {
 export declare function createInfraRuntimeProvider(options?: CreateInfraRuntimeProviderOptions): AnkhRuntimeCommandProvider;
 declare const provider: AnkhRuntimeCommandProvider;
 export default provider;
-//# sourceMappingURL=ankh.provider.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist/cli/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAGL,KAAK,oBAAoB,EAEzB,KAAK,mBAAmB,EACzB,MAAM,gBAAgB,CAAC;AAQxB,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACnD;AAED,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,iCAAsC,GAC9C,0BAA0B,CAyB5B;AAED,QAAA,MAAM,QAAQ,4BAA+B,CAAC;AAE9C,eAAe,QAAQ,CAAC"}

package/dist/{ankh.provider.js → cli/index.js}

@@ -1,5 +1,5 @@
-import { createProviderCommandDescriptors, INFRA_COMMANDS, runInfraCommand, } from './commands.js';
-import { INFRA_CAPABILITIES, INFRA_COMMAND_CATEGORY, INFRA_PACKAGE_NAME, INFRA_PACKAGE_VERSION, } from './packageMetadata.js';
+import { createProviderCommandDescriptors, INFRA_COMMANDS, runInfraCommand, } from '../commands.js';
+import { INFRA_CAPABILITIES, INFRA_COMMAND_CATEGORY, INFRA_PACKAGE_NAME, INFRA_PACKAGE_VERSION, } from '../packageMetadata.js';
 export function createInfraRuntimeProvider(options = {}) {
     const runCommandImpl = options.runCommandImpl ?? runInfraCommand;
     return {
@@ -24,4 +24,4 @@ export function createInfraRuntimeProvider(options = {}) {
 }
 const provider = createInfraRuntimeProvider();
 export default provider;
-//# sourceMappingURL=ankh.provider.js.map
+//# sourceMappingURL=index.js.map

package/dist/cli/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gCAAgC,EAChC,cAAc,EAEd,eAAe,GAEhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,uBAAuB,CAAC;AAO/B,MAAM,UAAU,0BAA0B,CACxC,UAA6C,EAAE;IAE/C,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,eAAe,CAAC;IAEjE,OAAO;QACL,EAAE,EAAE,kBAAkB;QACtB,QAAQ,EAAE,sBAAsB;QAChC,OAAO,EAAE,qBAAqB;QAC9B,YAAY,EAAE,CAAC,GAAG,kBAAkB,CAAC;QACrC,QAAQ,EAAE,gCAAgC,EAAE;QAC5C,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,CAAC,OAAO;gBACb,OAAO,cAAc,CACnB;oBACE,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,OAAO;oBACP,OAAO,EAAE,OAAO,CAAC,OAAO;iBACzB,EACD;oBACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;KACiC,CAAC;AACzC,CAAC;AAED,MAAM,QAAQ,GAAG,0BAA0B,EAAE,CAAC;AAE9C,eAAe,QAAQ,CAAC","sourcesContent":["import type { AnkhRuntimeCommandProvider } from '@ankhorage/ankh';\n\nimport {\n  createProviderCommandDescriptors,\n  INFRA_COMMANDS,\n  type InfraCommandServices,\n  runInfraCommand,\n  type RunInfraCommandImpl,\n} from '../commands.js';\nimport {\n  INFRA_CAPABILITIES,\n  INFRA_COMMAND_CATEGORY,\n  INFRA_PACKAGE_NAME,\n  INFRA_PACKAGE_VERSION,\n} from '../packageMetadata.js';\n\nexport interface CreateInfraRuntimeProviderOptions {\n  readonly runCommandImpl?: RunInfraCommandImpl;\n  readonly services?: Partial<InfraCommandServices>;\n}\n\nexport function createInfraRuntimeProvider(\n  options: CreateInfraRuntimeProviderOptions = {},\n): AnkhRuntimeCommandProvider {\n  const runCommandImpl = options.runCommandImpl ?? runInfraCommand;\n\n  return {\n    id: INFRA_PACKAGE_NAME,\n    category: INFRA_COMMAND_CATEGORY,\n    version: INFRA_PACKAGE_VERSION,\n    capabilities: [...INFRA_CAPABILITIES],\n    commands: createProviderCommandDescriptors(),\n    handlers: INFRA_COMMANDS.map((command) => ({\n      path: command.path,\n      handler(request) {\n        return runCommandImpl(\n          {\n            argv: request.argv,\n            command,\n            context: request.context,\n          },\n          {\n            services: options.services,\n          },\n        );\n      },\n    })),\n  } satisfies AnkhRuntimeCommandProvider;\n}\n\nconst provider = createInfraRuntimeProvider();\n\nexport default provider;\n"]}

package/dist/readme-usage.js

@@ -1,4 +1,4 @@
-import { runCli } from './cli.js';
+import { runCli } from './cli/bin.js';
 /***
  * Provider and CLI surface
  *

package/dist/readme-usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"readme-usage.js","sourceRoot":"","sources":["../src/readme-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC","sourcesContent":["import { runCli } from './cli.js';\n\n/***\n * Provider and CLI surface\n *\n * `@ankhorage/infra` owns infra command behavior.\n *\n * The same shared command implementation backs both:\n *\n * - `ankh infra ...`\n * - `bunx @ankhorage/infra ...`\n *\n * Current command surface:\n *\n * - `validate`\n * - `generate`\n * - `status`\n * - `up`\n * - `down`\n *\n * `status` runs the generated live runtime status script for a project.\n *\n * Project resolution is project-aware:\n *\n * - pass `[project]`, or\n * - omit it when cwd is already inside `apps/<project>`\n *\n * @usage\n */\nawait runCli(['--help']);\n"]}
+{"version":3,"file":"readme-usage.js","sourceRoot":"","sources":["../src/readme-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC","sourcesContent":["import { runCli } from './cli/bin.js';\n\n/***\n * Provider and CLI surface\n *\n * `@ankhorage/infra` owns infra command behavior.\n *\n * The same shared command implementation backs both:\n *\n * - `ankh infra ...`\n * - `bunx @ankhorage/infra ...`\n *\n * Current command surface:\n *\n * - `validate`\n * - `generate`\n * - `status`\n * - `up`\n * - `down`\n *\n * `status` runs the generated live runtime status script for a project.\n *\n * Project resolution is project-aware:\n *\n * - pass `[project]`, or\n * - omit it when cwd is already inside `apps/<project>`\n *\n * @usage\n */\nawait runCli(['--help']);\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ankhorage/infra",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Project-aware infrastructure generation library and executable Ankh provider for Ankhorage.",
   "homepage": "https://github.com/ankhorage/infra#readme",
   "bugs": {
@@ -49,6 +49,11 @@
       "import": "./dist/index.js",
       "default": "./dist/index.js"
     },
+    "./cli": {
+      "types": "./dist/cli/index.d.ts",
+      "import": "./dist/cli/index.js",
+      "default": "./dist/cli/index.js"
+    },
     "./metadata": {
       "types": "./dist/metadata/index.d.ts",
       "import": "./dist/metadata/index.js",
@@ -57,11 +62,11 @@
     "./package.json": "./package.json"
   },
   "bin": {
-    "ankhorage-infra": "./dist/cli.js"
+    "ankhorage-infra": "./dist/cli/bin.js"
   },
   "ankh": {
     "category": "infra",
-    "provider": "./dist/ankh.provider.js",
+    "provider": "./dist/cli/index.js",
     "capabilities": [
       "infra.validate",
       "infra.generate",

package/src/{cli.ts → cli/bin.ts}

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 
-import type { InfraCommandContext, InfraCommandRunResult } from './commandContext.js';
-import { createDefaultCommandContext } from './commandContext.js';
+import type { InfraCommandContext, InfraCommandRunResult } from '../commandContext.js';
+import { createDefaultCommandContext } from '../commandContext.js';
 import {
   findInfraCommandByStandaloneName,
   type InfraCommandServices,
@@ -9,7 +9,7 @@ import {
   renderUnknownCommand,
   runInfraCommand,
   type RunInfraCommandImpl,
-} from './commands.js';
+} from '../commands.js';
 
 export interface InfraCliOptions {
   readonly context?: InfraCommandContext;

package/src/{cli.test.ts → cli/cli.test.ts}

@@ -6,9 +6,9 @@ import {
 } from '@ankhorage/ankh';
 import { describe, expect, test } from 'bun:test';
 
-import { createInfraRuntimeProvider } from './ankh.provider.js';
-import { runCli } from './cli.js';
-import { createCapturedCommandContext } from './testSupport.js';
+import { createCapturedCommandContext } from '../testSupport.js';
+import { runCli } from './bin.js';
+import { createInfraRuntimeProvider } from './index.js';
 
 describe('standalone cli and provider-backed dispatch', () => {
   test('prints help and version for the standalone CLI', async () => {
@@ -108,7 +108,7 @@ function createDiscoveredPackage(): AnkhDiscoveredPackage {
   return {
     metadata: {
       category: 'infra',
-      provider: './dist/ankh.provider.js',
+      provider: './dist/cli/index.js',
       capabilities: ['infra.validate', 'infra.generate', 'infra.status', 'infra.up', 'infra.down'],
     },
     packageJsonPath: '/workspace/package.json',
@@ -131,7 +131,7 @@ function createLoadedProvider(
       commands: provider.commands,
     },
     providerModuleDefaultExport: provider,
-    providerModulePath: '/workspace/dist/ankh.provider.js',
-    providerModuleUrl: 'file:///workspace/dist/ankh.provider.js',
+    providerModulePath: '/workspace/dist/cli/index.js',
+    providerModuleUrl: 'file:///workspace/dist/cli/index.js',
   };
 }

package/src/{ankh.provider.test.ts → cli/index.test.ts}

@@ -1,10 +1,10 @@
 import type { AnkhRuntimeCommandProvider } from '@ankhorage/ankh';
 import { describe, expect, test } from 'bun:test';
 
-import provider, { createInfraRuntimeProvider } from './ankh.provider.js';
-import { createProviderCommandDescriptors, INFRA_COMMANDS } from './commands.js';
+import { createProviderCommandDescriptors, INFRA_COMMANDS } from '../commands.js';
+import provider, { createInfraRuntimeProvider } from './index.js';
 
-describe('ankh provider', () => {
+describe('infra package cli provider', () => {
   test('publishes the expected runtime provider shape', () => {
     const expectedProvider = createInfraRuntimeProvider() satisfies AnkhRuntimeCommandProvider;
 

package/src/{ankh.provider.ts → cli/index.ts}

@@ -6,13 +6,13 @@ import {
   type InfraCommandServices,
   runInfraCommand,
   type RunInfraCommandImpl,
-} from './commands.js';
+} from '../commands.js';
 import {
   INFRA_CAPABILITIES,
   INFRA_COMMAND_CATEGORY,
   INFRA_PACKAGE_NAME,
   INFRA_PACKAGE_VERSION,
-} from './packageMetadata.js';
+} from '../packageMetadata.js';
 
 export interface CreateInfraRuntimeProviderOptions {
   readonly runCommandImpl?: RunInfraCommandImpl;

package/src/package.test.ts

@@ -7,14 +7,14 @@ describe('package metadata', () => {
   test('publishes the expected Ankh metadata and bin entry', () => {
     const expectedAnkhMetadata = {
       category: 'infra',
-      provider: './dist/ankh.provider.js',
+      provider: './dist/cli/index.js',
       capabilities: ['infra.validate', 'infra.generate', 'infra.status', 'infra.up', 'infra.down'],
     } as const satisfies AnkhPackageMetadata;
 
     expect(packageJson.name).toBe('@ankhorage/infra');
     expect(packageJson.type).toBe('module');
     expect(packageJson.bin).toEqual({
-      'ankhorage-infra': './dist/cli.js',
+      'ankhorage-infra': './dist/cli/bin.js',
     });
     expect(packageJson.ankh).toEqual(expectedAnkhMetadata);
     expect(JSON.parse(JSON.stringify(expectedAnkhMetadata))).toEqual(expectedAnkhMetadata);

package/src/readme-usage.ts

@@ -1,4 +1,4 @@
-import { runCli } from './cli.js';
+import { runCli } from './cli/bin.js';
 
 /***
  * Provider and CLI surface

package/dist/ankh.provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ankh.provider.d.ts","sourceRoot":"","sources":["../src/ankh.provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAGL,KAAK,oBAAoB,EAEzB,KAAK,mBAAmB,EACzB,MAAM,eAAe,CAAC;AAQvB,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACnD;AAED,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,iCAAsC,GAC9C,0BAA0B,CAyB5B;AAED,QAAA,MAAM,QAAQ,4BAA+B,CAAC;AAE9C,eAAe,QAAQ,CAAC"}

package/dist/ankh.provider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ankh.provider.js","sourceRoot":"","sources":["../src/ankh.provider.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gCAAgC,EAChC,cAAc,EAEd,eAAe,GAEhB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAO9B,MAAM,UAAU,0BAA0B,CACxC,UAA6C,EAAE;IAE/C,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,eAAe,CAAC;IAEjE,OAAO;QACL,EAAE,EAAE,kBAAkB;QACtB,QAAQ,EAAE,sBAAsB;QAChC,OAAO,EAAE,qBAAqB;QAC9B,YAAY,EAAE,CAAC,GAAG,kBAAkB,CAAC;QACrC,QAAQ,EAAE,gCAAgC,EAAE;QAC5C,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,CAAC,OAAO;gBACb,OAAO,cAAc,CACnB;oBACE,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,OAAO;oBACP,OAAO,EAAE,OAAO,CAAC,OAAO;iBACzB,EACD;oBACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;KACiC,CAAC;AACzC,CAAC;AAED,MAAM,QAAQ,GAAG,0BAA0B,EAAE,CAAC;AAE9C,eAAe,QAAQ,CAAC","sourcesContent":["import type { AnkhRuntimeCommandProvider } from '@ankhorage/ankh';\n\nimport {\n  createProviderCommandDescriptors,\n  INFRA_COMMANDS,\n  type InfraCommandServices,\n  runInfraCommand,\n  type RunInfraCommandImpl,\n} from './commands.js';\nimport {\n  INFRA_CAPABILITIES,\n  INFRA_COMMAND_CATEGORY,\n  INFRA_PACKAGE_NAME,\n  INFRA_PACKAGE_VERSION,\n} from './packageMetadata.js';\n\nexport interface CreateInfraRuntimeProviderOptions {\n  readonly runCommandImpl?: RunInfraCommandImpl;\n  readonly services?: Partial<InfraCommandServices>;\n}\n\nexport function createInfraRuntimeProvider(\n  options: CreateInfraRuntimeProviderOptions = {},\n): AnkhRuntimeCommandProvider {\n  const runCommandImpl = options.runCommandImpl ?? runInfraCommand;\n\n  return {\n    id: INFRA_PACKAGE_NAME,\n    category: INFRA_COMMAND_CATEGORY,\n    version: INFRA_PACKAGE_VERSION,\n    capabilities: [...INFRA_CAPABILITIES],\n    commands: createProviderCommandDescriptors(),\n    handlers: INFRA_COMMANDS.map((command) => ({\n      path: command.path,\n      handler(request) {\n        return runCommandImpl(\n          {\n            argv: request.argv,\n            command,\n            context: request.context,\n          },\n          {\n            services: options.services,\n          },\n        );\n      },\n    })),\n  } satisfies AnkhRuntimeCommandProvider;\n}\n\nconst provider = createInfraRuntimeProvider();\n\nexport default provider;\n"]}

package/dist/cli.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAEtF,OAAO,EAEL,KAAK,oBAAoB,EAIzB,KAAK,mBAAmB,EACzB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACnD;AAED,wBAAsB,MAAM,CAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,qBAAqB,CAAC,CA+BhC"}

package/dist/cli.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,gCAAgC,EAEhC,cAAc,EACd,oBAAoB,EACpB,eAAe,GAEhB,MAAM,eAAe,CAAC;AAQvB,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,IAAuB,EACvB,UAA2B,EAAE;IAE7B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,2BAA2B,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,IAAI,eAAe,CAAC;IAC7D,MAAM,CAAC,UAAU,EAAE,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC;IAEzC,IAAI,UAAU,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACrD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,OAAO,GAAG,gCAAgC,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,UAAU,CACf;QACE,IAAI,EAAE,UAAU;QAChB,OAAO;QACP,OAAO;KACR,EACD;QACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,MAAM,CAAC;AAClE,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AACxE,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAChC,CAAC","sourcesContent":["#!/usr/bin/env bun\n\nimport type { InfraCommandContext, InfraCommandRunResult } from './commandContext.js';\nimport { createDefaultCommandContext } from './commandContext.js';\nimport {\n  findInfraCommandByStandaloneName,\n  type InfraCommandServices,\n  renderRootHelp,\n  renderUnknownCommand,\n  runInfraCommand,\n  type RunInfraCommandImpl,\n} from './commands.js';\n\nexport interface InfraCliOptions {\n  readonly context?: InfraCommandContext;\n  readonly runCommandImpl?: RunInfraCommandImpl;\n  readonly services?: Partial<InfraCommandServices>;\n}\n\nexport async function runCli(\n  argv: readonly string[],\n  options: InfraCliOptions = {},\n): Promise<InfraCommandRunResult> {\n  const context = options.context ?? createDefaultCommandContext();\n  const runCommand = options.runCommandImpl ?? runInfraCommand;\n  const [firstToken, ...restTokens] = argv;\n\n  if (firstToken === undefined || isHelpToken(firstToken)) {\n    context.writeStdout(renderRootHelp(context.version));\n    return { exitCode: 0 };\n  }\n\n  if (isVersionToken(firstToken)) {\n    context.writeStdout(`${context.version}\\n`);\n    return { exitCode: 0 };\n  }\n\n  const command = findInfraCommandByStandaloneName(firstToken);\n  if (command === null) {\n    context.writeStderr(renderUnknownCommand(firstToken));\n    return { exitCode: 1 };\n  }\n\n  return runCommand(\n    {\n      argv: restTokens,\n      command,\n      context,\n    },\n    {\n      services: options.services,\n    },\n  );\n}\n\nfunction isHelpToken(value: string): boolean {\n  return value === '--help' || value === '-h' || value === 'help';\n}\n\nfunction isVersionToken(value: string): boolean {\n  return value === '--version' || value === '-v' || value === 'version';\n}\n\nif (import.meta.main) {\n  const result = await runCli(process.argv.slice(2));\n  process.exit(result.exitCode);\n}\n"]}