incur 0.3.1 → 0.3.3

package/src/Fetch.test.ts

@@ -66,13 +66,7 @@ describe('parseArgv', () => {
   })
 
   test('multiple headers', () => {
-    const input = Fetch.parseArgv([
-      'users',
-      '-H',
-      'X-A: 1',
-      '-H',
-      'X-B: 2',
-    ])
+    const input = Fetch.parseArgv(['users', '-H', 'X-A: 1', '-H', 'X-B: 2'])
     expect(input.headers.get('X-A')).toBe('1')
     expect(input.headers.get('X-B')).toBe('2')
   })
@@ -123,16 +117,12 @@ describe('buildRequest', () => {
   })
 
   test('builds POST request with body', () => {
-    const req = Fetch.buildRequest(
-      Fetch.parseArgv(['users', '-X', 'POST', '-d', '{"name":"Bob"}']),
-    )
+    const req = Fetch.buildRequest(Fetch.parseArgv(['users', '-X', 'POST', '-d', '{"name":"Bob"}']))
     expect(req.method).toBe('POST')
   })
 
   test('builds request with headers', () => {
-    const req = Fetch.buildRequest(
-      Fetch.parseArgv(['users', '-H', 'X-Api-Key: secret']),
-    )
+    const req = Fetch.buildRequest(Fetch.parseArgv(['users', '-H', 'X-Api-Key: secret']))
     expect(req.headers.get('X-Api-Key')).toBe('secret')
   })
 })

package/src/Fetch.ts

@@ -102,8 +102,7 @@ export function buildRequest(input: FetchInput): Request {
 
   if (input.body !== undefined) {
     init.body = input.body
-    if (!input.headers.has('content-type'))
-      input.headers.set('content-type', 'application/json')
+    if (!input.headers.has('content-type')) input.headers.set('content-type', 'application/json')
   }
 
   return new Request(url.toString(), init)

package/src/Filter.ts

@@ -97,7 +97,12 @@ function resolve(data: unknown, segments: Segment[], index: number): unknown {
   return sliced.map((item) => resolve(item, segments, index + 1))
 }
 
-function merge(target: Record<string, unknown>, data: unknown, segments: Segment[], index: number): void {
+function merge(
+  target: Record<string, unknown>,
+  data: unknown,
+  segments: Segment[],
+  index: number,
+): void {
   if (index >= segments.length || typeof data !== 'object' || data === null) return
   const segment = segments[index]!
 
@@ -129,8 +134,7 @@ function merge(target: Record<string, unknown>, data: unknown, segments: Segment
 
     // Next segment is a key — recurse into nested object
     if (typeof val !== 'object' || val === null) return
-    if (!target[segment.key] || typeof target[segment.key] !== 'object')
-      target[segment.key] = {}
+    if (!target[segment.key] || typeof target[segment.key] !== 'object') target[segment.key] = {}
     merge(target[segment.key] as Record<string, unknown>, val, segments, index + 1)
     return
   }

package/src/Help.test.ts

@@ -99,6 +99,26 @@ describe('formatCommand', () => {
     expect(result).toContain('Verbosity level')
   })
 
+  test('shows enum values for z.enum options', () => {
+    const result = Help.formatCommand('tool deploy', {
+      options: z.object({
+        env: z.enum(['staging', 'production']).describe('Target environment'),
+      }),
+    })
+    expect(result).toContain('--env <staging|production>')
+  })
+
+  test('shows literal values for z.union of z.literal options', () => {
+    const result = Help.formatCommand('tool deploy', {
+      options: z.object({
+        level: z
+          .union([z.literal('low'), z.literal('medium'), z.literal('high')])
+          .describe('Priority level'),
+      }),
+    })
+    expect(result).toContain('--level <low|medium|high>')
+  })
+
   test('shows [deprecated] tag for deprecated options', () => {
     const result = Help.formatCommand('tool deploy', {
       description: 'Deploy app',
@@ -179,9 +199,9 @@ describe('formatRoot', () => {
     })
     expect(result).toMatchInlineSnapshot(`
       "my-tool@1.0.0 — A test CLI
-      Aliases: mt, myt
 
       Usage: my-tool <command>
+      Aliases: mt, myt
 
       Commands:
         fetch  Fetch a URL
@@ -208,9 +228,9 @@ describe('formatRoot', () => {
     })
     expect(result).toMatchInlineSnapshot(`
       "my-tool@1.0.0 — A test CLI
-      Aliases: mt, myt
 
       Usage: my-tool <url>
+      Aliases: mt, myt
 
       Arguments:
         url  URL to fetch

package/src/Help.ts

@@ -8,11 +8,11 @@ export function formatRoot(name: string, options: formatRoot.Options = {}): stri
   // Header
   const title = version ? `${name}@${version}` : name
   lines.push(description ? `${title} \u2014 ${description}` : title)
-  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
   lines.push('')
 
   // Synopsis
   lines.push(`Usage: ${name} <command>`)
+  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
 
   // Commands
   if (commands.length > 0) {
@@ -105,7 +105,6 @@ export function formatCommand(name: string, options: formatCommand.Options = {})
   // Header
   const title = version ? `${name}@${version}` : name
   lines.push(description ? `${title} \u2014 ${description}` : title)
-  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
   lines.push('')
 
   // Synopsis
@@ -128,6 +127,7 @@ export function formatCommand(name: string, options: formatCommand.Options = {})
     const commandSuffix = options.commands && options.commands.length > 0 ? ' | <command>' : ''
     lines.push(`Usage: ${synopsis}${opts ? ' [options]' : ''}${commandSuffix}`)
   }
+  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
 
   // Arguments
   if (args) {
@@ -165,10 +165,10 @@ export function formatCommand(name: string, options: formatCommand.Options = {})
     lines.push('')
     lines.push('Examples:')
     const maxLen = Math.max(
-      ...examples.map((e) => (e.command ? `$ ${name} ${e.command}` : `$ ${name}`).length),
+      ...examples.map((e) => (e.command ? `${name} ${e.command}` : name).length),
     )
     for (const ex of examples) {
-      const cmd = ex.command ? `$ ${name} ${ex.command}` : `$ ${name}`
+      const cmd = ex.command ? `${name} ${ex.command}` : name
       if (ex.description)
         lines.push(`  ${cmd}${' '.repeat(maxLen - cmd.length)}  # ${ex.description}`)
       else lines.push(`  ${cmd}`)
@@ -274,6 +274,17 @@ function resolveTypeName(schema: unknown): string {
   if (unwrapped instanceof z.ZodNumber) return 'number'
   if (unwrapped instanceof z.ZodBoolean) return 'boolean'
   if (unwrapped instanceof z.ZodArray) return 'array'
+  if (unwrapped instanceof z.ZodEnum) {
+    const values = Object.values((unwrapped as any)._zod.def.entries) as string[]
+    return values.join('|')
+  }
+  if (unwrapped instanceof z.ZodUnion) {
+    const options = (unwrapped as any)._zod?.def?.options as z.ZodType[] | undefined
+    if (options?.every((o: z.ZodType) => o instanceof z.ZodLiteral)) {
+      const values = options.map((o: z.ZodType) => String((o as any)._zod.def.values[0]))
+      return values.join('|')
+    }
+  }
   return 'value'
 }
 
@@ -333,7 +344,10 @@ function globalOptionsLines(root = false): string[] {
   }
 
   const flags = [
-    { flag: '--filter-output <keys>', desc: 'Filter output by key paths (e.g. foo,bar.baz,a[0,3])' },
+    {
+      flag: '--filter-output <keys>',
+      desc: 'Filter output by key paths (e.g. foo,bar.baz,a[0,3])',
+    },
     { flag: '--format <toon|json|yaml|md|jsonl>', desc: 'Output format' },
     { flag: '--help', desc: 'Show help' },
     { flag: '--llms, --llms-full', desc: 'Print LLM-readable manifest' },

package/src/Openapi.test.ts

@@ -1,11 +1,11 @@
 import { describe, expect, test } from 'vitest'
 
-import * as Cli from './Cli.js'
-import * as Openapi from './Openapi.js'
-import { app } from '../test/fixtures/hono-api.js'
 import { app as prefixedApp } from '../test/fixtures/hono-api-prefixed.js'
-import { spec } from '../test/fixtures/openapi-spec.js'
+import { app } from '../test/fixtures/hono-api.js'
 import { app as openapiApp, spec as openapiSpec } from '../test/fixtures/hono-openapi-app.js'
+import { spec } from '../test/fixtures/openapi-spec.js'
+import * as Cli from './Cli.js'
+import * as Openapi from './Openapi.js'
 
 function serve(cli: { serve: Cli.Cli['serve'] }, argv: string[]) {
   let output = ''
@@ -13,7 +13,9 @@ function serve(cli: { serve: Cli.Cli['serve'] }, argv: string[]) {
   return cli
     .serve(argv, {
       stdout: (s) => (output += s),
-      exit: (c) => { exitCode = c },
+      exit: (c) => {
+        exitCode = c
+      },
     })
     .then(() => ({
       output,
@@ -22,9 +24,7 @@ function serve(cli: { serve: Cli.Cli['serve'] }, argv: string[]) {
 }
 
 function json(output: string) {
-  return JSON.parse(
-    output.replace(/"duration": "[^"]+"/g, '"duration": "<stripped>"'),
-  )
+  return JSON.parse(output.replace(/"duration": "[^"]+"/g, '"duration": "<stripped>"'))
 }
 
 describe('generateCommands', () => {
@@ -46,8 +46,10 @@ describe('generateCommands', () => {
 
 describe('cli integration', () => {
   function createCli() {
-    return Cli.create('test', { description: 'test' })
-      .command('api', { fetch: app.fetch, openapi: spec })
+    return Cli.create('test', { description: 'test' }).command('api', {
+      fetch: app.fetch,
+      openapi: spec,
+    })
   }
 
   test('GET /users via operationId', async () => {
@@ -57,7 +59,12 @@ describe('cli integration', () => {
 
   test('GET /users?limit=5 via options', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'listUsers', '--limit', '5', '--format', 'json',
+      'api',
+      'listUsers',
+      '--limit',
+      '5',
+      '--format',
+      'json',
     ])
     expect(json(output).limit).toBe(5)
   })
@@ -125,7 +132,11 @@ describe('cli integration', () => {
 
   test('--verbose wraps in envelope', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'healthCheck', '--verbose', '--format', 'json',
+      'api',
+      'healthCheck',
+      '--verbose',
+      '--format',
+      'json',
     ])
     const parsed = json(output)
     expect(parsed.ok).toBe(true)
@@ -141,8 +152,10 @@ describe('cli integration', () => {
 
 describe('@hono/zod-openapi integration', () => {
   function createCli() {
-    return Cli.create('test', { description: 'test' })
-      .command('api', { fetch: openapiApp.fetch, openapi: openapiSpec })
+    return Cli.create('test', { description: 'test' }).command('api', {
+      fetch: openapiApp.fetch,
+      openapi: openapiSpec,
+    })
   }
 
   test('GET /users via listUsers', async () => {
@@ -151,7 +164,14 @@ describe('@hono/zod-openapi integration', () => {
   })
 
   test('GET /users?limit=5', async () => {
-    const { output } = await serve(createCli(), ['api', 'listUsers', '--limit', '5', '--format', 'json'])
+    const { output } = await serve(createCli(), [
+      'api',
+      'listUsers',
+      '--limit',
+      '5',
+      '--format',
+      'json',
+    ])
     expect(json(output).limit).toBe(5)
   })
 
@@ -224,7 +244,11 @@ describe('@hono/zod-openapi integration', () => {
 
   test('--verbose wraps in envelope', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'healthCheck', '--verbose', '--format', 'json',
+      'api',
+      'healthCheck',
+      '--verbose',
+      '--format',
+      'json',
     ])
     const parsed = json(output)
     expect(parsed.ok).toBe(true)
@@ -248,7 +272,15 @@ describe('@hono/zod-openapi integration', () => {
 
   test('PUT /users/:id with optional boolean body option', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'updateUser', '1', '--name', 'Updated', '--active', 'true', '--format', 'json',
+      'api',
+      'updateUser',
+      '1',
+      '--name',
+      'Updated',
+      '--active',
+      'true',
+      '--format',
+      'json',
     ])
     const parsed = json(output)
     expect(parsed.id).toBe(1)
@@ -257,44 +289,63 @@ describe('@hono/zod-openapi integration', () => {
   })
 
   test('query param coercion with zod-openapi generated spec', async () => {
-    const { output } = await serve(createCli(), ['api', 'listUsers', '--limit', '3', '--format', 'json'])
+    const { output } = await serve(createCli(), [
+      'api',
+      'listUsers',
+      '--limit',
+      '3',
+      '--format',
+      'json',
+    ])
     expect(json(output).limit).toBe(3)
   })
 })
 
 describe('basePath', () => {
   test('fetch gateway prepends basePath to request path', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'users'])
     expect(output).toContain('Alice')
   })
 
   test('fetch gateway basePath with query params', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'users', '--limit', '5', '--format', 'json'])
     expect(json(output).limit).toBe(5)
   })
 
   test('fetch gateway basePath with POST', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'users', '-X', 'POST', '-d', '{"name":"Bob"}'])
     expect(output).toContain('Bob')
     expect(output).toContain('created')
   })
 
   test('openapi with basePath prepends to spec paths', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'listUsers'])
     expect(output).toContain('Alice')
   })
 
   test('openapi basePath with path params', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'getUser', '42'])
     expect(output).toMatchInlineSnapshot(`
       "id: 42
@@ -304,16 +355,22 @@ describe('basePath', () => {
   })
 
   test('openapi basePath with body options', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'createUser', '--name', 'Bob'])
     expect(output).toContain('created')
     expect(output).toContain('Bob')
   })
 
   test('openapi basePath with health check', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'healthCheck', '--format', 'json'])
     expect(json(output)).toEqual({ ok: true })
   })

package/src/Openapi.ts

@@ -46,7 +46,7 @@ export async function generateCommands(
   fetch: FetchHandler,
   options: { basePath?: string | undefined } = {},
 ): Promise<Map<string, GeneratedCommand>> {
-  const resolved = await dereference(structuredClone(spec) as any) as unknown as OpenAPISpec
+  const resolved = (await dereference(structuredClone(spec) as any)) as unknown as OpenAPISpec
   const commands = new Map<string, GeneratedCommand>()
   const paths = (resolved.paths ?? {}) as Record<string, Record<string, unknown>>
 
@@ -96,7 +96,15 @@ export async function generateCommands(
         description: op.summary ?? op.description,
         args: argsSchema,
         options: optionsSchema,
-        run: createHandler({ basePath: options.basePath, fetch, httpMethod, path, pathParams, queryParams, bodyProps }),
+        run: createHandler({
+          basePath: options.basePath,
+          fetch,
+          httpMethod,
+          path,
+          pathParams,
+          queryParams,
+          bodyProps,
+        }),
       })
     }
   }
@@ -135,8 +143,7 @@ function createHandler(config: {
     const bodyKeys = Object.keys(config.bodyProps)
     if (bodyKeys.length > 0) {
       const bodyObj: Record<string, unknown> = {}
-      for (const key of bodyKeys)
-        if (options[key] !== undefined) bodyObj[key] = options[key]
+      for (const key of bodyKeys) if (options[key] !== undefined) bodyObj[key] = options[key]
       if (Object.keys(bodyObj).length > 0) body = JSON.stringify(bodyObj)
     }
 
@@ -180,8 +187,10 @@ function coerceIfNeeded(schema: z.ZodType): z.ZodType {
   const inner = isOptional ? schema.unwrap() : schema
 
   // Direct number/boolean
-  if (inner instanceof z.ZodNumber) return isOptional ? z.coerce.number().optional() : z.coerce.number()
-  if (inner instanceof z.ZodBoolean) return isOptional ? z.coerce.boolean().optional() : z.coerce.boolean()
+  if (inner instanceof z.ZodNumber)
+    return isOptional ? z.coerce.number().optional() : z.coerce.number()
+  if (inner instanceof z.ZodBoolean)
+    return isOptional ? z.coerce.boolean().optional() : z.coerce.boolean()
 
   // Union containing number (e.g. type: ["number", "null"] from OpenAPI 3.1)
   if (inner instanceof z.ZodUnion) {

package/src/Skill.test.ts

@@ -333,9 +333,7 @@ describe('split', () => {
 
   test('emits fallback description when no explicit descriptions exist', () => {
     const files = Skill.split('test', [{ name: 'ping' }], 1)
-    expect(files[0]!.content).toContain(
-      'description: Run `test ping --help` for usage details.',
-    )
+    expect(files[0]!.content).toContain('description: Run `test ping --help` for usage details.')
   })
 
   test('includes requires_bin in frontmatter', () => {

package/src/Skill.ts

@@ -24,7 +24,11 @@ export type File = {
 }
 
 /** Generates a compact Markdown command index for `--llms`. */
-export function index(name: string, commands: CommandInfo[], description?: string | undefined): string {
+export function index(
+  name: string,
+  commands: CommandInfo[],
+  description?: string | undefined,
+): string {
   const lines: string[] = [`# ${name}`]
   if (description) lines.push('', description)
   lines.push('')
@@ -35,7 +39,10 @@ export function index(name: string, commands: CommandInfo[], description?: strin
     const desc = cmd.description ?? ''
     lines.push(`| \`${signature}\` | ${desc} |`)
   }
-  lines.push('', `Run \`${name} --llms-full\` for full manifest. Run \`${name} <command> --schema\` for argument details.`)
+  lines.push(
+    '',
+    `Run \`${name} --llms-full\` for full manifest. Run \`${name} <command> --schema\` for argument details.`,
+  )
   return lines.join('\n')
 }