@seedcli/completions 0.1.7 → 0.1.10

package/dist/bash.d.ts

@@ -1,6 +1,11 @@
 import type { CompletionInfo } from "./types.js";
 /**
  * Generate a bash completion script.
+ *
+ * Uses a lookup key built from all command tokens (words[1]..words[cword-1])
+ * joined with underscores so that nested subcommand completions are reachable.
+ * For example, `mycli db migrate <TAB>` builds the key "db_migrate" which
+ * matches the case pattern generated by generateCommandCase.
  */
 export declare function bash(info: CompletionInfo): string;
 //# sourceMappingURL=bash.d.ts.map

package/dist/bash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../src/bash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAyCpE;;GAEG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAiCjD"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../src/bash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAoDpE;;;;;;;GAOG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAgDjD"}

package/dist/bash.js

@@ -1,20 +1,25 @@
-function generateCommandCase(brand, cmd, path) {
+import { sanitizeShellToken } from "./types.js";
+const MAX_COMPLETION_DEPTH = 20;
+function generateCommandCase(brand, cmd, path, depth = 0) {
+    if (depth > MAX_COMPLETION_DEPTH)
+        return "";
     const lines = [];
-    const casePattern = path ? `${path}_${cmd.name}` : cmd.name;
+    const safeName = sanitizeShellToken(cmd.name);
+    const casePattern = path ? `${path}_${safeName}` : safeName;
     // Gather completions for this command
     const words = [];
     // Add subcommands
     if (cmd.subcommands) {
         for (const sub of cmd.subcommands) {
-            words.push(sub.name);
+            words.push(sanitizeShellToken(sub.name));
         }
     }
     // Add flags
     if (cmd.flags) {
         for (const f of cmd.flags) {
-            words.push(`--${f.name}`);
+            words.push(`--${sanitizeShellToken(f.name)}`);
             if (f.alias)
-                words.push(`-${f.alias}`);
+                words.push(`-${sanitizeShellToken(f.alias)}`);
         }
     }
     if (words.length > 0) {
@@ -26,25 +31,33 @@ function generateCommandCase(brand, cmd, path) {
     // Recurse for subcommands
     if (cmd.subcommands) {
         for (const sub of cmd.subcommands) {
-            lines.push(generateCommandCase(brand, sub, casePattern));
+            lines.push(generateCommandCase(brand, sub, casePattern, depth + 1));
         }
     }
     return lines.join("\n");
 }
 /**
  * Generate a bash completion script.
+ *
+ * Uses a lookup key built from all command tokens (words[1]..words[cword-1])
+ * joined with underscores so that nested subcommand completions are reachable.
+ * For example, `mycli db migrate <TAB>` builds the key "db_migrate" which
+ * matches the case pattern generated by generateCommandCase.
  */
 export function bash(info) {
     const { brand, commands } = info;
-    const topLevelWords = commands.flatMap((c) => [c.name, ...(c.aliases ?? [])]).join(" ");
+    const safeBrand = sanitizeShellToken(brand);
+    const topLevelWords = commands
+        .flatMap((c) => [sanitizeShellToken(c.name), ...(c.aliases ?? []).map(sanitizeShellToken)])
+        .join(" ");
     const caseClauses = [];
     for (const cmd of commands) {
-        caseClauses.push(generateCommandCase(brand, cmd, ""));
+        caseClauses.push(generateCommandCase(safeBrand, cmd, ""));
     }
-    return `# Bash completions for ${brand}
+    return `# Bash completions for ${safeBrand}
 # Generated by @seedcli/completions
 
-_${brand}_completions() {
+_${safeBrand}_completions() {
     local cur prev words cword
     _init_completion || return
 
@@ -53,16 +66,28 @@ _${brand}_completions() {
         return 0
     fi
 
-    local command="\${words[1]}"
+    # Build a lookup key from all command tokens before the cursor.
+    # e.g. "mycli db migrate <TAB>" → key="db_migrate"
+    local key=""
+    for ((i=1; i < cword; i++)); do
+        if [[ "\${words[i]}" == -* ]]; then
+            continue
+        fi
+        if [[ -n "$key" ]]; then
+            key="\${key}_\${words[i]}"
+        else
+            key="\${words[i]}"
+        fi
+    done
 
-    case "\${command}" in
+    case "$key" in
 ${caseClauses.join("\n")}
         *)
             ;;
     esac
 }
 
-complete -F _${brand}_completions ${brand}
+complete -F _${safeBrand}_completions ${safeBrand}
 `;
 }
 //# sourceMappingURL=bash.js.map

package/dist/bash.js.map

@@ -1 +1 @@
-{"version":3,"file":"bash.js","sourceRoot":"","sources":["../src/bash.ts"],"names":[],"mappings":"AAEA,SAAS,mBAAmB,CAAC,KAAa,EAAE,GAAsB,EAAE,IAAY;IAC/E,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IAE5D,sCAAsC;IACtC,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,kBAAkB;IAClB,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACF,CAAC;IAED,YAAY;IACZ,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YAC3B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1B,IAAI,CAAC,CAAC,KAAK;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,WAAW,WAAW,GAAG,CAAC,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,yCAAyC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACxF,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACnC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC9B,CAAC;IAED,0BAA0B;IAC1B,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,IAAI,CAAC,IAAoB;IACxC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAEjC,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAExF,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,0BAA0B,KAAK;;;GAGpC,KAAK;;;;;oCAK4B,aAAa;;;;;;;EAO/C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;eAMT,KAAK,gBAAgB,KAAK;CACxC,CAAC;AACF,CAAC"}
+{"version":3,"file":"bash.js","sourceRoot":"","sources":["../src/bash.ts"],"names":[],"mappings":"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"}

package/dist/fish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fish.d.ts","sourceRoot":"","sources":["../src/fish.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAiDpE;;GAEG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAejD"}
+{"version":3,"file":"fish.d.ts","sourceRoot":"","sources":["../src/fish.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAyDpE;;GAEG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAgBjD"}

package/dist/fish.js

@@ -1,26 +1,32 @@
-function generateFishCompletions(brand, cmd, condition) {
+import { escapeShellDescription, sanitizeShellToken } from "./types.js";
+const MAX_COMPLETION_DEPTH = 20;
+function generateFishCompletions(brand, cmd, condition, depth = 0) {
+    if (depth > MAX_COMPLETION_DEPTH)
+        return [];
     const lines = [];
-    const desc = cmd.description ? ` -d '${cmd.description.replace(/'/g, "'\\''")}'` : "";
+    const safeName = sanitizeShellToken(cmd.name);
+    const desc = cmd.description ? ` -d '${escapeShellDescription(cmd.description)}'` : "";
     // Add the command itself as a completion
-    lines.push(`complete -c ${brand} ${condition} -a '${cmd.name}'${desc}`);
+    lines.push(`complete -c ${brand} ${condition} -a '${safeName}'${desc}`);
     // Add aliases
     if (cmd.aliases) {
         for (const alias of cmd.aliases) {
-            lines.push(`complete -c ${brand} ${condition} -a '${alias}'${desc}`);
+            lines.push(`complete -c ${brand} ${condition} -a '${sanitizeShellToken(alias)}'${desc}`);
         }
     }
     // Subcommand condition: we need the parent command in the args
-    const subCondition = `-n '__fish_seen_subcommand_from ${cmd.name}'`;
+    const subCondition = `-n '__fish_seen_subcommand_from ${safeName}'`;
     // Add flags for this command
     if (cmd.flags) {
         for (const f of cmd.flags) {
-            const flagDesc = f.description ? ` -d '${f.description.replace(/'/g, "'\\''")}'` : "";
-            let line = `complete -c ${brand} ${subCondition} -l '${f.name}'`;
+            const safeFlagName = sanitizeShellToken(f.name);
+            const flagDesc = f.description ? ` -d '${escapeShellDescription(f.description)}'` : "";
+            let line = `complete -c ${brand} ${subCondition} -l '${safeFlagName}'`;
             if (f.alias) {
-                line += ` -s '${f.alias}'`;
+                line += ` -s '${sanitizeShellToken(f.alias)}'`;
             }
             if (f.choices && f.choices.length > 0) {
-                line += ` -r -a '${f.choices.join(" ")}'`;
+                line += ` -r -a '${f.choices.map(sanitizeShellToken).join(" ")}'`;
             }
             line += flagDesc;
             lines.push(line);
@@ -29,7 +35,7 @@ function generateFishCompletions(brand, cmd, condition) {
     // Recurse for subcommands
     if (cmd.subcommands) {
         for (const sub of cmd.subcommands) {
-            lines.push(...generateFishCompletions(brand, sub, subCondition));
+            lines.push(...generateFishCompletions(brand, sub, subCondition, depth + 1));
         }
     }
     return lines;
@@ -39,14 +45,15 @@ function generateFishCompletions(brand, cmd, condition) {
  */
 export function fish(info) {
     const { brand, commands } = info;
+    const safeBrand = sanitizeShellToken(brand);
     const lines = [
-        `# Fish completions for ${brand}`,
+        `# Fish completions for ${safeBrand}`,
         `# Generated by @seedcli/completions`,
         "",
     ];
-    const topLevelCondition = `-n 'not __fish_seen_subcommand_from ${commands.map((c) => c.name).join(" ")}'`;
+    const topLevelCondition = `-n 'not __fish_seen_subcommand_from ${commands.map((c) => sanitizeShellToken(c.name)).join(" ")}'`;
     for (const cmd of commands) {
-        lines.push(...generateFishCompletions(brand, cmd, topLevelCondition));
+        lines.push(...generateFishCompletions(safeBrand, cmd, topLevelCondition));
     }
     return `${lines.join("\n")}\n`;
 }

package/dist/fish.js.map

@@ -1 +1 @@
-{"version":3,"file":"fish.js","sourceRoot":"","sources":["../src/fish.ts"],"names":[],"mappings":"AAEA,SAAS,uBAAuB,CAC/B,KAAa,EACb,GAAsB,EACtB,SAAiB;IAEjB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAEtF,yCAAyC;IACzC,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,IAAI,SAAS,QAAQ,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;IAExE,cAAc;IACd,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QACjB,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,IAAI,SAAS,QAAQ,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC;QACtE,CAAC;IACF,CAAC;IAED,+DAA+D;IAC/D,MAAM,YAAY,GAAG,mCAAmC,GAAG,CAAC,IAAI,GAAG,CAAC;IAEpE,6BAA6B;IAC7B,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACtF,IAAI,IAAI,GAAG,eAAe,KAAK,IAAI,YAAY,QAAQ,CAAC,CAAC,IAAI,GAAG,CAAC;YACjE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;gBACb,IAAI,IAAI,QAAQ,CAAC,CAAC,KAAK,GAAG,CAAC;YAC5B,CAAC;YACD,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvC,IAAI,IAAI,WAAW,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAC3C,CAAC;YACD,IAAI,IAAI,QAAQ,CAAC;YACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;IACF,CAAC;IAED,0BAA0B;IAC1B,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,GAAG,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;QAClE,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,IAAI,CAAC,IAAoB;IACxC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACjC,MAAM,KAAK,GAAa;QACvB,0BAA0B,KAAK,EAAE;QACjC,qCAAqC;QACrC,EAAE;KACF,CAAC;IAEF,MAAM,iBAAiB,GAAG,uCAAuC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAE1G,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,GAAG,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAChC,CAAC"}
+{"version":3,"file":"fish.js","sourceRoot":"","sources":["../src/fish.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -4,5 +4,6 @@ export { fish } from "./fish.js";
 export { install } from "./install.js";
 export { powershell } from "./powershell.js";
 export type { CompletionArg, CompletionCommand, CompletionFlag, CompletionInfo, ShellType, } from "./types.js";
+export { escapeShellDescription, sanitizeShellToken } from "./types.js";
 export { zsh } from "./zsh.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,YAAY,EACX,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,SAAS,GACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,YAAY,EACX,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,SAAS,GACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC"}

package/dist/index.js

@@ -3,5 +3,6 @@ export { detect } from "./detect.js";
 export { fish } from "./fish.js";
 export { install } from "./install.js";
 export { powershell } from "./powershell.js";
+export { escapeShellDescription, sanitizeShellToken } from "./types.js";
 export { zsh } from "./zsh.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQ7C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQ7C,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC"}

package/dist/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AA8B5D;;GAEG;AACH,wBAAsB,OAAO,CAC5B,IAAI,EAAE,cAAc,EACpB,KAAK,CAAC,EAAE,SAAS,GACf,OAAO,CAAC;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAe7C"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AA8B5D;;GAEG;AACH,wBAAsB,OAAO,CAC5B,IAAI,EAAE,cAAc,EACpB,KAAK,CAAC,EAAE,SAAS,GACf,OAAO,CAAC;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAwC7C"}

package/dist/install.js

@@ -38,8 +38,31 @@ export async function install(info, shell) {
         const dir = join(homedir(), ".config", "fish", "completions");
         await mkdir(dir, { recursive: true });
     }
-    const marker = `# ${info.brand} completions`;
-    await appendFile(rcPath, `\n${marker}\n${script}\n`);
+    const markerStart = `# ${info.brand} completions`;
+    const markerEnd = `# end ${info.brand} completions`;
+    const block = `\n${markerStart}\n${script}\n${markerEnd}\n`;
+    // Check if completions are already installed — update if so
+    try {
+        const { readFile, writeFile } = await import("node:fs/promises");
+        const content = await readFile(rcPath, "utf-8");
+        const startIdx = content.indexOf(markerStart);
+        if (startIdx !== -1) {
+            const endIdx = content.indexOf(markerEnd, startIdx);
+            if (endIdx !== -1) {
+                // Replace existing block
+                const updated = content.slice(0, startIdx) +
+                    `${markerStart}\n${script}\n${markerEnd}` +
+                    content.slice(endIdx + markerEnd.length);
+                await writeFile(rcPath, updated);
+            }
+            // If no end marker found, leave as-is (legacy install)
+            return { shell: detectedShell, path: rcPath };
+        }
+    }
+    catch {
+        // File doesn't exist yet — proceed with install
+    }
+    await appendFile(rcPath, block);
     return { shell: detectedShell, path: rcPath };
 }
 //# sourceMappingURL=install.js.map

package/dist/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAE/B,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAE/D,MAAM,UAAU,GAAwD;IACvE,IAAI;IACJ,GAAG;IACH,IAAI;IACJ,UAAU;CACV,CAAC;AAEF,SAAS,SAAS,CAAC,KAAgB,EAAE,KAAa;IACjD,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,QAAQ,KAAK,EAAE,CAAC;QACf,KAAK,MAAM;YACV,OAAO,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9B,KAAK,KAAK;YACT,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC7B,KAAK,MAAM;YACV,OAAO,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC;QACtE,KAAK,YAAY;YAChB,OAAO,CACN,OAAO,CAAC,GAAG,CAAC,OAAO;gBACnB,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,kCAAkC,CAAC,CACvE,CAAC;IACJ,CAAC;AACF,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC5B,IAAoB,EACpB,KAAiB;IAEjB,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAEpD,0CAA0C;IAC1C,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC9D,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,IAAI,CAAC,KAAK,cAAc,CAAC;IAC7C,MAAM,UAAU,CAAC,MAAM,EAAE,KAAK,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC;IAErD,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"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"}

package/dist/powershell.d.ts

@@ -1,6 +1,11 @@
 import type { CompletionInfo } from "./types.js";
 /**
  * Generate a PowerShell `Register-ArgumentCompleter` script.
+ *
+ * Uses a compound key built from all non-flag tokens (joined with underscores)
+ * so that nested subcommand completions are reachable. For example,
+ * `mycli db migrate <TAB>` builds the key "db_migrate" which matches the
+ * switch case generated by generateCommandCases.
  */
 export declare function powershell(info: CompletionInfo): string;
 //# sourceMappingURL=powershell.d.ts.map

package/dist/powershell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powershell.d.ts","sourceRoot":"","sources":["../src/powershell.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAiCpE;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAwCvD"}
+{"version":3,"file":"powershell.d.ts","sourceRoot":"","sources":["../src/powershell.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AA8EpE;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CA4CvD"}

package/dist/powershell.js

@@ -1,48 +1,89 @@
+import { sanitizeShellToken } from "./types.js";
+const MAX_COMPLETION_DEPTH = 20;
+/**
+ * Escape a string for safe use in PowerShell single-quoted strings.
+ * In PowerShell, single-quoted strings only need '' to represent a literal '.
+ * Also remove backticks and $ to prevent expression injection.
+ */
+function escapePowerShellString(value) {
+    return value.replace(/'/g, "''").replace(/[`$]/g, "");
+}
 function generateCommandCompletions(cmd, indent) {
     const lines = [];
     // Add subcommands
     if (cmd.subcommands) {
         for (const sub of cmd.subcommands) {
-            const desc = sub.description ? sub.description.replace(/'/g, "''") : sub.name;
-            lines.push(`${indent}[CompletionResult]::new('${sub.name}', '${desc}', [CompletionResultType]::ParameterValue, '${desc}')`);
+            const safeName = sanitizeShellToken(sub.name);
+            const desc = sub.description ? escapePowerShellString(sub.description) : safeName;
+            lines.push(`${indent}[CompletionResult]::new('${safeName}', '${desc}', [CompletionResultType]::ParameterValue, '${desc}')`);
         }
     }
     // Add flags
     if (cmd.flags) {
         for (const f of cmd.flags) {
-            const desc = f.description ? f.description.replace(/'/g, "''") : `--${f.name}`;
-            lines.push(`${indent}[CompletionResult]::new('--${f.name}', '${desc}', [CompletionResultType]::ParameterName, '${desc}')`);
+            const safeFlagName = sanitizeShellToken(f.name);
+            const desc = f.description ? escapePowerShellString(f.description) : `--${safeFlagName}`;
+            lines.push(`${indent}[CompletionResult]::new('--${safeFlagName}', '${desc}', [CompletionResultType]::ParameterName, '${desc}')`);
             if (f.alias) {
-                lines.push(`${indent}[CompletionResult]::new('-${f.alias}', '${desc}', [CompletionResultType]::ParameterName, '${desc}')`);
+                const safeAlias = sanitizeShellToken(f.alias);
+                lines.push(`${indent}[CompletionResult]::new('-${safeAlias}', '${desc}', [CompletionResultType]::ParameterName, '${desc}')`);
             }
         }
     }
     return lines;
 }
+/**
+ * Recursively generate switch cases for a command and all its subcommands.
+ * Uses an underscore-joined key path (e.g., "db_migrate") to match the
+ * compound key built from non-flag tokens at runtime.
+ */
+function generateCommandCases(cmd, path, depth = 0) {
+    if (depth > MAX_COMPLETION_DEPTH)
+        return [];
+    const cases = [];
+    const safeName = sanitizeShellToken(cmd.name);
+    const key = path ? `${path}_${safeName}` : safeName;
+    const indent = "                ";
+    const completions = generateCommandCompletions(cmd, indent);
+    if (completions.length > 0) {
+        cases.push(`            '${key}' {
+${completions.join("\n")}
+            }`);
+    }
+    // Recurse for subcommands
+    if (cmd.subcommands) {
+        for (const sub of cmd.subcommands) {
+            cases.push(...generateCommandCases(sub, key, depth + 1));
+        }
+    }
+    return cases;
+}
 /**
  * Generate a PowerShell `Register-ArgumentCompleter` script.
+ *
+ * Uses a compound key built from all non-flag tokens (joined with underscores)
+ * so that nested subcommand completions are reachable. For example,
+ * `mycli db migrate <TAB>` builds the key "db_migrate" which matches the
+ * switch case generated by generateCommandCases.
  */
 export function powershell(info) {
     const { brand, commands } = info;
+    const safeBrand = sanitizeShellToken(brand);
     const commandCases = [];
     for (const cmd of commands) {
-        const completions = generateCommandCompletions(cmd, "                ");
-        if (completions.length > 0) {
-            commandCases.push(`            '${cmd.name}' {
-${completions.join("\n")}
-            }`);
-        }
+        commandCases.push(...generateCommandCases(cmd, ""));
     }
     const topLevelCompletions = commands
         .map((c) => {
-        const desc = c.description ? c.description.replace(/'/g, "''") : c.name;
-        return `            [CompletionResult]::new('${c.name}', '${desc}', [CompletionResultType]::ParameterValue, '${desc}')`;
+        const safeName = sanitizeShellToken(c.name);
+        const desc = c.description ? escapePowerShellString(c.description) : safeName;
+        return `            [CompletionResult]::new('${safeName}', '${desc}', [CompletionResultType]::ParameterValue, '${desc}')`;
     })
         .join("\n");
-    return `# PowerShell completions for ${brand}
+    return `# PowerShell completions for ${safeBrand}
 # Generated by @seedcli/completions
 
-Register-ArgumentCompleter -CommandName '${brand}' -ScriptBlock {
+Register-ArgumentCompleter -CommandName '${safeBrand}' -ScriptBlock {
     param($wordToComplete, $commandAst, $cursorPosition)
 
     $tokens = $commandAst.ToString().Split(' ', [StringSplitOptions]::RemoveEmptyEntries)
@@ -52,9 +93,16 @@ ${topLevelCompletions}
         return
     }
 
-    $command = $tokens[1]
+    # Build a compound key from all non-flag tokens after the command name.
+    # e.g. "mycli db migrate <TAB>" -> key = "db_migrate"
+    $key = ''
+    for ($i = 1; $i -lt $tokens.Length; $i++) {
+        if ($tokens[$i] -like '-*') { continue }
+        if ($key -ne '') { $key += '_' }
+        $key += $tokens[$i]
+    }
 
-    switch ($command) {
+    switch ($key) {
 ${commandCases.join("\n")}
     }
 } | Where-Object { $_.CompletionText -like "$wordToComplete*" }

package/dist/powershell.js.map

@@ -1 +1 @@
-{"version":3,"file":"powershell.js","sourceRoot":"","sources":["../src/powershell.ts"],"names":[],"mappings":"AAEA,SAAS,0BAA0B,CAAC,GAAsB,EAAE,MAAc;IACzE,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,kBAAkB;IAClB,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAC9E,KAAK,CAAC,IAAI,CACT,GAAG,MAAM,4BAA4B,GAAG,CAAC,IAAI,OAAO,IAAI,+CAA+C,IAAI,IAAI,CAC/G,CAAC;QACH,CAAC;IACF,CAAC;IAED,YAAY;IACZ,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/E,KAAK,CAAC,IAAI,CACT,GAAG,MAAM,8BAA8B,CAAC,CAAC,IAAI,OAAO,IAAI,8CAA8C,IAAI,IAAI,CAC9G,CAAC;YACF,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;gBACb,KAAK,CAAC,IAAI,CACT,GAAG,MAAM,6BAA6B,CAAC,CAAC,KAAK,OAAO,IAAI,8CAA8C,IAAI,IAAI,CAC9G,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAoB;IAC9C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAEjC,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,0BAA0B,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QACxE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,IAAI;EAC3C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;cACV,CAAC,CAAC;QACd,CAAC;IACF,CAAC;IAED,MAAM,mBAAmB,GAAG,QAAQ;SAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACV,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACxE,OAAO,wCAAwC,CAAC,CAAC,IAAI,OAAO,IAAI,+CAA+C,IAAI,IAAI,CAAC;IACzH,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,OAAO,gCAAgC,KAAK;;;2CAGF,KAAK;;;;;;EAM9C,mBAAmB;;;;;;;EAOnB,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;;;CAGxB,CAAC;AACF,CAAC"}
+{"version":3,"file":"powershell.js","sourceRoot":"","sources":["../src/powershell.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -23,4 +23,14 @@ export interface CompletionInfo {
     brand: string;
     commands: CompletionCommand[];
 }
+/**
+ * Sanitize a string for safe inclusion in a shell script.
+ * Strips any characters outside [a-zA-Z0-9_-].
+ */
+export declare function sanitizeShellToken(value: string): string;
+/**
+ * Escape a description string for shell scripts.
+ * Removes backticks, $, and other dangerous characters while preserving readability.
+ */
+export declare function escapeShellDescription(value: string): string;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,YAAY,CAAC;AAE/D,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE,aAAa,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC9B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,YAAY,CAAC;AAE/D,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE,aAAa,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/dist/types.js

@@ -1,2 +1,15 @@
-export {};
+/**
+ * Sanitize a string for safe inclusion in a shell script.
+ * Strips any characters outside [a-zA-Z0-9_-].
+ */
+export function sanitizeShellToken(value) {
+    return value.replace(/[^a-zA-Z0-9_-]/g, "");
+}
+/**
+ * Escape a description string for shell scripts.
+ * Removes backticks, $, and other dangerous characters while preserving readability.
+ */
+export function escapeShellDescription(value) {
+    return value.replace(/[`$\\!"]/g, "").replace(/'/g, "'\\''");
+}
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AA8BA;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAa;IACnD,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC"}

package/dist/zsh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zsh.d.ts","sourceRoot":"","sources":["../src/zsh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAyDpE;;GAEG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAsChD"}
+{"version":3,"file":"zsh.d.ts","sourceRoot":"","sources":["../src/zsh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAiEpE;;GAEG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAuChD"}

package/dist/zsh.js

@@ -1,30 +1,36 @@
-function generateSubcommandFunction(brand, cmd, prefix) {
+import { escapeShellDescription, sanitizeShellToken } from "./types.js";
+const MAX_COMPLETION_DEPTH = 20;
+function generateSubcommandFunction(brand, cmd, prefix, depth = 0) {
+    if (depth > MAX_COMPLETION_DEPTH)
+        return [];
     const blocks = [];
-    const fnName = prefix ? `_${brand}_${prefix}_${cmd.name}` : `_${brand}_${cmd.name}`;
+    const safeName = sanitizeShellToken(cmd.name);
+    const fnName = prefix ? `_${brand}_${prefix}_${safeName}` : `_${brand}_${safeName}`;
     const args = [];
     // Add subcommand descriptions
     if (cmd.subcommands && cmd.subcommands.length > 0) {
         const subcmdDescs = cmd.subcommands
-            .map((s) => `'${s.name}:${(s.description ?? "").replace(/'/g, "'\\''")}'`)
+            .map((s) => `'${sanitizeShellToken(s.name)}:${escapeShellDescription(s.description ?? "")}'`)
             .join(" ");
-        args.push(`'1:command:(${cmd.subcommands.map((s) => s.name).join(" ")})'`);
+        args.push(`'1:command:(${cmd.subcommands.map((s) => sanitizeShellToken(s.name)).join(" ")})'`);
         blocks.push(`# Subcommands: ${subcmdDescs}`);
     }
     // Add flags
     if (cmd.flags) {
         for (const f of cmd.flags) {
-            const desc = (f.description ?? "")
-                .replace(/'/g, "'\\''")
+            const safeFlagName = sanitizeShellToken(f.name);
+            const desc = escapeShellDescription(f.description ?? "")
                 .replace(/\[/g, "\\[")
                 .replace(/\]/g, "\\]");
             if (f.choices && f.choices.length > 0) {
-                args.push(`'--${f.name}[${desc}]:value:(${f.choices.join(" ")})'`);
+                const safeChoices = f.choices.map(sanitizeShellToken).join(" ");
+                args.push(`'--${safeFlagName}[${desc}]:value:(${safeChoices})'`);
             }
             else {
-                args.push(`'--${f.name}[${desc}]'`);
+                args.push(`'--${safeFlagName}[${desc}]'`);
             }
             if (f.alias) {
-                args.push(`'-${f.alias}[${desc}]'`);
+                args.push(`'-${sanitizeShellToken(f.alias)}[${desc}]'`);
             }
         }
     }
@@ -37,8 +43,8 @@ function generateSubcommandFunction(brand, cmd, prefix) {
     // Recurse for subcommands
     if (cmd.subcommands) {
         for (const sub of cmd.subcommands) {
-            const nextPrefix = prefix ? `${prefix}_${cmd.name}` : cmd.name;
-            blocks.push(...generateSubcommandFunction(brand, sub, nextPrefix));
+            const nextPrefix = prefix ? `${prefix}_${safeName}` : safeName;
+            blocks.push(...generateSubcommandFunction(brand, sub, nextPrefix, depth + 1));
         }
     }
     return blocks;
@@ -48,18 +54,19 @@ function generateSubcommandFunction(brand, cmd, prefix) {
  */
 export function zsh(info) {
     const { brand, commands } = info;
+    const safeBrand = sanitizeShellToken(brand);
     const functionBlocks = [];
     for (const cmd of commands) {
-        functionBlocks.push(...generateSubcommandFunction(brand, cmd, ""));
+        functionBlocks.push(...generateSubcommandFunction(safeBrand, cmd, ""));
     }
-    return `#compdef ${brand}
-# Zsh completions for ${brand}
+    return `#compdef ${safeBrand}
+# Zsh completions for ${safeBrand}
 # Generated by @seedcli/completions
 
-_${brand}() {
+_${safeBrand}() {
     local -a commands
     commands=(
-        ${commands.map((c) => `'${c.name}:${(c.description ?? "").replace(/'/g, "'\\''")}'`).join("\n        ")}
+        ${commands.map((c) => `'${sanitizeShellToken(c.name)}:${escapeShellDescription(c.description ?? "")}'`).join("\n        ")}
     )
 
     _arguments \\
@@ -72,7 +79,7 @@ _${brand}() {
             ;;
         args)
             case "\${words[1]}" in
-                ${commands.map((c) => `${c.name}) _${brand}_${c.name} ;;`).join("\n                ")}
+                ${commands.map((c) => `${sanitizeShellToken(c.name)}) _${safeBrand}_${sanitizeShellToken(c.name)} ;;`).join("\n                ")}
             esac
             ;;
     esac
@@ -80,7 +87,7 @@ _${brand}() {
 
 ${functionBlocks.join("\n\n")}
 
-_${brand} "$@"
+_${safeBrand} "$@"
 `;
 }
 //# sourceMappingURL=zsh.js.map

package/dist/zsh.js.map

@@ -1 +1 @@
-{"version":3,"file":"zsh.js","sourceRoot":"","sources":["../src/zsh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zsh.js","sourceRoot":"","sources":["../src/zsh.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@seedcli/completions",
-	"version": "0.1.7",
+	"version": "0.1.10",
 	"description": "Shell completion generation for bash, zsh, and fish",
 	"type": "module",
 	"license": "MIT",
@@ -30,7 +30,7 @@
 	"exports": {
 		".": {
 			"import": "./dist/index.js",
-			"types": "./dist/index.d.ts"
+			"types": "./dist/index.js"
 		}
 	},
 	"files": [