@kaynooo/cli-doctor 0.10.0 → 0.11.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;
@@ -1582,9 +1581,20 @@ var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|[\s\S]/giu;
 var CONTROL = /^[\x00-\x1F\x7F]/;
 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 PASTE_START = "\x1B[200~";
+var PASTE_END = "\x1B[201~";
+var KEYS = { "\x1B[A": "up", "\x1BOA": "up", "\x1B[B": "down", "\x1BOB": "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" };
+function readKeys(input, paste = { active: false }) {
+  return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => {
+    if (sequence === PASTE_START || sequence === PASTE_END) {
+      paste.active = sequence === PASTE_START;
+      return [];
+    }
+    if (paste.active && (sequence === "\r" || sequence === `
+`))
+      return [];
+    return KEYS[sequence] ?? (CONTROL.test(sequence) ? [] : [{ text: sequence }]);
+  });
 }
 function flip(checked, value) {
   const next = new Set(checked);
@@ -1683,6 +1693,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 +1740,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 +1784,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 +1878,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 +1941,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/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;
@@ -1580,9 +1579,20 @@ var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|[\s\S]/giu;
 var CONTROL = /^[\x00-\x1F\x7F]/;
 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 PASTE_START = "\x1B[200~";
+var PASTE_END = "\x1B[201~";
+var KEYS = { "\x1B[A": "up", "\x1BOA": "up", "\x1B[B": "down", "\x1BOB": "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" };
+function readKeys(input, paste = { active: false }) {
+  return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => {
+    if (sequence === PASTE_START || sequence === PASTE_END) {
+      paste.active = sequence === PASTE_START;
+      return [];
+    }
+    if (paste.active && (sequence === "\r" || sequence === `
+`))
+      return [];
+    return KEYS[sequence] ?? (CONTROL.test(sequence) ? [] : [{ text: sequence }]);
+  });
 }
 function flip(checked, value) {
   const next = new Set(checked);
@@ -1681,6 +1691,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 +1738,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 +1782,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 +1876,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 +1939,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.11.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.24.0"
   }
 }