@catladder/cli 0.0.0-new-cli-b2300dd6 → 0.0.0-new-cli-51a5f8b1

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-new-cli-b2300dd6",
+  "version": "0.0.0-new-cli-51a5f8b1",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/cli.ts

@@ -188,8 +188,13 @@ const completionCmd = program
 completionCmd
   .command("zsh")
   .description("output zsh completion script")
-  .action(() => {
-    const binaryName = process.argv[1].split("/").pop() ?? "catladder";
+  .option(
+    "--command <cmd>",
+    "command used to invoke the CLI (e.g. 'yarn catladder')",
+  )
+  .action((opts: { command?: string }) => {
+    const binaryName =
+      opts.command ?? process.argv[1].split("/").pop() ?? "catladder";
     console.log(generateZshCompletionScript(binaryName));
   });
 

package/src/completion.ts

@@ -142,11 +142,15 @@ async function resolveChoicesForCompletion(
 
 /**
  * Generate the zsh completion script.
- * The user adds `eval "$(catladder completion zsh)"` to their .zshrc.
+ * Supports both direct invocation (`catladder`) and prefixed (`yarn catladder`).
  */
-export function generateZshCompletionScript(binaryName: string): string {
-  const funcName = binaryName.replace(/-/g, "_");
-  return `
+export function generateZshCompletionScript(command: string): string {
+  const parts = command.split(" ");
+  const funcName = command.replace(/[- ]/g, "_");
+
+  if (parts.length === 1) {
+    // Direct binary: catladder
+    return `
 ###-begin-${funcName}-completions-###
 _${funcName}_completions() {
   local -a completions
@@ -156,14 +160,47 @@ _${funcName}_completions() {
   local -a cmd_words=(\${words:1:$((CURRENT-2))})
 
   # Call the CLI's __complete command
-  completions=(\${(f)"$(${binaryName} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
+  completions=(\${(f)"$(${command} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
+
+  if [[ \${#completions[@]} -gt 0 ]]; then
+    compadd -a completions
+  fi
+}
+
+compdef _${funcName}_completions ${command}
+###-end-${funcName}-completions-###
+`.trim();
+  }
+
+  // Multi-word command (e.g., "yarn catladder")
+  // Register on the first word (e.g., "yarn") but only activate
+  // when the subcommand matches (e.g., "catladder")
+  const prefix = parts[0];
+  const subcommand = parts.slice(1).join(" ");
+  const skipWords = parts.length; // how many words to skip before CLI args
+
+  return `
+###-begin-${funcName}-completions-###
+_${funcName}_completions() {
+  # Only activate when subcommand is "${subcommand}"
+  if [[ $CURRENT -le ${skipWords} ]] || [[ "\${words[2,${skipWords}]}" != "${subcommand}" ]]; then
+    return
+  fi
+
+  local -a completions
+  local current_word="\${words[$CURRENT]}"
+
+  # Words after "${command}", excluding the current word being completed
+  local -a cmd_words=(\${words:${skipWords}:$((CURRENT-${skipWords}-1))})
+
+  completions=(\${(f)"$(${command} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
 
   if [[ \${#completions[@]} -gt 0 ]]; then
     compadd -a completions
   fi
 }
 
-compdef _${funcName}_completions ${binaryName}
+compdef _${funcName}_completions ${prefix}
 ###-end-${funcName}-completions-###
 `.trim();
 }