lace-mcp 0.0.2-alpha.5 → 0.0.2-alpha.7

package/dist/cli.js

@@ -51,7 +51,7 @@ function getClaudeDesktopConfigPath() {
 }
 function getEditorConfigPath(target) {
   const home = homedir();
-  if (target === "claude") return join(home, ".claude", "settings.json");
+  if (target === "claude") return join(home, ".claude.json");
   if (target === "claude-desktop") return getClaudeDesktopConfigPath();
   if (target === "cursor") return join(home, ".cursor", "mcp.json");
   return join(home, ".codex", "config.toml");
@@ -77,6 +77,7 @@ import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { platform as platform2 } from "node:os";
 import { join as join2 } from "node:path";
+import { createInterface } from "node:readline";
 function getAuthFilePath() {
   return join2(LACE_DATA, AUTH_FILE_NAME);
 }
@@ -158,6 +159,33 @@ 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();
+}
+function promptOrg(organizations) {
+  return new Promise((resolve2) => {
+    const rl = createInterface({ input: process.stdin, output: process.stderr });
+    console.log("\n  Which organization?\n");
+    for (let i = 0; i < organizations.length; i++) {
+      console.log(`  ${i + 1}. ${organizations[i].name}`);
+    }
+    rl.question("\n  > ", (answer) => {
+      rl.close();
+      const idx = parseInt(answer.trim(), 10) - 1;
+      const org = organizations[idx] ?? organizations[0];
+      if (!organizations[idx]) console.log(`  Defaulting to ${org.name}`);
+      console.log("");
+      resolve2(org.id);
+    });
+  });
+}
 async function browserLogin(apiBase = DEFAULT_API_BASE) {
   const { authUrl, state } = await startAuthFlow(apiBase);
   console.log("\n  Opening browser to sign in...");
@@ -165,7 +193,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");
@@ -256,7 +294,7 @@ 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";
+import { createInterface as createInterface2 } from "node:readline";
 function parseFlags(args) {
   const flags = {};
   for (let i = 0; i < args.length; i++) {
@@ -271,7 +309,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 });
+    const rl = createInterface2({ 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]]}`);
@@ -336,6 +374,21 @@ 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) {
+  const claudeUserPath = getEditorConfigPath("claude");
+  refreshJsonMcpEntry(claudeUserPath, env);
+  const projectMcpPath = join3(process.cwd(), ".mcp.json");
+  refreshJsonMcpEntry(projectMcpPath, env);
+  const cursorUserPath = getEditorConfigPath("cursor");
+  refreshJsonMcpEntry(cursorUserPath, env);
+}
 function writeJsonMcpEntry(configPath, entry) {
   const dir = resolve(configPath, "..");
   mkdirSync2(dir, { recursive: true });
@@ -394,7 +447,7 @@ function installClaude(env, scope = "user") {
   try {
     const envFlags = Object.entries(env).map(([key, value]) => `-e ${key}=${value}`).join(" ");
     execSync2(
-      `claude mcp add --transport stdio --scope ${scope} ${envFlags} lace -- npx ${mcpArgs("claude").join(" ")}`,
+      `claude mcp add lace --transport stdio --scope ${scope} ${envFlags} -- npx ${mcpArgs("claude").join(" ")}`,
       {
         stdio: "inherit"
       }
@@ -402,14 +455,14 @@ 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) {
@@ -418,7 +471,7 @@ function getCursorConfigPath(scope) {
 }
 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 +510,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;
@@ -519,6 +573,7 @@ function uninstallClaude() {
   } catch {
     removeJsonMcpEntry(getEditorConfigPath("claude"));
   }
+  removeJsonMcpEntry(join4(process.cwd(), ".mcp.json"));
   removeSkillFile("claude");
 }
 function uninstallTarget(target) {

package/package.json

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