ymmv-cli 0.3.0 → 0.5.0

package/README.md

@@ -2,33 +2,51 @@
 
 **Share your dev tool-stack from the terminal.**
 
-Editor, OS, shell, terminal, browser, font (and more) — published to a clean
-page at `ymmv.fyi/<handle>` in about 10 seconds.
+Editor, OS, shell, terminal, theme, AI tool (and more), published to a
+clean page at `ymmv.fyi/<handle>` in about 10 seconds. See a live one:
+[ymmv.fyi/bardisty](https://ymmv.fyi/bardisty).
+
+![Running npx ymmv-cli to detect, confirm, and publish a dev stack to a live ymmv.fyi page](https://raw.githubusercontent.com/ymmv-fyi/ymmv/main/docs/demo.gif)
 
 ```sh
 npx ymmv-cli            # detect your stack, confirm, go live at ymmv.fyi/<you>
 npx ymmv-cli bardisty   # view someone's stack in the terminal
 ```
 
+Viewing someone while you're logged in diffs their stack against yours:
+
+```
+          bardisty  you
+~ Editor  Zed       VS Code
+= Shell   bash      bash
+~ Theme   Gruvbox   Catppuccin
+~ Font    Lilex     JetBrains Mono
+
+  3 differ · 1 shared — your mileage may vary
+```
+
 Install once for the short `ymmv` command:
 
 ```sh
 npm i -g ymmv-cli
 ```
 
-First run includes a one-time GitHub sign-in (the device flow you know from `gh`
-/ `npm login`, ~10s).
+First run includes a one-time GitHub sign-in. Works on macOS, Linux, Windows,
+and WSL. Nothing is published until you confirm (detection only pre-fills), and
+`ymmv delete` removes everything. Releases are published from GitHub Actions
+via npm Trusted Publishing, with provenance.
 
 ## Commands
 
-- `ymmv` — detect, confirm, and publish (re-run any time to update)
-- `ymmv <handle>` — view a profile, or diff it against yours when you're logged in
-- `ymmv set editor Neovim` — change one value
-- `ymmv set --extra "Keyboard=HHKB"` — add a free-form line of your own
-- `ymmv delete` — remove your profile
-- `ymmv login` / `ymmv logout` — sign in / out
+- `ymmv` detects, confirms, and publishes (re-run any time to update)
+- `ymmv <handle>` views a profile, or diffs it against yours when you're logged in
+- `ymmv set editor Neovim` changes one value
+- `ymmv set --extra "Keyboard=HHKB"` adds a free-form line of your own
+- `ymmv unset editor` removes one value (`ymmv set editor -` works too); `ymmv unset --extra "Keyboard"` removes an extra
+- `ymmv delete` removes your profile
+- `ymmv login` / `ymmv logout` sign in / out
 
-Every profile is open JSON too — `GET https://ymmv.fyi/api/v1/u/<handle>`.
+Every profile is open JSON too: `GET https://ymmv.fyi/api/v1/u/<handle>`.
 
 ## License
 

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { readFileSync } from "fs";
+import { readFileSync as readFileSync2 } from "fs";
 
 // src/config.ts
 var BASE = (process.env.YMMV_API ?? "https://ymmv.fyi").replace(/\/+$/, "");
@@ -44,16 +44,22 @@ async function revokeYmmvToken(token) {
   return body.revoked === true;
 }
 
+// src/commands.ts
+import { readFileSync, statSync } from "fs";
+
 // ../shared/dist/keys.js
 var CURATED_KEYS = [
   "editor",
   "os",
   "shell",
+  "prompt",
   "terminal",
   "browser",
   "window-manager",
   "font",
+  "theme",
   "multiplexer",
+  "version-manager",
   "dotfiles",
   "ai-tool"
 ];
@@ -61,11 +67,14 @@ var KEY_LABELS = {
   editor: "Editor",
   os: "OS",
   shell: "Shell",
+  prompt: "Prompt",
   terminal: "Terminal",
   browser: "Browser",
   "window-manager": "Window Manager",
   font: "Font",
+  theme: "Theme",
   multiplexer: "Multiplexer",
+  "version-manager": "Version Manager",
   dotfiles: "Dotfiles",
   "ai-tool": "AI Tool"
 };
@@ -122,16 +131,95 @@ var TOOLS = [
   { key: "terminal", canonical: "Hyper", envTokens: ["hyper"] },
   { key: "terminal", canonical: "Rio", envTokens: ["rio"] },
   { key: "terminal", canonical: "kitty", envTokens: ["kitty"] },
+  // kitty refuses TERM_PROGRAM (its issue #3317); detect.ts probes KITTY_WINDOW_ID instead — token kept for the day that changes
   { key: "terminal", canonical: "Tabby", envTokens: ["tabby"] },
   { key: "terminal", canonical: "Warp", envTokens: ["warpterminal"] },
   // `warpterminal` env id ≠ typed "Warp"
+  { key: "terminal", canonical: "GNOME Console", envTokens: ["kgx"] },
+  // $TERM_PROGRAM=kgx since GNOME 45
+  { key: "terminal", canonical: "mintty", envTokens: ["mintty"] },
+  // Git Bash/MSYS2 console, ≥3.1.5
+  { key: "terminal", canonical: "Zed", envTokens: ["zed"] },
+  // Zed's built-in terminal (~0.145+)
+  // ── browser (envTokens mirror BROWSER_NAMES: $BROWSER basenames) ──────────
+  { key: "browser", canonical: "Firefox", envTokens: ["firefox"], aliases: ["ff"] },
+  // Hyphenated Linux binary names double as diff aliases (kde/plasma precedent): unlike `vi`,
+  // each unambiguously names exactly that browser, so a TYPED "google-chrome" should diff-equal
+  // a DETECTED "Chrome".
+  {
+    key: "browser",
+    canonical: "Chrome",
+    envTokens: ["chrome", "google-chrome"],
+    aliases: ["google chrome", "google-chrome"]
+    // NOT Chromium — distinct browser
+  },
+  {
+    key: "browser",
+    canonical: "Edge",
+    envTokens: ["msedge", "microsoft-edge"],
+    aliases: ["microsoft edge", "microsoft-edge"]
+  },
+  {
+    key: "browser",
+    canonical: "Chromium",
+    envTokens: ["chromium", "chromium-browser"],
+    aliases: ["chromium-browser"]
+  },
+  {
+    key: "browser",
+    canonical: "Brave",
+    envTokens: ["brave", "brave-browser"],
+    aliases: ["brave-browser"]
+  },
+  { key: "browser", canonical: "LibreWolf", envTokens: ["librewolf"] },
+  {
+    key: "browser",
+    canonical: "Vivaldi",
+    envTokens: ["vivaldi", "vivaldi-stable"],
+    aliases: ["vivaldi-stable"]
+  },
+  { key: "browser", canonical: "Zen", envTokens: ["zen", "zen-browser"], aliases: ["zen-browser"] },
+  { key: "browser", canonical: "qutebrowser", envTokens: ["qutebrowser"] },
+  // ── window-manager (envTokens mirror WM_NAMES: XDG_CURRENT_DESKTOP list entries +
+  //    DESKTOP_SESSION basenames, lowercased). Deliberate: canonical names are what users put on
+  //    profiles — the DE name (GNOME, KDE Plasma), not its compositor (Mutter, KWin). Compositors
+  //    with their own socket vars (Hyprland/Sway/i3/niri) are ALSO probed directly in detect.ts;
+  //    WMs with no env footprint at all (river, bspwm, dwm, Qtile, awesome) have no tokens — a
+  //    dead token would only inflate the pinned detector fixtures. ──────────
+  { key: "window-manager", canonical: "GNOME", envTokens: ["gnome"] },
+  {
+    key: "window-manager",
+    canonical: "KDE Plasma",
+    envTokens: ["kde", "plasma"],
+    aliases: ["kde", "plasma"]
+  },
+  { key: "window-manager", canonical: "Hyprland", envTokens: ["hyprland"] },
+  { key: "window-manager", canonical: "Sway", envTokens: ["sway"] },
+  { key: "window-manager", canonical: "i3", envTokens: ["i3"] },
+  { key: "window-manager", canonical: "niri", envTokens: ["niri"] },
+  { key: "window-manager", canonical: "COSMIC", envTokens: ["cosmic"] },
+  { key: "window-manager", canonical: "Cinnamon", envTokens: ["cinnamon", "x-cinnamon"] },
+  { key: "window-manager", canonical: "MATE", envTokens: ["mate"] },
+  { key: "window-manager", canonical: "XFCE", envTokens: ["xfce"] },
+  { key: "window-manager", canonical: "LXQt", envTokens: ["lxqt"] },
+  { key: "window-manager", canonical: "Budgie", envTokens: ["budgie"] },
+  { key: "window-manager", canonical: "Pantheon", envTokens: ["pantheon"] },
+  { key: "window-manager", canonical: "Unity", envTokens: ["unity"] },
+  // ── prompt (presence-detected in detect.ts — entries exist for diff aliases only; fold
+  //    already equates case/space variants, so single-word tools need no entry) ──
+  { key: "prompt", canonical: "Powerlevel10k", aliases: ["p10k"] },
+  // NOT p9k — distinct predecessor
+  { key: "prompt", canonical: "Oh My Posh", aliases: ["oh-my-posh", "omp"] },
+  // hyphens survive fold
+  // ── theme (never detected — aliases for spellings fold can't equate: hyphens + the é) ──
+  { key: "theme", canonical: "Ros\xE9 Pine", aliases: ["rose pine", "rose-pine"] },
+  { key: "theme", canonical: "Tokyo Night", aliases: ["tokyo-night"] },
+  { key: "theme", canonical: "One Dark", aliases: ["one-dark"] },
   // ── diff-only synonyms (no detector for these fields) ─────────────────────
-  { key: "browser", canonical: "Firefox", aliases: ["ff"] },
-  { key: "browser", canonical: "Chrome", aliases: ["google chrome"] },
-  // NOT Chromium — distinct browser
-  { key: "browser", canonical: "Edge", aliases: ["microsoft edge"] },
   { key: "os", canonical: "macOS", aliases: ["osx", "os x", "mac"] },
   { key: "os", canonical: "Windows", aliases: ["win"] },
+  { key: "os", canonical: "Arch Linux", aliases: ["arch"] },
+  // os-release NAME= vs what people type
   { key: "multiplexer", canonical: "GNU Screen", aliases: ["screen"] }
   // matches detector's "GNU Screen"
 ];
@@ -284,7 +372,7 @@ function parseProfile(raw) {
 
 // ../shared/dist/reserved.js
 var RESERVED_ROUTES = ["api", "login", "logout"];
-var CLI_VERBS = ["login", "logout", "set", "delete", "view", "help"];
+var CLI_VERBS = ["login", "logout", "set", "unset", "delete", "view", "help"];
 var RESERVED = [.../* @__PURE__ */ new Set([...RESERVED_ROUTES, ...CLI_VERBS])];
 var RESERVED_SET = new Set(RESERVED);
 var HANDLE_RE = /^[a-zA-Z0-9](?:-?[a-zA-Z0-9])*$/;
@@ -440,6 +528,136 @@ async function login(deps = {}) {
   );
 }
 
+// src/render.ts
+var ESC = String.fromCharCode(27);
+var CSI = `${ESC}[`;
+var CODES = {
+  amber: `${CSI}93m`,
+  // DESIGN: amber == ANSI bright-yellow
+  faint: `${CSI}90m`,
+  bold: `${CSI}1m`,
+  reset: `${CSI}0m`
+};
+var NO_CODES = { amber: "", faint: "", bold: "", reset: "" };
+function palette(color) {
+  return color ? CODES : NO_CODES;
+}
+var ESC_INTRODUCERS = `${String.fromCharCode(27)}${String.fromCharCode(155)}`;
+var BEL = String.fromCharCode(7);
+var ANSI_RE = new RegExp(
+  `[${ESC_INTRODUCERS}][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d/#&.:=?%@~_]*)*)?${BEL})|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))`,
+  "g"
+);
+var CTRL_RE = new RegExp(
+  `[${String.fromCharCode(0)}-${String.fromCharCode(31)}${String.fromCharCode(127)}-${String.fromCharCode(159)}]`,
+  "g"
+);
+var BIDI_RE = new RegExp(
+  `[${String.fromCharCode(8234)}-${String.fromCharCode(8238)}${String.fromCharCode(8294)}-${String.fromCharCode(8297)}${String.fromCharCode(8206)}${String.fromCharCode(8207)}]`,
+  "g"
+);
+function sanitizeValue(value) {
+  return value.replace(ANSI_RE, "").replace(CTRL_RE, "").replace(BIDI_RE, "");
+}
+function useColor(env, isTTY) {
+  if (env.NO_COLOR !== void 0) return false;
+  if (env.FORCE_COLOR !== void 0) return env.FORCE_COLOR !== "0";
+  return isTTY;
+}
+function orderedEntries(profile) {
+  const byKey = new Map(
+    (profile.entries ?? []).map((e) => [e.key, e.value])
+  );
+  return CURATED_KEYS.flatMap((key) => {
+    const value = byKey.get(key);
+    return value === void 0 ? [] : [{ label: KEY_LABELS[key], value: sanitizeValue(value) }];
+  });
+}
+function renderProfile(profile, opts) {
+  const c = palette(opts.color);
+  const rows = orderedEntries(profile);
+  const extras = (profile.extras ?? []).map((x) => ({
+    label: sanitizeValue(x.label),
+    value: sanitizeValue(x.value)
+  }));
+  const labelW = Math.max(
+    0,
+    ...rows.map((r) => r.label.length),
+    ...extras.map((x) => x.label.length)
+  );
+  const lines = ["", `  ${c.bold}${sanitizeValue(profile.handle)}${c.reset}`, ""];
+  for (const r of rows) {
+    lines.push(`  ${c.faint}${r.label.padEnd(labelW)}${c.reset}  ${r.value}`);
+  }
+  if (extras.length) {
+    lines.push("");
+    for (const x of extras) {
+      lines.push(`  ${c.faint}${x.label.padEnd(labelW)}${c.reset}  ${x.value}`);
+    }
+  }
+  lines.push("", `  ${c.faint}updated ${sanitizeValue(profile.updated_at)}${c.reset}`, "");
+  return lines.join("\n");
+}
+var MISSING = "\u2014";
+function extrasBlock(extras, theirsLabel, mineLabel, c) {
+  if (!extras.theirs.length && !extras.mine.length) return [];
+  const out = ["", `  ${c.faint}extras${c.reset}`];
+  const line = (who, label, value) => `  ${c.faint}${who}${c.reset}  ${sanitizeValue(label)} = ${sanitizeValue(value)}`;
+  for (const x of extras.theirs) out.push(line(theirsLabel, x.label, x.value));
+  for (const x of extras.mine) out.push(line(mineLabel, x.label, x.value));
+  return out;
+}
+function renderDiff(result, opts) {
+  const c = palette(opts.color);
+  const theirsLabel = sanitizeValue(opts.theirsLabel);
+  const mineLabel = sanitizeValue(opts.mineLabel);
+  const cells = result.rows.map((r) => ({
+    label: r.label,
+    theirs: r.theirs === null ? MISSING : sanitizeValue(r.theirs),
+    mine: r.mine === null ? MISSING : sanitizeValue(r.mine),
+    differ: r.status !== "same"
+  }));
+  const labelW = Math.max(3, ...cells.map((r) => r.label.length));
+  const theirsW = Math.max(theirsLabel.length, ...cells.map((r) => r.theirs.length));
+  const lines = [""];
+  lines.push(
+    `  ${c.faint}${"".padEnd(labelW)}  ${theirsLabel.padEnd(theirsW)}  ${mineLabel}${c.reset}`
+  );
+  for (const r of cells) {
+    if (!opts.color) {
+      const sym = r.differ ? "~" : "=";
+      lines.push(`${sym} ${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}`);
+    } else if (r.differ) {
+      lines.push(
+        `${c.amber}\u2022${c.reset} ${r.label.padEnd(labelW)}  ${c.amber}${r.theirs.padEnd(theirsW)}${c.reset}  ${c.amber}${r.mine}${c.reset}`
+      );
+    } else {
+      lines.push(
+        `  ${c.faint}${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}${c.reset}`
+      );
+    }
+  }
+  lines.push(...extrasBlock(result.extras, theirsLabel, mineLabel, c));
+  lines.push(
+    "",
+    `  ${c.faint}${result.differ} differ \xB7 ${result.shared} shared \u2014 your mileage may vary${c.reset}`,
+    ""
+  );
+  return lines.join("\n");
+}
+function nudge(color) {
+  const c = palette(color);
+  return `
+  ${c.amber}publish yours to diff \u2192${c.reset} run ${c.bold}ymmv${c.reset}
+`;
+}
+function notFound(handle) {
+  return `
+  no ymmv profile for "${sanitizeValue(handle)}" yet.
+  publish one at ymmv.fyi with: npx ymmv-cli
+`;
+}
+
 // src/api.ts
 async function rateLimitMessage(res) {
   const retry = res.headers.get("retry-after");
@@ -470,6 +688,11 @@ async function publishProfile(profile) {
     // a mutation must never follow a redirect into a false success
   });
   let cred = await ensureLogin();
+  if ((cred.handle ?? "").toLowerCase() !== profile.handle.toLowerCase()) {
+    throw new Error(
+      "the stored login changed while this command was running \u2014 re-run it under the current account."
+    );
+  }
   let res = await send(cred);
   if (res.status === 401 || res.status === 409) {
     if (res.status === 401) await deleteToken();
@@ -488,7 +711,8 @@ async function publishProfile(profile) {
     throw new Error(`publish failed: ${res.status} ${await res.text()}`);
   }
   const data = await res.json();
-  console.log(`Published ${data.handle} -> ${BASE}/${data.handle}`);
+  const shown = typeof data.handle === "string" ? sanitizeValue(data.handle) : profile.handle;
+  console.log(`Published ${shown} -> ${BASE}/${shown}`);
 }
 async function fetchProfileJson(handle) {
   const res = await fetch(`${BASE}/api/v1/u/${encodeURIComponent(handle)}`);
@@ -525,7 +749,7 @@ function firstToken(s) {
   return s.trim().split(/\s+/)[0] ?? "";
 }
 var namesFor = (key) => {
-  const map = {};
+  const map = /* @__PURE__ */ Object.create(null);
   for (const tool of TOOLS) {
     if (tool.key !== key) continue;
     for (const token of tool.envTokens ?? []) map[token] = tool.canonical;
@@ -535,15 +759,44 @@ var namesFor = (key) => {
 var SHELL_NAMES = namesFor("shell");
 var EDITOR_NAMES = namesFor("editor");
 var TERM_PROGRAMS = namesFor("terminal");
-function detectOS(env, platform) {
-  if (env.WSL_DISTRO_NAME) return `${env.WSL_DISTRO_NAME} (WSL)`;
+var BROWSER_NAMES = namesFor("browser");
+var WM_NAMES = namesFor("window-manager");
+var TERM_EXACT = Object.assign(/* @__PURE__ */ Object.create(null), {
+  "xterm-kitty": "kitty",
+  "xterm-ghostty": "Ghostty",
+  foot: "foot",
+  alacritty: "Alacritty"
+});
+var BROWSER_DISPATCHERS = /* @__PURE__ */ new Set([
+  "xdg-open",
+  "wslview",
+  "sensible-browser",
+  "x-www-browser",
+  "www-browser",
+  "open",
+  "gio",
+  "browser.sh",
+  "browser.cmd"
+]);
+function linuxDistro(read) {
+  if (!read) return void 0;
+  try {
+    const line = read("/etc/os-release").split("\n").find((l) => l.startsWith("NAME="));
+    const name = line?.slice("NAME=".length).trim().replace(/^["']|["']$/g, "");
+    return name?.trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
+function detectOS(env, platform, opts) {
+  if (platform === "linux" && env.WSL_DISTRO_NAME) return `${env.WSL_DISTRO_NAME} (WSL)`;
   switch (platform) {
     case "darwin":
       return "macOS";
     case "win32":
       return "Windows";
     case "linux":
-      return "Linux";
+      return linuxDistro(opts.readTextFile) ?? "Linux";
     default:
       return platform;
   }
@@ -555,6 +808,9 @@ function detectShell(env, platform) {
     return SHELL_NAMES[key] ?? basename(raw);
   }
   if (platform === "win32") {
+    const firstSeg = env.PSModulePath?.split(";")[0]?.trim().toLowerCase() ?? "";
+    if (/[\\/]documents[\\/](windows)?powershell[\\/]modules$/.test(firstSeg)) return "PowerShell";
+    if (env.PROMPT) return env.ComSpec ? basename(env.ComSpec) : "cmd";
     if (env.PSModulePath) return "PowerShell";
     if (env.ComSpec) return basename(env.ComSpec);
   }
@@ -563,18 +819,37 @@ function detectShell(env, platform) {
 function detectTerminal(env) {
   const tp = env.TERM_PROGRAM?.trim();
   if (tp && tp.toLowerCase() !== "tmux") {
+    if (tp.toLowerCase() === "vscode" && env.CURSOR_TRACE_ID) return "Cursor";
     return TERM_PROGRAMS[tp.toLowerCase()] ?? tp;
   }
+  if (env.TERMINAL_EMULATOR === "JetBrains-JediTerm") return "JetBrains";
   if (env.WT_SESSION) return "Windows Terminal";
   if (env.KONSOLE_VERSION) return "Konsole";
   if (env.ALACRITTY_WINDOW_ID || env.ALACRITTY_SOCKET) return "Alacritty";
+  if (env.KITTY_WINDOW_ID || env.KITTY_PID) return "kitty";
+  if (env.GNOME_TERMINAL_SERVICE || env.GNOME_TERMINAL_SCREEN) return "GNOME Terminal";
+  if (env.TILIX_ID) return "Tilix";
+  if (env.TERMINATOR_UUID) return "Terminator";
+  if (env.ConEmuANSI || env.ConEmuPID) return "ConEmu";
+  if (env.XTERM_VERSION) return "xterm";
+  const t = env.TERM?.trim().toLowerCase();
+  if (t && TERM_EXACT[t]) return TERM_EXACT[t];
   return void 0;
 }
 function detectEditor(env) {
   const raw = env.VISUAL ?? env.EDITOR;
-  if (!raw) return void 0;
-  const bin = basename(firstToken(raw));
-  return EDITOR_NAMES[bin.toLowerCase()] ?? bin;
+  if (raw) {
+    const bin = basename(firstToken(raw));
+    return EDITOR_NAMES[bin.toLowerCase()] ?? bin;
+  }
+  if (env.NVIM) return "Neovim";
+  if (env.VIM_TERMINAL) return "Vim";
+  if (env.INSIDE_EMACS) return "Emacs";
+  if (env.CURSOR_TRACE_ID) return "Cursor";
+  const tp = env.TERM_PROGRAM?.trim().toLowerCase();
+  if (tp === "vscode") return "VS Code";
+  if (tp === "zed" || env.ZED_TERM === "true") return "Zed";
+  return void 0;
 }
 function detectMultiplexer(env) {
   if (env.TMUX) return "tmux";
@@ -582,17 +857,92 @@ function detectMultiplexer(env) {
   if (env.STY) return "GNU Screen";
   return void 0;
 }
-function detectStack(env, platform) {
+function detectPrompt(env) {
+  if (env.STARSHIP_SHELL || env.STARSHIP_SESSION_KEY) return "Starship";
+  if (env.POSH_SHELL || env.POSH_SESSION_ID || env.POSH_THEME) return "Oh My Posh";
+  if (env.P9K_TTY || env._P9K_TTY) return "Powerlevel10k";
+  if (env.SPACESHIP_VERSION) return "Spaceship";
+  if (Object.keys(env).some((k) => k.startsWith("_tide_"))) return "Tide";
+  return void 0;
+}
+function detectVersionManager(env) {
+  const path = env.PATH ?? "";
+  if (env.MISE_SHELL || env.__MISE_ORIG_PATH || /[\\/]mise[\\/]shims/i.test(path)) return "mise";
+  if (env.ASDF_DIR || env.ASDF_DATA_DIR || /\.asdf[\\/]shims/i.test(path)) return "asdf";
+  if (env.PROTO_HOME) return "proto";
+  if (env.VOLTA_HOME) return "Volta";
+  if (env.FNM_MULTISHELL_PATH || env.FNM_DIR) return "fnm";
+  if (env.NVM_DIR) return "nvm";
+  if (env.PYENV_SHELL || env.PYENV_ROOT) return "pyenv";
+  if (env.RBENV_SHELL || env.RBENV_ROOT) return "rbenv";
+  return void 0;
+}
+function detectWindowManager(env) {
+  if (env.HYPRLAND_INSTANCE_SIGNATURE) return "Hyprland";
+  if (env.NIRI_SOCKET) return "niri";
+  if (env.SWAYSOCK) return "Sway";
+  if (env.I3SOCK) return "i3";
+  for (const part of env.XDG_CURRENT_DESKTOP?.split(":") ?? []) {
+    const hit = WM_NAMES[part.trim().toLowerCase()];
+    if (hit) return hit;
+  }
+  const ds = env.DESKTOP_SESSION;
+  if (ds) {
+    const hit = WM_NAMES[basename(ds).toLowerCase()];
+    if (hit) return hit;
+  }
+  if (env.KDE_FULL_SESSION || env.KDE_SESSION_VERSION) return "KDE Plasma";
+  return void 0;
+}
+function detectBrowser(env) {
+  const raw = env.BROWSER;
+  if (!raw) return void 0;
+  const trimmed = raw.trim();
+  if (/^[A-Za-z]:[\\/]/.test(trimmed) || trimmed.includes("\\")) {
+    const bin = basename(trimmed);
+    if (!bin || BROWSER_DISPATCHERS.has(bin.toLowerCase())) return void 0;
+    return BROWSER_NAMES[bin.toLowerCase()] ?? bin;
+  }
+  for (const candidate of trimmed.split(":")) {
+    const bin = basename(firstToken(candidate));
+    if (!bin) continue;
+    if (BROWSER_DISPATCHERS.has(bin.toLowerCase())) continue;
+    const hit = BROWSER_NAMES[bin.toLowerCase()];
+    if (hit) return hit;
+    if (candidate.startsWith("/") && /\s/.test(candidate.trim())) {
+      const whole = basename(candidate.trim().replace(/\s+%[a-zA-Z].*$/, ""));
+      if (whole && !whole.includes("/")) return BROWSER_NAMES[whole.toLowerCase()] ?? whole;
+    }
+    return bin;
+  }
+  return void 0;
+}
+function detectAiTool(env) {
+  if (env.AGENT?.trim().toLowerCase() === "amp") return "Amp";
+  if (env.CLAUDECODE) return "Claude Code";
+  if (env.CODEX_THREAD_ID) return "Codex";
+  if (env.GEMINI_CLI) return "Gemini CLI";
+  if (env.OPENCODE) return "opencode";
+  if (env.COPILOT_CLI) return "GitHub Copilot";
+  if (env.CURSOR_TRACE_ID || env.CURSOR_AGENT) return "Cursor";
+  return void 0;
+}
+function detectStack(env, platform, opts = {}) {
   const out = /* @__PURE__ */ new Map();
   const set = (key, value) => {
     if (value?.trim()) out.set(key, value.trim());
   };
   try {
-    set("os", detectOS(env, platform));
+    set("os", detectOS(env, platform, opts));
     set("shell", detectShell(env, platform));
+    set("prompt", detectPrompt(env));
     set("terminal", detectTerminal(env));
     set("editor", detectEditor(env));
     set("multiplexer", detectMultiplexer(env));
+    set("version-manager", detectVersionManager(env));
+    set("window-manager", detectWindowManager(env));
+    set("browser", detectBrowser(env));
+    set("ai-tool", detectAiTool(env));
   } catch {
   }
   return out;
@@ -616,6 +966,9 @@ function entriesFromMap(map) {
     return value ? [{ key, value }] : [];
   });
 }
+function unknownEntries(existing) {
+  return (existing?.entries ?? []).filter((e) => !isCuratedKey(e.key));
+}
 function applySet(existing, target) {
   const entries = (existing?.entries ?? []).map((e) => ({ ...e }));
   const extras = (existing?.extras ?? []).map((x) => ({ ...x }));
@@ -625,142 +978,34 @@ function applySet(existing, target) {
     if (i >= 0) entries[i] = next;
     else entries.push(next);
   } else {
-    const i = extras.findIndex((x) => x.label.toLowerCase() === target.label.toLowerCase());
+    const wanted = target.label.trim().toLowerCase();
+    const i = extras.findIndex((x) => x.label.trim().toLowerCase() === wanted);
     const next = { label: target.label, value: target.value };
     if (i >= 0) extras[i] = next;
     else extras.push(next);
   }
   return { entries, extras };
 }
-
-// src/render.ts
-var ESC = String.fromCharCode(27);
-var CSI = `${ESC}[`;
-var CODES = {
-  amber: `${CSI}93m`,
-  // DESIGN: amber == ANSI bright-yellow
-  faint: `${CSI}90m`,
-  bold: `${CSI}1m`,
-  reset: `${CSI}0m`
-};
-var NO_CODES = { amber: "", faint: "", bold: "", reset: "" };
-function palette(color) {
-  return color ? CODES : NO_CODES;
-}
-var ESC_INTRODUCERS = `${String.fromCharCode(27)}${String.fromCharCode(155)}`;
-var BEL = String.fromCharCode(7);
-var ANSI_RE = new RegExp(
-  `[${ESC_INTRODUCERS}][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d/#&.:=?%@~_]*)*)?${BEL})|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))`,
-  "g"
-);
-var CTRL_RE = new RegExp(
-  `[${String.fromCharCode(0)}-${String.fromCharCode(31)}${String.fromCharCode(127)}-${String.fromCharCode(159)}]`,
-  "g"
-);
-var BIDI_RE = new RegExp(
-  `[${String.fromCharCode(8234)}-${String.fromCharCode(8238)}${String.fromCharCode(8294)}-${String.fromCharCode(8297)}${String.fromCharCode(8206)}${String.fromCharCode(8207)}]`,
-  "g"
-);
-function sanitizeValue(value) {
-  return value.replace(ANSI_RE, "").replace(CTRL_RE, "").replace(BIDI_RE, "");
-}
-function useColor(env, isTTY) {
-  if (env.NO_COLOR !== void 0) return false;
-  if (env.FORCE_COLOR !== void 0) return env.FORCE_COLOR !== "0";
-  return isTTY;
-}
-function orderedEntries(profile) {
-  const byKey = new Map(
-    (profile.entries ?? []).map((e) => [e.key, e.value])
-  );
-  return CURATED_KEYS.flatMap((key) => {
-    const value = byKey.get(key);
-    return value === void 0 ? [] : [{ label: KEY_LABELS[key], value: sanitizeValue(value) }];
-  });
-}
-function renderProfile(profile, opts) {
-  const c = palette(opts.color);
-  const rows = orderedEntries(profile);
-  const extras = (profile.extras ?? []).map((x) => ({
-    label: sanitizeValue(x.label),
-    value: sanitizeValue(x.value)
-  }));
-  const labelW = Math.max(
-    0,
-    ...rows.map((r) => r.label.length),
-    ...extras.map((x) => x.label.length)
-  );
-  const lines = ["", `  ${c.bold}${sanitizeValue(profile.handle)}${c.reset}`, ""];
-  for (const r of rows) {
-    lines.push(`  ${c.faint}${r.label.padEnd(labelW)}${c.reset}  ${r.value}`);
-  }
-  if (extras.length) {
-    lines.push("");
-    for (const x of extras) {
-      lines.push(`  ${c.faint}${x.label.padEnd(labelW)}${c.reset}  ${x.value}`);
-    }
-  }
-  lines.push("", `  ${c.faint}updated ${sanitizeValue(profile.updated_at)}${c.reset}`, "");
-  return lines.join("\n");
-}
-var MISSING = "\u2014";
-function extrasBlock(extras, theirsLabel, mineLabel, c) {
-  if (!extras.theirs.length && !extras.mine.length) return [];
-  const out = ["", `  ${c.faint}extras${c.reset}`];
-  const line = (who, label, value) => `  ${c.faint}${who}${c.reset}  ${sanitizeValue(label)} = ${sanitizeValue(value)}`;
-  for (const x of extras.theirs) out.push(line(theirsLabel, x.label, x.value));
-  for (const x of extras.mine) out.push(line(mineLabel, x.label, x.value));
-  return out;
-}
-function renderDiff(result, opts) {
-  const c = palette(opts.color);
-  const theirsLabel = sanitizeValue(opts.theirsLabel);
-  const mineLabel = sanitizeValue(opts.mineLabel);
-  const cells = result.rows.map((r) => ({
-    label: r.label,
-    theirs: r.theirs === null ? MISSING : sanitizeValue(r.theirs),
-    mine: r.mine === null ? MISSING : sanitizeValue(r.mine),
-    differ: r.status !== "same"
-  }));
-  const labelW = Math.max(3, ...cells.map((r) => r.label.length));
-  const theirsW = Math.max(theirsLabel.length, ...cells.map((r) => r.theirs.length));
-  const lines = [""];
-  lines.push(
-    `  ${c.faint}${"".padEnd(labelW)}  ${theirsLabel.padEnd(theirsW)}  ${mineLabel}${c.reset}`
-  );
-  for (const r of cells) {
-    if (!opts.color) {
-      const sym = r.differ ? "~" : "=";
-      lines.push(`${sym} ${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}`);
-    } else if (r.differ) {
-      lines.push(
-        `${c.amber}\u2022${c.reset} ${r.label.padEnd(labelW)}  ${c.amber}${r.theirs.padEnd(theirsW)}${c.reset}  ${c.amber}${r.mine}${c.reset}`
-      );
-    } else {
-      lines.push(
-        `  ${c.faint}${r.label.padEnd(labelW)}  ${r.theirs.padEnd(theirsW)}  ${r.mine}${c.reset}`
-      );
-    }
+function applyUnset(existing, target) {
+  const entries = existing.entries.map((e) => ({ ...e }));
+  const extras = existing.extras.map((x) => ({ ...x }));
+  if (target.kind === "curated") {
+    const hit2 = entries.find((e) => e.key === target.key);
+    if (!hit2) return { entries, extras, removed: null };
+    return {
+      entries: entries.filter((e) => e.key !== target.key),
+      extras,
+      removed: { label: hit2.key, value: hit2.value }
+    };
   }
-  lines.push(...extrasBlock(result.extras, theirsLabel, mineLabel, c));
-  lines.push(
-    "",
-    `  ${c.faint}${result.differ} differ \xB7 ${result.shared} shared \u2014 your mileage may vary${c.reset}`,
-    ""
-  );
-  return lines.join("\n");
-}
-function nudge(color) {
-  const c = palette(color);
-  return `
-  ${c.amber}publish yours to diff \u2192${c.reset} run ${c.bold}ymmv${c.reset}
-`;
-}
-function notFound(handle) {
-  return `
-  no ymmv profile for "${sanitizeValue(handle)}" yet.
-  publish one at ymmv.fyi with: npx ymmv-cli
-`;
+  const wanted = target.label.trim().toLowerCase();
+  const hit = extras.find((x) => x.label.trim().toLowerCase() === wanted);
+  if (!hit) return { entries, extras, removed: null };
+  return {
+    entries,
+    extras: extras.filter((x) => x.label.trim().toLowerCase() !== wanted),
+    removed: { label: hit.label, value: hit.value }
+  };
 }
 
 // src/commands.ts
@@ -775,6 +1020,13 @@ function requireHandle(cred) {
   process.exitCode = 1;
   return null;
 }
+function assertHandleUnchanged(existing, handle) {
+  if (existing && existing.handle.toLowerCase() !== handle.toLowerCase()) {
+    throw new Error(
+      `this login is bound to "${handle}" but your profile now lives at "${sanitizeValue(existing.handle)}" \u2014 run \`ymmv login\` to refresh, then retry.`
+    );
+  }
+}
 function newProfile(handle, entries, extras) {
   return {
     schema_version: SCHEMA_VERSION,
@@ -794,19 +1046,49 @@ async function promptEntries(defaults, prompter) {
   return entriesFromMap(chosen);
 }
 async function publish(io) {
+  if (!io.interactive && !io.yes) {
+    console.error("Non-interactive publish needs -y (nothing publishes unconfirmed): ymmv -y");
+    process.exitCode = 1;
+    return;
+  }
   const cred = await ensureLogin();
   const handle = requireHandle(cred);
   if (!handle) return;
-  const detected = detectStack(process.env, process.platform);
+  const detected = detectStack(process.env, process.platform, {
+    readTextFile: (p) => {
+      const st = statSync(p);
+      if (!st.isFile() || st.size > 64 * 1024) throw new Error("not a readable os-release");
+      return readFileSync(p, "utf8");
+    }
+  });
   const existing = await fetchProfileJson(handle);
+  assertHandleUnchanged(existing, handle);
   const defaults = buildDefaults(existing, detected);
+  const carried = unknownEntries(existing);
   let entries = entriesFromMap(defaults);
   const extras = existing?.extras ?? [];
   if (io.interactive && io.prompter) {
     entries = await promptEntries(defaults, io.prompter);
   }
+  entries = [...entries, ...carried];
   const profile = newProfile(handle, entries, extras);
   console.log(renderProfile(profile, { color: colorEnabled() }));
+  if (carried.length > 0) {
+    const s = carried.length === 1 ? "" : "s";
+    console.log(`(+${carried.length} newer field${s} kept as-is \u2014 upgrade ymmv-cli to edit them)`);
+    for (const e of carried) {
+      console.log(`    ${sanitizeValue(e.key)} = ${sanitizeValue(e.value)}`);
+    }
+  }
+  const publishedLabels = new Set(
+    entries.filter((e) => isCuratedKey(e.key)).map((e) => KEY_LABELS[e.key].toLowerCase())
+  );
+  for (const x of extras) {
+    if (publishedLabels.has(x.label.trim().toLowerCase())) {
+      const label = sanitizeValue(x.label.trim());
+      console.log(`(extra "${label}" duplicates a curated field \u2014 ymmv unset --extra "${label}")`);
+    }
+  }
   if (io.interactive && io.prompter && !io.yes) {
     const go = await io.prompter.confirm(`Publish to ymmv.fyi/${handle}?`, true);
     if (!go) {
@@ -845,6 +1127,7 @@ async function runSet(target) {
   const handle = requireHandle(cred);
   if (!handle) return;
   const existing = await fetchProfileJson(handle);
+  assertHandleUnchanged(existing, handle);
   const { entries, extras } = applySet(existing, target);
   await publishProfile(newProfile(handle, entries, extras));
   if (target.kind === "curated") {
@@ -853,6 +1136,32 @@ async function runSet(target) {
     console.log(`Set extra ${target.label} = ${target.value}.`);
   }
 }
+async function runUnset(target) {
+  const cred = await ensureLogin();
+  const handle = requireHandle(cred);
+  if (!handle) return;
+  const existing = await fetchProfileJson(handle);
+  assertHandleUnchanged(existing, handle);
+  if (!existing) {
+    console.log("No profile yet \u2014 run `ymmv` to publish one.");
+    return;
+  }
+  const { entries, extras, removed } = applyUnset(existing, target);
+  if (!removed) {
+    console.log(
+      target.kind === "curated" ? `${KEY_LABELS[target.key]} is not set.` : `No extra "${target.label}".`
+    );
+    return;
+  }
+  await publishProfile(newProfile(handle, entries, extras));
+  if (target.kind === "curated") {
+    console.log(`Removed ${KEY_LABELS[target.key]} (was "${sanitizeValue(removed.value)}").`);
+  } else {
+    console.log(
+      `Removed extra "${sanitizeValue(removed.label)}" (was "${sanitizeValue(removed.value)}").`
+    );
+  }
+}
 async function runDelete(io) {
   const cred = await ensureLogin();
   const target = cred.handle ? `ymmv.fyi/${cred.handle}` : "your profile";
@@ -878,6 +1187,10 @@ async function runDelete(io) {
 // src/prompt.ts
 import { stdin, stdout } from "process";
 import { createInterface } from "readline/promises";
+function promptLine(label, def) {
+  const clean = def ? sanitizeValue(def) : def;
+  return `  ${label}${clean ? ` [${clean}]` : ""}: `;
+}
 function makePrompter() {
   let rl = null;
   const io = () => {
@@ -886,8 +1199,9 @@ function makePrompter() {
   };
   return {
     async ask(label, def) {
-      const answer = (await io().question(`  ${label}${def ? ` [${def}]` : ""}: `)).trim();
-      return answer === "" ? def ?? "" : answer;
+      const clean = def ? sanitizeValue(def) : def;
+      const answer = (await io().question(promptLine(label, def))).trim();
+      return answer === "" ? clean ?? "" : answer;
     },
     async confirm(question, defYes) {
       const answer = (await io().question(`  ${question} ${defYes ? "[Y/n]" : "[y/N]"} `)).trim().toLowerCase();
@@ -902,8 +1216,18 @@ function makePrompter() {
 }
 
 // src/resolve.ts
-var SET_USAGE = 'usage: ymmv set <key> <value>  |  ymmv set --extra "Label=Value"';
-var EXTRA_USAGE = 'usage: ymmv set --extra "Label=Value"';
+var SET_EXTRA = 'ymmv set --extra "Label=Value"';
+var UNSET_EXTRA = 'ymmv unset --extra "Label"';
+var SET_USAGE = `usage: ymmv set <key> <value>  |  ${SET_EXTRA}`;
+var EXTRA_USAGE = `usage: ${SET_EXTRA}`;
+var UNSET_USAGE = `usage: ymmv unset <key>  |  ${UNSET_EXTRA}`;
+function invalidKeyError(head, hint) {
+  return {
+    kind: "error",
+    message: `"${head}" is not a curated key. Valid keys: ${CURATED_KEYS.join(", ")}.
+For anything else, use: ${hint}.`
+  };
+}
 function hasYes(args) {
   return args.includes("-y") || args.includes("--yes");
 }
@@ -916,20 +1240,34 @@ function parseSet(rest) {
     const label = spec.slice(0, eq).trim();
     const value2 = spec.slice(eq + 1).trim();
     if (!label || !value2) return { kind: "error", message: EXTRA_USAGE };
+    if (value2 === "-") return { kind: "unset", target: { kind: "extra", label } };
     return { kind: "set", target: { kind: "extra", label, value: value2 } };
   }
   if (!head) return { kind: "error", message: SET_USAGE };
-  if (!isCuratedKey(head)) {
-    return {
-      kind: "error",
-      message: `"${head}" is not a curated key. Valid keys: ${CURATED_KEYS.join(", ")}.
-For anything else, use: ymmv set --extra "Label=Value".`
-    };
-  }
+  if (!isCuratedKey(head)) return invalidKeyError(head, SET_EXTRA);
   const value = rest.slice(1).join(" ").trim();
   if (!value) return { kind: "error", message: `usage: ymmv set ${head} <value>` };
+  if (value === "-") return { kind: "unset", target: { kind: "curated", key: head } };
   return { kind: "set", target: { kind: "curated", key: head, value } };
 }
+function parseUnset(rest) {
+  const head = rest[0];
+  if (head === "--extra" || head === "-e") {
+    const label = rest.slice(1).join(" ").trim();
+    if (!label) return { kind: "error", message: `usage: ${UNSET_EXTRA}` };
+    if (label.includes("=")) {
+      return {
+        kind: "error",
+        message: 'unset takes just the label: ymmv unset --extra "Keyboard"'
+      };
+    }
+    return { kind: "unset", target: { kind: "extra", label } };
+  }
+  if (!head) return { kind: "error", message: UNSET_USAGE };
+  if (!isCuratedKey(head)) return invalidKeyError(head, UNSET_EXTRA);
+  if (rest.length > 1) return { kind: "error", message: `usage: ymmv unset ${head}` };
+  return { kind: "unset", target: { kind: "curated", key: head } };
+}
 function resolveArg(argv) {
   const first = argv[0];
   if (first === "-h" || first === "--help" || first === "help") return { kind: "help" };
@@ -940,6 +1278,7 @@ function resolveArg(argv) {
   if (first === "logout") return { kind: "logout" };
   if (first === "delete") return { kind: "delete", yes: hasYes(argv.slice(1)) };
   if (first === "set") return parseSet(argv.slice(1));
+  if (first === "unset") return parseUnset(argv.slice(1));
   if (first === "view") {
     const handle = argv[1];
     if (!handle) return { kind: "error", message: "usage: ymmv view <handle>" };
@@ -965,16 +1304,19 @@ var HELP = `ymmv \u2014 terminal-native developer tool-stack profiles (ymmv.fyi)
 
 Usage:
   ymmv                      detect your stack, confirm, and publish your profile
+  ymmv -y                   publish without prompts (required when stdin isn't a TTY)
   ymmv <handle>             view a profile \u2014 logged in, see the diff vs yours
   ymmv view <handle>        explicit view (when a handle collides with a verb)
   ymmv set <key> <value>    set one curated key
   ymmv set --extra "L=V"    set a free-form extra
+  ymmv unset <key>          remove one curated key (ymmv set <key> - works too)
+  ymmv unset --extra "L"    remove a free-form extra
   ymmv delete               delete your profile (permanent)
   ymmv login | logout       GitHub device-flow auth
   ymmv help | --version
 
-Curated keys: editor, os, shell, terminal, browser, window-manager, font,
-              multiplexer, dotfiles, ai-tool
+Curated keys: editor, os, shell, prompt, terminal, browser, window-manager,
+              font, theme, multiplexer, version-manager, dotfiles, ai-tool
 
 Respects NO_COLOR. Point YMMV_API at a dev Worker to target one.
 Publish your own: npx ymmv-cli`;
@@ -1002,7 +1344,7 @@ async function logout() {
 }
 function printVersion() {
   try {
-    const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+    const pkg = JSON.parse(readFileSync2(new URL("../package.json", import.meta.url), "utf8"));
     console.log(`ymmv-cli ${pkg.version ?? "unknown"}`);
   } catch {
     console.log("ymmv-cli (version unknown)");
@@ -1029,6 +1371,9 @@ async function main(argv) {
     case "set":
       await runSet(cmd.target);
       break;
+    case "unset":
+      await runUnset(cmd.target);
+      break;
     case "delete":
       await interactive(runDelete, cmd.yes);
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ymmv-cli",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Publish and diff terminal-native developer tool-stack profiles at ymmv.fyi.",
   "type": "module",
   "bin": {