@kaynooo/cli-doctor 0.9.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);
@@ -1615,6 +1625,22 @@ async function checklist(question, choices, { initial = new Set, min = 0, toggle
   });
   return accepted ? checked : undefined;
 }
+async function confirm(question, { default: fallback, ...settings } = {}) {
+  let answered = fallback;
+  const choices = { true: "Y/n", false: "y/N", undefined: "y/n" }[String(fallback)];
+  const accepted = await ask(question, settings, (colors, state) => [state === "asking" ? asking(colors, question, "", choices) : answer(colors, question, state, answered ? "yes" : "no")], (key) => {
+    if (key === "cancel")
+      return "cancel";
+    if (key === "enter")
+      return answered === undefined ? undefined : "enter";
+    const letter = typeof key === "object" ? key.text.toLowerCase() : "";
+    if (letter !== "y" && letter !== "n")
+      return;
+    answered = letter === "y";
+    return "enter";
+  });
+  return accepted ? answered : undefined;
+}
 async function input2(question, { default: fallback, mask = false, validate, ...settings } = {}) {
   let value = "";
   let invalid;
@@ -1667,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")
@@ -1708,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);
@@ -1745,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();
   }
@@ -1755,18 +1795,19 @@ async function ask(question, { hint, terminal = process15 }, render, press) {
 
 // src/install.ts
 var HOOKS = "hooks";
+var PLUGIN_UNINSTALL = ["claude", "plugin", "uninstall", "cli-hooks"];
 var PLUGIN_INSTALL = ["claude", "plugin", "install", "cli-hooks", "--marketplace", `https://${FORGE}/kaynooo/cli.git`];
 var CLI_PREFIX = /^cli-/;
 var shortName = (name) => name.slice(name.indexOf("/") + 1).replace(CLI_PREFIX, "");
 function candidates2(host) {
-  const packages = Object.entries(TOOLS).filter(([name]) => !isInstalled(host, name)).map(([name, bins]) => {
+  const packages = Object.entries(TOOLS).map(([name, bins]) => {
     const needs = (NEEDS[name] ?? []).map((need) => need.bin);
-    return { id: name, names: [shortName(name), name, `cli-${shortName(name)}`, ...bins], label: shortName(name), hint: `${bins.join(" ")}: ${ABOUT[name] ?? ""}${needs.length === 0 ? "" : `, needs ${needs.join(", ")}`}`, packages: [name] };
+    return { id: name, names: [shortName(name), name, `cli-${shortName(name)}`, ...bins], label: shortName(name), hint: `${bins.join(" ")}: ${ABOUT[name] ?? ""}${needs.length === 0 ? "" : `, needs ${needs.join(", ")}`}`, packages: [name], installed: isInstalled(host, name) };
   });
   const { plugin, mod } = hooksWiring(host);
-  if (plugin || mod !== undefined)
+  if (mod !== undefined && !plugin)
     return packages;
-  return [...packages, { id: HOOKS, names: [HOOKS, "plugin", "cli-hooks"], label: "hooks", hint: `the Claude Code plugin running guard on every tool call, needs ${HOOKS_REQUIRES}`, packages: isInstalled(host, HOOKS_REQUIRES) ? [] : [HOOKS_REQUIRES] }];
+  return [...packages, { id: HOOKS, names: [HOOKS, "plugin", "cli-hooks"], label: "hooks", hint: `the Claude Code plugin running guard on every tool call, needs ${HOOKS_REQUIRES}`, packages: isInstalled(host, HOOKS_REQUIRES) ? [] : [HOOKS_REQUIRES], installed: plugin }];
 }
 function choose(pool, names) {
   const chosen = new Set;
@@ -1803,12 +1844,21 @@ function plan(host, picked, force) {
 function checksFor(packages, plugin) {
   return [...packages.map((name) => name.slice(name.indexOf("/") + 1)), ...plugin ? ["hooks"] : [], "needs", "completions", ...packages.includes("@kaynooo/cli-forgejo") ? ["tea"] : []];
 }
-async function ask2(pool) {
+async function ask2(all) {
   if (!isInteractive())
     badUsage("name what to install, or all: doctor --install forgejo check hooks (doctor --install --list shows the choices)");
-  const choices = pool.map((each) => ({ value: each, label: each.label, hint: each.hint }));
-  const picked = await checklist("install which?", choices, { hint: "name them instead: doctor --install forgejo check" });
-  return picked === undefined ? [] : [...picked];
+  const choices = all.map((each) => ({ value: each, label: each.label, hint: `${each.installed ? "installed, " : ""}${each.hint}` }));
+  const picked = await checklist("installed packages", choices, { initial: new Set(all.filter((each) => each.installed)), hint: "check to install, uncheck to remove: doctor --install forgejo check names them" });
+  if (picked === undefined)
+    return;
+  const remove = all.filter((each) => !picked.has(each) && each.installed);
+  if (remove.length > 0 && await confirm(`remove ${remove.map((each) => each.label).join(", ")}?`, { default: false }) !== true)
+    return { add: all.filter((each) => picked.has(each) && !each.installed), remove: [] };
+  return { add: all.filter((each) => picked.has(each) && !each.installed), remove };
+}
+function removal(all, remove) {
+  const keepsGuard = all.some((each) => each.id === HOOKS && each.installed && !remove.includes(each));
+  return { packages: [...new Set(remove.flatMap((each) => each.id === HOOKS ? [] : each.packages))].filter((name) => !(keepsGuard && name === HOOKS_REQUIRES)), plugin: remove.some((each) => each.id === HOOKS) };
 }
 async function askWorkspace(host) {
   if (!isInteractive() || workspaceChosen({ home: host.home }))
@@ -1817,8 +1867,9 @@ async function askWorkspace(host) {
   if (folder !== undefined && folder !== "" && !saveWorkspace(folder, { home: host.home }))
     console.error(`could not write the workspace into ${userConfigPath("config", { home: host.home })}: it does not parse, fix it by hand`);
 }
-async function install(host, options, recheck) {
-  const pool = candidates2(host);
+async function install(host, options, recheck, choosing = ask2) {
+  const all = candidates2(host);
+  const pool = all.filter((each) => !each.installed);
   const { dim, green, red, yellow } = paint(process16.stdout);
   if (options.list) {
     for (const each of pool)
@@ -1827,20 +1878,23 @@ async function install(host, options, recheck) {
       console.log("everything is installed");
     return 0;
   }
-  if (pool.length === 0) {
+  if (pool.length === 0 && (options.names.length > 0 || !isInteractive())) {
     console.log("everything is installed");
     return 0;
   }
-  const unknown = options.names.filter((name) => name !== "all" && !Object.values(candidatesAll(host)).some((each) => each.names.includes(name)));
+  const unknown = options.names.filter((name) => name !== "all" && !all.some((each) => each.names.includes(name)));
   if (unknown.length > 0)
     badUsage(`nothing to install is named ${unknown.join(", ")}: doctor --install --list`);
-  const picked = options.names.length === 0 ? await ask2(pool) : choose(pool, options.names);
+  const chosen = options.names.length === 0 ? await choosing(all) : { add: choose(pool, options.names), remove: [] };
+  const picked = chosen?.add ?? [];
   const skipped = options.names.filter((name) => name !== "all" && !pool.some((each) => each.names.includes(name)));
   for (const name of skipped)
     console.log(`${dim("already")}  ${name} is installed`);
-  if (picked.length === 0) {
+  const removing = removal(all, chosen?.remove ?? []);
+  const removes = removing.packages.length > 0 || removing.plugin;
+  if (picked.length === 0 && !removes) {
     if (skipped.length === 0)
-      console.log("nothing picked");
+      console.log("nothing changed");
     return 0;
   }
   const planned = plan(host, picked, options.force);
@@ -1848,7 +1902,7 @@ async function install(host, options, recheck) {
     console.log(`${red("blocked")}  ${each.package} needs ${each.need} (${each.why}): ${each.how}; --force installs it anyway`);
   for (const each of planned.warnings)
     console.log(`${yellow("warn   ")}  ${each.package}: ${each.need} is missing, ${each.why}`);
-  if (planned.packages.length === 0 && !planned.plugin)
+  if (planned.packages.length === 0 && !planned.plugin && !removes)
     return 1;
   if (!options.dryRun && planned.packages.some((name) => name === "@kaynooo/cli-workspace" || name === "@kaynooo/cli-pkg"))
     await askWorkspace(host);
@@ -1857,6 +1911,11 @@ async function install(host, options, recheck) {
     console.log(`${options.dryRun ? dim("would  ") : green("install")}  ${command.join(" ")}`);
   if (planned.plugin)
     console.log(`${options.dryRun ? dim("would  ") : green("install")}  ${PLUGIN_INSTALL.join(" ")}`);
+  const uninstall = ["bun", "remove", "-g", ...removing.packages];
+  if (removing.packages.length > 0)
+    console.log(`${options.dryRun ? dim("would  ") : green("remove ")}  ${uninstall.join(" ")}`);
+  if (removing.plugin)
+    console.log(`${options.dryRun ? dim("would  ") : green("remove ")}  ${PLUGIN_UNINSTALL.join(" ")}`);
   if (options.dryRun)
     return planned.blocked.length > 0 ? 1 : 0;
   if (planned.packages.length > 0) {
@@ -1875,16 +1934,27 @@ async function install(host, options, recheck) {
         console.error(`${red("failed")}   ${PLUGIN_INSTALL.join(" ")}: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
     }
   }
+  if (removing.packages.length > 0) {
+    const ran = await host.run(uninstall);
+    if (ran.code !== 0) {
+      console.error(`${red("failed")}   bun remove -g: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
+      return 1;
+    }
+  }
+  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) {
+      console.error(`${red("failed")}   ${PLUGIN_UNINSTALL.join(" ")}: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
+      return 1;
+    }
+  }
   console.log(`
 after the install:`);
   const code = await recheck(checksFor(planned.packages, planned.plugin));
   return planned.blocked.length > 0 ? 1 : code;
 }
-function candidatesAll(host) {
-  const open = candidates2(host);
-  const done = Object.entries(TOOLS).filter(([name]) => isInstalled(host, name)).map(([name, bins]) => ({ id: name, names: [shortName(name), name, `cli-${shortName(name)}`, ...bins], label: shortName(name), hint: "", packages: [name] }));
-  return [...open, ...done];
-}
 
 // src/doctor.ts
 var USAGE = `doctor [--only <check>] [--quiet] [--fix | --install [<name>...|all]] [--list] [--dry-run] [--force] [--json]: checks this host's @kaynooo/cli-* install, one line per check, the command that fixes a failing one beside it, and installs the packages it picks
@@ -1901,7 +1971,7 @@ var OPTIONS = {
   quiet: { type: "boolean", short: "q", description: "print only the failing checks" },
   fix: { type: "boolean", description: "run the fix: lines doctor may run, then check again" },
   "dry-run": { type: "boolean", description: "with --fix or --install, show what would run without running it (alone, it implies --fix)" },
-  install: { type: "boolean", description: "install the packages named, or picked from a checklist: forgejo, ft, hooks, all" },
+  install: { type: "boolean", description: "install the packages named, or managed from a checklist, installed ones checked and unchecking removing them: forgejo, ft, hooks, all" },
   list: { type: "boolean", description: "with --install, print the choices" },
   force: { type: "boolean", description: "with --install, install a package even though a tool it requires is missing" }
 };
@@ -1924,7 +1994,7 @@ function printOutcomes(outcomes, log) {
     log(`${marks[status]}  ${command}${detail === undefined ? "" : `  ${dim(detail)}`}`);
 }
 async function main(args, host = hostHere()) {
-  const { values, positionals } = parse(args, USAGE, OPTIONS, { positionals: ["[name...]"], exits: EXITS, replaces: "checking each bin's version, tea's login and the hooks by hand", examples: ["doctor", ["doctor --json", "the checks for a script"], ["doctor -q", "silent unless something fails"], ["doctor --fix --dry-run", "what --fix would run"], ["doctor --install", "pick the packages to add"], ["doctor --install forgejo check hooks", "three named ones"], ["doctor --install all --dry-run", "what installing everything would run"]] });
+  const { values, positionals } = parse(args, USAGE, OPTIONS, { positionals: ["[name...]"], exits: EXITS, replaces: "checking each bin's version, tea's login and the hooks by hand", examples: ["doctor", ["doctor --json", "the checks for a script"], ["doctor -q", "silent unless something fails"], ["doctor --fix --dry-run", "what --fix would run"], ["doctor --install", "check to install, uncheck to remove"], ["doctor --install forgejo check hooks", "three named ones"], ["doctor --install all --dry-run", "what installing everything would run"]] });
   const only = values.only ?? [];
   if (values.install !== true && (positionals.length > 0 || values.list === true || values.force === true))
     badUsage("names, --list and --force go with --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);
@@ -1613,6 +1623,22 @@ async function checklist(question, choices, { initial = new Set, min = 0, toggle
   });
   return accepted ? checked : undefined;
 }
+async function confirm(question, { default: fallback, ...settings } = {}) {
+  let answered = fallback;
+  const choices = { true: "Y/n", false: "y/N", undefined: "y/n" }[String(fallback)];
+  const accepted = await ask(question, settings, (colors, state) => [state === "asking" ? asking(colors, question, "", choices) : answer(colors, question, state, answered ? "yes" : "no")], (key) => {
+    if (key === "cancel")
+      return "cancel";
+    if (key === "enter")
+      return answered === undefined ? undefined : "enter";
+    const letter = typeof key === "object" ? key.text.toLowerCase() : "";
+    if (letter !== "y" && letter !== "n")
+      return;
+    answered = letter === "y";
+    return "enter";
+  });
+  return accepted ? answered : undefined;
+}
 async function input2(question, { default: fallback, mask = false, validate, ...settings } = {}) {
   let value = "";
   let invalid;
@@ -1665,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")
@@ -1706,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);
@@ -1743,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();
   }
@@ -1753,18 +1793,19 @@ async function ask(question, { hint, terminal = process15 }, render, press) {
 
 // src/install.ts
 var HOOKS = "hooks";
+var PLUGIN_UNINSTALL = ["claude", "plugin", "uninstall", "cli-hooks"];
 var PLUGIN_INSTALL = ["claude", "plugin", "install", "cli-hooks", "--marketplace", `https://${FORGE}/kaynooo/cli.git`];
 var CLI_PREFIX = /^cli-/;
 var shortName = (name) => name.slice(name.indexOf("/") + 1).replace(CLI_PREFIX, "");
 function candidates2(host) {
-  const packages = Object.entries(TOOLS).filter(([name]) => !isInstalled(host, name)).map(([name, bins]) => {
+  const packages = Object.entries(TOOLS).map(([name, bins]) => {
     const needs = (NEEDS[name] ?? []).map((need) => need.bin);
-    return { id: name, names: [shortName(name), name, `cli-${shortName(name)}`, ...bins], label: shortName(name), hint: `${bins.join(" ")}: ${ABOUT[name] ?? ""}${needs.length === 0 ? "" : `, needs ${needs.join(", ")}`}`, packages: [name] };
+    return { id: name, names: [shortName(name), name, `cli-${shortName(name)}`, ...bins], label: shortName(name), hint: `${bins.join(" ")}: ${ABOUT[name] ?? ""}${needs.length === 0 ? "" : `, needs ${needs.join(", ")}`}`, packages: [name], installed: isInstalled(host, name) };
   });
   const { plugin, mod } = hooksWiring(host);
-  if (plugin || mod !== undefined)
+  if (mod !== undefined && !plugin)
     return packages;
-  return [...packages, { id: HOOKS, names: [HOOKS, "plugin", "cli-hooks"], label: "hooks", hint: `the Claude Code plugin running guard on every tool call, needs ${HOOKS_REQUIRES}`, packages: isInstalled(host, HOOKS_REQUIRES) ? [] : [HOOKS_REQUIRES] }];
+  return [...packages, { id: HOOKS, names: [HOOKS, "plugin", "cli-hooks"], label: "hooks", hint: `the Claude Code plugin running guard on every tool call, needs ${HOOKS_REQUIRES}`, packages: isInstalled(host, HOOKS_REQUIRES) ? [] : [HOOKS_REQUIRES], installed: plugin }];
 }
 function choose(pool, names) {
   const chosen = new Set;
@@ -1801,12 +1842,21 @@ function plan(host, picked, force) {
 function checksFor(packages, plugin) {
   return [...packages.map((name) => name.slice(name.indexOf("/") + 1)), ...plugin ? ["hooks"] : [], "needs", "completions", ...packages.includes("@kaynooo/cli-forgejo") ? ["tea"] : []];
 }
-async function ask2(pool) {
+async function ask2(all) {
   if (!isInteractive())
     badUsage("name what to install, or all: doctor --install forgejo check hooks (doctor --install --list shows the choices)");
-  const choices = pool.map((each) => ({ value: each, label: each.label, hint: each.hint }));
-  const picked = await checklist("install which?", choices, { hint: "name them instead: doctor --install forgejo check" });
-  return picked === undefined ? [] : [...picked];
+  const choices = all.map((each) => ({ value: each, label: each.label, hint: `${each.installed ? "installed, " : ""}${each.hint}` }));
+  const picked = await checklist("installed packages", choices, { initial: new Set(all.filter((each) => each.installed)), hint: "check to install, uncheck to remove: doctor --install forgejo check names them" });
+  if (picked === undefined)
+    return;
+  const remove = all.filter((each) => !picked.has(each) && each.installed);
+  if (remove.length > 0 && await confirm(`remove ${remove.map((each) => each.label).join(", ")}?`, { default: false }) !== true)
+    return { add: all.filter((each) => picked.has(each) && !each.installed), remove: [] };
+  return { add: all.filter((each) => picked.has(each) && !each.installed), remove };
+}
+function removal(all, remove) {
+  const keepsGuard = all.some((each) => each.id === HOOKS && each.installed && !remove.includes(each));
+  return { packages: [...new Set(remove.flatMap((each) => each.id === HOOKS ? [] : each.packages))].filter((name) => !(keepsGuard && name === HOOKS_REQUIRES)), plugin: remove.some((each) => each.id === HOOKS) };
 }
 async function askWorkspace(host) {
   if (!isInteractive() || workspaceChosen({ home: host.home }))
@@ -1815,8 +1865,9 @@ async function askWorkspace(host) {
   if (folder !== undefined && folder !== "" && !saveWorkspace(folder, { home: host.home }))
     console.error(`could not write the workspace into ${userConfigPath("config", { home: host.home })}: it does not parse, fix it by hand`);
 }
-async function install(host, options, recheck) {
-  const pool = candidates2(host);
+async function install(host, options, recheck, choosing = ask2) {
+  const all = candidates2(host);
+  const pool = all.filter((each) => !each.installed);
   const { dim, green, red, yellow } = paint(process16.stdout);
   if (options.list) {
     for (const each of pool)
@@ -1825,20 +1876,23 @@ async function install(host, options, recheck) {
       console.log("everything is installed");
     return 0;
   }
-  if (pool.length === 0) {
+  if (pool.length === 0 && (options.names.length > 0 || !isInteractive())) {
     console.log("everything is installed");
     return 0;
   }
-  const unknown = options.names.filter((name) => name !== "all" && !Object.values(candidatesAll(host)).some((each) => each.names.includes(name)));
+  const unknown = options.names.filter((name) => name !== "all" && !all.some((each) => each.names.includes(name)));
   if (unknown.length > 0)
     badUsage(`nothing to install is named ${unknown.join(", ")}: doctor --install --list`);
-  const picked = options.names.length === 0 ? await ask2(pool) : choose(pool, options.names);
+  const chosen = options.names.length === 0 ? await choosing(all) : { add: choose(pool, options.names), remove: [] };
+  const picked = chosen?.add ?? [];
   const skipped = options.names.filter((name) => name !== "all" && !pool.some((each) => each.names.includes(name)));
   for (const name of skipped)
     console.log(`${dim("already")}  ${name} is installed`);
-  if (picked.length === 0) {
+  const removing = removal(all, chosen?.remove ?? []);
+  const removes = removing.packages.length > 0 || removing.plugin;
+  if (picked.length === 0 && !removes) {
     if (skipped.length === 0)
-      console.log("nothing picked");
+      console.log("nothing changed");
     return 0;
   }
   const planned = plan(host, picked, options.force);
@@ -1846,7 +1900,7 @@ async function install(host, options, recheck) {
     console.log(`${red("blocked")}  ${each.package} needs ${each.need} (${each.why}): ${each.how}; --force installs it anyway`);
   for (const each of planned.warnings)
     console.log(`${yellow("warn   ")}  ${each.package}: ${each.need} is missing, ${each.why}`);
-  if (planned.packages.length === 0 && !planned.plugin)
+  if (planned.packages.length === 0 && !planned.plugin && !removes)
     return 1;
   if (!options.dryRun && planned.packages.some((name) => name === "@kaynooo/cli-workspace" || name === "@kaynooo/cli-pkg"))
     await askWorkspace(host);
@@ -1855,6 +1909,11 @@ async function install(host, options, recheck) {
     console.log(`${options.dryRun ? dim("would  ") : green("install")}  ${command.join(" ")}`);
   if (planned.plugin)
     console.log(`${options.dryRun ? dim("would  ") : green("install")}  ${PLUGIN_INSTALL.join(" ")}`);
+  const uninstall = ["bun", "remove", "-g", ...removing.packages];
+  if (removing.packages.length > 0)
+    console.log(`${options.dryRun ? dim("would  ") : green("remove ")}  ${uninstall.join(" ")}`);
+  if (removing.plugin)
+    console.log(`${options.dryRun ? dim("would  ") : green("remove ")}  ${PLUGIN_UNINSTALL.join(" ")}`);
   if (options.dryRun)
     return planned.blocked.length > 0 ? 1 : 0;
   if (planned.packages.length > 0) {
@@ -1873,16 +1932,27 @@ async function install(host, options, recheck) {
         console.error(`${red("failed")}   ${PLUGIN_INSTALL.join(" ")}: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
     }
   }
+  if (removing.packages.length > 0) {
+    const ran = await host.run(uninstall);
+    if (ran.code !== 0) {
+      console.error(`${red("failed")}   bun remove -g: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
+      return 1;
+    }
+  }
+  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) {
+      console.error(`${red("failed")}   ${PLUGIN_UNINSTALL.join(" ")}: exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}`);
+      return 1;
+    }
+  }
   console.log(`
 after the install:`);
   const code = await recheck(checksFor(planned.packages, planned.plugin));
   return planned.blocked.length > 0 ? 1 : code;
 }
-function candidatesAll(host) {
-  const open = candidates2(host);
-  const done = Object.entries(TOOLS).filter(([name]) => isInstalled(host, name)).map(([name, bins]) => ({ id: name, names: [shortName(name), name, `cli-${shortName(name)}`, ...bins], label: shortName(name), hint: "", packages: [name] }));
-  return [...open, ...done];
-}
 
 // src/doctor.ts
 var USAGE = `doctor [--only <check>] [--quiet] [--fix | --install [<name>...|all]] [--list] [--dry-run] [--force] [--json]: checks this host's @kaynooo/cli-* install, one line per check, the command that fixes a failing one beside it, and installs the packages it picks
@@ -1899,7 +1969,7 @@ var OPTIONS = {
   quiet: { type: "boolean", short: "q", description: "print only the failing checks" },
   fix: { type: "boolean", description: "run the fix: lines doctor may run, then check again" },
   "dry-run": { type: "boolean", description: "with --fix or --install, show what would run without running it (alone, it implies --fix)" },
-  install: { type: "boolean", description: "install the packages named, or picked from a checklist: forgejo, ft, hooks, all" },
+  install: { type: "boolean", description: "install the packages named, or managed from a checklist, installed ones checked and unchecking removing them: forgejo, ft, hooks, all" },
   list: { type: "boolean", description: "with --install, print the choices" },
   force: { type: "boolean", description: "with --install, install a package even though a tool it requires is missing" }
 };
@@ -1922,7 +1992,7 @@ function printOutcomes(outcomes, log) {
     log(`${marks[status]}  ${command}${detail === undefined ? "" : `  ${dim(detail)}`}`);
 }
 async function main(args, host = hostHere()) {
-  const { values, positionals } = parse(args, USAGE, OPTIONS, { positionals: ["[name...]"], exits: EXITS, replaces: "checking each bin's version, tea's login and the hooks by hand", examples: ["doctor", ["doctor --json", "the checks for a script"], ["doctor -q", "silent unless something fails"], ["doctor --fix --dry-run", "what --fix would run"], ["doctor --install", "pick the packages to add"], ["doctor --install forgejo check hooks", "three named ones"], ["doctor --install all --dry-run", "what installing everything would run"]] });
+  const { values, positionals } = parse(args, USAGE, OPTIONS, { positionals: ["[name...]"], exits: EXITS, replaces: "checking each bin's version, tea's login and the hooks by hand", examples: ["doctor", ["doctor --json", "the checks for a script"], ["doctor -q", "silent unless something fails"], ["doctor --fix --dry-run", "what --fix would run"], ["doctor --install", "check to install, uncheck to remove"], ["doctor --install forgejo check hooks", "three named ones"], ["doctor --install all --dry-run", "what installing everything would run"]] });
   const only = values.only ?? [];
   if (values.install !== true && (positionals.length > 0 || values.list === true || values.force === true))
     badUsage("names, --list and --force go with --install");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-doctor",
   "type": "module",
-  "version": "0.9.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.22.0"
+    "@kaynooo/cli-kit": "0.24.0"
   }
 }