@kaynooo/cli-doctor 0.10.0 → 0.12.0

package/dist/cli-bin.js

@@ -481,7 +481,6 @@ var DASHES = /^-+/;
 function jsonOption(holds) {
   return { type: "boolean", description: holds === undefined ? "print JSON" : `print JSON: ${holds}` };
 }
-
 class Exit extends Error {
   code;
   hint;
@@ -1480,6 +1479,28 @@ var BASH_FUNCTION = `__kaynooo_cli_complete() {
     done
     COMPREPLY+=($(compgen -W "$words" -- "$cur"))
 }`;
+var ZSH_FUNCTION = `__kaynooo_cli_complete() {
+    local line
+    local -a described plain
+    for line in \${(f)"$("\${words[1]}" __complete "\${(@)words[2,CURRENT]}" 2>/dev/null)"}; do
+        if [[ $line == __files__ ]]; then
+            _files
+        elif [[ $line == *$'\\t'* ]]; then
+            described+=("\${\${line%%$'\\t'*}//:/\\\\:}:\${line#*$'\\t'}")
+        else
+            plain+=("$line")
+        fi
+    done
+    (( \${#described} )) && _describe -V value described
+    (( \${#plain} )) && compadd -- "\${plain[@]}"
+    return 0
+}`;
+function zshScript(bins) {
+  return `# Generated by \`cli completions zsh\`
+${ZSH_FUNCTION}
+compdef __kaynooo_cli_complete ${bins.join(" ")}
+`;
+}
 function bashScript(bins) {
   return `# Generated by \`cli completions bash\`
 ${BASH_FUNCTION}
@@ -1578,13 +1599,68 @@ import process16 from "process";
 
 // ../kit/src/prompt.ts
 import process15 from "process";
-var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|[\s\S]/giu;
-var CONTROL = /^[\x00-\x1F\x7F]/;
+
+// ../kit/src/picker/score.ts
+var BOUNDARY_AFTER = new Set([" ", "/", "-", "_", ".", ":", "\\", "(", "[", ",", "\t"]);
+var NONE = Number.NEGATIVE_INFINITY;
+
+// ../kit/src/picker/state.ts
+var IS_CONTROL = /[\x00-\x1F\x7F-\x9F]/;
+var PASTE_START = "\x1B[200~";
+var PASTE_END = "\x1B[201~";
+var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|\x1B[\s\S]|[\s\S]/gu;
+var KEYS = {
+  "\x1B[A": "up",
+  "\x1BOA": "up",
+  "\x10": "up",
+  "\x1B[B": "down",
+  "\x1BOB": "down",
+  "\x0E": "down",
+  "\x1B[5~": "pageup",
+  "\x1B[6~": "pagedown",
+  "\x1B[H": "home",
+  "\x1B[1~": "home",
+  "\x1BOH": "home",
+  "\x1B[F": "end",
+  "\x1B[4~": "end",
+  "\x1BOF": "end",
+  "\r": "enter",
+  "\n": "enter",
+  "\x03": "cancel",
+  "\x1B": "cancel",
+  "\x7F": "erase",
+  "\b": "erase",
+  "\x15": "clear",
+  "\x17": "word",
+  "\t": "tab",
+  "\x1F": "help",
+  "\x1BOP": "help",
+  "\x1B[11~": "help"
+};
+function parseKeys(input, paste = { active: false }, ctrls = []) {
+  const codes = new Map(ctrls.map((name) => [String.fromCharCode(name.codePointAt(name.length - 1) - 96), name]));
+  return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => {
+    const named = codes.get(sequence);
+    const key = named === undefined ? KEYS[sequence] : { ctrl: named };
+    if (sequence === PASTE_START || sequence === PASTE_END) {
+      paste.active = sequence === PASTE_START;
+      return [];
+    }
+    if (paste.active && (sequence === "\r" || sequence === `
+`))
+      return [];
+    if (key !== undefined)
+      return [key];
+    return IS_CONTROL.test(sequence) || sequence.startsWith("\x1B") ? [] : [{ text: sequence }];
+  });
+}
+
+// ../kit/src/prompt.ts
 var WORDS = /\s+/;
 var MAX_ROWS = 10;
-var KEYS = { "\x1B[A": "up", "\x1BOA": "up", "\x1B[B": "down", "\x1BOB": "down", "\r": "enter", "\n": "enter", "\x03": "cancel", "\x1B": "cancel", "\x7F": "erase", "\b": "erase" };
-function readKeys(input) {
-  return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => KEYS[sequence] ?? (CONTROL.test(sequence) ? [] : [{ text: sequence }]));
+var PROMPT_KEYS = new Set(["up", "down", "pageup", "pagedown", "home", "end", "enter", "cancel", "erase"]);
+function readKeys(input, paste = { active: false }) {
+  return parseKeys(input, paste).filter((key) => typeof key === "object" ? "text" in key : PROMPT_KEYS.has(key));
 }
 function flip(checked, value) {
   const next = new Set(checked);
@@ -1683,6 +1759,12 @@ class List {
         this.cursor = (this.cursor + (key === "up" ? this.matches.length - 1 : 1)) % this.matches.length;
       return;
     }
+    if (key === "home" || key === "end" || key === "pageup" || key === "pagedown") {
+      const last = this.matches.length - 1;
+      const to = { home: 0, end: last, pageup: this.cursor - MAX_ROWS, pagedown: this.cursor + MAX_ROWS }[key];
+      this.cursor = Math.max(0, Math.min(last, to));
+      return;
+    }
     if (key === "erase")
       this.filter([...this.query].slice(0, -1).join(""));
     else if (typeof key === "object")
@@ -1724,22 +1806,29 @@ async function ask(question, { hint, terminal = process15 }, render, press) {
   if (!isInteractive(terminal))
     fail(`cannot ask "${question}" off a terminal`, 2, hint);
   const colors = paint(stderr);
-  let drawn = 0;
+  let drawn = [];
+  let current = "asking";
   let outcome;
+  const columns = () => stderr.columns || 80;
   const draw = (state) => {
-    const frame = render(colors, state, { columns: stderr.columns || 80, rows: stderr.rows || 24 });
-    stderr.write(`${drawn > 1 ? `\x1B[${drawn - 1}A` : ""}\r\x1B[0J${frame.join(`
+    const frame = render(colors, state, { columns: columns(), rows: stderr.rows || 24 });
+    const rows = drawn.reduce((sum, line) => sum + Math.max(1, Math.ceil(Bun.stringWidth(line) / columns())), 0);
+    stderr.write(`${rows > 1 ? `\x1B[${rows - 1}A` : ""}\r\x1B[0J${frame.join(`
 `)}`);
-    drawn = frame.length;
+    drawn = frame;
+    current = state;
   };
+  const redraw = () => draw(current);
+  const paste = { active: false };
   try {
+    stderr.on?.("resize", redraw);
     stdin.setRawMode(true);
     stdin.resume();
-    stderr.write("\x1B[?25l");
+    stderr.write("\x1B[?25l\x1B[?2004h");
     draw("asking");
     return await new Promise((resolve) => {
       function onData(data) {
-        for (const key of readKeys(data.toString())) {
+        for (const key of readKeys(data.toString(), paste)) {
           const pressed = press(key);
           if (pressed !== undefined) {
             settle(pressed);
@@ -1761,9 +1850,10 @@ async function ask(question, { hint, terminal = process15 }, render, press) {
       stdin.on("end", onEnd);
     });
   } finally {
+    stderr.off?.("resize", redraw);
     draw(outcome ?? "cancel");
     stderr.write(`
-\x1B[?25h`);
+\x1B[?25h\x1B[?2004l`);
     stdin.setRawMode(false);
     stdin.pause();
   }
@@ -1854,7 +1944,7 @@ async function install(host, options, recheck, choosing = ask2) {
       console.log("everything is installed");
     return 0;
   }
-  if (pool.length === 0 && options.names.length > 0) {
+  if (pool.length === 0 && (options.names.length > 0 || !isInteractive())) {
     console.log("everything is installed");
     return 0;
   }
@@ -1917,10 +2007,14 @@ async function install(host, options, recheck, choosing = ask2) {
       return 1;
     }
   }
-  if (removing.plugin && host.which("claude") !== null) {
+  if (removing.plugin && host.which("claude") === null) {
+    console.error(`${yellow("not run")}  ${PLUGIN_UNINSTALL.join(" ")}: claude is not on PATH`);
+  } else if (removing.plugin) {
     const ran = await host.run(PLUGIN_UNINSTALL);
-    if (ran.code !== 0)
+    if (ran.code !== 0) {
       console.error(`${red("failed")}   ${PLUGIN_UNINSTALL.join(" ")}: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
+      return 1;
+    }
   }
   console.log(`
 after the install:`);
@@ -2045,26 +2139,24 @@ async function list(args, host = hostHere()) {
     print2(listed);
   return 0;
 }
-var COMPLETIONS_USAGE = `cli completions <fish|bash> [--install] [--dir <folder>]: shell completions for every installed bin of the @kaynooo/cli-* packages
+var COMPLETIONS_USAGE = `cli completions <fish|bash|zsh> [--install] [--dir <folder>]: shell completions for every installed bin of the @kaynooo/cli-* packages
 
 Each bin completes itself through \`<bin> __complete\`; this writes the glue a shell needs per bin.
 fish: without --install the files print on stdout, with it they go to ~/.cache/fish/kaynooo-cli (or $XDG_CACHE_HOME), one <bin>.fish each, the stale ones this command wrote taken out. That folder has to be in fish_complete_path, first so a completion fish ships for the same name does not win: \`set -p fish_complete_path ~/.cache/fish/kaynooo-cli\`.
 bash: one script on stdout, sourced from ~/.bashrc with \`source <(cli completions bash)\`; --install and --dir are fish's.
-zsh: has no script of its own, it reads the bash one through bashcompinit: \`autoload -U +X compinit && compinit\`, \`autoload -U +X bashcompinit && bashcompinit\`, then the bash line above in ~/.zshrc (untested, zsh is not installed on the machine this was written on).`;
+zsh: one script on stdout like bash's, after compinit in ~/.zshrc: \`autoload -U +X compinit && compinit\`, then \`source <(cli completions zsh)\` (written without zsh at hand to run it, so untested).`;
 var COMPLETIONS_OPTIONS = {
   install: { type: "boolean", description: "write the files to the folder instead of printing them" },
   dir: { type: "string", short: "d", description: "the folder to write to, instead of ~/.cache/fish/kaynooo-cli" }
 };
 async function completions(args, host = hostHere()) {
-  const { values, positionals } = parse(args, COMPLETIONS_USAGE, COMPLETIONS_OPTIONS, { positionals: ["<shell>"], exits: [[0, "it printed or wrote them"], [2, "a usage error or a shell without a script"]], candidates: { "<shell>": () => ["fish", "bash"] }, examples: ["cli completions fish", ["cli completions fish --install", "write one file per bin"], ["source <(cli completions bash)", "in ~/.bashrc"]] });
-  if (positionals[0] === "zsh")
-    badUsage("zsh has no script of its own: it reads the bash one through bashcompinit, see cli completions --help");
-  if (positionals[0] !== "fish" && positionals[0] !== "bash")
-    badUsage("completions exist for fish and bash: cli completions fish");
-  if (positionals[0] === "bash") {
+  const { values, positionals } = parse(args, COMPLETIONS_USAGE, COMPLETIONS_OPTIONS, { positionals: ["<shell>"], exits: [[0, "it printed or wrote them"], [2, "a usage error or a shell without a script"]], candidates: { "<shell>": () => ["fish", "bash", "zsh"] }, examples: ["cli completions fish", ["cli completions fish --install", "write one file per bin"], ["source <(cli completions bash)", "in ~/.bashrc"], ["source <(cli completions zsh)", "in ~/.zshrc after compinit"]] });
+  if (positionals[0] !== "fish" && positionals[0] !== "bash" && positionals[0] !== "zsh")
+    badUsage("completions exist for fish, bash and zsh: cli completions fish");
+  if (positionals[0] === "bash" || positionals[0] === "zsh") {
     if (values.install === true || values.dir !== undefined)
-      badUsage("--install and --dir are for fish: source the bash script instead");
-    console.log(bashScript(installedBins(host)).trimEnd());
+      badUsage(`--install and --dir are for fish: source the ${positionals[0]} script instead`);
+    console.log((positionals[0] === "zsh" ? zshScript : bashScript)(installedBins(host)).trimEnd());
     return 0;
   }
   if (values.install !== true) {

package/dist/cli.js

@@ -481,7 +481,6 @@ var DASHES = /^-+/;
 function jsonOption(holds) {
   return { type: "boolean", description: holds === undefined ? "print JSON" : `print JSON: ${holds}` };
 }
-
 class Exit extends Error {
   code;
   hint;
@@ -1318,6 +1317,28 @@ var BASH_FUNCTION = `__kaynooo_cli_complete() {
     done
     COMPREPLY+=($(compgen -W "$words" -- "$cur"))
 }`;
+var ZSH_FUNCTION = `__kaynooo_cli_complete() {
+    local line
+    local -a described plain
+    for line in \${(f)"$("\${words[1]}" __complete "\${(@)words[2,CURRENT]}" 2>/dev/null)"}; do
+        if [[ $line == __files__ ]]; then
+            _files
+        elif [[ $line == *$'\\t'* ]]; then
+            described+=("\${\${line%%$'\\t'*}//:/\\\\:}:\${line#*$'\\t'}")
+        else
+            plain+=("$line")
+        fi
+    done
+    (( \${#described} )) && _describe -V value described
+    (( \${#plain} )) && compadd -- "\${plain[@]}"
+    return 0
+}`;
+function zshScript(bins) {
+  return `# Generated by \`cli completions zsh\`
+${ZSH_FUNCTION}
+compdef __kaynooo_cli_complete ${bins.join(" ")}
+`;
+}
 function bashScript(bins) {
   return `# Generated by \`cli completions bash\`
 ${BASH_FUNCTION}
@@ -1576,13 +1597,68 @@ import process16 from "process";
 
 // ../kit/src/prompt.ts
 import process15 from "process";
-var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|[\s\S]/giu;
-var CONTROL = /^[\x00-\x1F\x7F]/;
+
+// ../kit/src/picker/score.ts
+var BOUNDARY_AFTER = new Set([" ", "/", "-", "_", ".", ":", "\\", "(", "[", ",", "\t"]);
+var NONE = Number.NEGATIVE_INFINITY;
+
+// ../kit/src/picker/state.ts
+var IS_CONTROL = /[\x00-\x1F\x7F-\x9F]/;
+var PASTE_START = "\x1B[200~";
+var PASTE_END = "\x1B[201~";
+var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|\x1B[\s\S]|[\s\S]/gu;
+var KEYS = {
+  "\x1B[A": "up",
+  "\x1BOA": "up",
+  "\x10": "up",
+  "\x1B[B": "down",
+  "\x1BOB": "down",
+  "\x0E": "down",
+  "\x1B[5~": "pageup",
+  "\x1B[6~": "pagedown",
+  "\x1B[H": "home",
+  "\x1B[1~": "home",
+  "\x1BOH": "home",
+  "\x1B[F": "end",
+  "\x1B[4~": "end",
+  "\x1BOF": "end",
+  "\r": "enter",
+  "\n": "enter",
+  "\x03": "cancel",
+  "\x1B": "cancel",
+  "\x7F": "erase",
+  "\b": "erase",
+  "\x15": "clear",
+  "\x17": "word",
+  "\t": "tab",
+  "\x1F": "help",
+  "\x1BOP": "help",
+  "\x1B[11~": "help"
+};
+function parseKeys(input, paste = { active: false }, ctrls = []) {
+  const codes = new Map(ctrls.map((name) => [String.fromCharCode(name.codePointAt(name.length - 1) - 96), name]));
+  return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => {
+    const named = codes.get(sequence);
+    const key = named === undefined ? KEYS[sequence] : { ctrl: named };
+    if (sequence === PASTE_START || sequence === PASTE_END) {
+      paste.active = sequence === PASTE_START;
+      return [];
+    }
+    if (paste.active && (sequence === "\r" || sequence === `
+`))
+      return [];
+    if (key !== undefined)
+      return [key];
+    return IS_CONTROL.test(sequence) || sequence.startsWith("\x1B") ? [] : [{ text: sequence }];
+  });
+}
+
+// ../kit/src/prompt.ts
 var WORDS = /\s+/;
 var MAX_ROWS = 10;
-var KEYS = { "\x1B[A": "up", "\x1BOA": "up", "\x1B[B": "down", "\x1BOB": "down", "\r": "enter", "\n": "enter", "\x03": "cancel", "\x1B": "cancel", "\x7F": "erase", "\b": "erase" };
-function readKeys(input) {
-  return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => KEYS[sequence] ?? (CONTROL.test(sequence) ? [] : [{ text: sequence }]));
+var PROMPT_KEYS = new Set(["up", "down", "pageup", "pagedown", "home", "end", "enter", "cancel", "erase"]);
+function readKeys(input, paste = { active: false }) {
+  return parseKeys(input, paste).filter((key) => typeof key === "object" ? "text" in key : PROMPT_KEYS.has(key));
 }
 function flip(checked, value) {
   const next = new Set(checked);
@@ -1681,6 +1757,12 @@ class List {
         this.cursor = (this.cursor + (key === "up" ? this.matches.length - 1 : 1)) % this.matches.length;
       return;
     }
+    if (key === "home" || key === "end" || key === "pageup" || key === "pagedown") {
+      const last = this.matches.length - 1;
+      const to = { home: 0, end: last, pageup: this.cursor - MAX_ROWS, pagedown: this.cursor + MAX_ROWS }[key];
+      this.cursor = Math.max(0, Math.min(last, to));
+      return;
+    }
     if (key === "erase")
       this.filter([...this.query].slice(0, -1).join(""));
     else if (typeof key === "object")
@@ -1722,22 +1804,29 @@ async function ask(question, { hint, terminal = process15 }, render, press) {
   if (!isInteractive(terminal))
     fail(`cannot ask "${question}" off a terminal`, 2, hint);
   const colors = paint(stderr);
-  let drawn = 0;
+  let drawn = [];
+  let current = "asking";
   let outcome;
+  const columns = () => stderr.columns || 80;
   const draw = (state) => {
-    const frame = render(colors, state, { columns: stderr.columns || 80, rows: stderr.rows || 24 });
-    stderr.write(`${drawn > 1 ? `\x1B[${drawn - 1}A` : ""}\r\x1B[0J${frame.join(`
+    const frame = render(colors, state, { columns: columns(), rows: stderr.rows || 24 });
+    const rows = drawn.reduce((sum, line) => sum + Math.max(1, Math.ceil(Bun.stringWidth(line) / columns())), 0);
+    stderr.write(`${rows > 1 ? `\x1B[${rows - 1}A` : ""}\r\x1B[0J${frame.join(`
 `)}`);
-    drawn = frame.length;
+    drawn = frame;
+    current = state;
   };
+  const redraw = () => draw(current);
+  const paste = { active: false };
   try {
+    stderr.on?.("resize", redraw);
     stdin.setRawMode(true);
     stdin.resume();
-    stderr.write("\x1B[?25l");
+    stderr.write("\x1B[?25l\x1B[?2004h");
     draw("asking");
     return await new Promise((resolve) => {
       function onData(data) {
-        for (const key of readKeys(data.toString())) {
+        for (const key of readKeys(data.toString(), paste)) {
           const pressed = press(key);
           if (pressed !== undefined) {
             settle(pressed);
@@ -1759,9 +1848,10 @@ async function ask(question, { hint, terminal = process15 }, render, press) {
       stdin.on("end", onEnd);
     });
   } finally {
+    stderr.off?.("resize", redraw);
     draw(outcome ?? "cancel");
     stderr.write(`
-\x1B[?25h`);
+\x1B[?25h\x1B[?2004l`);
     stdin.setRawMode(false);
     stdin.pause();
   }
@@ -1852,7 +1942,7 @@ async function install(host, options, recheck, choosing = ask2) {
       console.log("everything is installed");
     return 0;
   }
-  if (pool.length === 0 && options.names.length > 0) {
+  if (pool.length === 0 && (options.names.length > 0 || !isInteractive())) {
     console.log("everything is installed");
     return 0;
   }
@@ -1915,10 +2005,14 @@ async function install(host, options, recheck, choosing = ask2) {
       return 1;
     }
   }
-  if (removing.plugin && host.which("claude") !== null) {
+  if (removing.plugin && host.which("claude") === null) {
+    console.error(`${yellow("not run")}  ${PLUGIN_UNINSTALL.join(" ")}: claude is not on PATH`);
+  } else if (removing.plugin) {
     const ran = await host.run(PLUGIN_UNINSTALL);
-    if (ran.code !== 0)
+    if (ran.code !== 0) {
       console.error(`${red("failed")}   ${PLUGIN_UNINSTALL.join(" ")}: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
+      return 1;
+    }
   }
   console.log(`
 after the install:`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-doctor",
   "type": "module",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "doctor: checks the @kaynooo/cli-* install of a host: each bin's version against the registry, tea's login to Forgejo, the Claude Code hooks and the Bun floor; cli list: every bin in one line, read from its own help.",
   "author": "Kaynooo <contact@kaynooo.fr>",
   "license": "MIT",
@@ -37,6 +37,6 @@
     "doctor": "$npm_execpath src/cli.ts"
   },
   "devDependencies": {
-    "@kaynooo/cli-kit": "0.23.0"
+    "@kaynooo/cli-kit": "0.25.0"
   }
 }