likho-cli 0.1.0 → 0.3.0

package/README.md

@@ -16,6 +16,11 @@ npx likho-cli
 4. It adds Likho to each tool's MCP settings, next to your other servers, and
    keeps a `.likho-backup` of any file it changes.
 
+Run it again any time: tools already connected are shown with their
+organization and start unticked, so it only adds what's missing. Ticking a
+connected tool asks whether to keep it or switch it to another organization;
+nothing is switched silently.
+
 Then restart the tools, sign in once in each (one click, your browser is
 already signed in), and say "join Likho" in any chat.
 

package/bin/likho.js

@@ -12,7 +12,6 @@
 
 const fs = require("node:fs");
 const path = require("node:path");
-const readline = require("node:readline/promises");
 const { tools, context } = require("../lib/tools");
 const { chooseInBrowser } = require("../lib/browser");
 const { UnreadableFile } = require("../lib/files");
@@ -41,41 +40,46 @@ function isProjectFolder(ctx) {
   return PROJECT_MARKERS.some((m) => fs.existsSync(path.join(ctx.cwd, m)));
 }
 
-function makeAsk(opts) {
-  const interactive = process.stdin.isTTY && !opts.yes;
-  let rl = null;
-  return {
-    async question(text, fallback) {
-      if (!interactive) return fallback;
-      rl = rl || readline.createInterface({ input: process.stdin, output: process.stdout });
-      const answer = (await rl.question(text)).trim();
-      return answer || fallback;
-    },
-    close() {
-      if (rl) rl.close();
-    },
-  };
+// Questions use arrow keys and space (@clack/prompts). Without a terminal to
+// ask in (CI, piped) or with --yes, every question takes its default.
+const interactive = (opts) => Boolean(process.stdin.isTTY && process.stdout.isTTY && !opts.yes);
+let ui;
+const loadUi = async () => (ui = ui || (await import("@clack/prompts")));
+
+class Cancelled extends Error {}
+
+async function answer(question) {
+  const value = await question;
+  if (ui.isCancel(value)) throw new Cancelled();
+  return value;
 }
 
 const say = (line = "") => console.log(line);
 const mcpUrl = (opts, org) => `${opts.server}/mcp${org ? `?org=${encodeURIComponent(org)}` : ""}`;
 
-async function chooseScope(opts, ctx, ask, verb) {
+/** The organization in a Likho address written by this tool ("" if none). */
+function orgOfUrl(url) {
+  try {
+    return new URL(url).searchParams.get("org") || "";
+  } catch {
+    return "";
+  }
+}
+
+async function chooseScope(opts, ctx, verb) {
   if (opts.scope) return opts.scope;
   if (!isProjectFolder(ctx)) return "global";
+  if (!interactive(opts)) return "project";
   const folder = path.basename(ctx.cwd);
-  say(`  This folder looks like a project: ${folder}`);
-  say(`  ${verb} Likho for:`);
-  if (verb === "Remove") {
-    say(`    1) Just this project (${folder}).`);
-    say("    2) All projects on this computer.");
-  } else {
-    say(`    1) Just this project. Every AI tool opened in ${folder} uses one organization.`);
-    say("    2) All projects on this computer. You choose an organization for each tool.");
-  }
-  const answer = await ask.question("  Choose 1 or 2 [1]: ", "1");
-  say();
-  return answer === "2" ? "global" : "project";
+  const setup = verb === "Set up";
+  return answer(ui.select({
+    message: `${verb} Likho for`,
+    options: [
+      { value: "project", label: `Just this project (${folder})`, hint: setup ? "every AI tool opened here uses one organization" : undefined },
+      { value: "global", label: "All projects on this computer", hint: setup ? "an organization for each tool" : undefined },
+    ],
+    initialValue: "project",
+  }));
 }
 
 function selectTools(opts, ctx) {
@@ -84,89 +88,158 @@ function selectTools(opts, ctx) {
   return list;
 }
 
+function cancelled(err) {
+  if (!(err instanceof Cancelled)) throw err;
+  ui.cancel("Cancelled. Nothing was changed.");
+  return 1;
+}
+
 async function connect(opts) {
   const ctx = context();
-  const ask = makeAsk(opts);
+  await loadUi();
   try {
-    say("\n  Likho: connect your AI tools\n");
-    const scope = await chooseScope(opts, ctx, ask, "Set up");
+    ui.intro("Likho: connect your AI tools");
+    const scope = await chooseScope(opts, ctx, "Set up");
     const found = selectTools(opts, ctx).filter((t) => opts.tools || t.detect());
     if (!found.length) {
-      say("  No supported AI tools found on this computer.");
-      say("  Supported: Claude Code, Codex, Cursor, VS Code, Gemini CLI, opencode, Windsurf, Claude Desktop.");
-      say(`  To connect another tool by hand, see Connect in your Likho dashboard: ${SUPPORT}`);
+      ui.log.warn("No supported AI tools found on this computer.\nSupported: Claude Code, Codex, Cursor, VS Code, Gemini CLI, opencode, Windsurf, Claude Desktop.");
+      ui.outro(`To connect another tool by hand, see Connect in your Likho dashboard: ${SUPPORT}`);
       return 1;
     }
     const usable = found.filter((t) => (scope === "project" ? t.project : t.global));
     const elsewhere = found.filter((t) => !usable.includes(t));
+    if (elsewhere.length) {
+      ui.log.info(`${elsewhere.map((t) => t.name).join(", ")} can only be set up for all projects: run npx likho-cli --global for ${elsewhere.length === 1 ? "it" : "them"}.`);
+    }
+    if (!usable.length) {
+      ui.outro("Nothing to set up here.");
+      return 1;
+    }
 
-    say(`  Found on this computer${scope === "project" ? `, for ${path.basename(ctx.cwd)} only` : ""}:`);
-    usable.forEach((t) => say(`    - ${t.name}`));
-    elsewhere.forEach((t) => say(`    - ${t.name} (can't be set up per project; run npx likho-cli --global for it)`));
-    if (!usable.length) return 1;
+    // What is already set up, so running again adds what's missing and keeps
+    // what works. In a project, the all-projects setting is shown too: the
+    // project one overrides it in this folder.
+    const existing = new Map(usable.filter((t) => !t.manual).map((t) => [t.id, t.current(ctx, scope)]).filter(([, url]) => url));
+    const inherited = (t) => (scope === "project" && t.global && !t.manual ? t.current(ctx, "global") : null);
+    const hintFor = (t) => {
+      if (t.manual) return "you add it in its settings";
+      if (existing.has(t.id)) return `already connected → ${orgOfUrl(existing.get(t.id)) || "Likho"}`;
+      const all = inherited(t);
+      return all ? `connected for all projects → ${orgOfUrl(all) || "Likho"}; this would override it here` : undefined;
+    };
 
-    let chosen = usable;
-    if ((await ask.question("\n  Connect these? [Y/n]: ", "y")).toLowerCase().startsWith("n")) {
-      chosen = [];
-      for (const t of usable) {
-        if (!(await ask.question(`    ${t.name}? [Y/n]: `, "y")).toLowerCase().startsWith("n")) chosen.push(t);
+    let chosen = usable.filter((t) => !existing.has(t.id));
+    if (opts.tools) {
+      chosen = usable; // named on the command line: set up as asked
+    } else if (interactive(opts)) {
+      if (!chosen.length) {
+        ui.log.info(`Likho is already set up here: ${usable.filter((t) => existing.has(t.id)).map((t) => `${t.name} → ${orgOfUrl(existing.get(t.id)) || "Likho"}`).join(", ")}`);
+        const next = await answer(ui.select({
+          message: "Anything to change?",
+          options: [
+            { value: "keep", label: "No, keep everything as it is" },
+            { value: "change", label: "Yes, switch a tool to another organization" },
+          ],
+          initialValue: "keep",
+        }));
+        if (next === "keep") {
+          ui.outro("Nothing to do.");
+          return 0;
+        }
+      }
+      const ids = await answer(ui.multiselect({
+        message: `Which AI tools should Likho connect${scope === "project" ? ` in ${path.basename(ctx.cwd)}` : ""}?`,
+        options: usable.map((t) => ({ value: t.id, label: t.name, hint: hintFor(t) })),
+        initialValues: chosen.map((t) => t.id),
+        required: false,
+      }));
+      chosen = usable.filter((t) => ids.includes(t.id));
+      // Ticking a connected tool means "switch it": confirm, never silently.
+      for (const t of chosen.filter((x) => existing.has(x.id))) {
+        const what = await answer(ui.select({
+          message: `${t.name} is already connected to ${orgOfUrl(existing.get(t.id)) || "Likho"}. What now?`,
+          options: [
+            { value: "keep", label: "Keep it as it is" },
+            { value: "switch", label: "Switch to another organization", hint: `you'll sign in again in ${t.name}` },
+          ],
+          initialValue: "keep",
+        }));
+        if (what === "keep") chosen = chosen.filter((x) => x !== t);
       }
+    } else if (existing.size) {
+      ui.log.info(`Kept as they are: ${usable.filter((t) => existing.has(t.id)).map((t) => t.name).join(", ")} (already connected).`);
     }
     if (!chosen.length) {
-      say("\n  Nothing to do.");
+      ui.outro("Nothing changed.");
       return 0;
     }
 
-    // Which organization each tool lands in.
+    // Which organization each lands in: picked in the browser, signed in.
     let orgFor;
     if (opts.org) {
       orgFor = () => opts.org;
     } else {
-      const choice = await chooseInBrowser(opts.server, {
-        scope,
-        tools: chosen.map((t) => t.id).join(","),
-        folder: scope === "project" ? path.basename(ctx.cwd) : "",
-      });
+      const spin = ui.spinner();
+      const choice = await chooseInBrowser(
+        opts.server,
+        { scope, tools: chosen.map((t) => t.id).join(","), folder: scope === "project" ? path.basename(ctx.cwd) : "" },
+        {
+          log: (line) => {
+            const text = line.trim();
+            if (text.startsWith("http")) {
+              ui.log.message(`If it didn't open: ${text}`);
+              spin.start("Pick the organization in your browser");
+            } else if (text) {
+              ui.log.step(text.replace(/\.\.\.$/, ""));
+            }
+          },
+        }
+      );
       if (!choice) {
-        say("  Cancelled. Nothing was changed.");
-        return 1;
+        spin.stop("Cancelled in the browser", 1);
+        throw new Cancelled();
       }
+      spin.stop(choice.org ? `Organization: ${choice.org}` : "Organizations chosen");
+      // The page can untick tools too; older pages don't send `tools`.
+      if (Array.isArray(choice.tools)) chosen = chosen.filter((t) => choice.tools.includes(t.id));
       orgFor = (t) => (choice.orgs && choice.orgs[t.id]) || choice.org || "";
     }
+    if (!chosen.length) {
+      ui.outro("No tools picked. Nothing was changed.");
+      return 0;
+    }
 
-    say("  Connecting...");
     const done = [];
     for (const t of chosen) {
       const org = orgFor(t);
       const url = mcpUrl(opts, org);
       if (t.manual) {
-        say(`    ! ${t.name}: add it yourself. ${t.signIn}`);
-        say(`        URL: ${url}`);
+        ui.log.warn(`${t.name}: add it yourself. ${t.signIn}\nURL: ${url}`);
         continue;
       }
       try {
         const result = t.install(ctx, scope, url);
-        say(`    ✓ ${t.name}${org ? ` → ${org}` : ""}${result.replaced ? " (updated)" : ""}`);
+        const was = existing.has(t.id) ? orgOfUrl(existing.get(t.id)) : "";
+        ui.log.success(`${t.name}${org ? ` → ${org}` : ""}${was && was !== org ? ` (was ${was})` : result.replaced ? " (updated)" : ""}`);
         done.push(t);
       } catch (err) {
-        if (err instanceof UnreadableFile) {
-          say(`    ! ${t.name}: ${err.message} has comments or isn't plain JSON, so it was left alone.`);
-          say(`        Add a server named "likho" with URL ${url} to it yourself.`);
-        } else {
-          say(`    ! ${t.name}: ${err.message}`);
-        }
+        ui.log.error(err instanceof UnreadableFile
+          ? `${t.name}: ${err.message} has comments or isn't plain JSON, so it was left alone.\nAdd a server named "likho" with URL ${url} to it yourself.`
+          : `${t.name}: ${err.message}`);
       }
     }
 
     if (done.length) {
-      say("\n  Done. Restart the tools above, then sign in once in each (one click, the browser is already signed in):");
-      done.forEach((t) => say(`    ${t.name}: ${t.signIn}`));
-      say('\n  Then, in any chat: "join Likho".');
-      if (scope === "project") say("  The files written here hold only Likho's address, no keys: safe to commit.");
+      const lines = done.map((t) => `${t.name}: ${t.signIn}`);
+      if (scope === "project") lines.push("", "The files written here hold only Likho's address, no keys: safe to commit.");
+      ui.note(lines.join("\n"), "Restart these tools, then sign in once in each");
+      ui.outro('Then, in any chat: "join Likho"');
+    } else {
+      ui.outro("Nothing was connected.");
     }
     return done.length ? 0 : 1;
-  } finally {
-    ask.close();
+  } catch (err) {
+    return cancelled(err);
   }
 }
 
@@ -187,25 +260,36 @@ function status(opts) {
 
 async function remove(opts) {
   const ctx = context();
-  const ask = makeAsk(opts);
+  await loadUi();
   try {
-    const scope = await chooseScope(opts, ctx, ask, "Remove");
-    let removed = 0;
-    for (const t of selectTools(opts, ctx)) {
-      if (t.manual || !(scope === "project" ? t.project : t.global)) continue;
+    ui.intro("Likho: remove from your AI tools");
+    const scope = await chooseScope(opts, ctx, "Remove");
+    const connected = selectTools(opts, ctx).filter((t) => !t.manual && (scope === "project" ? t.project : t.global) && t.current(ctx, scope));
+    if (!connected.length) {
+      ui.outro("Likho isn't connected there.");
+      return 0;
+    }
+    let chosen = connected;
+    if (!opts.tools && interactive(opts)) {
+      const ids = await answer(ui.multiselect({
+        message: "Remove Likho from which tools?",
+        options: connected.map((t) => ({ value: t.id, label: t.name })),
+        initialValues: connected.map((t) => t.id),
+        required: true,
+      }));
+      chosen = connected.filter((t) => ids.includes(t.id));
+    }
+    for (const t of chosen) {
       try {
-        if (t.remove(ctx, scope)) {
-          say(`  ✓ removed from ${t.name}`);
-          removed += 1;
-        }
+        if (t.remove(ctx, scope)) ui.log.success(`Removed from ${t.name}`);
       } catch (err) {
-        say(`  ! ${t.name}: ${err.message}`);
+        ui.log.error(`${t.name}: ${err.message}`);
       }
     }
-    say(removed ? "\n  Done. Restart those tools." : "  Likho wasn't connected there.");
+    ui.outro("Done. Restart those tools.");
     return 0;
-  } finally {
-    ask.close();
+  } catch (err) {
+    return cancelled(err);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "likho-cli",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Connect every AI tool on your computer (Claude Code, Codex, Cursor, VS Code, Gemini CLI, opencode, Windsurf) to Likho in one command.",
   "license": "MIT",
   "homepage": "https://likho.me",
@@ -26,5 +26,8 @@
     "codex",
     "cursor",
     "ai-agents"
-  ]
+  ],
+  "dependencies": {
+    "@clack/prompts": "^1.8.1"
+  }
 }