incur 0.4.0 → 0.4.2

package/src/e2e.test.ts

@@ -3,6 +3,7 @@ import { Cli, Errors, Skill, Typegen, z } from 'incur'
 import { app as honoApp } from '../test/fixtures/hono-api.js'
 
 let __mockSkillsHash: string | undefined
+let __mockSkillsInstalled = true
 
 const originalIsTTY = process.stdout.isTTY
 beforeAll(() => {
@@ -14,7 +15,11 @@ afterAll(() => {
 
 vi.mock('./SyncSkills.js', async (importOriginal) => {
   const actual = await importOriginal<typeof import('./SyncSkills.js')>()
-  return { ...actual, readHash: () => __mockSkillsHash }
+  return {
+    ...actual,
+    hasInstalledSkills: () => __mockSkillsInstalled,
+    readHash: () => __mockSkillsHash,
+  }
 })
 
 describe('routing', () => {
@@ -70,9 +75,9 @@ describe('routing', () => {
       "code: COMMAND_NOT_FOUND
       message: 'nonexistent' is not a command for 'app'.
       cta:
-        description: "See available commands:"
-        commands[1]{command}:
-          app --help
+        description: "Suggested command:"
+        commands[1]{command,description}:
+          app --help,see all available commands
       "
     `)
   })
@@ -85,8 +90,8 @@ describe('routing', () => {
     expect(output).toMatchInlineSnapshot(`
       "Error: 'nonexistent' is not a command for 'app'.
 
-      See available commands:
-        app --help
+      Suggested command:
+        app --help  # see all available commands
       "
     `)
   })
@@ -98,9 +103,9 @@ describe('routing', () => {
       "code: COMMAND_NOT_FOUND
       message: 'whoami' is not a command for 'app auth'.
       cta:
-        description: "See available commands:"
-        commands[1]{command}:
-          app auth --help
+        description: "Suggested command:"
+        commands[1]{command,description}:
+          app auth --help,see all available commands
       "
     `)
   })
@@ -112,9 +117,9 @@ describe('routing', () => {
       "code: COMMAND_NOT_FOUND
       message: 'nope' is not a command for 'app project deploy'.
       cta:
-        description: "See available commands:"
-        commands[1]{command}:
-          app project deploy --help
+        description: "Suggested command:"
+        commands[1]{command,description}:
+          app project deploy --help,see all available commands
       "
     `)
   })
@@ -173,7 +178,7 @@ describe('args and options', () => {
       'read',
       '--scopes',
       'write',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
     ])
@@ -192,7 +197,7 @@ describe('args and options', () => {
       'list',
       '--limit',
       '5',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
     ])
@@ -327,8 +332,8 @@ describe('output formats', () => {
     `)
   })
 
-  test('--verbose full envelope', async () => {
-    const { output } = await serve(createApp(), ['ping', '--verbose'])
+  test('--full-output full envelope', async () => {
+    const { output } = await serve(createApp(), ['ping', '--full-output'])
     expect(output).toMatchInlineSnapshot(`
       "ok: true
       data:
@@ -340,8 +345,8 @@ describe('output formats', () => {
     `)
   })
 
-  test('--verbose --format json full envelope', async () => {
-    const { output } = await serve(createApp(), ['ping', '--verbose', '--format', 'json'])
+  test('--full-output --format json full envelope', async () => {
+    const { output } = await serve(createApp(), ['ping', '--full-output', '--format', 'json'])
     expect(json(output)).toMatchInlineSnapshot(`
       {
         "data": {
@@ -356,13 +361,13 @@ describe('output formats', () => {
     `)
   })
 
-  test('nested command path in verbose meta', async () => {
+  test('nested command path in full-output meta', async () => {
     const { output } = await serve(createApp(), [
       'project',
       'deploy',
       'status',
       'd-1',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
     ])
@@ -400,8 +405,8 @@ describe('undefined output', () => {
     expect(output).toBe('')
   })
 
-  test('void command shows envelope with --verbose', async () => {
-    const { output } = await serve(createApp(), ['noop', '--verbose', '--format', 'json'])
+  test('void command shows envelope with --full-output', async () => {
+    const { output } = await serve(createApp(), ['noop', '--full-output', '--format', 'json'])
     expect(json(output)).toMatchInlineSnapshot(`
       {
         "meta": {
@@ -455,10 +460,10 @@ describe('--token-limit and --token-offset', () => {
     `)
   })
 
-  test('works with --verbose', async () => {
+  test('works with --full-output', async () => {
     const { output } = await serve(createApp(), [
       'ping',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
       '--token-limit',
@@ -479,10 +484,10 @@ describe('--token-limit and --token-offset', () => {
     `)
   })
 
-  test('--verbose includes meta.nextOffset when truncated', async () => {
+  test('--full-output includes meta.nextOffset when truncated', async () => {
     const { output } = await serve(createApp(), [
       'ping',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
       '--token-limit',
@@ -492,10 +497,10 @@ describe('--token-limit and --token-offset', () => {
     expect(output).toContain('[truncated:')
   })
 
-  test('--verbose omits meta.nextOffset when not truncated', async () => {
+  test('--full-output omits meta.nextOffset when not truncated', async () => {
     const { output } = await serve(createApp(), [
       'ping',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
       '--token-limit',
@@ -575,7 +580,7 @@ describe('error handling', () => {
     const { output, exitCode } = await serve(createApp(), [
       'auth',
       'status',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
     ])
@@ -595,7 +600,7 @@ describe('error handling', () => {
                 "command": "app auth login",
               },
             ],
-            "description": "Suggested commands:",
+            "description": "Suggested command:",
           },
           "duration": "<stripped>",
         },
@@ -633,7 +638,7 @@ describe('error handling', () => {
   test('command not found returns error envelope', async () => {
     const { output, exitCode } = await serve(createApp(), [
       'nonexistent',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
     ])
@@ -650,9 +655,10 @@ describe('error handling', () => {
             "commands": [
               {
                 "command": "app --help",
+                "description": "see all available commands",
               },
             ],
-            "description": "See available commands:",
+            "description": "Suggested command:",
           },
           "duration": "<stripped>",
         },
@@ -675,7 +681,13 @@ describe('error handling', () => {
 
 describe('cta', () => {
   test('ok() with string CTAs', async () => {
-    const { output } = await serve(createApp(), ['auth', 'login', '--verbose', '--format', 'json'])
+    const { output } = await serve(createApp(), [
+      'auth',
+      'login',
+      '--full-output',
+      '--format',
+      'json',
+    ])
     expect(json(output).meta.cta).toMatchInlineSnapshot(`
       {
         "commands": [
@@ -693,7 +705,7 @@ describe('cta', () => {
       'project',
       'create',
       'MyProject',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
     ])
@@ -714,7 +726,13 @@ describe('cta', () => {
   })
 
   test('error() with CTA', async () => {
-    const { output } = await serve(createApp(), ['auth', 'status', '--verbose', '--format', 'json'])
+    const { output } = await serve(createApp(), [
+      'auth',
+      'status',
+      '--full-output',
+      '--format',
+      'json',
+    ])
     expect(json(output).meta.cta).toMatchInlineSnapshot(`
       {
         "commands": [
@@ -722,13 +740,13 @@ describe('cta', () => {
             "command": "app auth login",
           },
         ],
-        "description": "Suggested commands:",
+        "description": "Suggested command:",
       }
     `)
   })
 
   test('plain return omits CTA', async () => {
-    const { output } = await serve(createApp(), ['ping', '--verbose', '--format', 'json'])
+    const { output } = await serve(createApp(), ['ping', '--full-output', '--format', 'json'])
     expect(json(output).meta.cta).toBeUndefined()
   })
 
@@ -737,7 +755,7 @@ describe('cta', () => {
       'project',
       'list',
       '--archived',
-      '--verbose',
+      '--full-output',
       '--format',
       'json',
     ])
@@ -779,8 +797,8 @@ describe('streaming', () => {
     `)
   })
 
-  test('default streams toon per chunk (--verbose)', async () => {
-    const { output } = await serve(createApp(), ['stream', '--verbose'])
+  test('default streams toon per chunk (--full-output)', async () => {
+    const { output } = await serve(createApp(), ['stream', '--full-output'])
     expect(output).toMatchInlineSnapshot(`
       "content: hello
       content: world
@@ -802,8 +820,8 @@ describe('streaming', () => {
     `)
   })
 
-  test('--format json --verbose buffers with envelope', async () => {
-    const { output } = await serve(createApp(), ['stream', '--verbose', '--format', 'json'])
+  test('--format json --full-output buffers with envelope', async () => {
+    const { output } = await serve(createApp(), ['stream', '--full-output', '--format', 'json'])
     expect(json(output)).toMatchInlineSnapshot(`
       {
         "data": [
@@ -868,7 +886,7 @@ describe('streaming', () => {
             "command": "app ping",
           },
         ],
-        "description": "Suggested commands:",
+        "description": "Suggested command:",
       }
     `)
   })
@@ -877,7 +895,7 @@ describe('streaming', () => {
     const { output } = await serve(createApp(), ['stream-ok'])
     expect(output).toContain('n: 1')
     expect(output).toContain('n: 2')
-    expect(output).toContain('Suggested commands:')
+    expect(output).toContain('Suggested command:')
     expect(output).toContain('app ping')
   })
 
@@ -963,22 +981,22 @@ describe('help', () => {
         stream-throw   Stream that throws
         validate-fail  Fails validation
 
-      Built-in Commands:
+      Integrations:
         completions  Generate shell completion script
-        mcp add      Register as an MCP server
-        skills add   Sync skill files to your agent
+        mcp add      Register as MCP server
+        skills       Sync skill files to agents (add, list)
 
       Global Options:
         --filter-output <keys>              Filter output by key paths (e.g. foo,bar.baz,a[0,3])
         --format <toon|json|yaml|md|jsonl>  Output format
+        --full-output                       Show full output envelope
         --help                              Show help
         --llms, --llms-full                 Print LLM-readable manifest
         --mcp                               Start as MCP stdio server
-        --schema                            Show JSON Schema for a command
+        --schema                            Show JSON Schema for command
         --token-count                       Print token count of output (instead of output)
         --token-limit <n>                   Limit output to n tokens
         --token-offset <n>                  Skip first n tokens of output
-        --verbose                           Show full output envelope
         --version                           Show version
       "
     `)
@@ -1005,13 +1023,13 @@ describe('help', () => {
       Global Options:
         --filter-output <keys>              Filter output by key paths (e.g. foo,bar.baz,a[0,3])
         --format <toon|json|yaml|md|jsonl>  Output format
+        --full-output                       Show full output envelope
         --help                              Show help
         --llms, --llms-full                 Print LLM-readable manifest
-        --schema                            Show JSON Schema for a command
+        --schema                            Show JSON Schema for command
         --token-count                       Print token count of output (instead of output)
         --token-limit <n>                   Limit output to n tokens
         --token-offset <n>                  Skip first n tokens of output
-        --verbose                           Show full output envelope
       "
     `)
   })
@@ -1032,13 +1050,13 @@ describe('help', () => {
       Global Options:
         --filter-output <keys>              Filter output by key paths (e.g. foo,bar.baz,a[0,3])
         --format <toon|json|yaml|md|jsonl>  Output format
+        --full-output                       Show full output envelope
         --help                              Show help
         --llms, --llms-full                 Print LLM-readable manifest
-        --schema                            Show JSON Schema for a command
+        --schema                            Show JSON Schema for command
         --token-count                       Print token count of output (instead of output)
         --token-limit <n>                   Limit output to n tokens
         --token-offset <n>                  Skip first n tokens of output
-        --verbose                           Show full output envelope
       "
     `)
   })
@@ -1053,18 +1071,18 @@ describe('help', () => {
       Options:
         --limit, -l <number>               Max results (default: 20)
         --sort, -s <name|created|updated>  Sort field (default: name)
-        --archived <boolean>               Include archived (default: false)
+        --archived                         Include archived
 
       Global Options:
         --filter-output <keys>              Filter output by key paths (e.g. foo,bar.baz,a[0,3])
         --format <toon|json|yaml|md|jsonl>  Output format
+        --full-output                       Show full output envelope
         --help                              Show help
         --llms, --llms-full                 Print LLM-readable manifest
-        --schema                            Show JSON Schema for a command
+        --schema                            Show JSON Schema for command
         --token-count                       Print token count of output (instead of output)
         --token-limit <n>                   Limit output to n tokens
         --token-offset <n>                  Skip first n tokens of output
-        --verbose                           Show full output envelope
       "
     `)
   })
@@ -1081,7 +1099,7 @@ describe('help', () => {
 
       Options:
         --branch, -b <string>  Branch to deploy (default: main)
-        --dry-run <boolean>    Dry run mode (default: false)
+        --dry-run              Dry run mode
 
       Examples:
         app project deploy create staging                                    # Deploy staging from main
@@ -1090,13 +1108,13 @@ describe('help', () => {
       Global Options:
         --filter-output <keys>              Filter output by key paths (e.g. foo,bar.baz,a[0,3])
         --format <toon|json|yaml|md|jsonl>  Output format
+        --full-output                       Show full output envelope
         --help                              Show help
         --llms, --llms-full                 Print LLM-readable manifest
-        --schema                            Show JSON Schema for a command
+        --schema                            Show JSON Schema for command
         --token-count                       Print token count of output (instead of output)
         --token-limit <n>                   Limit output to n tokens
         --token-offset <n>                  Skip first n tokens of output
-        --verbose                           Show full output envelope
       "
     `)
   })
@@ -1589,8 +1607,8 @@ describe('typegen', () => {
             'auth login': { args: {}; options: { hostname: string; web: boolean; scopes: string[] } }
             'auth logout': { args: {}; options: {} }
             'auth status': { args: {}; options: {} }
-            'config': { args: { key: string }; options: {} }
-            'echo': { args: { message: string; repeat: number }; options: { upper: boolean; prefix: string } }
+            'config': { args: { key?: string }; options: {} }
+            'echo': { args: { message: string; repeat?: number }; options: { upper: boolean; prefix: string } }
             'explode': { args: {}; options: {} }
             'explode-clac': { args: {}; options: {} }
             'noop': { args: {}; options: {} }
@@ -1738,22 +1756,22 @@ describe('root command with subcommands', () => {
         info     Show info
         version  Show version
 
-      Built-in Commands:
+      Integrations:
         completions  Generate shell completion script
-        mcp add      Register as an MCP server
-        skills add   Sync skill files to your agent
+        mcp add      Register as MCP server
+        skills       Sync skill files to agents (add, list)
 
       Global Options:
         --filter-output <keys>              Filter output by key paths (e.g. foo,bar.baz,a[0,3])
         --format <toon|json|yaml|md|jsonl>  Output format
+        --full-output                       Show full output envelope
         --help                              Show help
         --llms, --llms-full                 Print LLM-readable manifest
         --mcp                               Start as MCP stdio server
-        --schema                            Show JSON Schema for a command
+        --schema                            Show JSON Schema for command
         --token-count                       Print token count of output (instead of output)
         --token-limit <n>                   Limit output to n tokens
         --token-offset <n>                  Skip first n tokens of output
-        --verbose                           Show full output envelope
         --version                           Show version
       "
     `)
@@ -1786,7 +1804,7 @@ describe('edge cases', () => {
               "description": "View "Alpha"",
             },
           ],
-          "description": "Suggested commands:",
+          "description": "Suggested command:",
         },
         "items": [
           {
@@ -1864,7 +1882,7 @@ describe('edge cases', () => {
       'prod',
       '--branch',
       'release',
-      '--verbose',
+      '--full-output',
     ])
     expect(json(output)).toMatchInlineSnapshot(`
       {
@@ -1893,7 +1911,7 @@ describe('env', () => {
   test('env vars passed to handler', async () => {
     const { output } = await serve(
       createApp(),
-      ['auth', 'login', '--verbose', '--format', 'json'],
+      ['auth', 'login', '--full-output', '--format', 'json'],
       { env: { AUTH_HOST: 'custom.example.com' } },
     )
     expect(json(output).data.hostname).toBe('custom.example.com')
@@ -1902,7 +1920,7 @@ describe('env', () => {
   test('env defaults applied when var is unset', async () => {
     const { output } = await serve(
       createApp(),
-      ['auth', 'login', '--verbose', '--format', 'json'],
+      ['auth', 'login', '--full-output', '--format', 'json'],
       { env: {} },
     )
     expect(json(output).data.hostname).toBe('api.example.com')
@@ -1917,19 +1935,19 @@ describe('env', () => {
 
       Options:
         --hostname, -h <string>  API hostname (default: api.example.com)
-        --web, -w <boolean>      Open browser (default: false)
+        --web, -w                Open browser
         --scopes <array>         OAuth scopes
 
       Global Options:
         --filter-output <keys>              Filter output by key paths (e.g. foo,bar.baz,a[0,3])
         --format <toon|json|yaml|md|jsonl>  Output format
+        --full-output                       Show full output envelope
         --help                              Show help
         --llms, --llms-full                 Print LLM-readable manifest
-        --schema                            Show JSON Schema for a command
+        --schema                            Show JSON Schema for command
         --token-count                       Print token count of output (instead of output)
         --token-limit <n>                   Limit output to n tokens
         --token-offset <n>                  Skip first n tokens of output
-        --verbose                           Show full output envelope
 
       Environment Variables:
         AUTH_TOKEN  Pre-existing auth token
@@ -1970,17 +1988,21 @@ describe('skills staleness', () => {
   beforeEach(() => {
     stderrSpy = vi.spyOn(process.stderr, 'write').mockImplementation(() => true)
     __mockSkillsHash = undefined
+    __mockSkillsInstalled = true
   })
 
   afterEach(() => {
     stderrSpy.mockRestore()
+    __mockSkillsHash = undefined
+    __mockSkillsInstalled = true
   })
 
-  test('warns when running a command with stale skills', async () => {
+  test('includes skills CTA when stale', async () => {
     __mockSkillsHash = '0000000000000000'
     const { output } = await serve(createApp(), ['ping'])
     expect(output).toContain('pong: true')
-    expect(stderrSpy).toHaveBeenCalledWith(expect.stringContaining('Skills are out of date.'))
+    expect(output).toContain('Skills are out of date:')
+    expect(output).toContain('skills add')
   })
 
   test('no warning when skills hash matches', async () => {
@@ -1991,20 +2013,28 @@ describe('skills staleness', () => {
 
     const { output } = await serve(cli, ['ping'])
     expect(output).toContain('pong: true')
-    expect(stderrSpy).not.toHaveBeenCalled()
+    expect(output).not.toContain('Skills are out of date')
   })
 
   test('no warning on first use (no hash stored)', async () => {
     __mockSkillsHash = undefined
     const { output } = await serve(createApp(), ['ping'])
     expect(output).toContain('pong: true')
-    expect(stderrSpy).not.toHaveBeenCalled()
+    expect(output).not.toContain('Skills are out of date')
+  })
+
+  test('no warning when skills are not installed', async () => {
+    __mockSkillsHash = '0000000000000000'
+    __mockSkillsInstalled = false
+    const { output } = await serve(createApp(), ['ping'])
+    expect(output).toContain('pong: true')
+    expect(output).not.toContain('Skills are out of date')
   })
 
   test('no warning for --llms', async () => {
     __mockSkillsHash = '0000000000000000'
-    await serve(createApp(), ['--llms'])
-    expect(stderrSpy).not.toHaveBeenCalled()
+    const { output } = await serve(createApp(), ['--llms'])
+    expect(output).not.toContain('Skills are out of date')
   })
 
   test('no warning for --mcp', async () => {
@@ -2034,9 +2064,9 @@ describe('middleware', () => {
     `)
   })
 
-  test('vars: verbose envelope includes var data', async () => {
+  test('vars: full-output envelope includes var data', async () => {
     const { cli } = createMiddlewareApp()
-    const { output } = await serve(cli, ['whoami', '--verbose', '--format', 'json'])
+    const { output } = await serve(cli, ['whoami', '--full-output', '--format', 'json'])
     const parsed = json(output)
     expect(parsed.data.user).toBe('alice')
     expect(parsed.data.requestId).toBe('req-default')
@@ -2204,7 +2234,7 @@ describe('fetch gateway', () => {
   })
 
   test('query params from --key value', async () => {
-    const { output } = await serve(createApp(), ['api', 'users', '--limit', '5'])
+    await serve(createApp(), ['api', 'users', '--limit', '5'])
     const { output: jsonOut } = await serve(createApp(), [
       'api',
       'users',
@@ -2273,8 +2303,14 @@ describe('fetch gateway', () => {
     expect(json(output)).toEqual({ ok: true })
   })
 
-  test('--verbose wraps in envelope', async () => {
-    const { output } = await serve(createApp(), ['api', 'health', '--verbose', '--format', 'json'])
+  test('--full-output wraps in envelope', async () => {
+    const { output } = await serve(createApp(), [
+      'api',
+      'health',
+      '--full-output',
+      '--format',
+      'json',
+    ])
     const parsed = json(output)
     expect(parsed.ok).toBe(true)
     expect(parsed.data).toEqual({ ok: true })
@@ -2441,6 +2477,18 @@ describe('fetch api', () => {
           },
           "meta": {
             "command": "project create",
+            "cta": {
+              "commands": [
+                {
+                  "command": "app project get p-new",
+                  "description": "View "MyProject"",
+                },
+                {
+                  "command": "app project list",
+                },
+              ],
+              "description": "Suggested commands:",
+            },
             "duration": "<stripped>",
           },
           "ok": true,
@@ -2524,21 +2572,22 @@ describe('fetch api', () => {
     const cli = createApp()
     expect(await fetchJson(cli, new Request('http://localhost/explode-clac')))
       .toMatchInlineSnapshot(`
-      {
-        "body": {
-          "error": {
-            "code": "QUOTA_EXCEEDED",
-            "message": "Rate limit exceeded",
-          },
-          "meta": {
-            "command": "explode-clac",
-            "duration": "<stripped>",
+        {
+          "body": {
+            "error": {
+              "code": "QUOTA_EXCEEDED",
+              "message": "Rate limit exceeded",
+              "retryable": true,
+            },
+            "meta": {
+              "command": "explode-clac",
+              "duration": "<stripped>",
+            },
+            "ok": false,
           },
-          "ok": false,
-        },
-        "status": 500,
-      }
-    `)
+          "status": 500,
+        }
+      `)
   })
 
   test('validation error → 400', async () => {
@@ -2832,6 +2881,47 @@ describe('fetch api', () => {
       `)
     })
 
+    test('tools/call with no-args command', async () => {
+      const cli = createApp()
+      const sessionId = await initSession(cli)
+      const res = await mcpRequest(
+        cli,
+        {
+          jsonrpc: '2.0',
+          id: 6,
+          method: 'tools/call',
+          params: { name: 'ping', arguments: {} },
+        },
+        sessionId,
+      )
+      expect(res.status).toBe(200)
+      const body = await res.json()
+      expect(JSON.parse(body.result.content[0].text)).toMatchInlineSnapshot(`
+        {
+          "pong": true,
+        }
+      `)
+    })
+
+    test('tools/call with streaming command', async () => {
+      const cli = createApp()
+      const sessionId = await initSession(cli)
+      const res = await mcpRequest(
+        cli,
+        {
+          jsonrpc: '2.0',
+          id: 7,
+          method: 'tools/call',
+          params: { name: 'stream', arguments: {} },
+        },
+        sessionId,
+      )
+      expect(res.status).toBe(200)
+      const body = await res.json()
+      const chunks = JSON.parse(body.result.content[0].text)
+      expect(chunks).toEqual([{ content: 'hello' }, { content: 'world' }])
+    })
+
     test('non-/mcp paths still work alongside MCP', async () => {
       const cli = createApp()
       // Initialize MCP first