incur 0.1.4 → 0.1.6

package/src/e2e.test.ts

@@ -2,6 +2,14 @@ import { Cli, Errors, Skill, Typegen, z } from 'incur'
 
 let __mockSkillsHash: string | undefined
 
+const originalIsTTY = process.stdout.isTTY
+beforeAll(() => {
+  ;(process.stdout as any).isTTY = false
+})
+afterAll(() => {
+  ;(process.stdout as any).isTTY = originalIsTTY
+})
+
 vi.mock('./SyncSkills.js', async (importOriginal) => {
   const actual = await importOriginal<typeof import('./SyncSkills.js')>()
   return { ...actual, readHash: () => __mockSkillsHash }
@@ -56,6 +64,18 @@ describe('routing', () => {
   test('unknown top-level command', async () => {
     const { output, exitCode } = await serve(createApp(), ['nonexistent'])
     expect(exitCode).toBe(1)
+    expect(output).toMatchInlineSnapshot(`
+      "code: COMMAND_NOT_FOUND
+      message: 'nonexistent' is not a command. See 'app --help' for a list of available commands.
+      "
+    `)
+  })
+
+  test('unknown top-level command shows human error in TTY', async () => {
+    ;(process.stdout as any).isTTY = true
+    const { output, exitCode } = await serve(createApp(), ['nonexistent'])
+    ;(process.stdout as any).isTTY = false
+    expect(exitCode).toBe(1)
     expect(output).toMatchInlineSnapshot(`
       "Error: 'nonexistent' is not a command. See 'app --help' for a list of available commands.
       "
@@ -66,7 +86,8 @@ describe('routing', () => {
     const { output, exitCode } = await serve(createApp(), ['auth', 'whoami'])
     expect(exitCode).toBe(1)
     expect(output).toMatchInlineSnapshot(`
-      "Error: 'whoami' is not a command. See 'app auth --help' for a list of available commands.
+      "code: COMMAND_NOT_FOUND
+      message: 'whoami' is not a command. See 'app auth --help' for a list of available commands.
       "
     `)
   })
@@ -75,7 +96,8 @@ describe('routing', () => {
     const { output, exitCode } = await serve(createApp(), ['project', 'deploy', 'nope'])
     expect(exitCode).toBe(1)
     expect(output).toMatchInlineSnapshot(`
-      "Error: 'nope' is not a command. See 'app project deploy --help' for a list of available commands.
+      "code: COMMAND_NOT_FOUND
+      message: 'nope' is not a command. See 'app project deploy --help' for a list of available commands.
       "
     `)
   })
@@ -163,12 +185,32 @@ describe('args and options', () => {
   test('missing required arg fails validation', async () => {
     const { output, exitCode } = await serve(createApp(), ['project', 'get'])
     expect(exitCode).toBe(1)
+    expect(output).toContain('VALIDATION_ERROR')
+  })
+
+  test('missing required arg shows human error in TTY', async () => {
+    ;(process.stdout as any).isTTY = true
+    const { output, exitCode } = await serve(createApp(), ['project', 'get'])
+    ;(process.stdout as any).isTTY = false
+    expect(exitCode).toBe(1)
     expect(output).toContain('Error: missing required argument <id>')
   })
 
   test('unknown flag returns error', async () => {
     const { output, exitCode } = await serve(createApp(), ['ping', '--unknown-flag'])
     expect(exitCode).toBe(1)
+    expect(output).toMatchInlineSnapshot(`
+      "code: UNKNOWN
+      message: "Unknown flag: --unknown-flag"
+      "
+    `)
+  })
+
+  test('unknown flag shows human error in TTY', async () => {
+    ;(process.stdout as any).isTTY = true
+    const { output, exitCode } = await serve(createApp(), ['ping', '--unknown-flag'])
+    ;(process.stdout as any).isTTY = false
+    expect(exitCode).toBe(1)
     expect(output).toMatchInlineSnapshot(`
       "Error: Unknown flag: --unknown-flag
       "
@@ -348,8 +390,20 @@ describe('undefined output', () => {
 })
 
 describe('error handling', () => {
-  test('thrown Error shows human-readable message', async () => {
+  test('thrown Error shows structured error', async () => {
+    const { output, exitCode } = await serve(createApp(), ['explode'])
+    expect(exitCode).toBe(1)
+    expect(output).toMatchInlineSnapshot(`
+      "code: UNKNOWN
+      message: kaboom
+      "
+    `)
+  })
+
+  test('thrown Error shows human error in TTY', async () => {
+    ;(process.stdout as any).isTTY = true
     const { output, exitCode } = await serve(createApp(), ['explode'])
+    ;(process.stdout as any).isTTY = false
     expect(exitCode).toBe(1)
     expect(output).toMatchInlineSnapshot(`
       "Error: kaboom
@@ -1192,8 +1246,8 @@ describe('root command with subcommands', () => {
     const cli = Cli.create('tool', {
       description: 'A tool with a default action',
       args: z.object({ query: z.string().optional().describe('Search query') }),
-      run({ args }) {
-        return { default: true, query: args.query ?? null }
+      run(c) {
+        return { default: true, query: c.args.query ?? null }
       },
     })
     cli.command('info', {
@@ -1556,9 +1610,9 @@ function createApp() {
         scopes: z.array(z.string()).default([]).describe('OAuth scopes'),
       }),
       alias: { hostname: 'h', web: 'w' },
-      run({ env, options, ok }) {
-        return ok(
-          { hostname: env.AUTH_HOST, scopes: options.scopes },
+      run(c) {
+        return c.ok(
+          { hostname: c.env.AUTH_HOST, scopes: c.options.scopes },
           {
             cta: {
               description: 'Verify your session:',
@@ -1570,15 +1624,15 @@ function createApp() {
     })
     .command('logout', {
       description: 'Log out of the service',
-      run({ ok }) {
-        return ok({ loggedOut: true })
+      run(c) {
+        return c.ok({ loggedOut: true })
       },
     })
     .command('status', {
       description: 'Show authentication status',
       output: z.object({ loggedIn: z.boolean(), hostname: z.string(), user: z.string() }),
-      run({ error }) {
-        return error({
+      run(c) {
+        return c.error({
           code: 'NOT_AUTHENTICATED',
           message: 'Not logged in',
           retryable: false,
@@ -1607,12 +1661,12 @@ function createApp() {
         ),
         total: z.number(),
       }),
-      run({ options, ok }) {
+      run(c) {
         const items = [
           { id: 'p1', name: 'Alpha', archived: false },
           { id: 'p2', name: 'Beta', archived: true },
-        ].filter((p) => options.archived || !p.archived)
-        return ok(
+        ].filter((p) => c.options.archived || !p.archived)
+        return c.ok(
           { items, total: items.length },
           {
             cta: {
@@ -1634,9 +1688,9 @@ function createApp() {
         description: z.string(),
         members: z.array(z.object({ userId: z.string(), role: z.string() })),
       }),
-      run({ args, ok }) {
-        return ok({
-          id: args.id,
+      run(c) {
+        return c.ok({
+          id: c.args.id,
           name: 'Alpha',
           description: 'Main project',
           members: [{ userId: 'u1', role: 'admin' }],
@@ -1653,13 +1707,13 @@ function createApp() {
       alias: { description: 'd' },
 
       output: z.object({ id: z.string(), url: z.string() }),
-      run({ args, ok }) {
-        return ok(
+      run(c) {
+        return c.ok(
           { id: 'p-new', url: 'https://example.com/projects/p-new' },
           {
             cta: {
               commands: [
-                { command: 'project get p-new', description: `View "${args.name}"` },
+                { command: 'project get p-new', description: `View "${c.args.name}"` },
                 'project list',
               ],
             },
@@ -1675,14 +1729,14 @@ function createApp() {
       }),
       alias: { force: 'f' },
 
-      run({ args, options }) {
-        if (!options.force)
+      run(c) {
+        if (!c.options.force)
           throw new Errors.IncurError({
             code: 'CONFIRMATION_REQUIRED',
-            message: `Use --force to delete project ${args.id}`,
+            message: `Use --force to delete project ${c.args.id}`,
             retryable: true,
           })
-        return { deleted: true, id: args.id }
+        return { deleted: true, id: c.args.id }
       },
     })
 
@@ -1705,11 +1759,11 @@ function createApp() {
           options: { branch: 'release', dryRun: true },
         },
       ],
-      run({ args, options, ok }) {
-        return ok({
+      run(c) {
+        return c.ok({
           deployId: 'd-123',
-          url: `https://${args.env}.example.com`,
-          status: options.dryRun ? 'dry-run' : 'pending',
+          url: `https://${c.args.env}.example.com`,
+          status: c.options.dryRun ? 'dry-run' : 'pending',
         })
       },
     })
@@ -1718,16 +1772,16 @@ function createApp() {
       args: z.object({ deployId: z.string().describe('Deployment ID') }),
 
       output: z.object({ deployId: z.string(), status: z.string(), progress: z.number() }),
-      run({ args }) {
-        return { deployId: args.deployId, status: 'running', progress: 75 }
+      run(c) {
+        return { deployId: c.args.deployId, status: 'running', progress: 75 }
       },
     })
     .command('rollback', {
       description: 'Rollback a deployment',
       args: z.object({ deployId: z.string().describe('Deployment ID') }),
 
-      run({ args }) {
-        return { rolledBack: true, deployId: args.deployId }
+      run(c) {
+        return { rolledBack: true, deployId: c.args.deployId }
       },
     })
 
@@ -1736,8 +1790,8 @@ function createApp() {
   const config = Cli.create('config', {
     description: 'Show current configuration',
     args: z.object({ key: z.string().optional().describe('Config key to show') }),
-    run({ args }) {
-      if (args.key) return { key: args.key, value: 'some-value' }
+    run(c) {
+      if (c.args.key) return { key: c.args.key, value: 'some-value' }
       return { apiUrl: 'https://api.example.com', timeout: 30, debug: false }
     },
   })
@@ -1765,10 +1819,10 @@ function createApp() {
       prefix: z.string().default('').describe('Prefix string'),
     }),
     alias: { upper: 'u', prefix: 'p' },
-    run({ args, options }) {
-      const count = args.repeat ?? 1
-      let msg = options.prefix ? `${options.prefix} ${args.message}` : args.message
-      if (options.upper) msg = msg.toUpperCase()
+    run(c) {
+      const count = c.args.repeat ?? 1
+      let msg = c.options.prefix ? `${c.options.prefix} ${c.args.message}` : c.args.message
+      if (c.options.upper) msg = msg.toUpperCase()
       return { result: Array(count).fill(msg) }
     },
   })

package/src/internal/agents.ts

@@ -79,7 +79,7 @@ export function install(
     const canonicalDir = path.join(canonicalBase, skill.name)
 
     // Copy to canonical location
-    fs.rmSync(canonicalDir, { recursive: true, force: true })
+    rmForce(canonicalDir)
     fs.mkdirSync(canonicalDir, { recursive: true })
     if (skill.root)
       fs.copyFileSync(path.join(skill.dir, 'SKILL.md'), path.join(canonicalDir, 'SKILL.md'))
@@ -96,7 +96,7 @@ export function install(
       if (agentDir === canonicalDir) continue
 
       try {
-        fs.rmSync(agentDir, { recursive: true, force: true })
+        rmForce(agentDir)
         fs.mkdirSync(path.dirname(agentDir), { recursive: true })
         // Resolve through any existing symlinks in parent directories
         const realLinkDir = resolveParent(path.dirname(agentDir))
@@ -142,6 +142,27 @@ export declare namespace install {
   }
 }
 
+/**
+ * Removes a skill by name from the canonical location and all detected agent directories.
+ */
+export function remove(
+  skillName: string,
+  options: { global?: boolean | undefined; cwd?: string | undefined } = {},
+) {
+  const isGlobal = options.global !== false
+  const cwd = options.cwd || process.cwd()
+  const base = isGlobal ? home : cwd
+  const canonicalDir = path.join(base, '.agents', 'skills', skillName)
+  rmForce(canonicalDir)
+
+  for (const agent of detect()) {
+    if (agent.universal) continue
+    const agentSkillsDir = isGlobal ? agent.globalSkillsDir : path.join(cwd, agent.projectSkillsDir)
+    const agentDir = path.join(agentSkillsDir, skillName)
+    rmForce(agentDir)
+  }
+}
+
 /** Recursively discovers skill directories (those containing a `SKILL.md`). */
 function discoverSkills(rootDir: string): { name: string; dir: string; root?: boolean }[] {
   const results: { name: string; dir: string; root?: boolean }[] = []
@@ -190,6 +211,15 @@ function sanitizeName(name: string): string {
     .slice(0, 255)
 }
 
+/** Removes a file, directory, or symlink (including broken symlinks). */
+function rmForce(target: string) {
+  try {
+    const stat = fs.lstatSync(target)
+    if (stat.isSymbolicLink()) fs.unlinkSync(target)
+    else fs.rmSync(target, { recursive: true, force: true })
+  } catch {}
+}
+
 /** Resolves parent directories through symlinks. */
 function resolveParent(dir: string): string {
   try {