likho-cli 0.4.0 → 0.4.1

package/bin/likho.js

@@ -88,10 +88,13 @@ function orgOfUrl(url) {
   }
 }
 
+/** Any folder but the home folder can be a project (a new one has no files yet). */
+const inHome = (ctx) => path.resolve(ctx.cwd) === path.resolve(ctx.home);
+
 async function chooseScope(opts, ctx, verb) {
   if (opts.scope) return opts.scope;
-  if (!isProjectFolder(ctx)) return "global";
-  if (!interactive(opts)) return "project";
+  if (inHome(ctx)) return "global";
+  if (!interactive(opts)) return isProjectFolder(ctx) ? "project" : "global";
   const folder = path.basename(ctx.cwd);
   const setup = verb === "Set up";
   return answer(ui.select({
@@ -277,6 +280,25 @@ async function connect(opts) {
       }
     }
 
+    // Old or extra Likho entries in the same tools (e.g. "likho-hub" from
+    // before the rename) are a second connection: offer to remove them.
+    const leftovers = done.flatMap((t) => (t.leftovers ? t.leftovers(ctx, scope).map((name) => ({ t, name })) : []));
+    if (leftovers.length) {
+      const list = leftovers.map(({ t, name }) => `"${name}" in ${t.name}`).join(", ");
+      const clean = interactive(opts)
+        ? await answer(ui.confirm({ message: `Also found older Likho connections: ${list}. Remove them? (recommended)`, initialValue: true }))
+        : true;
+      if (clean) {
+        for (const { t, name } of leftovers) {
+          try {
+            if (t.removeOld(ctx, scope, name)) ui.log.success(`Removed the old "${name}" from ${t.name}`);
+          } catch (err) {
+            ui.log.error(`${t.name}: couldn't remove "${name}": ${err.message}`);
+          }
+        }
+      }
+    }
+
     let helperOn = false;
     if (pair && Object.keys(helperCodes).length) {
       try {
@@ -285,7 +307,7 @@ async function connect(opts) {
           const { key, org } = await helper.redeem(opts.server, code, pair.verifier);
           orgs.push({ slug: org.slug, name: org.name, key });
         }
-        helper.install(opts.server, orgs, isProjectFolder(ctx) ? ctx.cwd : "");
+        helper.install(opts.server, orgs, inHome(ctx) ? "" : ctx.cwd);
         helperOn = true;
         ui.log.success(`Wake-ups on for ${orgs.map((o) => o.name).join(", ")}: this computer wakes your agents when they're tagged, while it's on.`);
       } catch (err) {
@@ -299,7 +321,7 @@ async function connect(opts) {
       ui.note(lines.join("\n"), "Restart these tools, then sign in once in each");
     }
     if (helperOn) {
-      const where = isProjectFolder(ctx)
+      const where = !inHome(ctx)
         ? `Agents are only woken in folders set up like this one (${path.basename(ctx.cwd)}): run npx likho-cli in each other project folder too.`
         : "Agents are only woken in project folders you set up: run npx likho-cli inside each project folder whose agents should wake.";
       ui.note(

package/lib/files.js

@@ -64,6 +64,16 @@ function getEntry(file, section, name) {
   }
 }
 
+/** Every entry in data[section], as {name: entry}. */
+function listEntries(file, section) {
+  try {
+    const block = readJson(file)[section];
+    return block && typeof block === "object" ? block : {};
+  } catch {
+    return {};
+  }
+}
+
 // ---- Codex's TOML: only the [mcp_servers.<name>] table is ever touched.
 function tomlTable(name) {
   return new RegExp(`^\\[mcp_servers\\.${name}\\][\\s\\S]*?(?=^\\[|(?![\\s\\S]))`, "m");
@@ -85,6 +95,15 @@ function getTomlServerUrl(file, name) {
   return url ? url[1] : null;
 }
 
+/** {name: url} for every [mcp_servers.<name>] table. */
+function listTomlServers(file) {
+  if (!fs.existsSync(file)) return {};
+  const out = {};
+  const raw = fs.readFileSync(file, "utf8");
+  for (const m of raw.matchAll(/^\[mcp_servers\.([\w-]+)\]/gm)) out[m[1]] = getTomlServerUrl(file, m[1]) || "";
+  return out;
+}
+
 function removeTomlServer(file, name) {
   if (!fs.existsSync(file)) return false;
   const raw = fs.readFileSync(file, "utf8");
@@ -103,4 +122,6 @@ module.exports = {
   setTomlServer,
   getTomlServerUrl,
   removeTomlServer,
+  listEntries,
+  listTomlServers,
 };

package/lib/tools.js

@@ -13,6 +13,24 @@ const files = require("./files");
 
 const NAME = "likho";
 
+// Likho's hosted MCP addresses, old and new. An entry under another name that
+// points here (or the old name "likho-hub") is a leftover second connection.
+const LIKHO_HOSTS = ["likho.me", "www.likho.me", "mcp.likho.me", "likho-mcp.onrender.com"];
+
+function isOldLikho(name, entry) {
+  if (name === NAME) return false;
+  if (name === "likho-hub") return true;
+  const url = typeof entry === "string" ? entry : entry && (entry.url || entry.httpUrl || entry.serverUrl);
+  try {
+    return LIKHO_HOSTS.includes(new URL(url).host);
+  } catch {
+    return false;
+  }
+}
+
+/** Names of old or extra Likho entries in a {name: entry} block. */
+const oldNames = (block) => Object.entries(block || {}).filter(([n, e]) => isOldLikho(n, e)).map(([n]) => n);
+
 function onPath(cmd) {
   const probe = process.platform === "win32" ? spawnSync("where", [cmd], { encoding: "utf8" }) : spawnSync("which", [cmd], { encoding: "utf8" });
   return probe.status === 0 && Boolean((probe.stdout || "").trim());
@@ -56,6 +74,12 @@ function jsonTool({ id, name, section, entry, globalFile, projectFile, detect, s
       const found = files.getEntry(this.file(ctx, scope), section, NAME);
       return found ? found.url || found.httpUrl || found.serverUrl || "(set)" : null;
     },
+    leftovers(ctx, scope) {
+      return oldNames(files.listEntries(this.file(ctx, scope), section));
+    },
+    removeOld(ctx, scope, name) {
+      return files.removeEntry(this.file(ctx, scope), section, name);
+    },
   };
 }
 
@@ -86,6 +110,13 @@ function tools(ctx) {
         const found = files.getEntry(this.file(c, scope), "mcpServers", NAME);
         return found ? found.url || "(set)" : null;
       },
+      leftovers(c, scope) {
+        return oldNames(files.listEntries(this.file(c, scope), "mcpServers"));
+      },
+      removeOld(c, scope, name) {
+        if (scope === "global" && c.which("claude") && run("claude", ["mcp", "remove", name, "--scope", "user"])) return true;
+        return files.removeEntry(this.file(c, scope), "mcpServers", name);
+      },
     },
     {
       id: "codex",
@@ -112,6 +143,13 @@ function tools(ctx) {
       current(c) {
         return files.getTomlServerUrl(this.file(c), NAME);
       },
+      leftovers(c) {
+        return oldNames(files.listTomlServers(this.file(c)));
+      },
+      removeOld(c, scope, name) {
+        if (c.which("codex") && run("codex", ["mcp", "remove", name])) return true;
+        return files.removeTomlServer(this.file(c), name);
+      },
     },
     jsonTool({
       id: "cursor",
@@ -189,4 +227,4 @@ function context(overrides = {}) {
   };
 }
 
-module.exports = { tools, context, NAME };
+module.exports = { tools, context, NAME, isOldLikho };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "likho-cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "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",