@kaynooo/cli-kit 0.17.0 → 0.18.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-kit",
   "type": "module",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "What every @kaynooo CLI shares: argument parsing with --help, a command dispatcher with typo hints and shell completion, and output formatting.",
   "author": "Kaynooo <contact@kaynooo.fr>",
   "license": "MIT",

package/src/cli.ts

@@ -395,8 +395,16 @@ async function candidates(scope: Scope, defaultCommand: string | undefined, word
     command = commands[aliases?.[word] ?? word]
   }
 
-  if (listing)
-    return Promise.all(Object.entries(shown(commands)).map(async ([name, { summary }]) => `${name}\t${await resolveSummary(summary)}`))
+  if (listing) {
+    const own = await Promise.all(Object.entries(shown(commands)).map(async ([name, { summary }]) => `${name}\t${await resolveSummary(summary)}`))
+    const fallback = defaultCommand === undefined ? undefined : commands[defaultCommand]
+    // What the default command takes as its first positional is typed here too, `athome <project>`; a name a command already has is left out.
+    const values = fallback !== undefined && 'run' in fallback ? await leafCandidates(fallback.run, [word]) : []
+
+    const valueOf = (line: string) => line.slice(0, line.includes('\t') ? line.indexOf('\t') : undefined)
+
+    return [...own, ...values.filter(line => line !== FILES && !(valueOf(line) in commands))]
+  }
 
   if (command === undefined) {
     const fallback = defaultCommand === undefined ? undefined : commands[defaultCommand]