@memoraone/mcp 0.1.36 → 0.1.38

package/dist/cli.cjs

@@ -30,7 +30,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@memoraone/mcp",
-      version: "0.1.36",
+      version: "0.1.38",
       type: "module",
       main: "dist/index.cjs",
       bin: {
@@ -366,7 +366,7 @@ async function acquireLocalLock(lockName, options = {}) {
             `[memoraone-mcp] Failed to acquire lock ${lockName} after ${maxRetries} retries`
           );
         }
-        await new Promise((resolve16) => setTimeout(resolve16, retryDelayMs));
+        await new Promise((resolve17) => setTimeout(resolve17, retryDelayMs));
         continue;
       }
       throw err;
@@ -855,9 +855,9 @@ var MemoraOneHttpError = class extends Error {
 };
 
 // src/localState/localConnectClient.ts
-async function requestJson(baseUrl, method, path20, options = {}) {
+async function requestJson(baseUrl, method, path21, options = {}) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const url = `${baseUrl.replace(/\/+$/, "")}${path20.startsWith("/") ? path20 : `/${path20}`}`;
+  const url = `${baseUrl.replace(/\/+$/, "")}${path21.startsWith("/") ? path21 : `/${path21}`}`;
   const res = await fetchImpl(url, {
     method,
     headers: {
@@ -1528,8 +1528,8 @@ var StdioLineReader = class {
     if (this.closed) {
       return null;
     }
-    return new Promise((resolve16) => {
-      this.waiters.push(resolve16);
+    return new Promise((resolve17) => {
+      this.waiters.push(resolve17);
     });
   }
   /** Re-queue lines read during an intermediate protocol step (e.g. roots/list) for the main bridge loop. */
@@ -1602,17 +1602,17 @@ async function requestClientRootsListUris(options) {
 }
 
 // src/cleanup.ts
-var fs10 = __toESM(require("fs/promises"), 1);
-var path13 = __toESM(require("path"), 1);
+var fs11 = __toESM(require("fs/promises"), 1);
+var path15 = __toESM(require("path"), 1);
 var readline2 = __toESM(require("readline/promises"), 1);
 var import_node_child_process3 = require("child_process");
 var import_node_util3 = require("util");
 var import_node_process = require("process");
 
 // src/cursorGlobalMcpConfig.ts
-var fs9 = __toESM(require("fs/promises"), 1);
+var fs10 = __toESM(require("fs/promises"), 1);
 var os4 = __toESM(require("os"), 1);
-var path12 = __toESM(require("path"), 1);
+var path14 = __toESM(require("path"), 1);
 var import_node_child_process2 = require("child_process");
 var import_node_util2 = require("util");
 
@@ -1787,19 +1787,194 @@ async function resolveBindingFromInitializeParams(params, options = {}) {
   });
 }
 
+// src/packageExecutionMode.ts
+var path13 = __toESM(require("path"), 1);
+
+// src/resolveBuiltCliPath.ts
+var fs9 = __toESM(require("fs/promises"), 1);
+var path12 = __toESM(require("path"), 1);
+var MONOREPO_CLI_REL = path12.join("packages", "mcp", "dist", "cli.cjs");
+async function pathExists(filePath) {
+  try {
+    await fs9.access(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function findMonorepoCliFrom(startDir) {
+  let current = path12.resolve(startDir);
+  const root = path12.parse(current).root;
+  while (true) {
+    const candidate = path12.join(current, MONOREPO_CLI_REL);
+    if (await pathExists(candidate)) {
+      return path12.resolve(candidate);
+    }
+    if (current === root) break;
+    current = path12.dirname(current);
+  }
+  return null;
+}
+async function resolveFromRunningScript() {
+  if (!process.argv[1]) return null;
+  const script = path12.resolve(process.argv[1]);
+  const base = path12.basename(script);
+  if ((base === "cli.cjs" || base === "cli.ts" || base === "memoraone-mcp.cjs") && await pathExists(script)) {
+    return script;
+  }
+  const here = path12.dirname(script);
+  const candidates = [
+    path12.join(here, "cli.cjs"),
+    path12.join(here, "..", "dist", "cli.cjs"),
+    path12.join(here, "..", "..", "dist", "cli.cjs")
+  ];
+  for (const candidate of candidates) {
+    if (await pathExists(candidate)) {
+      return path12.resolve(candidate);
+    }
+  }
+  return null;
+}
+async function resolveBuiltCliPathAsync(options) {
+  const preferRunning = options?.preferRunningScript !== false;
+  if (preferRunning) {
+    const fromRunning = await resolveFromRunningScript();
+    if (fromRunning) return fromRunning;
+  }
+  const searchDirs = [];
+  if (options?.searchFrom !== void 0) {
+    const dirs = Array.isArray(options.searchFrom) ? options.searchFrom : [options.searchFrom];
+    searchDirs.push(...dirs);
+  }
+  searchDirs.push(process.cwd());
+  const seen = /* @__PURE__ */ new Set();
+  for (const dir of searchDirs) {
+    const key = path12.resolve(dir);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    const found = await findMonorepoCliFrom(key);
+    if (found) return found;
+  }
+  if (!preferRunning) {
+    return resolveFromRunningScript();
+  }
+  return null;
+}
+
+// src/packageExecutionMode.ts
+var PROD_API_URL = "https://api.memoraone.com";
+var STAGING_API_URL = "https://memora-api-staging-phbtrzocjq-uk.a.run.app";
+var STAGING_API_URL_PREFIX = "https://memora-api-staging-";
+function normalizeApiUrl(url) {
+  return url.trim().replace(/\/+$/, "");
+}
+function memoraoneNpmPackageSpec(channel) {
+  return channel === "staging" ? "@memoraone/mcp@staging" : "@memoraone/mcp@latest";
+}
+function isMemoraoneNpmPackageSpec(value) {
+  return value === "@memoraone/mcp@staging" || value === "@memoraone/mcp@latest";
+}
+function npmPackageChannelFromEnvironment(environment) {
+  return environment === "staging" ? "staging" : "latest";
+}
+function cursorEnvironmentFromPackageExecutionMode(mode) {
+  if (mode.kind === "local") return "local";
+  return mode.channel === "staging" ? "staging" : "production";
+}
+function npmPackageChannelFromApiUrl(apiUrl) {
+  if (!apiUrl) return "latest";
+  const normalized = normalizeApiUrl(apiUrl);
+  if (normalized === STAGING_API_URL || normalized.startsWith(STAGING_API_URL_PREFIX)) {
+    return "staging";
+  }
+  if (normalized === PROD_API_URL) return "latest";
+  return "latest";
+}
+function looksLikeLocalMonorepoCliPath(scriptPath) {
+  const normalized = scriptPath.replace(/\\/g, "/");
+  if (normalized.includes("/node_modules/@memoraone/mcp/")) return false;
+  if (normalized.includes("/.npm/_npx/")) return false;
+  if (normalized.includes("/_npx/")) return false;
+  const base = path13.basename(normalized);
+  if (base === "cli.ts" || base === "cli.cjs" || base === "memoraone-mcp.cjs") {
+    if (normalized.includes("/packages/mcp/dist/") || normalized.includes("/packages/mcp/dist-bin/") || normalized.includes("/packages/mcp/src/")) {
+      return true;
+    }
+  }
+  return false;
+}
+function looksLikePublishedPackagePath(scriptPath) {
+  const normalized = scriptPath.replace(/\\/g, "/");
+  return normalized.includes("/node_modules/@memoraone/mcp/") || normalized.includes("/.npm/_npx/") || /\/_npx\//.test(normalized);
+}
+function channelFromEnv(env2) {
+  const explicit = env2.MEMORAONE_NPM_CHANNEL?.trim().toLowerCase() || env2.npm_config_tag?.trim().toLowerCase();
+  if (explicit === "staging") return "staging";
+  if (explicit === "latest") return "latest";
+  return void 0;
+}
+async function resolvePackageExecutionMode(options = {}) {
+  if (options.executionMode) return options.executionMode;
+  const env2 = options.env ?? process.env;
+  const scriptPath = options.scriptPath !== void 0 ? options.scriptPath : process.argv[1] ? path13.resolve(process.argv[1]) : null;
+  if (scriptPath && looksLikePublishedPackagePath(scriptPath)) {
+    const channel2 = channelFromEnv(env2) ?? npmPackageChannelFromApiUrl(options.apiUrl);
+    return { kind: "published", channel: channel2 };
+  }
+  if (scriptPath && looksLikeLocalMonorepoCliPath(scriptPath)) {
+    return { kind: "local", cliPath: scriptPath };
+  }
+  if (options.cliPath) {
+    return { kind: "local", cliPath: path13.resolve(options.cliPath) };
+  }
+  const resolveCli = options.resolveBuiltCliPath ?? resolveBuiltCliPathAsync;
+  const builtCli = await resolveCli();
+  if (builtCli && looksLikeLocalMonorepoCliPath(builtCli) && !(scriptPath && looksLikePublishedPackagePath(scriptPath))) {
+    return { kind: "local", cliPath: builtCli };
+  }
+  const channel = channelFromEnv(env2) ?? npmPackageChannelFromApiUrl(options.apiUrl);
+  return { kind: "published", channel };
+}
+function setupOptionsFromPackageExecutionMode(mode) {
+  if (mode.kind === "local") {
+    return {
+      cursorEnvironment: "local",
+      devMode: true,
+      npmPackageChannel: "latest",
+      cursorLocalCliPathOverride: mode.cliPath,
+      cliPathOverride: mode.cliPath
+    };
+  }
+  return {
+    cursorEnvironment: cursorEnvironmentFromPackageExecutionMode(mode),
+    devMode: false,
+    npmPackageChannel: mode.channel,
+    cursorLocalCliPathOverride: null,
+    cliPathOverride: null
+  };
+}
+function formatIdeSetupRepairHint(workspaceRoot, mode) {
+  if (mode.kind === "local") {
+    return `Repair with (no new connect code): node ${mode.cliPath} setup-ide-files --all --local --dev --force --workspace-root ${workspaceRoot}`;
+  }
+  const spec = memoraoneNpmPackageSpec(mode.channel);
+  const stagingFlag = mode.channel === "staging" ? " --staging" : "";
+  return `Repair with (no new connect code): npx -y ${spec} setup-ide-files --all${stagingFlag} --force --workspace-root ${workspaceRoot}`;
+}
+
 // src/cursorGlobalMcpConfig.ts
 var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process2.execFile);
 var MEMORAONE_PROD_API_URL = "https://api.memoraone.com";
 var MEMORAONE_LOCAL_API_URL = "http://localhost:3001";
 var MEMORAONE_STAGING_API_URL = "https://memora-api-staging-phbtrzocjq-uk.a.run.app";
 var MEMORAONE_STAGING_API_URL_PREFIX = "https://memora-api-staging-";
-function normalizeApiUrl(url) {
+function normalizeApiUrl2(url) {
   return url.trim().replace(/\/+$/, "");
 }
 function resolveIdeApiUrl(options) {
+  if (options.apiUrl) return normalizeApiUrl2(options.apiUrl);
   if (options.environment === "staging") return MEMORAONE_STAGING_API_URL;
   if (options.environment === "production") return MEMORAONE_PROD_API_URL;
-  if (options.apiUrl) return normalizeApiUrl(options.apiUrl);
   return MEMORAONE_LOCAL_API_URL;
 }
 function buildMemoraoneCursorMcpServer(options) {
@@ -1811,7 +1986,7 @@ function buildMemoraoneCursorMcpServer(options) {
     MEMORAONE_IDE_TYPE: "cursor"
   };
   if (options.workspaceRoot !== void 0) {
-    env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path12.resolve(options.workspaceRoot);
+    env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path14.resolve(options.workspaceRoot);
   }
   if (options.environment === "local") {
     if (!options.cliPath) {
@@ -1826,15 +2001,16 @@ function buildMemoraoneCursorMcpServer(options) {
   if (!options.npxPath) {
     throw new Error("[setup-ide-files] Cursor MCP config requires a resolved npx path.");
   }
+  const channel = options.npmPackageChannel ?? npmPackageChannelFromEnvironment(options.environment);
   return {
     command: options.npxPath,
-    args: ["-y", "@memoraone/mcp@latest"],
+    args: ["-y", memoraoneNpmPackageSpec(channel)],
     env: env2
   };
 }
-async function pathExists(filePath) {
+async function pathExists2(filePath) {
   try {
-    await fs9.access(filePath);
+    await fs10.access(filePath);
     return true;
   } catch {
     return false;
@@ -1844,17 +2020,17 @@ function stripLeadingLineComments(text) {
   return text.split("\n").filter((line) => !/^\s*\/\//.test(line)).join("\n");
 }
 function getKnownCursorGlobalMcpConfigCandidates(homeDir) {
-  return [path12.join(homeDir, ".cursor", "mcp.json")];
+  return [path14.join(homeDir, ".cursor", "mcp.json")];
 }
 async function detectCursorGlobalMcpConfig(options) {
   if (options?.explicitPath) {
-    return { ok: true, path: options.explicitPath, detectedExisting: await pathExists(options.explicitPath) };
+    return { ok: true, path: options.explicitPath, detectedExisting: await pathExists2(options.explicitPath) };
   }
   const homeDir = options?.homeDir ?? os4.homedir();
   const candidates = getKnownCursorGlobalMcpConfigCandidates(homeDir);
   const existing = [];
   for (const candidate of candidates) {
-    if (await pathExists(candidate)) existing.push(candidate);
+    if (await pathExists2(candidate)) existing.push(candidate);
   }
   if (existing.length > 1) {
     return {
@@ -1882,10 +2058,10 @@ function formatBackupTimestamp(d = /* @__PURE__ */ new Date()) {
 }
 async function isWorkingNpx(npxPath) {
   try {
-    if (!await pathExists(npxPath)) return false;
+    if (!await pathExists2(npxPath)) return false;
     if (process.platform !== "win32") {
       try {
-        await fs9.access(npxPath, fs9.constants.X_OK);
+        await fs10.access(npxPath, fs10.constants.X_OK);
       } catch {
         return false;
       }
@@ -1907,7 +2083,7 @@ async function resolveNpxPath() {
   const pathSep = process.platform === "win32" ? ";" : ":";
   for (const dir of (process.env.PATH ?? "").split(pathSep)) {
     if (!dir) continue;
-    candidates.push(path12.join(dir, npxName));
+    candidates.push(path14.join(dir, npxName));
   }
   try {
     const lookupCmd = process.platform === "win32" ? "where" : "which";
@@ -1918,7 +2094,7 @@ async function resolveNpxPath() {
   }
   const seen = /* @__PURE__ */ new Set();
   for (const candidate of candidates) {
-    const abs = path12.isAbsolute(candidate) ? candidate : path12.resolve(candidate);
+    const abs = path14.isAbsolute(candidate) ? candidate : path14.resolve(candidate);
     const key = process.platform === "win32" ? abs.toLowerCase() : abs;
     if (seen.has(key)) continue;
     seen.add(key);
@@ -1930,12 +2106,14 @@ function mergeCursorRepoMcpConfigObject(existing, writeOptions) {
   const environment = writeOptions.environment ?? "production";
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
   const mcpServers = typeof base.mcpServers === "object" && base.mcpServers !== null && !Array.isArray(base.mcpServers) ? { ...base.mcpServers } : {};
+  delete mcpServers.memoraone;
   mcpServers.memoraone = buildMemoraoneCursorMcpServer({
     environment,
     npxPath: writeOptions.npxPath,
     cliPath: writeOptions.cliPath,
     workspaceRoot: writeOptions.repoRoot,
-    apiUrl: writeOptions.apiUrl
+    apiUrl: writeOptions.apiUrl,
+    npmPackageChannel: writeOptions.npmPackageChannel
   });
   return { ...base, mcpServers };
 }
@@ -1949,7 +2127,7 @@ function isManagedMemoraoneCursorServer(server) {
   if (!server || typeof server !== "object") return false;
   const s = server;
   if (!Array.isArray(s.args) || s.args.length !== 2) return false;
-  if (s.args[0] !== "-y" || s.args[1] !== "@memoraone/mcp@latest") return false;
+  if (s.args[0] !== "-y" || !isMemoraoneNpmPackageSpec(s.args[1])) return false;
   const env2 = s.env;
   if (!env2 || typeof env2 !== "object") return false;
   return memoraoneEnvMatchesManagedCleanupShape(env2);
@@ -1964,11 +2142,11 @@ function memoraoneEnvMatchesManagedCleanupShape(env2) {
   return env2.MEMORAONE_IDE_TYPE === "cursor" && isMemoraoneManagedApiUrl(env2.MEMORAONE_API_URL);
 }
 function getCursorRepoMcpConfigPath(repoRoot) {
-  return path12.join(repoRoot, ".cursor", "mcp.json");
+  return path14.join(repoRoot, ".cursor", "mcp.json");
 }
 async function readCursorMcpConfigObject(configPath) {
   try {
-    const raw = await fs9.readFile(configPath, "utf8");
+    const raw = await fs10.readFile(configPath, "utf8");
     return JSON.parse(stripLeadingLineComments(raw));
   } catch (err) {
     const code = err && typeof err === "object" && "code" in err ? err.code : void 0;
@@ -1986,21 +2164,21 @@ async function removeMemoraoneFromCursorGlobalConfig(options) {
     return { changed: true, backupPath: `${configPath}.backup-<timestamp>` };
   }
   const backupPath = `${configPath}.backup-${formatBackupTimestamp()}`;
-  await fs9.copyFile(configPath, backupPath);
+  await fs10.copyFile(configPath, backupPath);
   const mcpServers = typeof parsed2.mcpServers === "object" && parsed2.mcpServers !== null && !Array.isArray(parsed2.mcpServers) ? { ...parsed2.mcpServers } : {};
   delete mcpServers.memoraone;
   const hasOtherServers = Object.keys(mcpServers).length > 0;
   if (!hasOtherServers) {
-    await fs9.unlink(configPath);
+    await fs10.unlink(configPath);
     return { changed: true, backupPath };
   }
   const next = { ...parsed2, mcpServers };
-  await fs9.mkdir(path12.dirname(configPath), { recursive: true });
-  await fs9.writeFile(configPath, JSON.stringify(next, null, 2) + "\n", "utf8");
+  await fs10.mkdir(path14.dirname(configPath), { recursive: true });
+  await fs10.writeFile(configPath, JSON.stringify(next, null, 2) + "\n", "utf8");
   return { changed: true, backupPath };
 }
 async function auditCursorMcpConfig(options) {
-  const repoRoot = path12.resolve(options?.repoRoot ?? process.cwd());
+  const repoRoot = path14.resolve(options?.repoRoot ?? process.cwd());
   const repoConfigPath = getCursorRepoMcpConfigPath(repoRoot);
   const globalDetection = await detectCursorGlobalMcpConfig({
     homeDir: options?.homeDir,
@@ -2058,45 +2236,46 @@ function logCursorMcpConfigAudit(prefix, audit) {
 function logCursorMcpCliSummary(info, dryRun, opts) {
   const { repoConfigPath, repoOutcome, npxPath, cliPath, repoBackupPath, globalConfigPath, globalMemoraoneRemoved, globalBackupPath } = info;
   const interactive = opts?.forInteractivePostSetup === true;
-  console.log(`[setup-ide-files] Cursor repo MCP config: ${repoConfigPath}`);
+  const println = opts?.println ?? console.log;
+  println(`[setup-ide-files] Cursor repo MCP config: ${repoConfigPath}`);
   if (cliPath) {
-    console.log(`[setup-ide-files] Resolved local CLI: ${cliPath}`);
+    println(`[setup-ide-files] Resolved local CLI: ${cliPath}`);
   } else if (npxPath) {
-    console.log(`[setup-ide-files] Resolved npx: ${npxPath}`);
+    println(`[setup-ide-files] Resolved npx: ${npxPath}`);
   }
   if (repoBackupPath) {
-    console.log(`[setup-ide-files] Cursor repo MCP config backup: ${repoBackupPath}`);
+    println(`[setup-ide-files] Cursor repo MCP config backup: ${repoBackupPath}`);
   }
   if (!interactive) {
     if (repoOutcome === "created") {
-      console.log(
+      println(
         dryRun ? `[setup-ide-files] Cursor repo MCP config would be created: ${repoConfigPath}` : `[setup-ide-files] Cursor repo MCP config created: ${repoConfigPath}`
       );
     } else if (repoOutcome === "updated") {
-      console.log(
+      println(
         dryRun ? `[setup-ide-files] Cursor repo MCP config would be updated: ${repoConfigPath}` : `[setup-ide-files] Cursor repo MCP config updated: ${repoConfigPath}`
       );
     } else if (repoOutcome === "skipped") {
-      console.log(`[setup-ide-files] Cursor repo MCP config unchanged: ${repoConfigPath}`);
+      println(`[setup-ide-files] Cursor repo MCP config unchanged: ${repoConfigPath}`);
     }
   }
   if (globalMemoraoneRemoved && globalConfigPath) {
-    console.log(
+    println(
       dryRun ? `[setup-ide-files] Would remove memoraone from Cursor global MCP config: ${globalConfigPath}` : `[setup-ide-files] Removed memoraone from Cursor global MCP config: ${globalConfigPath}`
     );
     if (globalBackupPath) {
-      console.log(`[setup-ide-files] Cursor global MCP config backup: ${globalBackupPath}`);
+      println(`[setup-ide-files] Cursor global MCP config backup: ${globalBackupPath}`);
     }
   } else if (globalConfigPath) {
-    console.log(
+    println(
       `[setup-ide-files] Cursor global MCP config unchanged (no managed memoraone to remove): ${globalConfigPath}`
     );
   }
-  console.log(
+  println(
     "[setup-ide-files] Each Cursor window uses this repo\u2019s .cursor/mcp.json (separate MCP process per repo)."
   );
   if (!interactive) {
-    console.log(
+    println(
       "[setup-ide-files] Fully quit Cursor and reopen this repo for MCP changes to take effect."
     );
   }
@@ -2177,7 +2356,7 @@ async function defaultListSocketPaths(projectId) {
   const baseDir = getMcpBaseDir();
   let entries;
   try {
-    entries = await fs10.readdir(baseDir);
+    entries = await fs11.readdir(baseDir);
   } catch (err) {
     const code = err && typeof err === "object" && "code" in err ? err.code : void 0;
     if (code === "ENOENT") {
@@ -2190,7 +2369,7 @@ async function defaultListSocketPaths(projectId) {
     if (!name.endsWith(".sock") || !isMemoraoneSocketFilename(name)) {
       continue;
     }
-    const socketPath = path13.join(baseDir, name);
+    const socketPath = path15.join(baseDir, name);
     if (projectId === null) {
       paths.push(socketPath);
       continue;
@@ -2210,11 +2389,11 @@ async function defaultListSocketPaths(projectId) {
   return paths.sort();
 }
 async function defaultListSocketPathsForWorkspaceRoot(workspaceRoot) {
-  const resolvedRoot = path13.resolve(workspaceRoot);
+  const resolvedRoot = path15.resolve(workspaceRoot);
   const baseDir = getMcpBaseDir();
   let entries;
   try {
-    entries = await fs10.readdir(baseDir);
+    entries = await fs11.readdir(baseDir);
   } catch (err) {
     const code = err && typeof err === "object" && "code" in err ? err.code : void 0;
     if (code === "ENOENT") {
@@ -2227,10 +2406,10 @@ async function defaultListSocketPathsForWorkspaceRoot(workspaceRoot) {
     if (!name.endsWith(".sock") || !isHashSocketFilename(name)) {
       continue;
     }
-    const socketPath = path13.join(baseDir, name);
+    const socketPath = path15.join(baseDir, name);
     const record = readBindingSidecarRecord(socketPath);
     if (!record?.workspaceRoot) continue;
-    if (path13.resolve(record.workspaceRoot) === resolvedRoot) {
+    if (path15.resolve(record.workspaceRoot) === resolvedRoot) {
       paths.push(socketPath);
     }
   }
@@ -2239,21 +2418,21 @@ async function defaultListSocketPathsForWorkspaceRoot(workspaceRoot) {
 async function filterSocketPathsByIdeForCleanup(socketPaths, projectId, ide, workspaceRoot) {
   if (ide === void 0) return socketPaths;
   const normalizedProjectId = projectId.trim().toLowerCase();
-  const resolvedRoot = workspaceRoot ? path13.resolve(workspaceRoot) : null;
+  const resolvedRoot = workspaceRoot ? path15.resolve(workspaceRoot) : null;
   const filtered = [];
   for (const socketPath of socketPaths) {
-    const basename8 = path13.basename(socketPath);
-    if (isLegacySocketFilename(basename8)) {
-      if (isSocketFilenameForProjectAndIde(basename8, normalizedProjectId, ide)) {
+    const basename11 = path15.basename(socketPath);
+    if (isLegacySocketFilename(basename11)) {
+      if (isSocketFilenameForProjectAndIde(basename11, normalizedProjectId, ide)) {
         filtered.push(socketPath);
       }
       continue;
     }
-    if (isHashSocketFilename(basename8)) {
+    if (isHashSocketFilename(basename11)) {
       const record = readBindingSidecarRecord(socketPath);
       if (!record || record.ideType !== ide) continue;
       const sameProject = record.projectId.trim().toLowerCase() === normalizedProjectId;
-      const sameWorkspace = resolvedRoot !== null && path13.resolve(record.workspaceRoot) === resolvedRoot;
+      const sameWorkspace = resolvedRoot !== null && path15.resolve(record.workspaceRoot) === resolvedRoot;
       if (sameProject || sameWorkspace) {
         filtered.push(socketPath);
       }
@@ -2265,9 +2444,9 @@ async function defaultKillProcess(pid) {
   process.kill(pid, "SIGTERM");
 }
 async function defaultRemoveSocket(socketPath) {
-  await fs10.unlink(socketPath);
+  await fs11.unlink(socketPath);
   try {
-    await fs10.unlink(bindingSidecarPath(socketPath));
+    await fs11.unlink(bindingSidecarPath(socketPath));
   } catch {
   }
 }
@@ -2285,7 +2464,7 @@ async function defaultConfirm(message) {
 }
 async function resolveCleanupTarget(cwd2) {
   try {
-    const binding = await resolveAuthoritativeBinding([path13.resolve(cwd2)]);
+    const binding = await resolveAuthoritativeBinding([path15.resolve(cwd2)]);
     return {
       workspaceRoot: binding.workspaceRoot,
       repositoryBindingId: binding.repositoryBindingId,
@@ -2463,7 +2642,7 @@ async function runCleanup(opts) {
       projectIds.add(proc.projectId);
     }
     for (const socketPath of socketPaths) {
-      const id = extractProjectIdFromSocketFilename(path13.basename(socketPath));
+      const id = extractProjectIdFromSocketFilename(path15.basename(socketPath));
       if (id) {
         projectIds.add(id);
         continue;
@@ -2649,9 +2828,9 @@ function summarizeJsonRpcMethod(line) {
   }
 }
 function connectWithRetry(socketPath, log, maxRetries, retryDelayMs, connect2) {
-  return new Promise((resolve16, reject) => {
+  return new Promise((resolve17, reject) => {
     const tryConnect = (attempt) => {
-      connect2(socketPath).then(resolve16).catch((err) => {
+      connect2(socketPath).then(resolve17).catch((err) => {
         if (attempt >= maxRetries) {
           reject(err);
           return;
@@ -2767,8 +2946,8 @@ var BridgeDaemonRouter = class {
     this.maxRetries = options.maxRetries ?? 5;
     this.retryDelayMs = options.retryDelayMs ?? 200;
     this.lineReader = options.lineReader ?? null;
-    this.connectImpl = options.connect ?? ((socketPath) => new Promise((resolve16, reject) => {
-      const socket = net.connect(socketPath, () => resolve16(socket));
+    this.connectImpl = options.connect ?? ((socketPath) => new Promise((resolve17, reject) => {
+      const socket = net.connect(socketPath, () => resolve17(socket));
       socket.on("error", reject);
     }));
     this.spawnDaemonImpl = options.spawnDaemon ?? (async (binding) => {
@@ -3032,12 +3211,14 @@ async function runBridgeProxy(options) {
 // src/setupIdeFiles.ts
 var fs13 = __toESM(require("fs/promises"), 1);
 var os6 = __toESM(require("os"), 1);
-var path16 = __toESM(require("path"), 1);
+var path17 = __toESM(require("path"), 1);
+var import_node_crypto5 = require("crypto");
 
 // src/jetbrainsMcpConfig.ts
-var fs11 = __toESM(require("fs/promises"), 1);
+var fs12 = __toESM(require("fs/promises"), 1);
 var os5 = __toESM(require("os"), 1);
-var path14 = __toESM(require("path"), 1);
+var path16 = __toESM(require("path"), 1);
+var import_node_crypto4 = require("crypto");
 var import_node_child_process5 = require("child_process");
 
 // src/configUtils.ts
@@ -3059,7 +3240,6 @@ function resolveApiUrl(env2) {
 }
 
 // src/jetbrainsMcpConfig.ts
-var PROD_API_URL = "https://api.memoraone.com";
 var JETBRAINS_DEBUG_ENV_VARS = [
   "MEMORAONE_DEBUG_INIT",
   "MEMORAONE_DEBUG_MINIMAL_TOOLS",
@@ -3069,9 +3249,9 @@ var JETBRAINS_DEBUG_ENV_VARS = [
 function stripLeadingLineComments2(text) {
   return text.split("\n").filter((line) => !/^\s*\/\//.test(line)).join("\n");
 }
-async function pathExists2(filePath) {
+async function pathExists3(filePath) {
   try {
-    await fs11.access(filePath);
+    await fs12.access(filePath);
     return true;
   } catch {
     return false;
@@ -3082,12 +3262,12 @@ function formatJetBrainsBackupTimestamp(d = /* @__PURE__ */ new Date()) {
   return `${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}-${pad(d.getHours())}${pad(d.getMinutes())}${pad(d.getSeconds())}`;
 }
 function getJetBrainsGlobalMcpConfigPath(homeDir) {
-  return path14.join(homeDir, ".ai", "mcp", "mcp.json");
+  return path16.join(homeDir, ".ai", "mcp", "mcp.json");
 }
 function getJetBrainsProjectMcpConfigPaths(repoRoot) {
   return [
-    { kind: "project-ai", path: path14.join(repoRoot, ".ai", "mcp", "mcp.json") },
-    { kind: "project-ij", path: path14.join(repoRoot, ".ij", "mcp", "mcp.json") }
+    { kind: "project-ai", path: path16.join(repoRoot, ".ai", "mcp", "mcp.json") },
+    { kind: "project-ij", path: path16.join(repoRoot, ".ij", "mcp", "mcp.json") }
   ];
 }
 function getKnownJetBrainsMcpConfigLocations(homeDir, repoRoot) {
@@ -3097,17 +3277,21 @@ function getKnownJetBrainsMcpConfigLocations(homeDir, repoRoot) {
   ];
 }
 async function isZeroByteConfigFile(filePath) {
-  if (!await pathExists2(filePath)) return false;
-  const stat4 = await fs11.stat(filePath);
+  if (!await pathExists3(filePath)) return false;
+  const stat4 = await fs12.stat(filePath);
   return stat4.size === 0;
 }
 function buildMemoraoneJetBrainsMcpServer(options) {
+  const environment = options.environment ?? (options.devMode ? "local" : "production");
   const env2 = {
-    MEMORAONE_API_URL: options.devMode ? options.apiUrl ? normalizeApiUrl(options.apiUrl) : DEV_API_URL : PROD_API_URL,
+    MEMORAONE_API_URL: resolveIdeApiUrl({
+      environment,
+      apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
+    }),
     MEMORAONE_IDE_TYPE: "jetbrains",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path14.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path16.resolve(options.workspaceRoot)
   };
-  if (options.devMode) {
+  if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
   }
   if ("MEMORAONE_M1_PATH" in env2 || "MEMORAONE_API_KEY" in env2) {
@@ -3122,9 +3306,28 @@ function buildMemoraoneJetBrainsMcpServer(options) {
 function mergeJetBrainsMcpConfigObject(existing, memoraone) {
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
   const mcpServers = typeof base.mcpServers === "object" && base.mcpServers !== null && !Array.isArray(base.mcpServers) ? { ...base.mcpServers } : {};
+  delete mcpServers.memoraone;
   mcpServers.memoraone = memoraone;
   return { ...base, mcpServers };
 }
+async function writeJetBrainsMcpJsonAtomic(filePath, content) {
+  const dir = path16.dirname(filePath);
+  await fs12.mkdir(dir, { recursive: true });
+  const tmpPath = path16.join(
+    dir,
+    `.${path16.basename(filePath)}.${process.pid}.${(0, import_node_crypto4.randomBytes)(8).toString("hex")}.tmp`
+  );
+  try {
+    await fs12.writeFile(tmpPath, content, "utf8");
+    await fs12.rename(tmpPath, filePath);
+  } catch (err) {
+    try {
+      await fs12.unlink(tmpPath);
+    } catch {
+    }
+    throw err;
+  }
+}
 function memoraoneServerMatches(server, expected) {
   if (!server || typeof server !== "object") return false;
   const s = server;
@@ -3160,13 +3363,13 @@ function validateJetBrainsMcpConfig(parsed2, expected) {
   }
 }
 async function readJsonConfig(filePath) {
-  const raw = await fs11.readFile(filePath, "utf8");
+  const raw = await fs12.readFile(filePath, "utf8");
   if (raw.trim() === "") return null;
   return JSON.parse(stripLeadingLineComments2(raw));
 }
 async function backupConfigFile(filePath) {
   const backupPath = `${filePath}.bak-${formatJetBrainsBackupTimestamp()}`;
-  await fs11.copyFile(filePath, backupPath);
+  await fs12.copyFile(filePath, backupPath);
   return backupPath;
 }
 async function repairZeroByteConfigFile(filePath, dryRun) {
@@ -3177,7 +3380,7 @@ async function repairZeroByteConfigFile(filePath, dryRun) {
     return { repaired: true, backupPath: `${filePath}.bak-<timestamp>` };
   }
   const backupPath = await backupConfigFile(filePath);
-  await fs11.unlink(filePath);
+  await fs12.unlink(filePath);
   return { repaired: true, backupPath };
 }
 function configHasMemoraone(parsed2) {
@@ -3188,7 +3391,7 @@ function configHasMemoraone(parsed2) {
 }
 async function removeMemoraoneFromProjectConfig(options) {
   const { configPath, dryRun } = options;
-  if (!await pathExists2(configPath)) {
+  if (!await pathExists3(configPath)) {
     return { changed: false };
   }
   let parsed2 = null;
@@ -3208,30 +3411,31 @@ async function removeMemoraoneFromProjectConfig(options) {
   delete mcpServers.memoraone;
   const hasOtherServers = Object.keys(mcpServers).length > 0;
   if (!hasOtherServers) {
-    await fs11.unlink(configPath);
+    await fs12.unlink(configPath);
     return { changed: true, backupPath };
   }
   const next = { ...parsed2, mcpServers };
-  await fs11.mkdir(path14.dirname(configPath), { recursive: true });
-  await fs11.writeFile(configPath, JSON.stringify(next, null, 2) + "\n", "utf8");
+  await fs12.mkdir(path16.dirname(configPath), { recursive: true });
+  await fs12.writeFile(configPath, JSON.stringify(next, null, 2) + "\n", "utf8");
   return { changed: true, backupPath };
 }
 async function resolveLocalCliPathAsync() {
-  const here = process.argv[1] ? path14.dirname(path14.resolve(process.argv[1])) : process.cwd();
+  const here = process.argv[1] ? path16.dirname(path16.resolve(process.argv[1])) : process.cwd();
   const candidates = [
-    path14.join(here, "cli.cjs"),
-    path14.join(here, "..", "dist", "cli.cjs"),
-    path14.join(here, "..", "..", "dist", "cli.cjs")
+    path16.join(here, "cli.cjs"),
+    path16.join(here, "..", "dist", "cli.cjs"),
+    path16.join(here, "..", "..", "dist", "cli.cjs")
   ];
   for (const candidate of candidates) {
-    if (await pathExists2(candidate)) {
-      return path14.resolve(candidate);
+    if (await pathExists3(candidate)) {
+      return path16.resolve(candidate);
     }
   }
   return null;
 }
 async function buildJetBrainsMemoraoneServer(options) {
-  if (options.devMode) {
+  const environment = options.environment ?? (options.devMode ? "local" : "production");
+  if (environment === "local" || options.devMode) {
     let cliPath = options.cliPathOverride;
     if (cliPath === void 0) {
       cliPath = await resolveLocalCliPathAsync();
@@ -3245,6 +3449,7 @@ async function buildJetBrainsMemoraoneServer(options) {
       command: process.execPath,
       args: [cliPath],
       workspaceRoot: options.workspaceRoot,
+      environment: "local",
       devMode: true,
       apiUrl: options.apiUrl
     });
@@ -3258,19 +3463,31 @@ async function buildJetBrainsMemoraoneServer(options) {
       "[setup-ide-files] Could not resolve a working npx executable. Install Node.js/npm or ensure npx is on PATH before configuring JetBrains MCP."
     );
   }
+  const channel = options.npmPackageChannel ?? npmPackageChannelFromEnvironment(environment);
   return buildMemoraoneJetBrainsMcpServer({
     command: npxPath,
-    args: ["-y", "@memoraone/mcp@latest"],
+    args: ["-y", memoraoneNpmPackageSpec(channel)],
     workspaceRoot: options.workspaceRoot,
-    devMode: false
+    environment,
+    devMode: false,
+    apiUrl: options.apiUrl
   });
 }
+function isOptionalJetBrainsHandshakeUnavailable(detail) {
+  if (!detail) return false;
+  if (detail.includes("-32601")) return true;
+  if (/Method not found/i.test(detail)) return true;
+  return false;
+}
+function formatOptionalJetBrainsHandshakeUnavailableDetail(detail) {
+  return "MCP handshake optional verification unavailable while configuration succeeded" + (detail ? ` (${detail})` : "");
+}
 async function verifyJetBrainsMcpHandshake(options) {
   const timeoutMs = options.timeoutMs ?? 15e3;
   const { server } = options;
-  return new Promise((resolve16) => {
+  return new Promise((resolve17) => {
     let settled = false;
-    const finish = (ok, detail) => {
+    const finish = (ok, detail, optionalUnavailable) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
@@ -3278,7 +3495,7 @@ async function verifyJetBrainsMcpHandshake(options) {
         child.kill();
       } catch {
       }
-      resolve16({ ok, detail });
+      resolve17({ ok, detail, optionalUnavailable });
     };
     const child = (0, import_node_child_process5.spawn)(server.command, [...server.args], {
       env: { ...process.env, ...server.env },
@@ -3318,7 +3535,12 @@ async function verifyJetBrainsMcpHandshake(options) {
           finish(true, "initialize OK; tools/list OK");
         }
         if (msg.error) {
-          finish(false, `JSON-RPC error: ${JSON.stringify(msg.error)}`);
+          const errDetail = `JSON-RPC error: ${JSON.stringify(msg.error)}`;
+          if (isOptionalJetBrainsHandshakeUnavailable(errDetail)) {
+            finish(true, errDetail, true);
+          } else {
+            finish(false, errDetail);
+          }
         }
       }
     });
@@ -3347,11 +3569,11 @@ async function verifyJetBrainsMcpHandshake(options) {
 async function setupJetBrainsMcpConfig(options) {
   const homeDir = options.homeDir ?? os5.homedir();
   const globalPath = options.globalConfigPath ?? getJetBrainsGlobalMcpConfigPath(homeDir);
-  const workspaceRoot = path14.resolve(options.repoRoot);
+  const workspaceRoot = path16.resolve(options.repoRoot);
   const repairActions = [];
   const allLocations = getKnownJetBrainsMcpConfigLocations(homeDir, options.repoRoot);
   for (const location of allLocations) {
-    if (await pathExists2(location.path)) {
+    if (await pathExists3(location.path)) {
       repairActions.push({ type: "found-config", location });
     }
   }
@@ -3368,6 +3590,8 @@ async function setupJetBrainsMcpConfig(options) {
   const memoraone = await buildJetBrainsMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
+    environment: options.environment,
+    npmPackageChannel: options.npmPackageChannel,
     apiUrl: options.apiUrl,
     npxPathOverride: options.npxPathOverride,
     cliPathOverride: options.cliPathOverride
@@ -3388,24 +3612,15 @@ async function setupJetBrainsMcpConfig(options) {
       repairActions.push({ type: "removed-project-memoraone", path: location.path });
     }
   }
-  const existed = await pathExists2(globalPath);
+  const existed = await pathExists3(globalPath);
   let existing = null;
   if (existed) {
     try {
       existing = await readJsonConfig(globalPath);
     } catch {
-      if (options.dryRun) {
-        existing = null;
-      } else {
-        const backupPath2 = await backupConfigFile(globalPath);
-        repairActions.push({
-          type: "repaired-zero-byte",
-          path: globalPath,
-          backupPath: backupPath2
-        });
-        await fs11.unlink(globalPath);
-        existing = null;
-      }
+      throw new Error(
+        `[setup-ide-files] Invalid JSON in shared JetBrains MCP config (file preserved, not modified): ${globalPath}. Fix or remove the file, then re-run setup-ide-files.`
+      );
     }
   }
   const merged = mergeJetBrainsMcpConfigObject(existing, memoraone);
@@ -3426,9 +3641,8 @@ async function setupJetBrainsMcpConfig(options) {
   if (existed) {
     backupPath = await backupConfigFile(globalPath);
   }
-  await fs11.mkdir(path14.dirname(globalPath), { recursive: true });
-  await fs11.writeFile(globalPath, body, "utf8");
-  const verifyRaw = await fs11.readFile(globalPath, "utf8");
+  await writeJetBrainsMcpJsonAtomic(globalPath, body);
+  const verifyRaw = await fs12.readFile(globalPath, "utf8");
   const verifyParsed = JSON.parse(stripLeadingLineComments2(verifyRaw));
   validateJetBrainsMcpConfig(verifyParsed, memoraone);
   const outcome = existed ? "updated" : "created";
@@ -3438,122 +3652,64 @@ async function setupJetBrainsMcpConfig(options) {
   if (options.verify !== false) {
     const verify = await verifyJetBrainsMcpHandshake({ server: memoraone });
     verifyOk = verify.ok;
-    verifyDetail = verify.detail;
-    repairActions.push({ type: "verify-handshake", ok: verify.ok, detail: verify.detail });
+    verifyDetail = verify.optionalUnavailable ? formatOptionalJetBrainsHandshakeUnavailableDetail(verify.detail) : verify.detail;
+    repairActions.push({
+      type: "verify-handshake",
+      ok: verify.ok,
+      detail: verifyDetail ?? verify.detail
+    });
   }
   return { outcome, backupPath, repairActions, verifyOk, verifyDetail, memoraone };
 }
-function logJetBrainsMcpCliSummary(info, dryRun) {
+function formatJetBrainsHandshakeLogLine(action) {
+  const optional = /optional verification unavailable/i.test(action.detail) || isOptionalJetBrainsHandshakeUnavailable(action.detail);
+  if (optional) {
+    if (/optional verification unavailable/i.test(action.detail)) {
+      return `[setup-ide-files] ${action.detail}`;
+    }
+    return `[setup-ide-files] ${formatOptionalJetBrainsHandshakeUnavailableDetail(action.detail)}`;
+  }
+  if (action.ok) {
+    return `[setup-ide-files] MCP handshake verification: ${action.detail}`;
+  }
+  return `[setup-ide-files] MCP handshake verification skipped/failed: ${action.detail}`;
+}
+function logJetBrainsMcpCliSummary(info, dryRun, println = console.log) {
   for (const action of info.repairActions) {
     if (action.type === "found-config") {
-      console.log(`[setup-ide-files] Found JetBrains MCP config (${action.location.kind}): ${action.location.path}`);
+      println(`[setup-ide-files] Found JetBrains MCP config (${action.location.kind}): ${action.location.path}`);
     } else if (action.type === "repaired-zero-byte") {
-      console.log(`[setup-ide-files] Repaired zero-byte MCP config: ${action.path}`);
-      console.log(`[setup-ide-files] Backup: ${action.backupPath}`);
+      println(`[setup-ide-files] Repaired zero-byte MCP config: ${action.path}`);
+      println(`[setup-ide-files] Backup: ${action.backupPath}`);
     } else if (action.type === "backed-up-conflicting-project-config") {
-      console.log(`[setup-ide-files] Backed up conflicting project MCP config: ${action.path}`);
-      console.log(`[setup-ide-files] Backup: ${action.backupPath}`);
+      println(`[setup-ide-files] Backed up conflicting project MCP config: ${action.path}`);
+      println(`[setup-ide-files] Backup: ${action.backupPath}`);
     } else if (action.type === "removed-project-memoraone") {
-      console.log(`[setup-ide-files] Removed project-scoped memoraone definition: ${action.path}`);
+      println(`[setup-ide-files] Removed project-scoped memoraone definition: ${action.path}`);
     } else if (action.type === "verify-handshake") {
-      if (action.ok) {
-        console.log(`[setup-ide-files] MCP handshake verification: ${action.detail}`);
-      } else {
-        console.log(`[setup-ide-files] MCP handshake verification skipped/failed: ${action.detail}`);
-      }
+      println(formatJetBrainsHandshakeLogLine(action));
     }
   }
   const prefix = dryRun ? "would be " : "";
   if (info.outcome === "created") {
-    console.log(`[setup-ide-files] JetBrains global MCP config ${prefix}created: ${info.activeConfigPath}`);
+    println(`[setup-ide-files] JetBrains global MCP config ${prefix}created: ${info.activeConfigPath}`);
   } else if (info.outcome === "updated") {
-    console.log(`[setup-ide-files] JetBrains global MCP config ${prefix}updated: ${info.activeConfigPath}`);
+    println(`[setup-ide-files] JetBrains global MCP config ${prefix}updated: ${info.activeConfigPath}`);
   } else {
-    console.log(`[setup-ide-files] JetBrains global MCP config unchanged: ${info.activeConfigPath}`);
+    println(`[setup-ide-files] JetBrains global MCP config unchanged: ${info.activeConfigPath}`);
   }
   if (info.backupPath) {
-    console.log(`[setup-ide-files] JetBrains global MCP config backup: ${info.backupPath}`);
+    println(`[setup-ide-files] JetBrains global MCP config backup: ${info.backupPath}`);
   }
   if (info.npxPath) {
-    console.log(`[setup-ide-files] Resolved npx: ${info.npxPath}`);
+    println(`[setup-ide-files] Resolved npx: ${info.npxPath}`);
   }
-  console.log(`[setup-ide-files] Final active JetBrains MCP config: ${info.activeConfigPath}`);
-  console.log(
+  println(`[setup-ide-files] Final active JetBrains MCP config: ${info.activeConfigPath}`);
+  println(
     "[setup-ide-files] Fully quit JetBrains IDE and reopen this repo for MCP changes to take effect."
   );
 }
 
-// src/resolveBuiltCliPath.ts
-var fs12 = __toESM(require("fs/promises"), 1);
-var path15 = __toESM(require("path"), 1);
-var MONOREPO_CLI_REL = path15.join("packages", "mcp", "dist", "cli.cjs");
-async function pathExists3(filePath) {
-  try {
-    await fs12.access(filePath);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function findMonorepoCliFrom(startDir) {
-  let current = path15.resolve(startDir);
-  const root = path15.parse(current).root;
-  while (true) {
-    const candidate = path15.join(current, MONOREPO_CLI_REL);
-    if (await pathExists3(candidate)) {
-      return path15.resolve(candidate);
-    }
-    if (current === root) break;
-    current = path15.dirname(current);
-  }
-  return null;
-}
-async function resolveFromRunningScript() {
-  if (!process.argv[1]) return null;
-  const script = path15.resolve(process.argv[1]);
-  const base = path15.basename(script);
-  if ((base === "cli.cjs" || base === "cli.ts" || base === "memoraone-mcp.cjs") && await pathExists3(script)) {
-    return script;
-  }
-  const here = path15.dirname(script);
-  const candidates = [
-    path15.join(here, "cli.cjs"),
-    path15.join(here, "..", "dist", "cli.cjs"),
-    path15.join(here, "..", "..", "dist", "cli.cjs")
-  ];
-  for (const candidate of candidates) {
-    if (await pathExists3(candidate)) {
-      return path15.resolve(candidate);
-    }
-  }
-  return null;
-}
-async function resolveBuiltCliPathAsync(options) {
-  const preferRunning = options?.preferRunningScript !== false;
-  if (preferRunning) {
-    const fromRunning = await resolveFromRunningScript();
-    if (fromRunning) return fromRunning;
-  }
-  const searchDirs = [];
-  if (options?.searchFrom !== void 0) {
-    const dirs = Array.isArray(options.searchFrom) ? options.searchFrom : [options.searchFrom];
-    searchDirs.push(...dirs);
-  }
-  searchDirs.push(process.cwd());
-  const seen = /* @__PURE__ */ new Set();
-  for (const dir of searchDirs) {
-    const key = path15.resolve(dir);
-    if (seen.has(key)) continue;
-    seen.add(key);
-    const found = await findMonorepoCliFrom(key);
-    if (found) return found;
-  }
-  if (!preferRunning) {
-    return resolveFromRunningScript();
-  }
-  return null;
-}
-
 // src/openCursorMcpSettings.ts
 var import_node_child_process6 = require("child_process");
 var readline4 = __toESM(require("readline/promises"), 1);
@@ -3622,6 +3778,7 @@ function createTerminalPresentation(opts = {}) {
     warningSymbol,
     nextActionPrefix,
     successLine: (message) => paint(color, ANSI.green, `${successSymbol} ${message}`),
+    checkLine: (message) => `${paint(color, ANSI.green, successSymbol)} ${message}`,
     warningLine: (message) => paint(color, ANSI.yellow, `${warningSymbol} ${message}`),
     nextActionLine: (message) => `${nextActionPrefix} ${message}`,
     heading: (text) => paint(color, ANSI.bold, text),
@@ -3674,44 +3831,6 @@ async function confirmYesDefault(question, deps = {}) {
     rl.close();
   }
 }
-function collectOutcomePaths(outcomes) {
-  const created = [];
-  const updated = [];
-  for (const [file, outcome] of Object.entries(outcomes)) {
-    if (outcome === "created") created.push(file);
-    else if (outcome === "updated") updated.push(file);
-  }
-  return { created, updated };
-}
-function formatCursorSetupCompletedSummary(opts, presentation = createTerminalPresentation({ color: false, unicode: false })) {
-  const { created, updated } = collectOutcomePaths(opts.outcomes);
-  const tp = presentation;
-  const lines = [
-    tp.successLine("MemoraOne setup completed for Cursor"),
-    "",
-    tp.heading("Repository"),
-    tp.indent(tp.cyan(opts.repoRoot)),
-    "",
-    tp.heading("Changes")
-  ];
-  if (created.length === 0 && updated.length === 0) {
-    lines.push(tp.indent(tp.dim("No file changes needed")));
-  } else {
-    if (created.length) {
-      lines.push(tp.indent(`Created: ${created.join(", ")}`));
-    }
-    if (updated.length) {
-      lines.push(tp.indent(`Updated: ${updated.join(", ")}`));
-    }
-  }
-  return lines;
-}
-function printCursorSetupCompletedSummary(opts, println = console.log, presentation) {
-  const tp = presentation ?? createTerminalPresentation();
-  for (const line of formatCursorSetupCompletedSummary(opts, tp)) {
-    println(line);
-  }
-}
 function macosOpenCursorMcpSettingsAppleScript() {
   return [
     'tell application "Cursor" to activate',
@@ -3782,6 +3901,39 @@ async function runOpenCursorMcpSettingsFlow(deps = {}) {
   printManualCursorMcpSettingsSteps(platform2, println);
 }
 
+// src/setupSuccessOutput.ts
+var RESTART_LINE = "Restart your IDEs to finish setup.";
+function formatSetupSuccessLines(opts = {}) {
+  const tp = opts.presentation ?? createTerminalPresentation(opts.presentationOptions ?? { color: false, unicode: true });
+  const targets = opts.targets ?? {};
+  const lines = [];
+  if (opts.repositoryConnected) {
+    lines.push(tp.checkLine("Repository connected"));
+  }
+  if (targets.cursor) {
+    lines.push(tp.checkLine("Cursor configured"));
+  }
+  if (targets.vscode) {
+    lines.push(tp.checkLine("VS Code configured"));
+  }
+  if (targets.jetbrains) {
+    lines.push(tp.checkLine("JetBrains configured"));
+  }
+  const hasIde = Boolean(targets.cursor || targets.vscode || targets.jetbrains);
+  lines.push("");
+  lines.push(tp.checkLine("MemoraOne is ready"));
+  if (hasIde) {
+    lines.push("");
+    lines.push(RESTART_LINE);
+  }
+  return lines;
+}
+function printSetupSuccess(opts, println = console.log) {
+  for (const line of formatSetupSuccessLines(opts)) {
+    println(line);
+  }
+}
+
 // src/setupIdeFiles.ts
 var MANAGED_MARKER = "<!-- MemoraOne managed IDE helper -->";
 function buildMemoraoneMcpServer(ideType, options = {}) {
@@ -3795,7 +3947,7 @@ function buildMemoraoneMcpServer(ideType, options = {}) {
       throw new Error("[setup-ide-files] Local VS Code MCP config requires a built CLI path.");
     }
     if (options.workspaceRoot !== void 0) {
-      env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path16.resolve(options.workspaceRoot);
+      env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path17.resolve(options.workspaceRoot);
     }
     return {
       command: "node",
@@ -3803,16 +3955,17 @@ function buildMemoraoneMcpServer(ideType, options = {}) {
       env: env2
     };
   }
+  const channel = options.npmPackageChannel ?? npmPackageChannelFromEnvironment(environment);
   return {
     command: options.command ?? "npx",
-    args: ["-y", "@memoraone/mcp@latest"],
+    args: ["-y", memoraoneNpmPackageSpec(channel)],
     env: env2
   };
 }
 function assertUnderRepoRoot(repoRoot, absPath) {
-  const normRoot = path16.resolve(repoRoot) + path16.sep;
-  const normPath = path16.resolve(absPath);
-  if (normPath !== path16.resolve(repoRoot) && !normPath.startsWith(normRoot)) {
+  const normRoot = path17.resolve(repoRoot) + path17.sep;
+  const normPath = path17.resolve(absPath);
+  if (normPath !== path17.resolve(repoRoot) && !normPath.startsWith(normRoot)) {
     throw new Error(`[setup-ide-files] Refusing to write outside repo root: ${absPath}`);
   }
 }
@@ -3828,18 +3981,18 @@ async function ensureGitignoreMemoraone(_repoRoot, _opts) {
   return "skipped";
 }
 async function findRepoRoot(startDir) {
-  let current = path16.resolve(startDir);
-  const root = path16.parse(current).root;
+  let current = path17.resolve(startDir);
+  const root = path17.parse(current).root;
   while (true) {
-    const gitPath = path16.join(current, ".git");
-    const m1Path = path16.join(current, "memoraone.m1");
+    const gitPath = path17.join(current, ".git");
+    const m1Path = path17.join(current, "memoraone.m1");
     if (await pathExists4(gitPath) || await pathExists4(m1Path)) {
       return current;
     }
     if (current === root) {
       return null;
     }
-    current = path16.dirname(current);
+    current = path17.dirname(current);
   }
 }
 function stripLeadingLineComments3(text) {
@@ -3888,16 +4041,44 @@ function mcpJsonHeader() {
 function buildVscodeMcpJsonBody(existing, options = {}) {
   const base = existing && typeof existing === "object" ? { ...existing } : { servers: {} };
   const servers = typeof base.servers === "object" && base.servers !== null && !Array.isArray(base.servers) ? { ...base.servers } : {};
+  delete servers.memoraone;
   servers.memoraone = buildMemoraoneMcpServer("copilot-vscode", options);
   const merged = { ...base, servers };
   return mcpJsonHeader() + JSON.stringify(merged, null, 2) + "\n";
 }
+async function writeSharedMcpJsonAtomic(filePath, content) {
+  const dir = path17.dirname(filePath);
+  await fs13.mkdir(dir, { recursive: true });
+  const tmpPath = path17.join(
+    dir,
+    `.${path17.basename(filePath)}.${process.pid}.${(0, import_node_crypto5.randomBytes)(8).toString("hex")}.tmp`
+  );
+  try {
+    await fs13.writeFile(tmpPath, content, "utf8");
+    await fs13.rename(tmpPath, filePath);
+  } catch (err) {
+    try {
+      await fs13.unlink(tmpPath);
+    } catch {
+    }
+    throw err;
+  }
+}
+var SharedMcpJsonParseError = class extends Error {
+  constructor(configPath) {
+    super(
+      `[setup-ide-files] Invalid JSON in shared MCP config (file preserved, not modified): ${configPath}. Fix or remove the file, then re-run setup-ide-files.`
+    );
+    this.name = "SharedMcpJsonParseError";
+    this.configPath = configPath;
+  }
+};
 function buildCursorMcpJsonBody(existing, writeOptions) {
   const merged = mergeCursorRepoMcpConfigObject(existing, writeOptions);
   return mcpJsonHeader() + JSON.stringify(merged, null, 2) + "\n";
 }
 async function writeManagedMarkdown(repoRoot, relPath, fullContent, opts) {
-  const abs = path16.join(repoRoot, relPath);
+  const abs = path17.join(repoRoot, relPath);
   assertUnderRepoRoot(repoRoot, abs);
   let prior = "";
   let existed = false;
@@ -3909,25 +4090,25 @@ async function writeManagedMarkdown(repoRoot, relPath, fullContent, opts) {
   }
   if (!existed) {
     if (opts.dryRun) return "created";
-    await fs13.mkdir(path16.dirname(abs), { recursive: true });
+    await fs13.mkdir(path17.dirname(abs), { recursive: true });
     await fs13.writeFile(abs, fullContent, "utf8");
     return "created";
   }
   if (prior.includes(MANAGED_MARKER)) {
     if (prior === fullContent) return "skipped";
     if (opts.dryRun) return "updated";
-    await fs13.mkdir(path16.dirname(abs), { recursive: true });
+    await fs13.mkdir(path17.dirname(abs), { recursive: true });
     await fs13.writeFile(abs, fullContent, "utf8");
     return "updated";
   }
   if (!opts.force) return "skipped-untracked";
   if (opts.dryRun) return "updated";
-  await fs13.mkdir(path16.dirname(abs), { recursive: true });
+  await fs13.mkdir(path17.dirname(abs), { recursive: true });
   await fs13.writeFile(abs, fullContent, "utf8");
   return "updated";
 }
 async function writeIdeMcpJson(repoRoot, relPath, buildBody, opts) {
-  const abs = path16.join(repoRoot, relPath);
+  const abs = path17.join(repoRoot, relPath);
   assertUnderRepoRoot(repoRoot, abs);
   let raw = "";
   let existed = false;
@@ -3940,24 +4121,24 @@ async function writeIdeMcpJson(repoRoot, relPath, buildBody, opts) {
   if (!existed) {
     const body = buildBody(null);
     if (opts.dryRun) return "created";
-    await fs13.mkdir(path16.dirname(abs), { recursive: true });
-    await fs13.writeFile(abs, body, "utf8");
+    await writeSharedMcpJsonAtomic(abs, body);
     return "created";
   }
   const managed = raw.includes(MANAGED_MARKER);
   if (!managed && !opts.force) return "skipped-untracked";
-  let parsed2 = null;
+  let parsed2;
   try {
     parsed2 = JSON.parse(stripLeadingLineComments3(raw));
   } catch {
-    parsed2 = null;
+    throw new SharedMcpJsonParseError(abs);
+  }
+  if (!parsed2 || typeof parsed2 !== "object" || Array.isArray(parsed2)) {
+    throw new SharedMcpJsonParseError(abs);
   }
-  if (!parsed2 && !opts.force) return "skipped-untracked";
   const next = buildBody(parsed2);
   if (managed && next === raw) return "skipped";
   if (opts.dryRun) return "updated";
-  await fs13.mkdir(path16.dirname(abs), { recursive: true });
-  await fs13.writeFile(abs, next, "utf8");
+  await writeSharedMcpJsonAtomic(abs, next);
   return "updated";
 }
 function parseSetupIdeFlags(argv) {
@@ -3973,6 +4154,7 @@ function parseSetupIdeFlags(argv) {
   let repair = false;
   let local = false;
   let staging = false;
+  let verbose = false;
   let workspaceRoot;
   let apiUrl;
   const unknown = [];
@@ -3991,6 +4173,7 @@ function parseSetupIdeFlags(argv) {
     else if (a === "--repair") repair = true;
     else if (a === "--local") local = true;
     else if (a === "--staging") staging = true;
+    else if (a === "--verbose") verbose = true;
     else if (a === "--workspace-root") {
       const value = argv[++i];
       if (!value || value.startsWith("-")) {
@@ -4048,22 +4231,48 @@ function parseSetupIdeFlags(argv) {
     workspaceRoot,
     apiUrl,
     explicitCursor: cursor,
+    verbose,
     unknown,
     flagError
   };
 }
-async function resolveSetupApiUrl(o, repoRoot, localOrDev) {
-  if (o.apiUrl) return normalizeApiUrl(o.apiUrl);
-  if (!localOrDev) return void 0;
+function logSetupIdeFilesVerboseSuccess(opts, println = console.log) {
+  const { targets, dryRun, result } = opts;
+  if (result.repoRoot) {
+    println(`[setup-ide-files] Repo root: ${result.repoRoot}`);
+  }
+  if (result.daemonCleanup && !result.daemonCleanup.skipped) {
+    logSetupIdeCleanupSummary(result.daemonCleanup, println);
+  }
+  if (targets.cursor && result.cursorMcp) {
+    logCursorMcpCliSummary(result.cursorMcp, dryRun, {
+      forInteractivePostSetup: opts.forInteractivePostSetup,
+      println
+    });
+  }
+  if (targets.jetbrains && result.jetbrainsMcp) {
+    logJetBrainsMcpCliSummary(result.jetbrainsMcp, dryRun, println);
+  }
+  summarizeOutcomes(result.outcomes, println);
+  if (dryRun) {
+    println("[setup-ide-files] Dry run: no files written.");
+    if (result.daemonCleanup && !result.daemonCleanup.skipped) {
+      println("[setup-ide-files] Dry run: no daemons stopped, no sockets removed.");
+    }
+  }
+  println(`[setup-ide-files] ${restartIdeInstruction(targets)}`);
+}
+async function resolveSetupApiUrl(o, repoRoot) {
+  if (o.apiUrl) return normalizeApiUrl2(o.apiUrl);
   const binding = await findBindingRecordByWorkspaceRoot(repoRoot, o.homeDir);
-  if (binding?.apiUrl) return normalizeApiUrl(binding.apiUrl);
+  if (binding?.apiUrl) return normalizeApiUrl2(binding.apiUrl);
   return void 0;
 }
 async function persistBindingApiUrl(repoRoot, apiUrl, homeDir, dryRun) {
   if (dryRun) return;
   const binding = await findBindingRecordByWorkspaceRoot(repoRoot, homeDir);
   if (!binding) return;
-  const normalized = normalizeApiUrl(apiUrl);
+  const normalized = normalizeApiUrl2(apiUrl);
   if (binding.apiUrl === normalized) return;
   await writeBindingRecord(
     {
@@ -4079,7 +4288,7 @@ function cursorEnvironmentFromFlags(local, staging) {
   if (staging) return "staging";
   return "production";
 }
-function summarizeOutcomes(outcomes) {
+function summarizeOutcomes(outcomes, println = console.log) {
   const created = [];
   const updated = [];
   const skipped = [];
@@ -4097,7 +4306,7 @@ function summarizeOutcomes(outcomes) {
   if (skippedUntracked.length) {
     lines.push(`  skipped (unmanaged existing file, use --force): ${skippedUntracked.join(", ")}`);
   }
-  console.log(lines.join("\n"));
+  println(lines.join("\n"));
 }
 function ideTypesFromSetupTargets(targets) {
   const ides = [];
@@ -4138,28 +4347,28 @@ function aggregateCleanupResults(results) {
     error
   };
 }
-function logSetupIdeCleanupSummary(cleanup) {
+function logSetupIdeCleanupSummary(cleanup, println = console.log) {
   if (cleanup.skipped) return;
-  console.log(`[setup-ide-files] Project id: ${cleanup.projectId}`);
+  println(`[setup-ide-files] Project id: ${cleanup.projectId}`);
   if (cleanup.foundDaemonCount > 0) {
-    console.log(`[setup-ide-files] Found ${cleanup.foundDaemonCount} stale daemon(s)`);
+    println(`[setup-ide-files] Found ${cleanup.foundDaemonCount} stale daemon(s)`);
     if (cleanup.dryRun) {
-      console.log(`[setup-ide-files] Would stop ${cleanup.foundDaemonCount} stale daemon(s)`);
+      println(`[setup-ide-files] Would stop ${cleanup.foundDaemonCount} stale daemon(s)`);
     } else if (cleanup.stoppedDaemonCount > 0) {
-      console.log(`[setup-ide-files] Stopped ${cleanup.stoppedDaemonCount} stale daemon(s)`);
+      println(`[setup-ide-files] Stopped ${cleanup.stoppedDaemonCount} stale daemon(s)`);
     }
   } else {
-    console.log("[setup-ide-files] No stale daemons found for this project and IDE target(s).");
+    println("[setup-ide-files] No stale daemons found for this project and IDE target(s).");
   }
   if (cleanup.removedSocketCount > 0) {
     if (cleanup.dryRun) {
-      console.log(`[setup-ide-files] Would remove ${cleanup.removedSocketCount} stale socket(s)`);
+      println(`[setup-ide-files] Would remove ${cleanup.removedSocketCount} stale socket(s)`);
     } else {
-      console.log(`[setup-ide-files] Removed ${cleanup.removedSocketCount} stale socket(s)`);
+      println(`[setup-ide-files] Removed ${cleanup.removedSocketCount} stale socket(s)`);
     }
   }
   if (cleanup.skippedUnrelatedDaemonCount > 0) {
-    console.log(
+    println(
       `[setup-ide-files] Skipped ${cleanup.skippedUnrelatedDaemonCount} unrelated project daemon(s)`
     );
   }
@@ -4238,7 +4447,7 @@ async function runSetupIdeFiles(o) {
   const outcomes = {};
   let cursorMcp;
   let jetbrainsMcp;
-  const repoRoot = o.workspaceRoot !== void 0 && o.workspaceRoot !== "" ? path16.resolve(o.workspaceRoot) : await findRepoRoot(o.cwd);
+  const repoRoot = o.workspaceRoot !== void 0 && o.workspaceRoot !== "" ? path17.resolve(o.workspaceRoot) : await findRepoRoot(o.cwd);
   if (!repoRoot) {
     return {
       exitCode: 1,
@@ -4274,12 +4483,13 @@ async function runSetupIdeFiles(o) {
   });
   const cursorEnvironment = o.cursorEnvironment ?? "production";
   const localOrDev = cursorEnvironment === "local" || Boolean(o.devMode);
-  const resolvedApiUrl2 = await resolveSetupApiUrl(o, repoRoot, localOrDev);
+  const npmPackageChannel = o.npmPackageChannel ?? npmPackageChannelFromEnvironment(cursorEnvironment);
+  const resolvedApiUrl2 = await resolveSetupApiUrl(o, repoRoot);
   const effectiveApiUrl = resolveIdeApiUrl({
     environment: localOrDev ? "local" : cursorEnvironment,
     apiUrl: resolvedApiUrl2
   });
-  if (localOrDev && !o.dryRun) {
+  if (!o.dryRun && resolvedApiUrl2) {
     await persistBindingApiUrl(repoRoot, effectiveApiUrl, o.homeDir, o.dryRun);
   }
   const cursorContent = `---
@@ -4324,7 +4534,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
       npxPath: npxPath ?? void 0,
       cliPath,
       repoRoot,
-      apiUrl: resolvedApiUrl2
+      apiUrl: resolvedApiUrl2,
+      npmPackageChannel
     };
     outcomes[".cursor/rules/memoraone-mcp.mdc"] = await writeManagedMarkdown(
       repoRoot,
@@ -4332,12 +4543,22 @@ description: MemoraOne MCP \u2014 IDE agent instructions
       cursorContent,
       { force: o.force, dryRun: o.dryRun }
     );
-    outcomes[".cursor/mcp.json"] = await writeIdeMcpJson(
-      repoRoot,
-      ".cursor/mcp.json",
-      (existing) => buildCursorMcpJsonBody(existing, cursorWriteOptions),
-      { force: o.force, dryRun: o.dryRun }
-    );
+    try {
+      outcomes[".cursor/mcp.json"] = await writeIdeMcpJson(
+        repoRoot,
+        ".cursor/mcp.json",
+        (existing) => buildCursorMcpJsonBody(existing, cursorWriteOptions),
+        { force: o.force, dryRun: o.dryRun }
+      );
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      return {
+        exitCode: 1,
+        repoRoot,
+        outcomes,
+        error: message
+      };
+    }
     const repoConfigPath = getCursorRepoMcpConfigPath(repoRoot);
     const repoOutcome = outcomes[".cursor/mcp.json"] ?? "skipped";
     let globalConfigPath;
@@ -4386,7 +4607,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
     };
   }
   if (o.targets.vscode) {
-    const vscodeEnvironment = localOrDev ? "local" : "production";
+    const vscodeEnvironment = localOrDev ? "local" : cursorEnvironment === "staging" ? "staging" : "production";
     let vscodeCliPath;
     if (vscodeEnvironment === "local") {
       let resolvedCliPath = o.cursorLocalCliPathOverride;
@@ -4407,20 +4628,32 @@ description: MemoraOne MCP \u2014 IDE agent instructions
       }
       vscodeCliPath = resolvedCliPath;
     }
-    outcomes[".vscode/mcp.json"] = await writeIdeMcpJson(
-      repoRoot,
-      ".vscode/mcp.json",
-      (existing) => buildVscodeMcpJsonBody(existing, {
-        environment: vscodeEnvironment,
-        apiUrl: resolvedApiUrl2,
-        cliPath: vscodeCliPath,
-        workspaceRoot: vscodeEnvironment === "local" ? repoRoot : void 0
-      }),
-      {
-        force: o.force,
-        dryRun: o.dryRun
-      }
-    );
+    try {
+      outcomes[".vscode/mcp.json"] = await writeIdeMcpJson(
+        repoRoot,
+        ".vscode/mcp.json",
+        (existing) => buildVscodeMcpJsonBody(existing, {
+          environment: vscodeEnvironment,
+          apiUrl: resolvedApiUrl2,
+          cliPath: vscodeCliPath,
+          workspaceRoot: vscodeEnvironment === "local" ? repoRoot : void 0,
+          npmPackageChannel
+        }),
+        {
+          force: o.force,
+          dryRun: o.dryRun
+        }
+      );
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      return {
+        exitCode: 1,
+        repoRoot,
+        outcomes,
+        cursorMcp,
+        error: message
+      };
+    }
     outcomes[".github/copilot-instructions.md"] = await writeManagedMarkdown(
       repoRoot,
       ".github/copilot-instructions.md",
@@ -4443,8 +4676,11 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         repoRoot,
         globalConfigPath: activePath,
         dryRun: o.dryRun,
-        // Connect/local repair passes --dev so JetBrains gets the same backend URL + local CLI.
-        devMode: o.devMode,
+        // Local dogfood: --dev / local environment → node + built CLI.
+        // Published staging/production: npx + channel-specific package spec.
+        devMode: localOrDev,
+        environment: localOrDev ? "local" : cursorEnvironment,
+        npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         repair: o.repair ?? false,
         verify: o.verifyHandshake ?? !o.dryRun,
@@ -4489,6 +4725,7 @@ async function cliSetupIdeFiles(argv, options = {}) {
     workspaceRoot,
     apiUrl,
     explicitCursor,
+    verbose,
     unknown,
     flagError
   } = parseSetupIdeFlags(argv);
@@ -4504,6 +4741,7 @@ async function cliSetupIdeFiles(argv, options = {}) {
   const openDeps = options.openCursorMcpSettings ?? {};
   const stdinIsTty = openDeps.stdinIsTty ?? process.stdin.isTTY === true;
   const env2 = openDeps.env ?? process.env;
+  const println = options.println ?? openDeps.println ?? console.log;
   const promptOpenCursorSettings = shouldPromptOpenCursorMcpSettings({
     explicitCursor,
     all,
@@ -4511,6 +4749,7 @@ async function cliSetupIdeFiles(argv, options = {}) {
     stdinIsTty,
     env: env2
   });
+  const cursorEnvironment = cursorEnvironmentFromFlags(local, staging);
   const result = await runSetupIdeFiles({
     cwd: cwd2,
     workspaceRoot,
@@ -4520,62 +4759,50 @@ async function cliSetupIdeFiles(argv, options = {}) {
     noGitignore: options.setupOverrides?.noGitignore ?? noGitignore,
     devMode,
     repair,
-    cursorEnvironment: cursorEnvironmentFromFlags(local, staging),
+    cursorEnvironment,
+    npmPackageChannel: npmPackageChannelFromEnvironment(cursorEnvironment),
     apiUrl,
     ...options.setupOverrides
   });
   if (result.error) {
     console.error(result.error);
     if (result.repoRoot) {
-      console.log(`[setup-ide-files] Repo root: ${result.repoRoot}`);
+      println(`[setup-ide-files] Repo root: ${result.repoRoot}`);
     }
     summarizeOutcomes(result.outcomes);
     return result.exitCode;
   }
-  if (result.repoRoot) {
-    console.log(`[setup-ide-files] Repo root: ${result.repoRoot}`);
-  }
-  if (result.daemonCleanup && !result.daemonCleanup.skipped) {
-    logSetupIdeCleanupSummary(result.daemonCleanup);
-  }
-  if (targets.cursor && result.cursorMcp) {
-    logCursorMcpCliSummary(result.cursorMcp, dryRun, {
-      forInteractivePostSetup: promptOpenCursorSettings
-    });
-  }
-  if (targets.jetbrains && result.jetbrainsMcp) {
-    logJetBrainsMcpCliSummary(result.jetbrainsMcp, dryRun);
+  const presentation = openDeps.presentation ?? createTerminalPresentation({
+    env: env2,
+    stdoutIsTty: openDeps.stdoutIsTty ?? process.stdout.isTTY === true,
+    color: openDeps.color,
+    unicode: openDeps.unicode
+  });
+  const showVerbose = verbose || dryRun;
+  if (showVerbose) {
+    logSetupIdeFilesVerboseSuccess(
+      {
+        targets,
+        dryRun,
+        result,
+        forInteractivePostSetup: promptOpenCursorSettings
+      },
+      println
+    );
+  } else {
+    printSetupSuccess({ targets, presentation }, println);
   }
   if (promptOpenCursorSettings && result.repoRoot) {
-    const presentation = openDeps.presentation ?? createTerminalPresentation({
-      env: env2,
-      stdoutIsTty: openDeps.stdoutIsTty ?? process.stdout.isTTY === true,
-      color: openDeps.color,
-      unicode: openDeps.unicode
-    });
-    printCursorSetupCompletedSummary(
-      { repoRoot: result.repoRoot, outcomes: result.outcomes },
-      openDeps.println,
-      presentation
-    );
     await runOpenCursorMcpSettingsFlow({
       ...openDeps,
       stdinIsTty,
       env: env2,
-      presentation
+      presentation,
+      println
     });
-  } else {
-    summarizeOutcomes(result.outcomes);
-    if (dryRun) {
-      console.log("[setup-ide-files] Dry run: no files written.");
-      if (result.daemonCleanup && !result.daemonCleanup.skipped) {
-        console.log("[setup-ide-files] Dry run: no daemons stopped, no sockets removed.");
-      }
-    }
-    console.log(`[setup-ide-files] ${restartIdeInstruction(targets)}`);
   }
   if (cleanup) {
-    console.log("[setup-ide-files] Running additional full-project cleanup (--cleanup)...");
+    println("[setup-ide-files] Running additional full-project cleanup (--cleanup)...");
     const cleanupResult = await runCleanup({
       cwd: cwd2,
       dryRun,
@@ -4591,16 +4818,16 @@ async function cliSetupIdeFiles(argv, options = {}) {
 }
 
 // src/localState/connectCommand.ts
-var path19 = __toESM(require("path"), 1);
+var path20 = __toESM(require("path"), 1);
 var os7 = __toESM(require("os"), 1);
 
 // src/config.ts
 var process2 = __toESM(require("process"), 1);
 var fs14 = __toESM(require("fs"), 1);
-var path17 = __toESM(require("path"), 1);
+var path18 = __toESM(require("path"), 1);
 var dotenv = __toESM(require("dotenv"), 1);
 var import_v4 = require("zod/v4");
-var dotenvPath = path17.resolve(process2.cwd(), ".env");
+var dotenvPath = path18.resolve(process2.cwd(), ".env");
 if (fs14.existsSync(dotenvPath)) {
   try {
     dotenv.config({ path: dotenvPath });
@@ -4669,7 +4896,7 @@ var config2 = {
 
 // src/repoFingerprint.ts
 var fs15 = __toESM(require("fs"), 1);
-var path18 = __toESM(require("path"), 1);
+var path19 = __toESM(require("path"), 1);
 var crypto2 = __toESM(require("crypto"), 1);
 var parseBooleanFlag3 = (value) => {
   if (!value) {
@@ -4708,7 +4935,7 @@ var resolveGitDir = (gitPath) => {
       const match = content.match(/^gitdir:\s*(.+)$/m);
       if (match) {
         const gitDir = match[1].trim();
-        return path18.resolve(path18.dirname(gitPath), gitDir);
+        return path19.resolve(path19.dirname(gitPath), gitDir);
       }
     }
   } catch {
@@ -4717,16 +4944,16 @@ var resolveGitDir = (gitPath) => {
   return null;
 };
 var findGitRoot = (start) => {
-  let current = path18.resolve(start);
+  let current = path19.resolve(start);
   while (true) {
-    const gitPath = path18.join(current, ".git");
+    const gitPath = path19.join(current, ".git");
     if (fs15.existsSync(gitPath)) {
       const gitDir = resolveGitDir(gitPath);
       if (gitDir) {
         return { gitRoot: current, gitDir };
       }
     }
-    const parent = path18.dirname(current);
+    const parent = path19.dirname(current);
     if (parent === current) {
       break;
     }
@@ -4735,7 +4962,7 @@ var findGitRoot = (start) => {
   return null;
 };
 var readOriginRemote = (gitDir) => {
-  const configPath = path18.join(gitDir, "config");
+  const configPath = path19.join(gitDir, "config");
   try {
     const content = fs15.readFileSync(configPath, "utf8");
     const lines = content.split(/\r?\n/);
@@ -4761,7 +4988,7 @@ var readOriginRemote = (gitDir) => {
 function resolveRepoFingerprint(cwd2) {
   const found = findGitRoot(cwd2);
   if (!found) {
-    const fallbackPath = path18.resolve(cwd2);
+    const fallbackPath = path19.resolve(cwd2);
     const fingerprint2 = sha256(fallbackPath);
     debugLog(`repo fingerprint=${fingerprint2} source=path-fallback`);
     return {
@@ -4783,7 +5010,7 @@ function resolveRepoFingerprint(cwd2) {
       source: "git-remote"
     };
   }
-  const fingerprint = sha256(path18.resolve(gitRoot));
+  const fingerprint = sha256(path19.resolve(gitRoot));
   debugLog(`repo fingerprint=${fingerprint} source=path-fallback`);
   return {
     fingerprint,
@@ -4809,16 +5036,32 @@ function normalizeGitRemote(remoteUrl) {
   normalized = normalized.replace(/\/+$/, "");
   return normalized.toLowerCase() || null;
 }
-function formatIdeSetupRepairHint(workspaceRoot, cliPath) {
-  const cli = cliPath ?? "<path-to-packages/mcp/dist/cli.cjs>";
-  return `Repair with (no new connect code): node ${cli} setup-ide-files --all --local --dev --force --workspace-root ${workspaceRoot}`;
-}
 async function runConnectCommand(options) {
   const code = normalizeConnectCode(options.code);
-  const cwd2 = path19.resolve(options.cwd ?? process.cwd());
+  const cwd2 = path20.resolve(options.cwd ?? process.cwd());
   const apiUrl = (options.apiUrl ?? config2.apiUrl).replace(/\/+$/, "");
   const homeDir = options.homeDir ?? os7.homedir();
   const environment = "local";
+  const executionMode = await resolvePackageExecutionMode({
+    executionMode: options.executionMode,
+    // Only honor an explicit caller cliPath; never auto-resolve before mode detection
+    // (published installs must not be forced into local monorepo mode).
+    cliPath: options.cliPath,
+    apiUrl,
+    scriptPath: options.scriptPath,
+    env: options.env,
+    resolveBuiltCliPath: resolveBuiltCliPathAsync
+  });
+  let resolvedMode = executionMode;
+  if (resolvedMode.kind === "local" && !resolvedMode.cliPath) {
+    const cliPath = await resolveBuiltCliPathAsync();
+    if (!cliPath) {
+      throw new Error(
+        "[memoraone-mcp] Local connect requires a built CLI at packages/mcp/dist/cli.cjs. Run pnpm build first."
+      );
+    }
+    resolvedMode = { kind: "local", cliPath };
+  }
   const ensured = await ensureRepositoryBindingForRoot(cwd2, {
     homeDir,
     identityDeps: options.identityDeps,
@@ -4826,7 +5069,7 @@ async function runConnectCommand(options) {
   });
   if (ensured.legacyM1WarningPath) {
     process.stderr.write(
-      `[memoraone-mcp] warning: ignoring legacy ${path19.basename(ensured.legacyM1WarningPath)} at ${ensured.legacyM1WarningPath} (credentials and binding are package-managed)
+      `[memoraone-mcp] warning: ignoring legacy ${path20.basename(ensured.legacyM1WarningPath)} at ${ensured.legacyM1WarningPath} (credentials and binding are package-managed)
 `
     );
   }
@@ -4902,7 +5145,7 @@ async function runConnectCommand(options) {
   if (options.configureIdes !== false) {
     const targets = { cursor: true, vscode: true, jetbrains: true };
     const setup = options.setupIdeFiles ?? runSetupIdeFiles;
-    const cliPath = options.cliPath !== void 0 ? options.cliPath : await resolveBuiltCliPathAsync();
+    const modeSetup = setupOptionsFromPackageExecutionMode(resolvedMode);
     let setupResult;
     try {
       setupResult = await setup({
@@ -4915,12 +5158,9 @@ async function runConnectCommand(options) {
         noGitignore: true,
         skipDaemonCleanup: true,
         homeDir,
-        cursorEnvironment: "local",
-        devMode: true,
-        // Propagate the same backend endpoint used for redeem into all IDE configs.
+        // Propagate the redeemed binding API URL (backend only — not execution mode).
         apiUrl,
-        cursorLocalCliPathOverride: cliPath,
-        cliPathOverride: cliPath,
+        ...modeSetup,
         ...options.setupIdeOptions
       });
     } catch (err) {
@@ -4934,7 +5174,7 @@ async function runConnectCommand(options) {
     }
     if (setupResult.exitCode !== 0) {
       const detail = setupResult.error ?? "unknown IDE setup error";
-      const repair = formatIdeSetupRepairHint(cwd2, cliPath);
+      const repair = formatIdeSetupRepairHint(cwd2, resolvedMode);
       return {
         exitCode: 1,
         repositoryBindingId: ensured.repositoryBindingId,
@@ -4944,9 +5184,23 @@ async function runConnectCommand(options) {
         createdBinding: ensured.created,
         legacyM1WarningPath: ensured.legacyM1WarningPath,
         ideSetupError: detail,
+        executionMode: resolvedMode,
         message: `Repository connection exists for binding ${ensured.repositoryBindingId} (project ${redeemed.project_id}), but IDE configuration failed: ${detail}. Credentials and binding were kept. ${repair}`
       };
     }
+    return {
+      exitCode: 0,
+      repositoryBindingId: ensured.repositoryBindingId,
+      projectId: redeemed.project_id,
+      installationPublicId: redeemed.installation_public_id,
+      recovered: redeemed.recovered,
+      createdBinding: ensured.created,
+      legacyM1WarningPath: ensured.legacyM1WarningPath,
+      executionMode: resolvedMode,
+      configuredTargets: targets,
+      setupResult,
+      message: baseSuccess
+    };
   }
   return {
     exitCode: 0,
@@ -4956,18 +5210,27 @@ async function runConnectCommand(options) {
     recovered: redeemed.recovered,
     createdBinding: ensured.created,
     legacyM1WarningPath: ensured.legacyM1WarningPath,
+    executionMode: resolvedMode,
     message: baseSuccess
   };
 }
 function parseConnectArgv(argv) {
   let code;
   let apiUrl;
+  let verbose = false;
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
+    if (a === "--verbose") {
+      verbose = true;
+      continue;
+    }
     if (a === "--api-url") {
       const value = argv[++i];
       if (!value || value.startsWith("-")) {
-        return { error: "Usage: memoraone-mcp connect <code> [--api-url <url>]" };
+        return {
+          verbose,
+          error: "Usage: memoraone-mcp connect <code> [--api-url <url>] [--verbose]"
+        };
       }
       apiUrl = value;
       continue;
@@ -4975,23 +5238,29 @@ function parseConnectArgv(argv) {
     if (a.startsWith("--api-url=")) {
       const value = a.slice("--api-url=".length);
       if (!value) {
-        return { error: "Usage: memoraone-mcp connect <code> [--api-url <url>]" };
+        return {
+          verbose,
+          error: "Usage: memoraone-mcp connect <code> [--api-url <url>] [--verbose]"
+        };
       }
       apiUrl = value;
       continue;
     }
     if (a.startsWith("-")) {
-      return { error: `Unknown connect option: ${a}` };
+      return { verbose, error: `Unknown connect option: ${a}` };
     }
     if (!code) {
       code = a;
       continue;
     }
-    return { error: "Usage: memoraone-mcp connect <code> [--api-url <url>]" };
+    return {
+      verbose,
+      error: "Usage: memoraone-mcp connect <code> [--api-url <url>] [--verbose]"
+    };
   }
-  return { code, apiUrl };
+  return { code, apiUrl, verbose };
 }
-async function cliConnect(argv) {
+async function cliConnect(argv, options = {}) {
   const parsed2 = parseConnectArgv(argv);
   if (parsed2.error) {
     process.stderr.write(`${parsed2.error}
@@ -4999,19 +5268,53 @@ async function cliConnect(argv) {
     return 1;
   }
   if (!parsed2.code) {
-    process.stderr.write("Usage: memoraone-mcp connect <code> [--api-url <url>]\n");
+    process.stderr.write("Usage: memoraone-mcp connect <code> [--api-url <url>] [--verbose]\n");
     return 1;
   }
+  const println = options.println ?? ((line) => process.stdout.write(`${line}
+`));
   try {
     const result = await runConnectCommand({
       code: parsed2.code,
-      cwd: process.cwd(),
+      cwd: options.cwd ?? process.cwd(),
       apiUrl: parsed2.apiUrl,
-      packageVersion: process.env.npm_package_version ?? null
+      packageVersion: process.env.npm_package_version ?? null,
+      env: options.env,
+      ...options.connectOptions
     });
     if (result.exitCode === 0) {
-      process.stdout.write(`${result.message}
-`);
+      if (parsed2.verbose) {
+        println(result.message);
+        if (result.projectId) {
+          println(`[memoraone-mcp] Project id: ${result.projectId}`);
+        }
+        println(`[memoraone-mcp] Repository root: ${options.cwd ?? process.cwd()}`);
+        if (result.setupResult && result.configuredTargets) {
+          logSetupIdeFilesVerboseSuccess(
+            {
+              targets: result.configuredTargets,
+              dryRun: false,
+              result: result.setupResult
+            },
+            println
+          );
+        }
+      } else {
+        const presentation = createTerminalPresentation({
+          env: options.env ?? process.env,
+          stdoutIsTty: options.stdoutIsTty ?? process.stdout.isTTY === true,
+          color: options.color,
+          unicode: options.unicode
+        });
+        printSetupSuccess(
+          {
+            repositoryConnected: true,
+            targets: result.configuredTargets,
+            presentation
+          },
+          println
+        );
+      }
     } else {
       process.stderr.write(`[memoraone-mcp] ${result.message}
 `);
@@ -5033,7 +5336,7 @@ if (args.includes("--version") || args.includes("-v")) {
 }
 if (args.includes("--help") || args.includes("-h")) {
   console.log(
-    "Usage: memoraone-mcp [--version] [--help]\n       memoraone-mcp connect <code> [--api-url <url>]\n       memoraone-mcp [--daemon --binding-id <mrb_\u2026> [--ide cursor|copilot-vscode|jetbrains]]\n       memoraone-mcp setup-ide-files [--all|--cursor|--vscode|--jetbrains] [--force] [--dry-run] [--no-gitignore] [--cleanup] [--dev] [--repair] [--workspace-root <path>] [--api-url <url>]\n         Cursor API environment (with --cursor or --all): --local (node + built cli.cjs + local API) | --staging (npx + staging API)\n         --workspace-root: configure an explicit bound workspace (skips .git discovery; for fileless Local MCP repair)\n         --api-url: developer-only local/dev API endpoint (defaults from binding or http://localhost:3001; never Studio :3000)\n       memoraone-mcp cleanup [--project-id <uuid>] [--ide cursor|copilot-vscode|jetbrains] [--dry-run] [--all-projects] [--yes]"
+    "Usage: memoraone-mcp [--version] [--help]\n       memoraone-mcp connect <code> [--api-url <url>] [--verbose]\n       memoraone-mcp [--daemon --binding-id <mrb_\u2026> [--ide cursor|copilot-vscode|jetbrains]]\n       memoraone-mcp setup-ide-files [--all|--cursor|--vscode|--jetbrains] [--force] [--dry-run] [--no-gitignore] [--cleanup] [--dev] [--repair] [--workspace-root <path>] [--api-url <url>] [--verbose]\n         Cursor API environment (with --cursor or --all): --local (node + built cli.cjs + local API) | --staging (npx + staging API)\n         --workspace-root: configure an explicit bound workspace (skips .git discovery; for fileless Local MCP repair)\n         --api-url: developer-only local/dev API endpoint (defaults from binding or http://localhost:3001; never Studio :3000)\n         --verbose: show developer diagnostics (paths, backups, daemon cleanup, handshake)\n       memoraone-mcp cleanup [--project-id <uuid>] [--ide cursor|copilot-vscode|jetbrains] [--dry-run] [--all-projects] [--yes]"
   );
   process.exit(0);
 }