@kaynooo/cli-doctor 0.4.0 → 0.5.0

package/README.md

@@ -1,11 +1,15 @@
 # doctor
 
-`doctor` checks a host's @kaynooo/cli-* install in one call: one line per check, the command that fixes a failing one beside it.
+`doctor` checks a host's @kaynooo/cli-* install in one call: one line per check, the command that fixes a failing one beside it. The package also ships a second bin, `cli` (`cli stats`, `cli list`, below), which is not `doctor`.
 
 ```sh
 bun install -g @kaynooo/cli-doctor
 doctor           # one line per check
 doctor --json    # [{check, ok, detail, fix?}]
+doctor -q        # only the failing checks, nothing when all pass
+doctor --only tea --only bun    # just these checks (a package such as cli-forgejo, tea, hooks, bun, completions)
+doctor --fix --dry-run          # what --fix would run
+doctor --fix     # run the fixes, then check again
 ```
 
 | Check | Passes when | Fix |
@@ -17,6 +21,20 @@ doctor --json    # [{check, ok, detail, fix?}]
 
 A registry that does not answer leaves a package passing, with a note. Exit codes: 0 every check passed, 1 one failed, 2 a usage error.
 
+## --fix
+
+`--fix` runs the `fix:` lines it may: the `bun install -g` ones (joined into one call), `cli completions fish --install`, and `claude plugin install` or `disable`. It then checks again, prints the checks as they stand and exits on those. Nothing that installs a system package is run, and a line that only describes a step (`tea` from its releases page, adding a folder to the PATH, `bun upgrade`, which replaces Bun itself) is printed as `not run`. `--dry-run` prints each line as `would` and runs nothing (alone it implies `--fix`).
+`--json` keeps its shape and prints the checks after the fixes, the fixes going to stderr; `--quiet` filters it to the failing ones.
+
+## cli completions
+
+```sh
+cli completions fish --install            # one file per installed bin in ~/.cache/fish/kaynooo-cli
+source <(cli completions bash)            # in ~/.bashrc
+```
+
+Each bin completes itself through `<bin> __complete`. fish gets a file per bin (put the folder first in `fish_complete_path`), bash one script sourced from `~/.bashrc`. zsh has no script of its own: load `compinit` and `bashcompinit` in `~/.zshrc`, then the bash line above (not tested, zsh is not installed on the machine this was written on). The fish files are checked by `doctor`.
+
 ## cli stats
 
 ```sh

package/dist/cli-bin.js

@@ -2,17 +2,16 @@
 // @bun
 
 // src/cli-bin.ts
-import process11 from "process";
-
+import process12 from "process";
 // ../kit/src/args.ts
-import process4 from "process";
+import process5 from "process";
 import { parseArgs } from "util";
 
 // ../kit/src/format.ts
-import process2 from "process";
+import process3 from "process";
 
 // ../kit/src/style.ts
-import process from "process";
+import process2 from "process";
 
 // ../../node_modules/.bun/@kaynooo+utils@2.31.2+d0769e28dc4dad16/node_modules/@kaynooo/utils/dist/chunk-mtetydvc.js
 function x(s) {
@@ -276,10 +275,10 @@ function le(i = {}) {
 var t = le();
 
 // ../kit/src/style.ts
-function takesControlCodes(stream, env = process.env) {
+function takesControlCodes(stream, env = process2.env) {
   return stream.isTTY === true && env.NO_COLOR === undefined && env.NODE_DISABLE_COLORS === undefined && env.TERM !== "dumb";
 }
-function paint(stream, env = process.env) {
+function paint(stream, env = process2.env) {
   return le({ stream: { isTTY: takesControlCodes(stream, env) }, env });
 }
 var STATUSES = {
@@ -312,7 +311,7 @@ function table(rows, { cellWidth, header = false, align = [], fit } = {}) {
       widths[index] = Math.max(widths[index] ?? 0, textWidth(cell));
   }
   const shown = fit === undefined ? cells : narrow(cells, widths, fit);
-  const colors = paint(process2.stdout);
+  const colors = paint(process3.stdout);
   const lines = shown.map((row) => row.map((cell, index) => {
     const width = widths[index] ?? 0;
     const gap = " ".repeat(Math.max(0, width - textWidth(cell)));
@@ -344,24 +343,30 @@ function printJson(value) {
 }
 
 // ../kit/src/help.ts
-import process3 from "process";
+import process4 from "process";
 var OPTIONAL = /\[[^\]]+\]/g;
 var USAGE_PREFIX = /^usage:\s*/i;
 var FULL_STOP = /\.$/;
-function usageLine(usage, colors = paint(process3.stdout)) {
+function usageLine(usage, colors = paint(process4.stdout)) {
   return `${colors.bold("Usage:")} ${usage.replace(USAGE_PREFIX, "").replaceAll(OPTIONAL, (part) => colors.dim(part))}`;
 }
-function helpText(usage, options, colors = paint(process3.stdout), { examples = [], replaces } = {}) {
-  return [usageLine(usage, colors), ...replacesRows(replaces, colors), "", colors.bold("Options:"), ...optionRows(options, colors), ...exampleRows(examples, colors)].join(`
+function helpText(usage, options, colors = paint(process4.stdout), { examples = [], replaces, exits = [] } = {}) {
+  return [usageLine(usage, colors), ...replacesRows(replaces, colors), "", colors.bold("Options:"), ...optionRows(options, colors), ...exitRows(exits, colors), ...exampleRows(examples, colors)].join(`
 `);
 }
-function replacesRows(replaces, colors = paint(process3.stdout)) {
+function exitRows(exits, colors = paint(process4.stdout)) {
+  if (exits.length === 0)
+    return [];
+  const width = Math.max(...exits.map(([code]) => String(code).length));
+  return ["", colors.bold("Exits:"), ...exits.map(([code, meaning]) => `  ${colors.cyan(String(code).padEnd(width))}  ${meaning}`)];
+}
+function replacesRows(replaces, colors = paint(process4.stdout)) {
   return replaces === undefined ? [] : ["", `${colors.bold("Instead of:")} ${replaces}`];
 }
-function wantsHelpJson(env = process3.env) {
+function wantsHelpJson(env = process4.env) {
   return env.KIT_HELP === "json";
 }
-function description(usage, { examples = [], replaces } = {}) {
+function description(usage, { examples = [], replaces, exits } = {}, options) {
   const lines = usage.replace(USAGE_PREFIX, "").split(`
 `);
   const first = lines[0];
@@ -372,15 +377,17 @@ function description(usage, { examples = [], replaces } = {}) {
     synopsis: colon === -1 ? first : first.slice(0, colon),
     summary: colon === -1 ? fallback : first.slice(colon + 2),
     ...replaces === undefined ? {} : { replaces },
-    examples: examples.map((example) => typeof example === "string" ? { line: example } : { line: example[0], note: example[1] })
+    examples: examples.map((example) => typeof example === "string" ? { line: example } : { line: example[0], note: example[1] }),
+    ...exits === undefined ? {} : { exits: exits.map(([code, meaning]) => ({ code, meaning })) },
+    ...options === undefined ? {} : { options: Object.entries(options).map(([name, { short, description }]) => ({ name, ...short === undefined ? {} : { short }, ...description === undefined ? {} : { description } })) }
   };
 }
-function exampleRows(examples, colors = paint(process3.stdout)) {
+function exampleRows(examples, colors = paint(process4.stdout)) {
   if (examples.length === 0)
     return [];
   return ["", colors.bold("Examples:"), ...examples.map((example) => typeof example === "string" ? `  ${example}` : `  ${example[0]}  ${colors.dim(`# ${example[1]}`)}`)];
 }
-function optionRows(options, colors = paint(process3.stdout)) {
+function optionRows(options, colors = paint(process4.stdout)) {
   const rows = Object.entries(options).map(([name, option]) => {
     const short = option.short === undefined ? "    " : `${colors.cyan(`-${option.short}`)}, `;
     const named = option.choices === undefined ? "<value>" : `<${option.choices.join("|")}>`;
@@ -469,7 +476,7 @@ var OUTPUT_OPTIONS = {
   color: { type: "string", description: "auto (on a terminal alone), always or never" },
   plain: { type: "boolean", description: "plain text, no colour or spinner: --color never" }
 };
-function applyOutput(color, plain, env = process4.env) {
+function applyOutput(color, plain, env = process5.env) {
   const when = plain === true ? "never" : color ?? "auto";
   if (when === "auto")
     return;
@@ -492,7 +499,7 @@ function parse(args, usage, options, settings = {}) {
   const { own, rest } = settings.trailing === true ? splitTrailing(args, all, settings.positionals?.length ?? 0) : splitRest(args, settings.rest === true);
   let parsed;
   try {
-    parsed = parseArgs({ args: joinDashValues(withBare(own, all), all), options: all, allowPositionals: true, allowNegative: settings.allowNegative === true, strict: true });
+    parsed = parseArgs({ args: joinDashValues(withBare(withAliases(own, all), all), all), options: all, allowPositionals: true, allowNegative: settings.allowNegative === true, strict: true });
   } catch (error) {
     const message = parseError(error);
     throw new UsageError(message, nearestOption(message, all, settings.allowNegative === true));
@@ -500,7 +507,7 @@ function parse(args, usage, options, settings = {}) {
   const values = parsed.values;
   applyOutput("color" in output ? values.color : undefined, "plain" in output ? values.plain : undefined);
   if (values.help === true) {
-    console.log(wantsHelpJson() ? JSON.stringify(description(usage, settings)) : helpText(usage, listing, undefined, settings));
+    console.log(wantsHelpJson() ? JSON.stringify(description(usage, settings, listing)) : helpText(usage, listing, undefined, settings));
     throw new HelpShown;
   }
   checkChoices(parsed.values, all);
@@ -542,6 +549,18 @@ function listed(options, allowNegative) {
     return [...option.description === undefined ? [] : [[name, option]], [`no-${name}`, { type: "boolean", description: option.negative }]];
   }));
 }
+function withAliases(args, options) {
+  const named = new Map(Object.entries(options).flatMap(([name, { aliases = [] }]) => aliases.map((alias) => [`--${alias}`, `--${name}`])));
+  if (named.size === 0)
+    return args;
+  const separator = args.indexOf("--");
+  const own = separator === -1 ? args : args.slice(0, separator);
+  return [...own.map((arg) => {
+    const at = arg.indexOf("=");
+    const current = named.get(at === -1 ? arg : arg.slice(0, at));
+    return current === undefined ? arg : `${current}${at === -1 ? "" : arg.slice(at)}`;
+  }), ...separator === -1 ? [] : args.slice(separator)];
+}
 function withBare(args, options) {
   const bare = new Map(Object.entries(options).flatMap(([name, { short, optional }]) => optional === undefined ? [] : [[`--${name}`, optional], ...short === undefined ? [] : [[`-${short}`, optional]]]));
   if (bare.size === 0)
@@ -628,7 +647,7 @@ function nearestOption(message, options, allowNegative) {
 }
 // ../kit/src/process.ts
 import { constants } from "os";
-import process5 from "process";
+import process6 from "process";
 var KILL_GRACE_MS = 2000;
 function exitCodeOf(code, signal) {
   if (code !== null)
@@ -648,7 +667,7 @@ async function runCommand(argv, { cwd, env, stdin = "ignore", timeoutMs, signal,
       return;
     try {
       if (grouped)
-        process5.kill(-proc.pid, killing);
+        process6.kill(-proc.pid, killing);
       else
         proc.kill(killing);
     } catch {}
@@ -722,13 +741,15 @@ var ESCAPE_CODE = new RegExp(`${ESC}(?:\\[[\\x30-\\x3F]*[\\x20-\\x2F]*[\\x40-\\x
 var RESET_STYLE = `${ESC}[0m`;
 var CLOSE_LINK = `${ESC}]8;;${ESC}\\`;
 // ../kit/src/cli.ts
-import process7 from "process";
+import { readFileSync, realpathSync } from "fs";
+import { dirname as dirname2, join as join2 } from "path";
+import process8 from "process";
 
 // ../kit/src/usage.ts
 import { appendFileSync, mkdirSync } from "fs";
 import { homedir } from "os";
 import { dirname, isAbsolute, join } from "path";
-import process6 from "process";
+import process7 from "process";
 
 // ../kit/src/logs.ts
 var DAY_MS = 24 * 60 * 60 * 1000;
@@ -742,14 +763,14 @@ var usageError;
 function noteUsageError(message) {
   usageError = message;
 }
-function stateHome(env = process6.env) {
+function stateHome(env = process7.env) {
   const dir = env.XDG_STATE_HOME;
   return dir !== undefined && isAbsolute(dir) ? dir : join(homedir(), ".local", "state");
 }
-function usagePath(env = process6.env) {
+function usagePath(env = process7.env) {
   return join(stateHome(env), CLI_FOLDER, "usage.jsonl");
 }
-function usageRecorded(env = process6.env) {
+function usageRecorded(env = process7.env) {
   const off = env.KAYNOOO_CLI_NO_USAGE;
   return env.NODE_ENV !== "test" && (off === undefined || off === "" || off === "0");
 }
@@ -763,7 +784,7 @@ function usageEntry(bin, command, argv, code, now = new Date) {
   usageError = undefined;
   return { at: now.toISOString(), bin, ...command === undefined ? {} : { command }, flags: flagNames(argv), code, ...unknown === undefined ? {} : { unknown } };
 }
-function recordUsage(entry, env = process6.env) {
+function recordUsage(entry, env = process7.env) {
   if (!usageRecorded(env))
     return;
   try {
@@ -890,8 +911,8 @@ async function help2({ path, header, summary: lazySummary, commands, defaultComm
 `);
 }
 function printError(prefix, message, hint, cause) {
-  const colors = paint(process7.stderr);
-  const styled = takesControlCodes(process7.stderr);
+  const colors = paint(process8.stderr);
+  const styled = takesControlCodes(process8.stderr);
   const head = styled ? `${colors.red.bold("error")} ${colors.dim(`${prefix}:`)}` : `error: ${prefix}:`;
   const under = (label, text, tint) => text === undefined ? "" : `
   ${styled ? tint(label) : `${label}:`} ${text}`;
@@ -934,11 +955,11 @@ async function dispatch(level, typed, { version, redact }) {
     }
   }
   if (name === undefined && level.path.length > 1) {
-    console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process7.stderr));
+    console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process8.stderr));
     return 2;
   }
   if (name === undefined || name === "help" || name === "--help" || name === "-h") {
-    console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process7.stdout));
+    console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process8.stdout));
     return 0;
   }
   if (level.path.length === 1 && (name === "--version" || name === "-v")) {
@@ -1054,10 +1075,22 @@ async function printCandidates(found) {
     console.log(line);
   return 0;
 }
-async function runCli(cli, argv = process7.argv.slice(2)) {
+function packageVersion(entry = Bun.main) {
+  for (let dir = dirname2(realpathSync(entry));; dir = dirname2(dir)) {
+    try {
+      const { version } = JSON.parse(readFileSync(join2(dir, "package.json"), "utf8"));
+      if (typeof version === "string")
+        return version;
+    } catch {}
+    if (dirname2(dir) === dir)
+      return "0.0.0";
+  }
+}
+async function runCli(cli, argv = process8.argv.slice(2)) {
+  const version = cli.version ?? packageVersion();
   if (argv[0] === COMPLETE)
     return printCandidates(candidates(scopeOf(cli.commands, cli.extraCommands, cli.aliases), cli.defaultCommand, argv.slice(1)));
-  const code = await dispatch({ path: [cli.name], header: (colors, about) => `${colors.bold(cli.name)} ${colors.dim(cli.version)}  ${about}`, summary: cli.about, ...scopeOf(cli.commands, cli.extraCommands, cli.aliases), defaultCommand: cli.defaultCommand, runBare: cli.runBare === true, examples: cli.examples, replaces: cli.replaces }, argv, { version: cli.version, redact: cli.redact });
+  const code = await dispatch({ path: [cli.name], header: (colors, about) => `${colors.bold(cli.name)} ${colors.dim(version)}  ${about}`, summary: cli.about, ...scopeOf(cli.commands, cli.extraCommands, cli.aliases), defaultCommand: cli.defaultCommand, runBare: cli.runBare === true, examples: cli.examples, replaces: cli.replaces }, argv, { version, redact: cli.redact });
   if (cli.usage !== false) {
     try {
       recordUsage(usageEntry(cli.name, commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv), argv, code));
@@ -1080,11 +1113,11 @@ function commandPath(scope, argv) {
   }
   return path.length === 0 ? undefined : path.join(" ");
 }
-async function runMain({ name, version, run, redact, usage }, argv = process7.argv.slice(2)) {
+async function runMain({ name, version, run, redact, usage }, argv = process8.argv.slice(2)) {
   if (argv[0] === COMPLETE)
     return printCandidates(leafCandidates(run, argv.slice(1)));
   if (argv.length === 1 && (argv[0] === "--version" || argv[0] === "-v")) {
-    console.log(version);
+    console.log(version ?? packageVersion());
     return 0;
   }
   let code;
@@ -1093,8 +1126,11 @@ async function runMain({ name, version, run, redact, usage }, argv = process7.ar
   } catch (error) {
     code = reportThrown(name, error, redact, wantsJson(argv));
   }
-  if (usage !== false)
-    recordUsage(usageEntry(name, undefined, argv, code));
+  if (usage !== false) {
+    try {
+      recordUsage(usageEntry(name, undefined, argv, code));
+    } catch {}
+  }
   return code;
 }
 // ../kit/src/secrets.ts
@@ -1103,28 +1139,27 @@ var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "ses
 var {Glob } = globalThis.Bun;
 var SESSION_FILES = new Glob("*.json");
 var ACCOUNT_DIRS = new Glob("*/sessions");
-// package.json
-var version = "0.4.0";
-
 // src/completions.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2, rmSync } from "fs";
-import { join as join3 } from "path";
-import process9 from "process";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync3, rmSync } from "fs";
+import { join as join4 } from "path";
+import process10 from "process";
 
 // src/checks.ts
-import { existsSync, readFileSync } from "fs";
-import { basename, join as join2 } from "path";
+import { existsSync, readFileSync as readFileSync2 } from "fs";
+import { basename, join as join3 } from "path";
 var TOOLS = {
+  "@kaynooo/cli-audit": ["audit"],
   "@kaynooo/cli-base": ["base", "proof"],
   "@kaynooo/cli-changelog": ["changelog"],
-  "@kaynooo/cli-check": ["check", "fix", "errs"],
+  "@kaynooo/cli-check": ["check", "fix", "errs", "j"],
   "@kaynooo/cli-code": ["peek", "todo-scan", "hotspots"],
   "@kaynooo/cli-db": ["db"],
+  "@kaynooo/cli-docker": ["dc", "dlog", "dx", "sf"],
   "@kaynooo/cli-doctor": ["doctor", "cli"],
   "@kaynooo/cli-edit": ["sub"],
   "@kaynooo/cli-env": ["ev", "redact"],
   "@kaynooo/cli-forgejo": ["ft"],
-  "@kaynooo/cli-git": ["gst", "gc"],
+  "@kaynooo/cli-git": ["gst", "gc", "gb"],
   "@kaynooo/cli-gitlab": ["gl"],
   "@kaynooo/cli-guard": ["guard"],
   "@kaynooo/cli-out": ["out"],
@@ -1132,6 +1167,7 @@ var TOOLS = {
   "@kaynooo/cli-pick": ["pick"],
   "@kaynooo/cli-pkg": ["pkg"],
   "@kaynooo/cli-probe": ["probe"],
+  "@kaynooo/cli-proc": ["pid", "ports", "procs"],
   "@kaynooo/cli-repos": ["repos"],
   "@kaynooo/cli-stack": ["stack"],
   "@kaynooo/cli-sweep": ["sweep"],
@@ -1153,7 +1189,7 @@ function readJsonText(text) {
   }
 }
 function readJson(path) {
-  return existsSync(path) ? readJsonText(readFileSync(path, "utf8")) : undefined;
+  return existsSync(path) ? readJsonText(readFileSync2(path, "utf8")) : undefined;
 }
 function firstLine(text) {
   const trimmed = text.trim();
@@ -1162,12 +1198,12 @@ function firstLine(text) {
   return end === -1 ? trimmed : trimmed.slice(0, end);
 }
 function installed(host, name) {
-  return readJson(join2(host.globalModules, name, "package.json"));
+  return readJson(join3(host.globalModules, name, "package.json"));
 }
 function ownBin(host, name, bin) {
   const declared = installed(host, name)?.bin;
   const file = typeof declared === "string" ? declared : declared?.[bin];
-  return file === undefined ? undefined : join2(host.globalModules, name, file);
+  return file === undefined ? undefined : join3(host.globalModules, name, file);
 }
 async function checkTool(host, name, bins) {
   const check = name.slice(name.indexOf("/") + 1);
@@ -1176,7 +1212,7 @@ async function checkTool(host, name, bins) {
     return { check, ok: false, detail: "not installed", fix: `bun install -g ${name}` };
   const off = bins.filter((bin) => host.which(bin) === null);
   if (off.length > 0)
-    return { check, ok: false, detail: `${version}, ${off.join(", ")} not on the PATH`, fix: `add ${join2(host.globalModules, "..", "..", "..", "bin")} to the PATH` };
+    return { check, ok: false, detail: `${version}, ${off.join(", ")} not on the PATH`, fix: `add ${join3(host.globalModules, "..", "..", "..", "bin")} to the PATH` };
   const info = await host.run(["bun", "info", name, "version", "--no-cache"]);
   const answered = info.code === 0 ? firstLine(info.stdout.trim().split(`
 `).at(-1) ?? "") : "";
@@ -1203,9 +1239,9 @@ async function checkTea(host) {
   return { check: "tea", ok: true, detail: `logged in to ${forge} as ${login.name}, Forgejo ${served}` };
 }
 function checkHooks(host) {
-  const settings = readJson(join2(host.home, ".claude", "settings.json")) ?? {};
+  const settings = readJson(join3(host.home, ".claude", "settings.json")) ?? {};
   const plugin = settings.enabledPlugins?.[PLUGIN] === true;
-  const mod = (settings.env?.CLAUDE_CODE_PLUGIN_DIRS ?? "").split(":").map((dir) => dir.replace(LEADING_TILDE, host.home)).find((dir) => basename(dir) === "cli" && existsSync(join2(dir, "hooks", "hooks.json")));
+  const mod = (settings.env?.CLAUDE_CODE_PLUGIN_DIRS ?? "").split(":").map((dir) => dir.replace(LEADING_TILDE, host.home)).find((dir) => basename(dir) === "cli" && existsSync(join3(dir, "hooks", "hooks.json")));
   if (plugin && mod !== undefined)
     return { check: "hooks", ok: false, detail: `both the ${PLUGIN} plugin and the mod in ${mod} run guard, so every call is checked twice`, fix: `claude plugin disable ${PLUGIN}` };
   if (plugin)
@@ -1230,12 +1266,22 @@ function checkCompletions(host) {
     return { check: "completions", ok: false, detail: `no fish completion in ${dir} for ${missing.join(", ")}`, fix: "cli completions fish --install" };
   return { check: "completions", ok: true, detail: dir };
 }
-async function runChecks(host) {
-  const entries = Object.entries(TOOLS);
+var toolCheck = (name) => name.slice(name.indexOf("/") + 1);
+var OTHER_CHECKS = ["tea", "hooks", "bun", "completions"];
+var CHECK_NAMES = [...Object.keys(TOOLS).map(toolCheck), ...OTHER_CHECKS];
+async function runChecks(host, only = []) {
+  const wanted = (check) => only.length === 0 || only.includes(check);
+  const entries = Object.entries(TOOLS).filter(([name]) => wanted(toolCheck(name)));
   const tools = [];
   for (let at = 0;at < entries.length; at += INFO_AT_ONCE)
     tools.push(...await Promise.all(entries.slice(at, at + INFO_AT_ONCE).map(async ([name, bins]) => checkTool(host, name, bins))));
-  return [...tools, await checkTea(host), checkHooks(host), checkBun(host), checkCompletions(host)];
+  return [
+    ...tools,
+    ...wanted("tea") ? [await checkTea(host)] : [],
+    ...wanted("hooks") ? [checkHooks(host)] : [],
+    ...wanted("bun") ? [checkBun(host)] : [],
+    ...wanted("completions") ? [checkCompletions(host)] : []
+  ];
 }
 
 // src/completions.ts
@@ -1252,8 +1298,28 @@ var FUNCTION = `functions -q __kaynooo_cli_complete; or function __kaynooo_cli_c
         end
     end
 end`;
-function completionDir(home, env = process9.env) {
-  return join3(env.XDG_CACHE_HOME ?? join3(home, ".cache"), "fish", "kaynooo-cli");
+var BASH_FUNCTION = `__kaynooo_cli_complete() {
+    local IFS=$'\\n' cur=\${COMP_WORDS[COMP_CWORD]} line words=
+    local -a lines
+    COMPREPLY=()
+    lines=($("\${COMP_WORDS[0]}" __complete "\${COMP_WORDS[@]:1:COMP_CWORD}" 2>/dev/null))
+    for line in "\${lines[@]}"; do
+        if [[ $line == __files__ ]]; then
+            COMPREPLY+=($(compgen -f -- "$cur"))
+        else
+            words+="\${line%%$'\\t'*}"$'\\n'
+        fi
+    done
+    COMPREPLY+=($(compgen -W "$words" -- "$cur"))
+}`;
+function bashScript(bins) {
+  return `# Generated by \`cli completions bash\`
+${BASH_FUNCTION}
+complete -F __kaynooo_cli_complete ${bins.join(" ")}
+`;
+}
+function completionDir(home, env = process10.env) {
+  return join4(env.XDG_CACHE_HOME ?? join4(home, ".cache"), "fish", "kaynooo-cli");
 }
 function installedBins(host) {
   return Object.values(TOOLS).flat().filter((bin) => host.which(bin) !== null);
@@ -1267,30 +1333,30 @@ complete -c ${bin} -f -a '(__kaynooo_cli_complete ${bin})'
 async function installCompletions(host, dir) {
   const bins = installedBins(host);
   mkdirSync2(dir, { recursive: true });
-  const removed = readdirSync(dir).filter((name) => FISH_FILE.test(name) && !bins.includes(name.replace(FISH_FILE, "")) && readFileSync2(join3(dir, name), "utf8").startsWith(MARKER));
+  const removed = readdirSync(dir).filter((name) => FISH_FILE.test(name) && !bins.includes(name.replace(FISH_FILE, "")) && readFileSync3(join4(dir, name), "utf8").startsWith(MARKER));
   for (const name of removed)
-    rmSync(join3(dir, name));
-  await Promise.all(bins.map(async (bin) => Bun.write(join3(dir, `${bin}.fish`), completionFile(bin))));
+    rmSync(join4(dir, name));
+  await Promise.all(bins.map(async (bin) => Bun.write(join4(dir, `${bin}.fish`), completionFile(bin))));
   return { written: bins, removed: removed.map((name) => name.replace(FISH_FILE, "")) };
 }
 function missingCompletions(host, dir) {
-  return installedBins(host).filter((bin) => !existsSync2(join3(dir, `${bin}.fish`)));
+  return installedBins(host).filter((bin) => !existsSync2(join4(dir, `${bin}.fish`)));
 }
 
 // src/host.ts
 import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
-import process10 from "process";
+import { join as join5 } from "path";
+import process11 from "process";
 var RUN_TIMEOUT_MS = 20000;
 function hostHere() {
   const home = homedir2();
   return {
     home,
-    globalModules: join4(process10.env.BUN_INSTALL ?? join4(home, ".bun"), "install", "global", "node_modules"),
+    globalModules: join5(process11.env.BUN_INSTALL ?? join5(home, ".bun"), "install", "global", "node_modules"),
     bunVersion: Bun.version,
     which: (bin) => Bun.which(bin),
     run: async (argv, env) => {
-      const ran = await runCommand(argv, { timeoutMs: RUN_TIMEOUT_MS, ...env === undefined ? {} : { env: { ...process10.env, ...env } } });
+      const ran = await runCommand(argv, { timeoutMs: RUN_TIMEOUT_MS, ...env === undefined ? {} : { env: { ...process11.env, ...env } } });
       if (ran.timedOut)
         return { code: 1, stdout: "", stderr: `timed out after ${RUN_TIMEOUT_MS / 1000}s` };
       const of = (stream) => Buffer.concat(ran.chunks.filter((chunk) => chunk.stream === stream).map((chunk) => chunk.data)).toString();
@@ -1324,7 +1390,7 @@ var LIST_OPTIONS = {
   json: jsonOption("[{bin, package, installed, synopsis?, summary?, replaces?, examples?}]")
 };
 function print(listed) {
-  const { cyan, dim } = paint(process11.stdout);
+  const { cyan, dim } = paint(process12.stdout);
   const width = Math.max(...listed.map((each) => each.bin.length));
   for (const each of listed) {
     const what = !each.installed ? dim(`not installed: bun install -g ${each.package}`) : `${each.summary ?? ""}${each.replaces === undefined ? "" : dim(`; instead of ${each.replaces}`)}`;
@@ -1340,18 +1406,28 @@ async function list(args, host = hostHere()) {
     print(listed);
   return 0;
 }
-var COMPLETIONS_USAGE = `cli completions fish [--install] [--dir <folder>]: fish completions for every installed bin of the @kaynooo/cli-* packages
+var COMPLETIONS_USAGE = `cli completions <fish|bash> [--install] [--dir <folder>]: shell completions for every installed bin of the @kaynooo/cli-* packages
 
-Each bin completes itself through \`<bin> __complete\`; this writes the one line fish needs per bin. 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\`.
-Exits 0 when it printed or wrote them, 2 on a usage error.`;
+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).`;
 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>"], candidates: { "<shell>": () => ["fish"] }, examples: ["cli completions fish", ["cli completions fish --install", "write one file per bin"]] });
-  if (positionals[0] !== "fish")
-    badUsage("only fish is supported: cli completions fish");
+  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") {
+    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());
+    return 0;
+  }
   if (values.install !== true) {
     console.log(installedBins(host).map(completionFile).join(`
 `));
@@ -1392,9 +1468,8 @@ ${table(summary.usageErrors.map((each) => [`${each.bin}${each.command === undefi
   return 0;
 }
 if (import.meta.main) {
-  process11.exitCode = await runCli({
+  process12.exitCode = await runCli({
     name: "cli",
-    version,
     about: "the bins of the @kaynooo/cli-* packages, described by their own help",
     replaces: "running each bin's --help to find the one that fits",
     examples: ["cli list", ["cli list --json", "with each bin's synopsis and examples"]],

package/dist/cli.js

@@ -2,17 +2,16 @@
 // @bun
 
 // src/cli.ts
-import process11 from "process";
-
+import process12 from "process";
 // ../kit/src/args.ts
-import process4 from "process";
+import process5 from "process";
 import { parseArgs } from "util";
 
 // ../kit/src/format.ts
-import process2 from "process";
+import process3 from "process";
 
 // ../kit/src/style.ts
-import process from "process";
+import process2 from "process";
 
 // ../../node_modules/.bun/@kaynooo+utils@2.31.2+d0769e28dc4dad16/node_modules/@kaynooo/utils/dist/chunk-mtetydvc.js
 function x(s) {
@@ -276,10 +275,10 @@ function le(i = {}) {
 var t = le();
 
 // ../kit/src/style.ts
-function takesControlCodes(stream, env = process.env) {
+function takesControlCodes(stream, env = process2.env) {
   return stream.isTTY === true && env.NO_COLOR === undefined && env.NODE_DISABLE_COLORS === undefined && env.TERM !== "dumb";
 }
-function paint(stream, env = process.env) {
+function paint(stream, env = process2.env) {
   return le({ stream: { isTTY: takesControlCodes(stream, env) }, env });
 }
 var STATUSES = {
@@ -312,7 +311,7 @@ function table(rows, { cellWidth, header = false, align = [], fit } = {}) {
       widths[index] = Math.max(widths[index] ?? 0, textWidth(cell));
   }
   const shown = fit === undefined ? cells : narrow(cells, widths, fit);
-  const colors = paint(process2.stdout);
+  const colors = paint(process3.stdout);
   const lines = shown.map((row) => row.map((cell, index) => {
     const width = widths[index] ?? 0;
     const gap = " ".repeat(Math.max(0, width - textWidth(cell)));
@@ -344,24 +343,30 @@ function printJson(value) {
 }
 
 // ../kit/src/help.ts
-import process3 from "process";
+import process4 from "process";
 var OPTIONAL = /\[[^\]]+\]/g;
 var USAGE_PREFIX = /^usage:\s*/i;
 var FULL_STOP = /\.$/;
-function usageLine(usage, colors = paint(process3.stdout)) {
+function usageLine(usage, colors = paint(process4.stdout)) {
   return `${colors.bold("Usage:")} ${usage.replace(USAGE_PREFIX, "").replaceAll(OPTIONAL, (part) => colors.dim(part))}`;
 }
-function helpText(usage, options, colors = paint(process3.stdout), { examples = [], replaces } = {}) {
-  return [usageLine(usage, colors), ...replacesRows(replaces, colors), "", colors.bold("Options:"), ...optionRows(options, colors), ...exampleRows(examples, colors)].join(`
+function helpText(usage, options, colors = paint(process4.stdout), { examples = [], replaces, exits = [] } = {}) {
+  return [usageLine(usage, colors), ...replacesRows(replaces, colors), "", colors.bold("Options:"), ...optionRows(options, colors), ...exitRows(exits, colors), ...exampleRows(examples, colors)].join(`
 `);
 }
-function replacesRows(replaces, colors = paint(process3.stdout)) {
+function exitRows(exits, colors = paint(process4.stdout)) {
+  if (exits.length === 0)
+    return [];
+  const width = Math.max(...exits.map(([code]) => String(code).length));
+  return ["", colors.bold("Exits:"), ...exits.map(([code, meaning]) => `  ${colors.cyan(String(code).padEnd(width))}  ${meaning}`)];
+}
+function replacesRows(replaces, colors = paint(process4.stdout)) {
   return replaces === undefined ? [] : ["", `${colors.bold("Instead of:")} ${replaces}`];
 }
-function wantsHelpJson(env = process3.env) {
+function wantsHelpJson(env = process4.env) {
   return env.KIT_HELP === "json";
 }
-function description(usage, { examples = [], replaces } = {}) {
+function description(usage, { examples = [], replaces, exits } = {}, options) {
   const lines = usage.replace(USAGE_PREFIX, "").split(`
 `);
   const first = lines[0];
@@ -372,15 +377,17 @@ function description(usage, { examples = [], replaces } = {}) {
     synopsis: colon === -1 ? first : first.slice(0, colon),
     summary: colon === -1 ? fallback : first.slice(colon + 2),
     ...replaces === undefined ? {} : { replaces },
-    examples: examples.map((example) => typeof example === "string" ? { line: example } : { line: example[0], note: example[1] })
+    examples: examples.map((example) => typeof example === "string" ? { line: example } : { line: example[0], note: example[1] }),
+    ...exits === undefined ? {} : { exits: exits.map(([code, meaning]) => ({ code, meaning })) },
+    ...options === undefined ? {} : { options: Object.entries(options).map(([name, { short, description }]) => ({ name, ...short === undefined ? {} : { short }, ...description === undefined ? {} : { description } })) }
   };
 }
-function exampleRows(examples, colors = paint(process3.stdout)) {
+function exampleRows(examples, colors = paint(process4.stdout)) {
   if (examples.length === 0)
     return [];
   return ["", colors.bold("Examples:"), ...examples.map((example) => typeof example === "string" ? `  ${example}` : `  ${example[0]}  ${colors.dim(`# ${example[1]}`)}`)];
 }
-function optionRows(options, colors = paint(process3.stdout)) {
+function optionRows(options, colors = paint(process4.stdout)) {
   const rows = Object.entries(options).map(([name, option]) => {
     const short = option.short === undefined ? "    " : `${colors.cyan(`-${option.short}`)}, `;
     const named = option.choices === undefined ? "<value>" : `<${option.choices.join("|")}>`;
@@ -469,7 +476,7 @@ var OUTPUT_OPTIONS = {
   color: { type: "string", description: "auto (on a terminal alone), always or never" },
   plain: { type: "boolean", description: "plain text, no colour or spinner: --color never" }
 };
-function applyOutput(color, plain, env = process4.env) {
+function applyOutput(color, plain, env = process5.env) {
   const when = plain === true ? "never" : color ?? "auto";
   if (when === "auto")
     return;
@@ -492,7 +499,7 @@ function parse(args, usage, options, settings = {}) {
   const { own, rest } = settings.trailing === true ? splitTrailing(args, all, settings.positionals?.length ?? 0) : splitRest(args, settings.rest === true);
   let parsed;
   try {
-    parsed = parseArgs({ args: joinDashValues(withBare(own, all), all), options: all, allowPositionals: true, allowNegative: settings.allowNegative === true, strict: true });
+    parsed = parseArgs({ args: joinDashValues(withBare(withAliases(own, all), all), all), options: all, allowPositionals: true, allowNegative: settings.allowNegative === true, strict: true });
   } catch (error) {
     const message = parseError(error);
     throw new UsageError(message, nearestOption(message, all, settings.allowNegative === true));
@@ -500,7 +507,7 @@ function parse(args, usage, options, settings = {}) {
   const values = parsed.values;
   applyOutput("color" in output ? values.color : undefined, "plain" in output ? values.plain : undefined);
   if (values.help === true) {
-    console.log(wantsHelpJson() ? JSON.stringify(description(usage, settings)) : helpText(usage, listing, undefined, settings));
+    console.log(wantsHelpJson() ? JSON.stringify(description(usage, settings, listing)) : helpText(usage, listing, undefined, settings));
     throw new HelpShown;
   }
   checkChoices(parsed.values, all);
@@ -542,6 +549,18 @@ function listed(options, allowNegative) {
     return [...option.description === undefined ? [] : [[name, option]], [`no-${name}`, { type: "boolean", description: option.negative }]];
   }));
 }
+function withAliases(args, options) {
+  const named = new Map(Object.entries(options).flatMap(([name, { aliases = [] }]) => aliases.map((alias) => [`--${alias}`, `--${name}`])));
+  if (named.size === 0)
+    return args;
+  const separator = args.indexOf("--");
+  const own = separator === -1 ? args : args.slice(0, separator);
+  return [...own.map((arg) => {
+    const at = arg.indexOf("=");
+    const current = named.get(at === -1 ? arg : arg.slice(0, at));
+    return current === undefined ? arg : `${current}${at === -1 ? "" : arg.slice(at)}`;
+  }), ...separator === -1 ? [] : args.slice(separator)];
+}
 function withBare(args, options) {
   const bare = new Map(Object.entries(options).flatMap(([name, { short, optional }]) => optional === undefined ? [] : [[`--${name}`, optional], ...short === undefined ? [] : [[`-${short}`, optional]]]));
   if (bare.size === 0)
@@ -628,7 +647,7 @@ function nearestOption(message, options, allowNegative) {
 }
 // ../kit/src/process.ts
 import { constants } from "os";
-import process5 from "process";
+import process6 from "process";
 var KILL_GRACE_MS = 2000;
 function exitCodeOf(code, signal) {
   if (code !== null)
@@ -648,7 +667,7 @@ async function runCommand(argv, { cwd, env, stdin = "ignore", timeoutMs, signal,
       return;
     try {
       if (grouped)
-        process5.kill(-proc.pid, killing);
+        process6.kill(-proc.pid, killing);
       else
         proc.kill(killing);
     } catch {}
@@ -722,13 +741,15 @@ var ESCAPE_CODE = new RegExp(`${ESC}(?:\\[[\\x30-\\x3F]*[\\x20-\\x2F]*[\\x40-\\x
 var RESET_STYLE = `${ESC}[0m`;
 var CLOSE_LINK = `${ESC}]8;;${ESC}\\`;
 // ../kit/src/cli.ts
-import process7 from "process";
+import { readFileSync, realpathSync } from "fs";
+import { dirname as dirname2, join as join2 } from "path";
+import process8 from "process";
 
 // ../kit/src/usage.ts
 import { appendFileSync, mkdirSync } from "fs";
 import { homedir } from "os";
 import { dirname, isAbsolute, join } from "path";
-import process6 from "process";
+import process7 from "process";
 
 // ../kit/src/logs.ts
 var DAY_MS = 24 * 60 * 60 * 1000;
@@ -742,14 +763,14 @@ var usageError;
 function noteUsageError(message) {
   usageError = message;
 }
-function stateHome(env = process6.env) {
+function stateHome(env = process7.env) {
   const dir = env.XDG_STATE_HOME;
   return dir !== undefined && isAbsolute(dir) ? dir : join(homedir(), ".local", "state");
 }
-function usagePath(env = process6.env) {
+function usagePath(env = process7.env) {
   return join(stateHome(env), CLI_FOLDER, "usage.jsonl");
 }
-function usageRecorded(env = process6.env) {
+function usageRecorded(env = process7.env) {
   const off = env.KAYNOOO_CLI_NO_USAGE;
   return env.NODE_ENV !== "test" && (off === undefined || off === "" || off === "0");
 }
@@ -763,7 +784,7 @@ function usageEntry(bin, command, argv, code, now = new Date) {
   usageError = undefined;
   return { at: now.toISOString(), bin, ...command === undefined ? {} : { command }, flags: flagNames(argv), code, ...unknown === undefined ? {} : { unknown } };
 }
-function recordUsage(entry, env = process6.env) {
+function recordUsage(entry, env = process7.env) {
   if (!usageRecorded(env))
     return;
   try {
@@ -890,8 +911,8 @@ async function help2({ path, header, summary: lazySummary, commands, defaultComm
 `);
 }
 function printError(prefix, message, hint, cause) {
-  const colors = paint(process7.stderr);
-  const styled = takesControlCodes(process7.stderr);
+  const colors = paint(process8.stderr);
+  const styled = takesControlCodes(process8.stderr);
   const head = styled ? `${colors.red.bold("error")} ${colors.dim(`${prefix}:`)}` : `error: ${prefix}:`;
   const under = (label, text, tint) => text === undefined ? "" : `
   ${styled ? tint(label) : `${label}:`} ${text}`;
@@ -934,11 +955,11 @@ async function dispatch(level, typed, { version, redact }) {
     }
   }
   if (name === undefined && level.path.length > 1) {
-    console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process7.stderr));
+    console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process8.stderr));
     return 2;
   }
   if (name === undefined || name === "help" || name === "--help" || name === "-h") {
-    console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process7.stdout));
+    console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process8.stdout));
     return 0;
   }
   if (level.path.length === 1 && (name === "--version" || name === "-v")) {
@@ -1054,10 +1075,22 @@ async function printCandidates(found) {
     console.log(line);
   return 0;
 }
-async function runCli(cli, argv = process7.argv.slice(2)) {
+function packageVersion(entry = Bun.main) {
+  for (let dir = dirname2(realpathSync(entry));; dir = dirname2(dir)) {
+    try {
+      const { version } = JSON.parse(readFileSync(join2(dir, "package.json"), "utf8"));
+      if (typeof version === "string")
+        return version;
+    } catch {}
+    if (dirname2(dir) === dir)
+      return "0.0.0";
+  }
+}
+async function runCli(cli, argv = process8.argv.slice(2)) {
+  const version = cli.version ?? packageVersion();
   if (argv[0] === COMPLETE)
     return printCandidates(candidates(scopeOf(cli.commands, cli.extraCommands, cli.aliases), cli.defaultCommand, argv.slice(1)));
-  const code = await dispatch({ path: [cli.name], header: (colors, about) => `${colors.bold(cli.name)} ${colors.dim(cli.version)}  ${about}`, summary: cli.about, ...scopeOf(cli.commands, cli.extraCommands, cli.aliases), defaultCommand: cli.defaultCommand, runBare: cli.runBare === true, examples: cli.examples, replaces: cli.replaces }, argv, { version: cli.version, redact: cli.redact });
+  const code = await dispatch({ path: [cli.name], header: (colors, about) => `${colors.bold(cli.name)} ${colors.dim(version)}  ${about}`, summary: cli.about, ...scopeOf(cli.commands, cli.extraCommands, cli.aliases), defaultCommand: cli.defaultCommand, runBare: cli.runBare === true, examples: cli.examples, replaces: cli.replaces }, argv, { version, redact: cli.redact });
   if (cli.usage !== false) {
     try {
       recordUsage(usageEntry(cli.name, commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv), argv, code));
@@ -1080,11 +1113,11 @@ function commandPath(scope, argv) {
   }
   return path.length === 0 ? undefined : path.join(" ");
 }
-async function runMain({ name, version, run, redact, usage }, argv = process7.argv.slice(2)) {
+async function runMain({ name, version, run, redact, usage }, argv = process8.argv.slice(2)) {
   if (argv[0] === COMPLETE)
     return printCandidates(leafCandidates(run, argv.slice(1)));
   if (argv.length === 1 && (argv[0] === "--version" || argv[0] === "-v")) {
-    console.log(version);
+    console.log(version ?? packageVersion());
     return 0;
   }
   let code;
@@ -1093,8 +1126,11 @@ async function runMain({ name, version, run, redact, usage }, argv = process7.ar
   } catch (error) {
     code = reportThrown(name, error, redact, wantsJson(argv));
   }
-  if (usage !== false)
-    recordUsage(usageEntry(name, undefined, argv, code));
+  if (usage !== false) {
+    try {
+      recordUsage(usageEntry(name, undefined, argv, code));
+    } catch {}
+  }
   return code;
 }
 // ../kit/src/secrets.ts
@@ -1103,17 +1139,14 @@ var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "ses
 var {Glob } = globalThis.Bun;
 var SESSION_FILES = new Glob("*.json");
 var ACCOUNT_DIRS = new Glob("*/sessions");
-// package.json
-var version = "0.4.0";
-
 // src/checks.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
-import { basename, join as join3 } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync3 } from "fs";
+import { basename, join as join4 } from "path";
 
 // src/completions.ts
-import { existsSync, mkdirSync as mkdirSync2, readdirSync, readFileSync, rmSync } from "fs";
-import { join as join2 } from "path";
-import process9 from "process";
+import { existsSync, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2, rmSync } from "fs";
+import { join as join3 } from "path";
+import process10 from "process";
 var MARKER = "# Generated by `cli completions fish`";
 var FISH_FILE = /\.fish$/;
 var FUNCTION = `functions -q __kaynooo_cli_complete; or function __kaynooo_cli_complete --argument-names bin --description 'what a @kaynooo/cli-* bin offers for the word being typed'
@@ -1127,8 +1160,28 @@ var FUNCTION = `functions -q __kaynooo_cli_complete; or function __kaynooo_cli_c
         end
     end
 end`;
-function completionDir(home, env = process9.env) {
-  return join2(env.XDG_CACHE_HOME ?? join2(home, ".cache"), "fish", "kaynooo-cli");
+var BASH_FUNCTION = `__kaynooo_cli_complete() {
+    local IFS=$'\\n' cur=\${COMP_WORDS[COMP_CWORD]} line words=
+    local -a lines
+    COMPREPLY=()
+    lines=($("\${COMP_WORDS[0]}" __complete "\${COMP_WORDS[@]:1:COMP_CWORD}" 2>/dev/null))
+    for line in "\${lines[@]}"; do
+        if [[ $line == __files__ ]]; then
+            COMPREPLY+=($(compgen -f -- "$cur"))
+        else
+            words+="\${line%%$'\\t'*}"$'\\n'
+        fi
+    done
+    COMPREPLY+=($(compgen -W "$words" -- "$cur"))
+}`;
+function bashScript(bins) {
+  return `# Generated by \`cli completions bash\`
+${BASH_FUNCTION}
+complete -F __kaynooo_cli_complete ${bins.join(" ")}
+`;
+}
+function completionDir(home, env = process10.env) {
+  return join3(env.XDG_CACHE_HOME ?? join3(home, ".cache"), "fish", "kaynooo-cli");
 }
 function installedBins(host) {
   return Object.values(TOOLS).flat().filter((bin) => host.which(bin) !== null);
@@ -1142,28 +1195,30 @@ complete -c ${bin} -f -a '(__kaynooo_cli_complete ${bin})'
 async function installCompletions(host, dir) {
   const bins = installedBins(host);
   mkdirSync2(dir, { recursive: true });
-  const removed = readdirSync(dir).filter((name) => FISH_FILE.test(name) && !bins.includes(name.replace(FISH_FILE, "")) && readFileSync(join2(dir, name), "utf8").startsWith(MARKER));
+  const removed = readdirSync(dir).filter((name) => FISH_FILE.test(name) && !bins.includes(name.replace(FISH_FILE, "")) && readFileSync2(join3(dir, name), "utf8").startsWith(MARKER));
   for (const name of removed)
-    rmSync(join2(dir, name));
-  await Promise.all(bins.map(async (bin) => Bun.write(join2(dir, `${bin}.fish`), completionFile(bin))));
+    rmSync(join3(dir, name));
+  await Promise.all(bins.map(async (bin) => Bun.write(join3(dir, `${bin}.fish`), completionFile(bin))));
   return { written: bins, removed: removed.map((name) => name.replace(FISH_FILE, "")) };
 }
 function missingCompletions(host, dir) {
-  return installedBins(host).filter((bin) => !existsSync(join2(dir, `${bin}.fish`)));
+  return installedBins(host).filter((bin) => !existsSync(join3(dir, `${bin}.fish`)));
 }
 
 // src/checks.ts
 var TOOLS = {
+  "@kaynooo/cli-audit": ["audit"],
   "@kaynooo/cli-base": ["base", "proof"],
   "@kaynooo/cli-changelog": ["changelog"],
-  "@kaynooo/cli-check": ["check", "fix", "errs"],
+  "@kaynooo/cli-check": ["check", "fix", "errs", "j"],
   "@kaynooo/cli-code": ["peek", "todo-scan", "hotspots"],
   "@kaynooo/cli-db": ["db"],
+  "@kaynooo/cli-docker": ["dc", "dlog", "dx", "sf"],
   "@kaynooo/cli-doctor": ["doctor", "cli"],
   "@kaynooo/cli-edit": ["sub"],
   "@kaynooo/cli-env": ["ev", "redact"],
   "@kaynooo/cli-forgejo": ["ft"],
-  "@kaynooo/cli-git": ["gst", "gc"],
+  "@kaynooo/cli-git": ["gst", "gc", "gb"],
   "@kaynooo/cli-gitlab": ["gl"],
   "@kaynooo/cli-guard": ["guard"],
   "@kaynooo/cli-out": ["out"],
@@ -1171,6 +1226,7 @@ var TOOLS = {
   "@kaynooo/cli-pick": ["pick"],
   "@kaynooo/cli-pkg": ["pkg"],
   "@kaynooo/cli-probe": ["probe"],
+  "@kaynooo/cli-proc": ["pid", "ports", "procs"],
   "@kaynooo/cli-repos": ["repos"],
   "@kaynooo/cli-stack": ["stack"],
   "@kaynooo/cli-sweep": ["sweep"],
@@ -1192,7 +1248,7 @@ function readJsonText(text) {
   }
 }
 function readJson(path) {
-  return existsSync2(path) ? readJsonText(readFileSync2(path, "utf8")) : undefined;
+  return existsSync2(path) ? readJsonText(readFileSync3(path, "utf8")) : undefined;
 }
 function firstLine(text) {
   const trimmed = text.trim();
@@ -1201,12 +1257,12 @@ function firstLine(text) {
   return end === -1 ? trimmed : trimmed.slice(0, end);
 }
 function installed(host, name) {
-  return readJson(join3(host.globalModules, name, "package.json"));
+  return readJson(join4(host.globalModules, name, "package.json"));
 }
 function ownBin(host, name, bin) {
   const declared = installed(host, name)?.bin;
   const file = typeof declared === "string" ? declared : declared?.[bin];
-  return file === undefined ? undefined : join3(host.globalModules, name, file);
+  return file === undefined ? undefined : join4(host.globalModules, name, file);
 }
 async function checkTool(host, name, bins) {
   const check = name.slice(name.indexOf("/") + 1);
@@ -1215,7 +1271,7 @@ async function checkTool(host, name, bins) {
     return { check, ok: false, detail: "not installed", fix: `bun install -g ${name}` };
   const off = bins.filter((bin) => host.which(bin) === null);
   if (off.length > 0)
-    return { check, ok: false, detail: `${version}, ${off.join(", ")} not on the PATH`, fix: `add ${join3(host.globalModules, "..", "..", "..", "bin")} to the PATH` };
+    return { check, ok: false, detail: `${version}, ${off.join(", ")} not on the PATH`, fix: `add ${join4(host.globalModules, "..", "..", "..", "bin")} to the PATH` };
   const info = await host.run(["bun", "info", name, "version", "--no-cache"]);
   const answered = info.code === 0 ? firstLine(info.stdout.trim().split(`
 `).at(-1) ?? "") : "";
@@ -1242,9 +1298,9 @@ async function checkTea(host) {
   return { check: "tea", ok: true, detail: `logged in to ${forge} as ${login.name}, Forgejo ${served}` };
 }
 function checkHooks(host) {
-  const settings = readJson(join3(host.home, ".claude", "settings.json")) ?? {};
+  const settings = readJson(join4(host.home, ".claude", "settings.json")) ?? {};
   const plugin = settings.enabledPlugins?.[PLUGIN] === true;
-  const mod = (settings.env?.CLAUDE_CODE_PLUGIN_DIRS ?? "").split(":").map((dir) => dir.replace(LEADING_TILDE, host.home)).find((dir) => basename(dir) === "cli" && existsSync2(join3(dir, "hooks", "hooks.json")));
+  const mod = (settings.env?.CLAUDE_CODE_PLUGIN_DIRS ?? "").split(":").map((dir) => dir.replace(LEADING_TILDE, host.home)).find((dir) => basename(dir) === "cli" && existsSync2(join4(dir, "hooks", "hooks.json")));
   if (plugin && mod !== undefined)
     return { check: "hooks", ok: false, detail: `both the ${PLUGIN} plugin and the mod in ${mod} run guard, so every call is checked twice`, fix: `claude plugin disable ${PLUGIN}` };
   if (plugin)
@@ -1269,28 +1325,75 @@ function checkCompletions(host) {
     return { check: "completions", ok: false, detail: `no fish completion in ${dir} for ${missing.join(", ")}`, fix: "cli completions fish --install" };
   return { check: "completions", ok: true, detail: dir };
 }
-async function runChecks(host) {
-  const entries = Object.entries(TOOLS);
+var toolCheck = (name) => name.slice(name.indexOf("/") + 1);
+var OTHER_CHECKS = ["tea", "hooks", "bun", "completions"];
+var CHECK_NAMES = [...Object.keys(TOOLS).map(toolCheck), ...OTHER_CHECKS];
+async function runChecks(host, only = []) {
+  const wanted = (check) => only.length === 0 || only.includes(check);
+  const entries = Object.entries(TOOLS).filter(([name]) => wanted(toolCheck(name)));
   const tools = [];
   for (let at = 0;at < entries.length; at += INFO_AT_ONCE)
     tools.push(...await Promise.all(entries.slice(at, at + INFO_AT_ONCE).map(async ([name, bins]) => checkTool(host, name, bins))));
-  return [...tools, await checkTea(host), checkHooks(host), checkBun(host), checkCompletions(host)];
+  return [
+    ...tools,
+    ...wanted("tea") ? [await checkTea(host)] : [],
+    ...wanted("hooks") ? [checkHooks(host)] : [],
+    ...wanted("bun") ? [checkBun(host)] : [],
+    ...wanted("completions") ? [checkCompletions(host)] : []
+  ];
+}
+
+// src/fix.ts
+var INSTALL = /^bun install -g (\S+)$/;
+var RUNNABLE = /^(?:cli completions fish --install|claude plugin (?:install \S+ --marketplace \S+|disable \S+))$/;
+function planFixes(results) {
+  const steps = [];
+  const installs = [];
+  for (const { ok, fix } of results) {
+    if (ok || fix === undefined)
+      continue;
+    const install = INSTALL.exec(fix);
+    if (install !== null)
+      installs.push(install[1] ?? "");
+    else
+      steps.push({ command: fix, argv: RUNNABLE.test(fix) ? fix.split(" ") : undefined });
+  }
+  if (installs.length === 0)
+    return steps;
+  const command = `bun install -g ${installs.join(" ")}`;
+  return [{ command, argv: command.split(" ") }, ...steps];
+}
+async function applyFixes(host, steps, dry) {
+  const outcomes = [];
+  for (const { command, argv } of steps) {
+    if (argv === undefined) {
+      outcomes.push({ command, status: "not run", detail: "not a command doctor runs: do it by hand" });
+      continue;
+    }
+    if (dry) {
+      outcomes.push({ command, status: "dry-run" });
+      continue;
+    }
+    const ran = await host.run(argv);
+    outcomes.push(ran.code === 0 ? { command, status: "ran" } : { command, status: "failed", detail: `exit ${ran.code}: ${firstLine(ran.stderr || ran.stdout)}` });
+  }
+  return outcomes;
 }
 
 // src/host.ts
 import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
-import process10 from "process";
+import { join as join5 } from "path";
+import process11 from "process";
 var RUN_TIMEOUT_MS = 20000;
 function hostHere() {
   const home = homedir2();
   return {
     home,
-    globalModules: join4(process10.env.BUN_INSTALL ?? join4(home, ".bun"), "install", "global", "node_modules"),
+    globalModules: join5(process11.env.BUN_INSTALL ?? join5(home, ".bun"), "install", "global", "node_modules"),
     bunVersion: Bun.version,
     which: (bin) => Bun.which(bin),
     run: async (argv, env) => {
-      const ran = await runCommand(argv, { timeoutMs: RUN_TIMEOUT_MS, ...env === undefined ? {} : { env: { ...process10.env, ...env } } });
+      const ran = await runCommand(argv, { timeoutMs: RUN_TIMEOUT_MS, ...env === undefined ? {} : { env: { ...process11.env, ...env } } });
       if (ran.timedOut)
         return { code: 1, stdout: "", stderr: `timed out after ${RUN_TIMEOUT_MS / 1000}s` };
       const of = (stream) => Buffer.concat(ran.chunks.filter((chunk) => chunk.stream === stream).map((chunk) => chunk.data)).toString();
@@ -1300,35 +1403,67 @@ function hostHere() {
 }
 
 // src/cli.ts
-var USAGE = `doctor [--json]: checks this host's @kaynooo/cli-* install, one line per check, the command that fixes a failing one beside it
+var USAGE = `doctor [--only <check>] [--quiet] [--fix [--dry-run]] [--json]: checks this host's @kaynooo/cli-* install, one line per check, the command that fixes a failing one beside it
 
-Each @kaynooo/cli-* package installed globally with its bins on the PATH and no older than the registry's latest; tea logged in to git.kaynooo.fr and reaching it; the Claude Code hooks wired through the cli-hooks plugin or the cli mod, not both; Bun at least the version the tools ask for.
-Exits 0 when every check passes, 1 when one fails, 2 on a usage error.`;
-var INSTALL = "bun install -g ";
+Each @kaynooo/cli-* package installed globally with its bins on the PATH and no older than the registry's latest; tea logged in to git.kaynooo.fr and reaching it; the Claude Code hooks wired through the cli-hooks plugin or the cli mod, not both; Bun at least the version the tools ask for; fish completions for every bin.
+--fix runs the printed fix: lines it may (global installs of the packages, the completions, the hooks plugin), the installs in one call, then checks again; a line that installs a system package or only describes a step is printed as not run. --dry-run shows what --fix would run.
+--quiet prints only the failing checks, nothing when all pass. --only limits the run to the checks named, e.g. --only tea --only bun.`;
+var EXITS = [[0, "every check passes (after --fix, the ones it fixed too)"], [1, "a check fails"], [2, "a usage error"]];
+var INSTALL2 = "bun install -g ";
 var OPTIONS = {
-  json: jsonOption("[{check, ok, detail, fix?}]")
+  json: jsonOption("[{check, ok, detail, fix?}], as the checks stand after --fix; the fixes it ran go to stderr"),
+  only: { type: "string", multiple: true, choices: CHECK_NAMES, description: "run only this check (a package such as cli-forgejo, tea, hooks, bun or completions), repeatable" },
+  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, show what would run without running it (alone, it implies --fix)" }
 };
 function print(results) {
-  const { green, red, dim } = paint(process11.stdout);
+  if (results.length === 0)
+    return;
+  const { green, red, dim } = paint(process12.stdout);
   const width = Math.max(...results.map((result) => result.check.length));
   for (const { check, ok, detail, fix } of results)
     console.log(`${ok ? green("ok  ") : red("FAIL")}  ${check.padEnd(width)}  ${detail}${fix === undefined ? "" : `  ${dim("fix:")} ${fix}`}`);
-  const installs = results.flatMap((result) => result.fix?.startsWith(INSTALL) === true ? [result.fix.slice(INSTALL.length)] : []);
+  const installs = results.flatMap((result) => result.fix?.startsWith(INSTALL2) === true ? [result.fix.slice(INSTALL2.length)] : []);
   if (installs.length > 1)
     console.log(`
-${dim("fix them all:")} ${INSTALL}${installs.join(" ")}`);
+${dim("fix them all:")} ${INSTALL2}${installs.join(" ")}`);
+}
+function printOutcomes(outcomes, log) {
+  const { green, red, dim } = paint(process12.stdout);
+  const marks = { ran: green("ran    "), failed: red("failed "), "dry-run": dim("would  "), "not run": dim("not run") };
+  for (const { command, status, detail } of outcomes)
+    log(`${marks[status]}  ${command}${detail === undefined ? "" : `  ${dim(detail)}`}`);
 }
 async function main(args, host = hostHere()) {
-  const { values } = parse(args, USAGE, OPTIONS, { positionals: [], replaces: "checking each bin's version, tea's login and the hooks by hand", examples: ["doctor", ["doctor --json", "the checks for a script"]] });
-  const results = await runChecks(host);
-  if (values.json === true)
-    printJson(results);
+  const { values } = parse(args, USAGE, OPTIONS, { positionals: [], 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"]] });
+  const only = values.only ?? [];
+  const dry = values["dry-run"] === true;
+  const json = values.json === true;
+  let results = await runChecks(host, only);
+  let fixed = false;
+  if ((values.fix === true || dry) && results.some((result) => !result.ok)) {
+    if (!json)
+      print(values.quiet === true ? results.filter((result) => !result.ok) : results);
+    const steps = planFixes(results);
+    printOutcomes(await applyFixes(host, steps, dry), json ? console.error : console.log);
+    if (dry)
+      return 1;
+    results = await runChecks(host, only);
+    fixed = true;
+  }
+  const shown = values.quiet === true ? results.filter((result) => !result.ok) : results;
+  if (fixed && !json && shown.length > 0)
+    console.log(`
+after the fixes:`);
+  if (json)
+    printJson(shown);
   else
-    print(results);
+    print(shown);
   return results.every((result) => result.ok) ? 0 : 1;
 }
 if (import.meta.main)
-  process11.exitCode = await runMain({ name: "doctor", version, run: async (args) => main(args) });
+  process12.exitCode = await runMain({ name: "doctor", run: async (args) => main(args) });
 export {
   main
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-doctor",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.5.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",