lace-mcp 0.0.2-alpha.6 → 0.0.2-alpha.8

package/dist/cli.js

@@ -56,6 +56,25 @@ function getEditorConfigPath(target) {
   if (target === "cursor") return join(home, ".cursor", "mcp.json");
   return join(home, ".codex", "config.toml");
 }
+function getProjectMcpConfigPath(cwd = process.cwd()) {
+  return join(cwd, ".mcp.json");
+}
+function getProjectCursorConfigPath(cwd = process.cwd()) {
+  return join(cwd, ".cursor", "mcp.json");
+}
+function getJsonMcpRefreshConfigPaths(cwd = process.cwd()) {
+  return [
+    getEditorConfigPath("claude"),
+    getProjectMcpConfigPath(cwd),
+    getEditorConfigPath("cursor"),
+    getProjectCursorConfigPath(cwd)
+  ];
+}
+function getJsonMcpConfigPathsForTarget(target, cwd = process.cwd()) {
+  if (target === "claude") return [getEditorConfigPath("claude"), getProjectMcpConfigPath(cwd)];
+  if (target === "cursor") return [getEditorConfigPath("cursor"), getProjectCursorConfigPath(cwd)];
+  return [getEditorConfigPath("claude-desktop")];
+}
 var LACE_DATA, DEFAULT_API_BASE;
 var init_paths = __esm({
   "src/paths.ts"() {
@@ -65,6 +84,33 @@ var init_paths = __esm({
   }
 });
 
+// src/prompt.ts
+import { createInterface } from "node:readline";
+function promptNumberedList(header, items, label) {
+  return new Promise((resolve2) => {
+    const rl = createInterface({ input: process.stdin, output: process.stderr });
+    console.log(`
+  ${header}
+`);
+    for (let i = 0; i < items.length; i++) {
+      console.log(`  ${i + 1}. ${label(items[i])}`);
+    }
+    rl.question("\n  > ", (answer) => {
+      rl.close();
+      const idx = parseInt(answer.trim(), 10) - 1;
+      const selected = items[idx] ?? items[0];
+      if (!items[idx]) console.log(`  Defaulting to ${label(selected)}`);
+      console.log("");
+      resolve2(selected);
+    });
+  });
+}
+var init_prompt = __esm({
+  "src/prompt.ts"() {
+    "use strict";
+  }
+});
+
 // src/auth.ts
 var auth_exports = {};
 __export(auth_exports, {
@@ -158,6 +204,20 @@ async function exchangeAuthCode(apiBase, code, state) {
     throw new Error(`Failed to exchange auth code: ${err instanceof Error ? err.message : "network error"}`);
   }
 }
+async function switchOrg(apiBase, currentToken, orgId) {
+  const res = await fetch(`${apiBase}/authkit/mcp-token`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ currentToken, orgId }),
+    signal: AbortSignal.timeout(AUTH_FETCH_TIMEOUT_MS)
+  });
+  if (!res.ok) throw new Error(`Org switch failed: ${res.status}`);
+  return await res.json();
+}
+async function promptOrg(organizations) {
+  const selected = await promptNumberedList("Which organization?", organizations, (o) => o.name);
+  return selected.id;
+}
 async function browserLogin(apiBase = DEFAULT_API_BASE) {
   const { authUrl, state } = await startAuthFlow(apiBase);
   console.log("\n  Opening browser to sign in...");
@@ -165,7 +225,17 @@ async function browserLogin(apiBase = DEFAULT_API_BASE) {
   console.log(`  \u2192 ${authUrl}
 `);
   const code = await pollForAuthCode(apiBase, state);
-  const { token, orgId } = await exchangeAuthCode(apiBase, code, state);
+  const exchangeResult = await exchangeAuthCode(apiBase, code, state);
+  let { token, orgId } = exchangeResult;
+  const organizations = exchangeResult.organizations ?? [];
+  if (organizations.length > 1) {
+    const selectedOrgId = await promptOrg(organizations);
+    if (selectedOrgId !== orgId) {
+      const switched = await switchOrg(apiBase, token, selectedOrgId);
+      token = switched.token;
+      orgId = switched.orgId;
+    }
+  }
   const credentials = { apiBase, token, orgId };
   saveCachedCredentials(credentials);
   console.log("  \u2713 Signed in successfully\n");
@@ -183,6 +253,7 @@ var init_auth = __esm({
   "src/auth.ts"() {
     "use strict";
     init_paths();
+    init_prompt();
     AUTH_FILE_NAME = "mcp-auth.json";
     AUTH_FETCH_TIMEOUT_MS = 1e4;
     POLL_INTERVAL_MS = 2e3;
@@ -256,7 +327,6 @@ import { execSync as execSync2 } from "node:child_process";
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join3, resolve } from "node:path";
-import { createInterface } from "node:readline";
 function parseFlags(args) {
   const flags = {};
   for (let i = 0; i < args.length; i++) {
@@ -270,21 +340,7 @@ function parseFlags(args) {
 }
 function promptScope(target) {
   const available = target === "claude" ? SCOPES : ["user", "project"];
-  return new Promise((promptResolve) => {
-    const rl = createInterface({ input: process.stdin, output: process.stderr });
-    console.log("\n  Where should Lace be installed?\n");
-    for (let i = 0; i < available.length; i++) {
-      console.log(`  ${i + 1}. ${SCOPE_LABELS[available[i]]}`);
-    }
-    rl.question("\n  > ", (answer) => {
-      rl.close();
-      const idx = parseInt(answer.trim(), 10) - 1;
-      const scope = available[idx] ?? available[0];
-      if (!available[idx]) console.log(`  Defaulting to ${scope}`);
-      console.log("");
-      promptResolve(scope);
-    });
-  });
+  return promptNumberedList("Where should Lace be installed?", available, (s) => SCOPE_LABELS[s]);
 }
 async function resolveCredentials(flags) {
   if (flags.token && flags.org) {
@@ -336,6 +392,18 @@ function readJsonConfig(configPath) {
   }
   return {};
 }
+function refreshJsonMcpEntry(configPath, env) {
+  const config2 = readJsonConfig(configPath);
+  const mcpServers = config2.mcpServers;
+  if (!mcpServers?.lace) return;
+  mcpServers.lace.env = env;
+  writeFileSync2(configPath, JSON.stringify(config2, null, 2));
+}
+function refreshAllLaceConfigs(env) {
+  for (const configPath of getJsonMcpRefreshConfigPaths()) {
+    refreshJsonMcpEntry(configPath, env);
+  }
+}
 function writeJsonMcpEntry(configPath, entry) {
   const dir = resolve(configPath, "..");
   mkdirSync2(dir, { recursive: true });
@@ -402,23 +470,23 @@ function installClaude(env, scope = "user") {
     console.log(`  \u2713 MCP server registered via claude CLI (scope: ${scope})`);
   } catch {
     const configPath = getEditorConfigPath("claude");
-    writeJsonMcpEntry(configPath, { command: "npx", args: mcpArgs("claude"), env });
+    writeJsonMcpEntry(configPath, { type: "stdio", command: "npx", args: mcpArgs("claude"), env });
   }
   installClaudeSkill();
 }
 function installClaudeDesktop(env) {
   const npx = resolveNpxPath();
   const configPath = getEditorConfigPath("claude-desktop");
-  writeJsonMcpEntry(configPath, { command: npx, args: mcpArgs("claude-desktop"), env });
+  writeJsonMcpEntry(configPath, { type: "stdio", command: npx, args: mcpArgs("claude-desktop"), env });
   installClaudeSkill();
 }
 function getCursorConfigPath(scope) {
-  if (scope === "project") return join3(process.cwd(), ".cursor", "mcp.json");
+  if (scope === "project") return getProjectCursorConfigPath();
   return getEditorConfigPath("cursor");
 }
 function installCursor(env, scope = "user") {
   const configPath = getCursorConfigPath(scope);
-  writeJsonMcpEntry(configPath, { command: "npx", args: mcpArgs("cursor"), env });
+  writeJsonMcpEntry(configPath, { type: "stdio", command: "npx", args: mcpArgs("cursor"), env });
   installCursorRule();
 }
 function installCodex(env) {
@@ -457,6 +525,7 @@ Installing Lace MCP for ${target}...`);
   else if (target === "claude-desktop") installClaudeDesktop(env);
   else if (target === "cursor") installCursor(env, scope);
   else installCodex(env);
+  refreshAllLaceConfigs(env);
   console.log('\nDone. Start a new session and say "implement the Lace decision" or type /lace.\n');
 }
 var TARGETS, PACKAGE_NAME, SCOPES, SCOPE_LABELS, SKILL_VERSION;
@@ -466,12 +535,13 @@ var init_install = __esm({
     init_auth();
     init_codexConfig();
     init_paths();
+    init_prompt();
     TARGETS = ["claude", "claude-desktop", "cursor", "codex"];
     PACKAGE_NAME = "lace-mcp";
     SCOPES = ["user", "project", "local"];
     SCOPE_LABELS = {
       user: "User    \u2014 available in all projects",
-      project: "Project \u2014 this project only (shared via .mcp.json)",
+      project: "Project \u2014 this project only",
       local: "Local   \u2014 this machine only (not shared)"
     };
     SKILL_VERSION = 1;
@@ -517,7 +587,9 @@ function uninstallClaude() {
     execSync3("claude mcp remove lace", { stdio: "inherit" });
     console.log("  \u2713 MCP server removed via claude CLI");
   } catch {
-    removeJsonMcpEntry(getEditorConfigPath("claude"));
+  }
+  for (const configPath of getJsonMcpConfigPathsForTarget("claude")) {
+    removeJsonMcpEntry(configPath);
   }
   removeSkillFile("claude");
 }
@@ -531,7 +603,9 @@ function uninstallTarget(target) {
       console.log(`  \u2713 Removed lace from ${configPath}`);
     }
   } else {
-    removeJsonMcpEntry(getEditorConfigPath(target));
+    for (const configPath of getJsonMcpConfigPathsForTarget(target)) {
+      removeJsonMcpEntry(configPath);
+    }
   }
   removeSkillFile(target);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lace-mcp",
-  "version": "0.0.2-alpha.6",
+  "version": "0.0.2-alpha.8",
   "type": "module",
   "files": [
     "dist/cli.js",