@memoraone/mcp 0.1.41 → 0.1.43

package/dist/cli.cjs

@@ -231,9 +231,16 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@memoraone/mcp",
-      version: "0.1.41",
+      version: "0.1.43",
       type: "module",
       main: "dist/index.cjs",
+      exports: {
+        ".": "./dist/index.cjs",
+        "./plugin-pairing": "./dist/pluginPairing.cjs",
+        "./dist/*": "./dist/*",
+        "./dist-bin/*": "./dist-bin/*",
+        "./package.json": "./package.json"
+      },
       bin: {
         "memoraone-mcp": "dist-bin/memoraone-mcp.cjs"
       },
@@ -524,7 +531,7 @@ async function acquireLocalLock(lockName, options = {}) {
             `[memoraone-mcp] Failed to acquire lock ${lockName} after ${maxRetries} retries`
           );
         }
-        await new Promise((resolve38) => setTimeout(resolve38, retryDelayMs));
+        await new Promise((resolve40) => setTimeout(resolve40, retryDelayMs));
         continue;
       }
       throw err;
@@ -1085,9 +1092,9 @@ var init_memoraClient = __esm({
 });
 
 // src/localState/localConnectClient.ts
-async function requestJson(baseUrl, method, path42, options = {}) {
+async function requestJson(baseUrl, method, path44, options = {}) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const url = `${baseUrl.replace(/\/+$/, "")}${path42.startsWith("/") ? path42 : `/${path42}`}`;
+  const url = `${baseUrl.replace(/\/+$/, "")}${path44.startsWith("/") ? path44 : `/${path44}`}`;
   const res = await fetchImpl(url, {
     method,
     headers: {
@@ -1161,8 +1168,10 @@ async function redeemLocalConnectCode(apiUrl, body, options = {}) {
     recovered: Boolean(data.recovered)
   };
 }
+var path8;
 var init_localConnectClient = __esm({
   "src/localState/localConnectClient.ts"() {
+    path8 = __toESM(require("path"), 1);
     init_memoraClient();
   }
 });
@@ -1186,7 +1195,7 @@ var init_tokenRefreshCoordinator = __esm({
 
 // src/localState/resolveLocalBinding.ts
 async function detectLegacyM1Warning(workspaceRoot) {
-  const candidate = path8.join(path8.resolve(workspaceRoot), CANONICAL_M1_FILENAME);
+  const candidate = path9.join(path9.resolve(workspaceRoot), CANONICAL_M1_FILENAME);
   try {
     await fs6.access(candidate);
     return candidate;
@@ -1195,7 +1204,7 @@ async function detectLegacyM1Warning(workspaceRoot) {
   }
 }
 async function ensureRepositoryBindingForRoot(workspaceRoot, options = {}) {
-  const resolved = path8.resolve(workspaceRoot);
+  const resolved = path9.resolve(workspaceRoot);
   const identity = await captureRootFilesystemIdentity(resolved, options.identityDeps);
   const legacyM1WarningPath = await detectLegacyM1Warning(resolved);
   const index = await loadPathIndex(options.homeDir);
@@ -1203,7 +1212,7 @@ async function ensureRepositoryBindingForRoot(workspaceRoot, options = {}) {
   if (lookup.kind === "path") {
     const record = await readBindingRecord(lookup.repositoryBindingId, options.homeDir);
     if (record && identityMatchesStored(record.filesystemIdentity, identity)) {
-      if (path8.resolve(record.workspaceRoot) !== resolved) {
+      if (path9.resolve(record.workspaceRoot) !== resolved) {
         const updated = {
           ...record,
           workspaceRoot: resolved,
@@ -1265,7 +1274,7 @@ async function ensureRepositoryBindingForRoot(workspaceRoot, options = {}) {
   };
 }
 async function resolveLocalBinding(workspaceRoot, options = {}) {
-  const resolved = path8.resolve(workspaceRoot);
+  const resolved = path9.resolve(workspaceRoot);
   const { repositoryBindingId, legacyM1WarningPath } = await ensureRepositoryBindingForRoot(
     resolved,
     { ...options, createIfMissing: false }
@@ -1313,11 +1322,11 @@ async function resolveLocalBinding(workspaceRoot, options = {}) {
     legacyM1WarningPath
   };
 }
-var fs6, path8;
+var fs6, path9;
 var init_resolveLocalBinding = __esm({
   "src/localState/resolveLocalBinding.ts"() {
     fs6 = __toESM(require("fs/promises"), 1);
-    path8 = __toESM(require("path"), 1);
+    path9 = __toESM(require("path"), 1);
     init_projectBinding();
     init_bindingStore();
     init_installationCredentials();
@@ -1349,7 +1358,7 @@ function toResolvedBinding(local) {
   };
 }
 async function warnLegacyM1IfPresent(workspaceRoot) {
-  const candidate = path9.join(path9.resolve(workspaceRoot), CANONICAL_M1_FILENAME);
+  const candidate = path10.join(path10.resolve(workspaceRoot), CANONICAL_M1_FILENAME);
   try {
     await fs7.access(candidate);
     process.stderr.write(
@@ -1408,7 +1417,7 @@ function normalizeWorkspaceSearchRoots(workspaceRoot) {
     if (raw === void 0) continue;
     const trimmed = String(raw).trim();
     if (trimmed === "") continue;
-    const resolved = path9.resolve(trimmed);
+    const resolved = path10.resolve(trimmed);
     if (!seen.has(resolved)) {
       seen.add(resolved);
       out.push(resolved);
@@ -1419,17 +1428,17 @@ function normalizeWorkspaceSearchRoots(workspaceRoot) {
 function bindingRelevantValuesMatch(a, b) {
   const envA = a.environment ?? void 0;
   const envB = b.environment ?? void 0;
-  return a.repositoryBindingId === b.repositoryBindingId && a.projectId.trim().toLowerCase() === b.projectId.trim().toLowerCase() && path9.resolve(a.workspaceRoot) === path9.resolve(b.workspaceRoot) && (a.installationPublicId ?? void 0) === (b.installationPublicId ?? void 0) && envA === envB && a.status === b.status;
+  return a.repositoryBindingId === b.repositoryBindingId && a.projectId.trim().toLowerCase() === b.projectId.trim().toLowerCase() && path10.resolve(a.workspaceRoot) === path10.resolve(b.workspaceRoot) && (a.installationPublicId ?? void 0) === (b.installationPublicId ?? void 0) && envA === envB && a.status === b.status;
 }
-async function reconcileResolvedBindingWithDisk(cached) {
+async function reconcileResolvedBindingWithDisk(cached, options = {}) {
   const repositoryBindingId = assertRepositoryBindingId(cached.repositoryBindingId);
-  const record = await readBindingRecord(repositoryBindingId);
+  const record = await readBindingRecord(repositoryBindingId, options.homeDir);
   if (!record) {
     throw new ReconnectRequiredError(
       `[memoraone-mcp] Cached binding missing for ${repositoryBindingId}. Run: memoraone-mcp connect <code>`
     );
   }
-  const workspaceRoot = path9.resolve(record.workspaceRoot);
+  const workspaceRoot = path10.resolve(record.workspaceRoot);
   const identity = await captureRootFilesystemIdentity(workspaceRoot);
   if (!identitiesMatch(record.filesystemIdentity, identity)) {
     throw new ReconnectRequiredError(
@@ -1512,11 +1521,11 @@ function decodeResolvedBinding(value) {
     status
   };
 }
-var fs7, path9, uuidRegex, CANONICAL_M1_FILENAME;
+var fs7, path10, uuidRegex, CANONICAL_M1_FILENAME;
 var init_projectBinding = __esm({
   "src/projectBinding.ts"() {
     fs7 = __toESM(require("fs/promises"), 1);
-    path9 = __toESM(require("path"), 1);
+    path10 = __toESM(require("path"), 1);
     init_resolveLocalBinding();
     init_bindingStore();
     init_rootFilesystemIdentity();
@@ -1590,7 +1599,7 @@ function isDaemonBindingMismatchError(err) {
 }
 function formatBindingMismatchError(socketPath, sidecar, expected, detail) {
   const lines = [
-    `[memoraone-mcp] Daemon socket binding mismatch at ${path10.basename(socketPath)}.`,
+    `[memoraone-mcp] Daemon socket binding mismatch at ${path11.basename(socketPath)}.`,
     `  socket: binding=${sidecar.repositoryBindingId} project=${sidecar.projectId} workspace=${sidecar.workspaceRoot}`,
     `  session: binding=${expected.repositoryBindingId} project=${expected.projectId} workspace=${expected.workspaceRoot}`
   ];
@@ -1625,11 +1634,11 @@ function verifyDaemonSidecarBinding(socketPath, expected, env2 = process.env, id
   }
   return sidecar;
 }
-var fs8, path10;
+var fs8, path11;
 var init_bindingSidecar = __esm({
   "src/bindingSidecar.ts"() {
     fs8 = __toESM(require("fs"), 1);
-    path10 = __toESM(require("path"), 1);
+    path11 = __toESM(require("path"), 1);
     init_bindingIdentity();
     init_projectBinding();
     init_socketPaths();
@@ -1654,8 +1663,8 @@ function getEnvWorkspaceRootCandidates() {
   const raw = process.env.WORKSPACE_FOLDER_PATHS;
   const parts = [];
   if (raw !== void 0 && raw.trim() !== "") {
-    for (const p of raw.split(path11.delimiter).map((s) => s.trim()).filter(Boolean)) {
-      parts.push(path11.resolve(p));
+    for (const p of raw.split(path12.delimiter).map((s) => s.trim()).filter(Boolean)) {
+      parts.push(path12.resolve(p));
     }
   }
   parts.push(process.cwd());
@@ -1679,7 +1688,7 @@ function extractWorkspaceRootsFromInitialize(params) {
     if (uri === void 0 || uri.trim() === "") {
       return;
     }
-    const resolved = path11.resolve(uriToPath(uri));
+    const resolved = path12.resolve(uriToPath(uri));
     if (!seen.has(resolved)) {
       seen.add(resolved);
       roots.push(resolved);
@@ -1701,7 +1710,7 @@ function getRepoScopedWorkspaceHint(env2 = process.env) {
   if (raw === void 0 || raw.trim() === "") {
     return null;
   }
-  return path11.resolve(raw.trim());
+  return path12.resolve(raw.trim());
 }
 function formatWorkspaceAmbiguityError(bindings) {
   const lines = bindings.map(
@@ -1777,8 +1786,8 @@ async function resolveBindingFromInitializeParams(params, options = {}) {
   const rootsListUris = options.rootsListUris ?? [];
   const rootsListPaths = rootsListUris.map((uri) => uriToPath(uri)).filter(Boolean);
   if (rootsListPaths.length > 1 && repoHint !== null) {
-    const hintResolved = path11.resolve(repoHint);
-    const matchingRoot = rootsListPaths.find((root) => path11.resolve(root) === hintResolved);
+    const hintResolved = path12.resolve(repoHint);
+    const matchingRoot = rootsListPaths.find((root) => path12.resolve(root) === hintResolved);
     if (!matchingRoot) {
       throw new Error(formatRepoHintNotInRootsListError(repoHint, rootsListPaths));
     }
@@ -1803,10 +1812,10 @@ async function resolveBindingFromInitializeParams(params, options = {}) {
     respectExplicitM1Path: options.respectExplicitM1Path
   });
 }
-var path11, import_node_url, MEMORAONE_WORKSPACE_ROOT_ENV;
+var path12, import_node_url, MEMORAONE_WORKSPACE_ROOT_ENV;
 var init_initializeBinding = __esm({
   "src/initializeBinding.ts"() {
-    path11 = __toESM(require("path"), 1);
+    path12 = __toESM(require("path"), 1);
     import_node_url = require("url");
     init_bindingIdentity();
     init_projectBinding();
@@ -1825,34 +1834,34 @@ async function pathExists(filePath) {
   }
 }
 async function findMonorepoCliFrom(startDir) {
-  let current = path12.resolve(startDir);
-  const root = path12.parse(current).root;
+  let current = path13.resolve(startDir);
+  const root = path13.parse(current).root;
   while (true) {
-    const candidate = path12.join(current, MONOREPO_CLI_REL);
+    const candidate = path13.join(current, MONOREPO_CLI_REL);
     if (await pathExists(candidate)) {
-      return path12.resolve(candidate);
+      return path13.resolve(candidate);
     }
     if (current === root) break;
-    current = path12.dirname(current);
+    current = path13.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);
+  const script = path13.resolve(process.argv[1]);
+  const base = path13.basename(script);
   if ((base === "cli.cjs" || base === "cli.ts" || base === "memoraone-mcp.cjs") && await pathExists(script)) {
     return script;
   }
-  const here = path12.dirname(script);
+  const here = path13.dirname(script);
   const candidates = [
-    path12.join(here, "cli.cjs"),
-    path12.join(here, "..", "dist", "cli.cjs"),
-    path12.join(here, "..", "..", "dist", "cli.cjs")
+    path13.join(here, "cli.cjs"),
+    path13.join(here, "..", "dist", "cli.cjs"),
+    path13.join(here, "..", "..", "dist", "cli.cjs")
   ];
   for (const candidate of candidates) {
     if (await pathExists(candidate)) {
-      return path12.resolve(candidate);
+      return path13.resolve(candidate);
     }
   }
   return null;
@@ -1871,7 +1880,7 @@ async function resolveBuiltCliPathAsync(options) {
   searchDirs.push(process.cwd());
   const seen = /* @__PURE__ */ new Set();
   for (const dir of searchDirs) {
-    const key = path12.resolve(dir);
+    const key = path13.resolve(dir);
     if (seen.has(key)) continue;
     seen.add(key);
     const found = await findMonorepoCliFrom(key);
@@ -1882,12 +1891,12 @@ async function resolveBuiltCliPathAsync(options) {
   }
   return null;
 }
-var fs9, path12, MONOREPO_CLI_REL;
+var fs9, path13, MONOREPO_CLI_REL;
 var init_resolveBuiltCliPath = __esm({
   "src/resolveBuiltCliPath.ts"() {
     fs9 = __toESM(require("fs/promises"), 1);
-    path12 = __toESM(require("path"), 1);
-    MONOREPO_CLI_REL = path12.join("packages", "mcp", "dist", "cli.cjs");
+    path13 = __toESM(require("path"), 1);
+    MONOREPO_CLI_REL = path13.join("packages", "mcp", "dist", "cli.cjs");
   }
 });
 
@@ -1922,7 +1931,7 @@ function looksLikeLocalMonorepoCliPath(scriptPath) {
   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);
+  const base = path14.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;
@@ -1943,7 +1952,7 @@ function channelFromEnv(env2) {
 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;
+  const scriptPath = options.scriptPath !== void 0 ? options.scriptPath : process.argv[1] ? path14.resolve(process.argv[1]) : null;
   if (scriptPath && looksLikePublishedPackagePath(scriptPath)) {
     const channel2 = channelFromEnv(env2) ?? npmPackageChannelFromApiUrl(options.apiUrl);
     return { kind: "published", channel: channel2 };
@@ -1952,7 +1961,7 @@ async function resolvePackageExecutionMode(options = {}) {
     return { kind: "local", cliPath: scriptPath };
   }
   if (options.cliPath) {
-    return { kind: "local", cliPath: path13.resolve(options.cliPath) };
+    return { kind: "local", cliPath: path14.resolve(options.cliPath) };
   }
   const resolveCli = options.resolveBuiltCliPath ?? resolveBuiltCliPathAsync;
   const builtCli = await resolveCli();
@@ -1988,10 +1997,10 @@ function formatIdeSetupRepairHint(workspaceRoot, mode) {
   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}`;
 }
-var path13, PROD_API_URL, STAGING_API_URL, STAGING_API_URL_PREFIX;
+var path14, PROD_API_URL, STAGING_API_URL, STAGING_API_URL_PREFIX;
 var init_packageExecutionMode = __esm({
   "src/packageExecutionMode.ts"() {
-    path13 = __toESM(require("path"), 1);
+    path14 = __toESM(require("path"), 1);
     init_resolveBuiltCliPath();
     PROD_API_URL = "https://api.memoraone.com";
     STAGING_API_URL = "https://memora-api-staging-phbtrzocjq-uk.a.run.app";
@@ -2005,7 +2014,14 @@ function normalizeMemoraoneServerName(name) {
 }
 function isMemoraoneOwnedServerName(name) {
   if (typeof name !== "string" || name.trim() === "") return false;
-  return OWNED_NAME_NORMALIZED.has(normalizeMemoraoneServerName(name));
+  const trimmed = name.trim();
+  return OWNED_NAME_NORMALIZED.has(normalizeMemoraoneServerName(trimmed)) || REPOSITORY_SERVER_KEY_RE.test(trimmed);
+}
+function memoraoneServerNameForRepositoryBinding(repositoryBindingId) {
+  const id = repositoryBindingId.trim();
+  if (id === "") throw new Error("repository_binding_id is required for global MCP ownership");
+  const suffix = (0, import_node_crypto4.createHash)("sha256").update(id, "utf8").digest("hex").slice(0, 16);
+  return `${MEMORAONE_REPOSITORY_SERVER_NAME_PREFIX}${suffix}`;
 }
 function collectCommandTokens(entry) {
   const tokens = [];
@@ -2032,6 +2048,12 @@ function envRecordFromEntry(entry) {
   }
   return null;
 }
+function memoraoneWorkspaceRootFromServerEntry(entry) {
+  if (!entry || typeof entry !== "object" || Array.isArray(entry)) return void 0;
+  const env2 = envRecordFromEntry(entry);
+  const root = env2?.MEMORAONE_WORKSPACE_ROOT;
+  return typeof root === "string" && root.trim() !== "" ? path15.resolve(root) : void 0;
+}
 function tokensInvokeMemoraone(tokens) {
   for (const token of tokens) {
     if (MEMORAONE_PACKAGE_SPEC_RE.test(token)) return true;
@@ -2052,6 +2074,17 @@ function envLooksMemoraoneOwned(env2) {
   if (typeof env2.MEMORAONE_API_KEY === "string") return true;
   return false;
 }
+function entryContainsLegacyCredentialFields(entry) {
+  if (!entry || typeof entry !== "object" || Array.isArray(entry)) return false;
+  const value = entry;
+  const env2 = envRecordFromEntry(value);
+  if (env2 && ("MEMORAONE_API_KEY" in env2 || "MEMORAONE_M1_PATH" in env2)) return true;
+  if (value.headers && typeof value.headers === "object" && !Array.isArray(value.headers)) {
+    const headers = value.headers;
+    return Object.keys(headers).some((key) => key.toLowerCase() === "authorization");
+  }
+  return false;
+}
 function isMemoraoneOwnedServerEntry(entry) {
   if (!entry || typeof entry !== "object" || Array.isArray(entry)) return false;
   const s = entry;
@@ -2084,6 +2117,55 @@ function replaceMemoraoneOwnedInServerMap(servers, canonical) {
   next[CANONICAL_MEMORAONE_MCP_SERVER_NAME] = canonical;
   return next;
 }
+function replaceMemoraoneRepositoryBindingInServerMap(servers, canonical, ownership) {
+  const generatedTargetKey = memoraoneServerNameForRepositoryBinding(
+    ownership.repositoryBindingId
+  );
+  const targetRoot = path15.resolve(ownership.workspaceRoot);
+  const matchingRootKeys = Object.entries(servers).filter(
+    ([key, value]) => REPOSITORY_SERVER_KEY_RE.test(key) && memoraoneWorkspaceRootFromServerEntry(value) === targetRoot
+  ).map(([key]) => key).sort();
+  const targetKey = matchingRootKeys.includes(generatedTargetKey) ? generatedTargetKey : matchingRootKeys[0] ?? generatedTargetKey;
+  const staleKeys = new Set(
+    (ownership.replacedRepositoryBindingIds ?? []).map(memoraoneServerNameForRepositoryBinding)
+  );
+  staleKeys.add(generatedTargetKey);
+  staleKeys.delete(targetKey);
+  const next = {};
+  for (const [key, value] of Object.entries(servers)) {
+    if (staleKeys.has(key)) continue;
+    if (matchingRootKeys.includes(key)) continue;
+    if (isMemoraoneOwnedServerName(key) && !REPOSITORY_SERVER_KEY_RE.test(key) && entryContainsLegacyCredentialFields(value)) {
+      continue;
+    }
+    if (isMemoraoneOwnedServerName(key) && !REPOSITORY_SERVER_KEY_RE.test(key) && memoraoneWorkspaceRootFromServerEntry(value) === targetRoot) {
+      continue;
+    }
+    next[key] = value;
+  }
+  next[targetKey] = canonical;
+  return next;
+}
+function stripMemoraoneRepositoryBindingFromServerMap(servers, ownership) {
+  const keys = /* @__PURE__ */ new Set([
+    memoraoneServerNameForRepositoryBinding(ownership.repositoryBindingId),
+    ...(ownership.replacedRepositoryBindingIds ?? []).map(
+      memoraoneServerNameForRepositoryBinding
+    )
+  ]);
+  const targetRoot = path15.resolve(ownership.workspaceRoot);
+  const next = {};
+  const removedKeys = [];
+  for (const [key, value] of Object.entries(servers)) {
+    const matchingWorkspace = isMemoraoneOwnedServerName(key) && memoraoneWorkspaceRootFromServerEntry(value) === targetRoot;
+    if (keys.has(key) || matchingWorkspace) {
+      removedKeys.push(key);
+    } else {
+      next[key] = value;
+    }
+  }
+  return { next, removedKeys };
+}
 function stripMemoraoneOwnedFromServerList(servers) {
   const next = [];
   let removedCount = 0;
@@ -2122,10 +2204,14 @@ function canonicalValueMatches(actual, expected) {
   }
   return false;
 }
-var CANONICAL_MEMORAONE_MCP_SERVER_NAME, LEGACY_MEMORAONE_SERVER_NAME_ALIASES, OWNED_NAME_NORMALIZED, MEMORAONE_PACKAGE_SPEC_RE, MEMORAONE_CLI_TOKEN_RE, MEMORAONE_LOCAL_CLI_PATH_RE, MEMORAONE_OWNED_SERVER_NAME_ALIASES;
+var import_node_crypto4, path15, CANONICAL_MEMORAONE_MCP_SERVER_NAME, MEMORAONE_REPOSITORY_SERVER_NAME_PREFIX, REPOSITORY_SERVER_KEY_RE, LEGACY_MEMORAONE_SERVER_NAME_ALIASES, OWNED_NAME_NORMALIZED, MEMORAONE_PACKAGE_SPEC_RE, MEMORAONE_CLI_TOKEN_RE, MEMORAONE_LOCAL_CLI_PATH_RE, MEMORAONE_OWNED_SERVER_NAME_ALIASES;
 var init_memoraoneMcpOwnership = __esm({
   "src/memoraoneMcpOwnership.ts"() {
+    import_node_crypto4 = require("crypto");
+    path15 = __toESM(require("path"), 1);
     CANONICAL_MEMORAONE_MCP_SERVER_NAME = "memoraone";
+    MEMORAONE_REPOSITORY_SERVER_NAME_PREFIX = "memoraone-";
+    REPOSITORY_SERVER_KEY_RE = /^memoraone-[0-9a-f]{16}$/;
     LEGACY_MEMORAONE_SERVER_NAME_ALIASES = [
       "memoraone",
       "memora-one",
@@ -2168,7 +2254,7 @@ function buildMemoraoneCursorMcpServer(options) {
     env2.MEMORAONE_IDE_TYPE = ideType;
   }
   if (options.workspaceRoot !== void 0) {
-    env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path14.resolve(options.workspaceRoot);
+    env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path16.resolve(options.workspaceRoot);
   }
   if (options.environment === "local") {
     if (!options.cliPath) {
@@ -2204,7 +2290,7 @@ function stripLeadingLineComments(text) {
   return text.split("\n").filter((line) => !/^\s*\/\//.test(line)).join("\n");
 }
 function getKnownCursorGlobalMcpConfigCandidates(homeDir) {
-  return [path14.join(homeDir, ".cursor", "mcp.json")];
+  return [path16.join(homeDir, ".cursor", "mcp.json")];
 }
 async function detectCursorGlobalMcpConfig(options) {
   if (options?.explicitPath) {
@@ -2267,7 +2353,7 @@ async function resolveNpxPath() {
   const pathSep = process.platform === "win32" ? ";" : ":";
   for (const dir of (process.env.PATH ?? "").split(pathSep)) {
     if (!dir) continue;
-    candidates.push(path14.join(dir, npxName));
+    candidates.push(path16.join(dir, npxName));
   }
   try {
     const lookupCmd = process.platform === "win32" ? "where" : "which";
@@ -2278,7 +2364,7 @@ async function resolveNpxPath() {
   }
   const seen = /* @__PURE__ */ new Set();
   for (const candidate of candidates) {
-    const abs = path14.isAbsolute(candidate) ? candidate : path14.resolve(candidate);
+    const abs = path16.isAbsolute(candidate) ? candidate : path16.resolve(candidate);
     const key = process.platform === "win32" ? abs.toLowerCase() : abs;
     if (seen.has(key)) continue;
     seen.add(key);
@@ -2338,7 +2424,7 @@ function mergeClaudeCodeMcpConfigObject(existing, writeOptions) {
   };
 }
 function getClaudeCodeMcpConfigPath(repoRoot) {
-  return path14.join(path14.resolve(repoRoot), ".mcp.json");
+  return path16.join(path16.resolve(repoRoot), ".mcp.json");
 }
 function isMemoraoneManagedApiUrl(url) {
   if (typeof url !== "string" || url.length === 0) return false;
@@ -2387,7 +2473,7 @@ function memoraoneServerMatches(server, matchOptions) {
   if (e.MEMORAONE_IDE_TYPE !== "cursor") return false;
   const workspaceRoot = e[MEMORAONE_WORKSPACE_ROOT_ENV];
   if (matchOptions.repoRoot !== void 0) {
-    return typeof workspaceRoot === "string" && path14.resolve(workspaceRoot) === path14.resolve(matchOptions.repoRoot);
+    return typeof workspaceRoot === "string" && path16.resolve(workspaceRoot) === path16.resolve(matchOptions.repoRoot);
   }
   return workspaceRoot === void 0;
 }
@@ -2422,7 +2508,7 @@ function validateCursorRepoMcpConfig(parsed2, matchOptions) {
   }
 }
 function getCursorRepoMcpConfigPath(repoRoot) {
-  return path14.join(repoRoot, ".cursor", "mcp.json");
+  return path16.join(repoRoot, ".cursor", "mcp.json");
 }
 async function readCursorMcpConfigObject(configPath) {
   try {
@@ -2453,12 +2539,12 @@ async function removeMemoraoneFromCursorGlobalConfig(options) {
     return { changed: true, backupPath };
   }
   const next = { ...parsed2, mcpServers };
-  await fs10.mkdir(path14.dirname(configPath), { recursive: true });
+  await fs10.mkdir(path16.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 = path14.resolve(options?.repoRoot ?? process.cwd());
+  const repoRoot = path16.resolve(options?.repoRoot ?? process.cwd());
   const repoConfigPath = getCursorRepoMcpConfigPath(repoRoot);
   const globalDetection = await detectCursorGlobalMcpConfig({
     homeDir: options?.homeDir,
@@ -2560,12 +2646,12 @@ function logCursorMcpCliSummary(info, dryRun, opts) {
     );
   }
 }
-var fs10, os4, path14, import_node_child_process2, import_node_util2, execFileAsync2, MEMORAONE_PROD_API_URL, MEMORAONE_LOCAL_API_URL, MEMORAONE_STAGING_API_URL, MEMORAONE_STAGING_API_URL_PREFIX;
+var fs10, os4, path16, import_node_child_process2, import_node_util2, execFileAsync2, MEMORAONE_PROD_API_URL, MEMORAONE_LOCAL_API_URL, MEMORAONE_STAGING_API_URL, MEMORAONE_STAGING_API_URL_PREFIX;
 var init_cursorGlobalMcpConfig = __esm({
   "src/cursorGlobalMcpConfig.ts"() {
     fs10 = __toESM(require("fs/promises"), 1);
     os4 = __toESM(require("os"), 1);
-    path14 = __toESM(require("path"), 1);
+    path16 = __toESM(require("path"), 1);
     import_node_child_process2 = require("child_process");
     import_node_util2 = require("util");
     init_initializeBinding();
@@ -2791,7 +2877,7 @@ async function defaultListSocketPaths(projectId) {
     if (!name.endsWith(".sock") || !isMemoraoneSocketFilename(name)) {
       continue;
     }
-    const socketPath = path15.join(baseDir, name);
+    const socketPath = path17.join(baseDir, name);
     if (projectId === null) {
       paths.push(socketPath);
       continue;
@@ -2811,7 +2897,7 @@ async function defaultListSocketPaths(projectId) {
   return paths.sort();
 }
 async function defaultListSocketPathsForWorkspaceRoot(workspaceRoot) {
-  const resolvedRoot = path15.resolve(workspaceRoot);
+  const resolvedRoot = path17.resolve(workspaceRoot);
   const baseDir = getMcpBaseDir();
   let entries;
   try {
@@ -2828,36 +2914,36 @@ async function defaultListSocketPathsForWorkspaceRoot(workspaceRoot) {
     if (!name.endsWith(".sock") || !isHashSocketFilename(name)) {
       continue;
     }
-    const socketPath = path15.join(baseDir, name);
+    const socketPath = path17.join(baseDir, name);
     const record = readBindingSidecarRecord(socketPath);
     if (!record?.workspaceRoot) continue;
-    if (path15.resolve(record.workspaceRoot) === resolvedRoot) {
+    if (path17.resolve(record.workspaceRoot) === resolvedRoot) {
       paths.push(socketPath);
     }
   }
   return paths.sort();
 }
 async function defaultListSocketPathsForM1Path(m1Path) {
-  return defaultListSocketPathsForWorkspaceRoot(path15.dirname(path15.resolve(m1Path)));
+  return defaultListSocketPathsForWorkspaceRoot(path17.dirname(path17.resolve(m1Path)));
 }
 async function filterSocketPathsByIdeForCleanup(socketPaths, projectId, ide, workspaceRoot) {
   if (ide === void 0) return socketPaths;
   const normalizedProjectId = projectId.trim().toLowerCase();
-  const resolvedRoot = workspaceRoot ? path15.resolve(workspaceRoot) : null;
+  const resolvedRoot = workspaceRoot ? path17.resolve(workspaceRoot) : null;
   const filtered = [];
   for (const socketPath of socketPaths) {
-    const basename30 = path15.basename(socketPath);
-    if (isLegacySocketFilename(basename30)) {
-      if (isSocketFilenameForProjectAndIde(basename30, normalizedProjectId, ide)) {
+    const basename31 = path17.basename(socketPath);
+    if (isLegacySocketFilename(basename31)) {
+      if (isSocketFilenameForProjectAndIde(basename31, normalizedProjectId, ide)) {
         filtered.push(socketPath);
       }
       continue;
     }
-    if (isHashSocketFilename(basename30)) {
+    if (isHashSocketFilename(basename31)) {
       const record = readBindingSidecarRecord(socketPath);
       if (!record || record.ideType !== ide) continue;
       const sameProject = record.projectId.trim().toLowerCase() === normalizedProjectId;
-      const sameWorkspace = resolvedRoot !== null && path15.resolve(record.workspaceRoot) === resolvedRoot;
+      const sameWorkspace = resolvedRoot !== null && path17.resolve(record.workspaceRoot) === resolvedRoot;
       if (sameProject || sameWorkspace) {
         filtered.push(socketPath);
       }
@@ -2889,7 +2975,7 @@ async function defaultConfirm(message) {
 }
 async function resolveCleanupTarget(cwd2) {
   try {
-    const binding = await resolveAuthoritativeBinding([path15.resolve(cwd2)]);
+    const binding = await resolveAuthoritativeBinding([path17.resolve(cwd2)]);
     return {
       workspaceRoot: binding.workspaceRoot,
       repositoryBindingId: binding.repositoryBindingId,
@@ -3085,7 +3171,7 @@ async function runCleanup(opts) {
       projectIds.add(proc.projectId);
     }
     for (const socketPath of socketPaths) {
-      const id = extractProjectIdFromSocketFilename(path15.basename(socketPath));
+      const id = extractProjectIdFromSocketFilename(path17.basename(socketPath));
       if (id) {
         projectIds.add(id);
         continue;
@@ -3268,11 +3354,11 @@ async function cliCleanup(argv) {
   }
   return result.exitCode;
 }
-var fs11, path15, readline, import_node_child_process3, import_node_util3, import_node_process, execFileAsync3, DAEMON_PROJECT_ID_RE, DAEMON_BINDING_ID_RE, PROJECT_ID_RE, MEMORAONE_MCP_COMMAND_RE, CLEANUP_PROJECT_ID_REQUIRED_ERROR;
+var fs11, path17, readline, import_node_child_process3, import_node_util3, import_node_process, execFileAsync3, DAEMON_PROJECT_ID_RE, DAEMON_BINDING_ID_RE, PROJECT_ID_RE, MEMORAONE_MCP_COMMAND_RE, CLEANUP_PROJECT_ID_REQUIRED_ERROR;
 var init_cleanup = __esm({
   "src/cleanup.ts"() {
     fs11 = __toESM(require("fs/promises"), 1);
-    path15 = __toESM(require("path"), 1);
+    path17 = __toESM(require("path"), 1);
     readline = __toESM(require("readline/promises"), 1);
     import_node_child_process3 = require("child_process");
     import_node_util3 = require("util");
@@ -3314,17 +3400,17 @@ var init_configUtils = __esm({
 });
 
 // src/config.ts
-var process2, fs12, path16, dotenv, import_v4, dotenvPath, EnvSchema, requiredEnvVars, missingEnvVars, parsed, resolvedApiUrl, parseBooleanFlag2, config2;
+var process2, fs12, path18, dotenv, import_v4, dotenvPath, EnvSchema, requiredEnvVars, missingEnvVars, parsed, resolvedApiUrl, parseBooleanFlag2, config2;
 var init_config = __esm({
   "src/config.ts"() {
     process2 = __toESM(require("process"), 1);
     fs12 = __toESM(require("fs"), 1);
-    path16 = __toESM(require("path"), 1);
+    path18 = __toESM(require("path"), 1);
     dotenv = __toESM(require("dotenv"), 1);
     import_v4 = require("zod/v4");
     init_configUtils();
     init_socketPaths();
-    dotenvPath = path16.resolve(process2.cwd(), ".env");
+    dotenvPath = path18.resolve(process2.cwd(), ".env");
     if (fs12.existsSync(dotenvPath)) {
       try {
         dotenv.config({ path: dotenvPath });
@@ -3399,7 +3485,7 @@ var init_config = __esm({
 function resolveRepoFingerprint(cwd2) {
   const found = findGitRoot(cwd2);
   if (!found) {
-    const fallbackPath = path17.resolve(cwd2);
+    const fallbackPath = path19.resolve(cwd2);
     const fingerprint2 = sha256(fallbackPath);
     debugLog(`repo fingerprint=${fingerprint2} source=path-fallback`);
     return {
@@ -3421,7 +3507,7 @@ function resolveRepoFingerprint(cwd2) {
       source: "git-remote"
     };
   }
-  const fingerprint = sha256(path17.resolve(gitRoot));
+  const fingerprint = sha256(path19.resolve(gitRoot));
   debugLog(`repo fingerprint=${fingerprint} source=path-fallback`);
   return {
     fingerprint,
@@ -3429,11 +3515,11 @@ function resolveRepoFingerprint(cwd2) {
     source: "path-fallback"
   };
 }
-var fs13, path17, crypto2, parseBooleanFlag3, debugEnabled2, debugLog, normalizeRemoteUrl, sha256, resolveGitDir, findGitRoot, readOriginRemote;
+var fs13, path19, crypto2, parseBooleanFlag3, debugEnabled2, debugLog, normalizeRemoteUrl, sha256, resolveGitDir, findGitRoot, readOriginRemote;
 var init_repoFingerprint = __esm({
   "src/repoFingerprint.ts"() {
     fs13 = __toESM(require("fs"), 1);
-    path17 = __toESM(require("path"), 1);
+    path19 = __toESM(require("path"), 1);
     crypto2 = __toESM(require("crypto"), 1);
     parseBooleanFlag3 = (value) => {
       if (!value) {
@@ -3472,7 +3558,7 @@ var init_repoFingerprint = __esm({
           const match = content.match(/^gitdir:\s*(.+)$/m);
           if (match) {
             const gitDir = match[1].trim();
-            return path17.resolve(path17.dirname(gitPath), gitDir);
+            return path19.resolve(path19.dirname(gitPath), gitDir);
           }
         }
       } catch {
@@ -3481,16 +3567,16 @@ var init_repoFingerprint = __esm({
       return null;
     };
     findGitRoot = (start) => {
-      let current = path17.resolve(start);
+      let current = path19.resolve(start);
       while (true) {
-        const gitPath = path17.join(current, ".git");
+        const gitPath = path19.join(current, ".git");
         if (fs13.existsSync(gitPath)) {
           const gitDir = resolveGitDir(gitPath);
           if (gitDir) {
             return { gitRoot: current, gitDir };
           }
         }
-        const parent = path17.dirname(current);
+        const parent = path19.dirname(current);
         if (parent === current) {
           break;
         }
@@ -3499,7 +3585,7 @@ var init_repoFingerprint = __esm({
       return null;
     };
     readOriginRemote = (gitDir) => {
-      const configPath = path17.join(gitDir, "config");
+      const configPath = path19.join(gitDir, "config");
       try {
         const content = fs13.readFileSync(configPath, "utf8");
         const lines = content.split(/\r?\n/);
@@ -3542,12 +3628,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 path18.join(homeDir, ".ai", "mcp", "mcp.json");
+  return path20.join(homeDir, ".ai", "mcp", "mcp.json");
 }
 function getJetBrainsProjectMcpConfigPaths(repoRoot) {
   return [
-    { kind: "project-ai", path: path18.join(repoRoot, ".ai", "mcp", "mcp.json") },
-    { kind: "project-ij", path: path18.join(repoRoot, ".ij", "mcp", "mcp.json") }
+    { kind: "project-ai", path: path20.join(repoRoot, ".ai", "mcp", "mcp.json") },
+    { kind: "project-ij", path: path20.join(repoRoot, ".ij", "mcp", "mcp.json") }
   ];
 }
 function getKnownJetBrainsMcpConfigLocations(homeDir, repoRoot) {
@@ -3582,7 +3668,7 @@ function buildMemoraoneJetBrainsMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "jetbrains",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path18.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path20.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -3596,17 +3682,17 @@ function buildMemoraoneJetBrainsMcpServer(options) {
     env: env2
   };
 }
-function mergeJetBrainsMcpConfigObject(existing, memoraone) {
+function mergeJetBrainsMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
   const mcpServers = typeof base.mcpServers === "object" && base.mcpServers !== null && !Array.isArray(base.mcpServers) ? { ...base.mcpServers } : {};
-  return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
+  return { ...base, mcpServers: ownership ? replaceMemoraoneRepositoryBindingInServerMap(mcpServers, memoraone, ownership) : replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeJetBrainsMcpJsonAtomic(filePath, content) {
-  const dir = path18.dirname(filePath);
+  const dir = path20.dirname(filePath);
   await fs14.mkdir(dir, { recursive: true });
-  const tmpPath = path18.join(
+  const tmpPath = path20.join(
     dir,
-    `.${path18.basename(filePath)}.${process.pid}.${(0, import_node_crypto4.randomBytes)(8).toString("hex")}.tmp`
+    `.${path20.basename(filePath)}.${process.pid}.${(0, import_node_crypto5.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs14.writeFile(tmpPath, content, "utf8");
@@ -3622,7 +3708,7 @@ async function writeJetBrainsMcpJsonAtomic(filePath, content) {
 function memoraoneServerMatches2(server, expected) {
   return canonicalValueMatches(server, expected);
 }
-function validateJetBrainsMcpConfig(parsed2, expected) {
+function validateJetBrainsMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!parsed2 || typeof parsed2 !== "object") {
     throw new Error("[setup-ide-files] JetBrains MCP config must be a JSON object.");
   }
@@ -3630,7 +3716,8 @@ function validateJetBrainsMcpConfig(parsed2, expected) {
   if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
     throw new Error("[setup-ide-files] JetBrains MCP config missing mcpServers object.");
   }
-  const memoraone = mcpServers.memoraone;
+  const serverMap = mcpServers;
+  const memoraone = serverMap[serverName] ?? Object.values(serverMap).find((entry) => memoraoneServerMatches2(entry, expected));
   if (!memoraoneServerMatches2(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] JetBrains MCP config mcpServers.memoraone is missing or invalid."
@@ -3690,20 +3777,20 @@ async function removeMemoraoneFromProjectConfig(options) {
     return { changed: true, backupPath };
   }
   const next = { ...parsed2, mcpServers };
-  await fs14.mkdir(path18.dirname(configPath), { recursive: true });
+  await fs14.mkdir(path20.dirname(configPath), { recursive: true });
   await fs14.writeFile(configPath, JSON.stringify(next, null, 2) + "\n", "utf8");
   return { changed: true, backupPath };
 }
 async function resolveLocalCliPathAsync() {
-  const here = process.argv[1] ? path18.dirname(path18.resolve(process.argv[1])) : process.cwd();
+  const here = process.argv[1] ? path20.dirname(path20.resolve(process.argv[1])) : process.cwd();
   const candidates = [
-    path18.join(here, "cli.cjs"),
-    path18.join(here, "..", "dist", "cli.cjs"),
-    path18.join(here, "..", "..", "dist", "cli.cjs")
+    path20.join(here, "cli.cjs"),
+    path20.join(here, "..", "dist", "cli.cjs"),
+    path20.join(here, "..", "..", "dist", "cli.cjs")
   ];
   for (const candidate of candidates) {
     if (await pathExists3(candidate)) {
-      return path18.resolve(candidate);
+      return path20.resolve(candidate);
     }
   }
   return null;
@@ -3760,7 +3847,7 @@ function formatOptionalJetBrainsHandshakeUnavailableDetail(detail) {
 async function verifyJetBrainsMcpHandshake(options) {
   const timeoutMs = options.timeoutMs ?? 15e3;
   const { server } = options;
-  return new Promise((resolve38) => {
+  return new Promise((resolve40) => {
     let settled = false;
     const finish = (ok, detail, optionalUnavailable) => {
       if (settled) return;
@@ -3770,7 +3857,7 @@ async function verifyJetBrainsMcpHandshake(options) {
         child.kill();
       } catch {
       }
-      resolve38({ ok, detail, optionalUnavailable });
+      resolve40({ ok, detail, optionalUnavailable });
     };
     const child = (0, import_node_child_process4.spawn)(server.command, [...server.args], {
       env: { ...process.env, ...server.env },
@@ -3844,7 +3931,7 @@ async function verifyJetBrainsMcpHandshake(options) {
 async function setupJetBrainsMcpConfig(options) {
   const homeDir = options.homeDir ?? os5.homedir();
   const globalPath = options.globalConfigPath ?? getJetBrainsGlobalMcpConfigPath(homeDir);
-  const workspaceRoot = path18.resolve(options.repoRoot);
+  const workspaceRoot = path20.resolve(options.repoRoot);
   const repairActions = [];
   const allLocations = getKnownJetBrainsMcpConfigLocations(homeDir, options.repoRoot);
   for (const location of allLocations) {
@@ -3898,11 +3985,10 @@ async function setupJetBrainsMcpConfig(options) {
       );
     }
   }
-  const merged = mergeJetBrainsMcpConfigObject(existing, memoraone);
+  const merged = mergeJetBrainsMcpConfigObject(existing, memoraone, options.ownership);
   const body = JSON.stringify(merged, null, 2) + "\n";
   if (existed && existing) {
-    const currentMemoraone = existing.mcpServers && typeof existing.mcpServers === "object" && !Array.isArray(existing.mcpServers) ? existing.mcpServers.memoraone : void 0;
-    if (memoraoneServerMatches2(currentMemoraone, memoraone)) {
+    if (canonicalValueMatches(existing, merged)) {
       repairActions.push({ type: "wrote-global-config", path: globalPath, outcome: "skipped" });
       return { outcome: "skipped", repairActions, memoraone };
     }
@@ -3919,7 +4005,7 @@ async function setupJetBrainsMcpConfig(options) {
   await writeJetBrainsMcpJsonAtomic(globalPath, body);
   const verifyRaw = await fs14.readFile(globalPath, "utf8");
   const verifyParsed = JSON.parse(stripLeadingLineComments2(verifyRaw));
-  validateJetBrainsMcpConfig(verifyParsed, memoraone);
+  validateJetBrainsMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
   const outcome = existed ? "updated" : "created";
   repairActions.push({ type: "wrote-global-config", path: globalPath, outcome });
   let verifyOk;
@@ -3984,13 +4070,13 @@ function logJetBrainsMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit JetBrains IDE and reopen this repo for MCP changes to take effect."
   );
 }
-var fs14, os5, path18, import_node_crypto4, import_node_child_process4, JETBRAINS_DEBUG_ENV_VARS;
+var fs14, os5, path20, import_node_crypto5, import_node_child_process4, JETBRAINS_DEBUG_ENV_VARS;
 var init_jetbrainsMcpConfig = __esm({
   "src/jetbrainsMcpConfig.ts"() {
     fs14 = __toESM(require("fs/promises"), 1);
     os5 = __toESM(require("os"), 1);
-    path18 = __toESM(require("path"), 1);
-    import_node_crypto4 = require("crypto");
+    path20 = __toESM(require("path"), 1);
+    import_node_crypto5 = require("crypto");
     import_node_child_process4 = require("child_process");
     init_configUtils();
     init_cursorGlobalMcpConfig();
@@ -4019,10 +4105,10 @@ async function pathExists4(filePath) {
   }
 }
 function getWindsurfGlobalMcpConfigPath(homeDir) {
-  return path19.join(homeDir, ".config", "devin", "mcp_config.json");
+  return path21.join(homeDir, ".config", "devin", "mcp_config.json");
 }
 function getWindsurfLegacyMcpConfigPath(homeDir) {
-  return path19.join(homeDir, ".codeium", "windsurf", "mcp_config.json");
+  return path21.join(homeDir, ".codeium", "windsurf", "mcp_config.json");
 }
 function formatWindsurfBackupTimestamp(d = /* @__PURE__ */ new Date()) {
   const pad = (n) => String(n).padStart(2, "0");
@@ -4036,7 +4122,7 @@ function buildMemoraoneWindsurfMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "windsurf",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path19.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path21.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -4052,10 +4138,10 @@ function buildMemoraoneWindsurfMcpServer(options) {
     env: env2
   };
 }
-function mergeWindsurfMcpConfigObject(existing, memoraone) {
+function mergeWindsurfMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
   const mcpServers = typeof base.mcpServers === "object" && base.mcpServers !== null && !Array.isArray(base.mcpServers) ? { ...base.mcpServers } : {};
-  return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
+  return { ...base, mcpServers: ownership ? replaceMemoraoneRepositoryBindingInServerMap(mcpServers, memoraone, ownership) : replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 function stripMemoraoneFromWindsurfConfigObject(existing) {
   const base = { ...existing };
@@ -4071,11 +4157,11 @@ function stripMemoraoneFromWindsurfConfigObject(existing) {
   return { next: { ...base, mcpServers }, removed: true };
 }
 async function writeWindsurfMcpJsonAtomic(filePath, content) {
-  const dir = path19.dirname(filePath);
+  const dir = path21.dirname(filePath);
   await fs15.mkdir(dir, { recursive: true });
-  const tmpPath = path19.join(
+  const tmpPath = path21.join(
     dir,
-    `.${path19.basename(filePath)}.${process.pid}.${(0, import_node_crypto5.randomBytes)(8).toString("hex")}.tmp`
+    `.${path21.basename(filePath)}.${process.pid}.${(0, import_node_crypto6.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs15.writeFile(tmpPath, content, "utf8");
@@ -4091,7 +4177,7 @@ async function writeWindsurfMcpJsonAtomic(filePath, content) {
 function memoraoneServerMatches3(server, expected) {
   return canonicalValueMatches(server, expected);
 }
-function validateWindsurfMcpConfig(parsed2, expected) {
+function validateWindsurfMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!parsed2 || typeof parsed2 !== "object") {
     throw new Error("[setup-ide-files] Devin Desktop MCP config must be a JSON object.");
   }
@@ -4099,7 +4185,8 @@ function validateWindsurfMcpConfig(parsed2, expected) {
   if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
     throw new Error("[setup-ide-files] Devin Desktop MCP config missing mcpServers object.");
   }
-  const memoraone = mcpServers.memoraone;
+  const serverMap = mcpServers;
+  const memoraone = serverMap[serverName] ?? Object.values(serverMap).find((entry) => memoraoneServerMatches3(entry, expected));
   if (!memoraoneServerMatches3(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] Devin Desktop MCP config mcpServers.memoraone is missing or invalid."
@@ -4166,8 +4253,8 @@ async function setupWindsurfMcpConfig(options) {
   const homeDir = options.homeDir ?? os6.homedir();
   const activePath = options.globalConfigPath ?? getWindsurfGlobalMcpConfigPath(homeDir);
   const legacyPath = options.legacyConfigPath ?? getWindsurfLegacyMcpConfigPath(homeDir);
-  const samePath = path19.resolve(activePath) === path19.resolve(legacyPath);
-  const workspaceRoot = path19.resolve(options.repoRoot);
+  const samePath = path21.resolve(activePath) === path21.resolve(legacyPath);
+  const workspaceRoot = path21.resolve(options.repoRoot);
   const memoraone = await buildWindsurfMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -4204,14 +4291,17 @@ async function setupWindsurfMcpConfig(options) {
     );
   }
   const mergeBase = activeExisted ? activeExisting : legacyExisting;
-  const merged = mergeWindsurfMcpConfigObject(mergeBase, memoraone);
+  const merged = mergeWindsurfMcpConfigObject(mergeBase, memoraone, options.ownership);
   const body = JSON.stringify(merged, null, 2) + "\n";
-  const activeMemoraone = extractMemoraone(activeExisting);
-  const activeAlreadyCorrect = activeExisted && memoraoneServerMatches3(activeMemoraone, memoraone);
+  const activeAlreadyCorrect = Boolean(
+    activeExisted && activeExisting && canonicalValueMatches(activeExisting, merged)
+  );
   let legacyNeedsCleanup = false;
   if (legacyExisted && !legacyMalformed && legacyExisting) {
-    const legacyMemoraone = extractMemoraone(legacyExisting);
-    legacyNeedsCleanup = legacyMemoraone !== void 0;
+    legacyNeedsCleanup = options.ownership ? stripMemoraoneRepositoryBindingFromServerMap(
+      legacyExisting.mcpServers ?? {},
+      options.ownership
+    ).removedKeys.length > 0 : extractMemoraone(legacyExisting) !== void 0;
   }
   if (activeAlreadyCorrect && !legacyNeedsCleanup) {
     return {
@@ -4247,7 +4337,7 @@ async function setupWindsurfMcpConfig(options) {
     await writeWindsurfMcpJsonAtomic(activePath, body);
     const verifyRaw = await fs15.readFile(activePath, "utf8");
     const verifyParsed = JSON.parse(stripLeadingLineComments3(verifyRaw));
-    validateWindsurfMcpConfig(verifyParsed, memoraone);
+    validateWindsurfMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
   }
   let legacyCleanup = "absent";
   let warning;
@@ -4257,7 +4347,11 @@ async function setupWindsurfMcpConfig(options) {
       warning = `[setup-ide-files] Legacy Windsurf MCP config has invalid JSON and was left unchanged: ${legacyPath}. Devin Desktop active config was written; fix or remove the legacy file to avoid ambiguity.`;
     } else if (legacyNeedsCleanup && legacyExisting) {
       await backupConfigFile2(legacyPath);
-      const { next, removed } = stripMemoraoneFromWindsurfConfigObject(legacyExisting);
+      const scoped = options.ownership && legacyExisting.mcpServers && typeof legacyExisting.mcpServers === "object" && !Array.isArray(legacyExisting.mcpServers) ? stripMemoraoneRepositoryBindingFromServerMap(
+        legacyExisting.mcpServers,
+        options.ownership
+      ) : null;
+      const { next, removed } = scoped ? { next: { ...legacyExisting, mcpServers: scoped.next }, removed: scoped.removedKeys.length > 0 } : stripMemoraoneFromWindsurfConfigObject(legacyExisting);
       if (removed) {
         const legacyBody = JSON.stringify(next, null, 2) + "\n";
         await writeWindsurfMcpJsonAtomic(legacyPath, legacyBody);
@@ -4320,13 +4414,13 @@ function logWindsurfMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Refresh MCP servers in Devin Desktop settings, or restart Devin Desktop, for MCP changes to take effect."
   );
 }
-var fs15, os6, path19, import_node_crypto5;
+var fs15, os6, path21, import_node_crypto6;
 var init_windsurfMcpConfig = __esm({
   "src/windsurfMcpConfig.ts"() {
     fs15 = __toESM(require("fs/promises"), 1);
     os6 = __toESM(require("os"), 1);
-    path19 = __toESM(require("path"), 1);
-    import_node_crypto5 = require("crypto");
+    path21 = __toESM(require("path"), 1);
+    import_node_crypto6 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -4346,13 +4440,13 @@ async function pathExists5(filePath) {
   }
 }
 function getOpenCodeProjectMcpConfigPath(repoRoot) {
-  return path20.join(path20.resolve(repoRoot), "opencode.json");
+  return path22.join(path22.resolve(repoRoot), "opencode.json");
 }
 function getOpenCodeProjectJsoncConfigPath(repoRoot) {
-  return path20.join(path20.resolve(repoRoot), "opencode.jsonc");
+  return path22.join(path22.resolve(repoRoot), "opencode.jsonc");
 }
 function getOpenCodeGlobalMcpConfigPath(homeDir) {
-  return path20.join(homeDir, ".config", "opencode", "opencode.json");
+  return path22.join(homeDir, ".config", "opencode", "opencode.json");
 }
 function buildMemoraoneOpenCodeMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -4362,7 +4456,7 @@ function buildMemoraoneOpenCodeMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "opencode",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path20.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path22.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -4393,11 +4487,11 @@ function mergeOpenCodeMcpConfigObject(existing, memoraone) {
   return { ...base, mcp: replaceMemoraoneOwnedInServerMap(mcp, memoraone) };
 }
 async function writeOpenCodeMcpJsonAtomic(filePath, content) {
-  const dir = path20.dirname(filePath);
+  const dir = path22.dirname(filePath);
   await fs16.mkdir(dir, { recursive: true });
-  const tmpPath = path20.join(
+  const tmpPath = path22.join(
     dir,
-    `.${path20.basename(filePath)}.${process.pid}.${(0, import_node_crypto6.randomBytes)(8).toString("hex")}.tmp`
+    `.${path22.basename(filePath)}.${process.pid}.${(0, import_node_crypto7.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs16.writeFile(tmpPath, content, "utf8");
@@ -4476,7 +4570,7 @@ async function buildOpenCodeMemoraoneServer(options) {
 async function setupOpenCodeMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getOpenCodeProjectMcpConfigPath(options.repoRoot);
   const jsoncPath = getOpenCodeProjectJsoncConfigPath(options.repoRoot);
-  const workspaceRoot = path20.resolve(options.repoRoot);
+  const workspaceRoot = path22.resolve(options.repoRoot);
   const memoraone = await buildOpenCodeMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -4539,12 +4633,12 @@ function logOpenCodeMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit OpenCode and reopen this repo for MCP changes to take effect."
   );
 }
-var fs16, path20, import_node_crypto6, OPENCODE_CONFIG_SCHEMA_URL, OpenCodeMcpJsonParseError, OpenCodeJsoncOnlyError;
+var fs16, path22, import_node_crypto7, OPENCODE_CONFIG_SCHEMA_URL, OpenCodeMcpJsonParseError, OpenCodeJsoncOnlyError;
 var init_opencodeMcpConfig = __esm({
   "src/opencodeMcpConfig.ts"() {
     fs16 = __toESM(require("fs/promises"), 1);
-    path20 = __toESM(require("path"), 1);
-    import_node_crypto6 = require("crypto");
+    path22 = __toESM(require("path"), 1);
+    import_node_crypto7 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -4583,11 +4677,11 @@ async function pathExists6(filePath) {
   }
 }
 function getCodexProjectMcpConfigPath(repoRoot) {
-  return path21.join(path21.resolve(repoRoot), ".codex", "config.toml");
+  return path23.join(path23.resolve(repoRoot), ".codex", "config.toml");
 }
 function getCodexGlobalMcpConfigPath(homeDir, env2 = process.env) {
-  const codexHome = env2.CODEX_HOME?.trim() ? path21.resolve(env2.CODEX_HOME) : path21.join(homeDir, ".codex");
-  return path21.join(codexHome, "config.toml");
+  const codexHome = env2.CODEX_HOME?.trim() ? path23.resolve(env2.CODEX_HOME) : path23.join(homeDir, ".codex");
+  return path23.join(codexHome, "config.toml");
 }
 function escapeTomlBasicString(value) {
   return '"' + value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r") + '"';
@@ -4611,7 +4705,7 @@ function buildMemoraoneCodexMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "codex",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path21.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path23.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -4838,11 +4932,11 @@ function parseCodexTomlOrThrow(source, configPath) {
   }
 }
 async function writeCodexTomlAtomic(filePath, content) {
-  const dir = path21.dirname(filePath);
+  const dir = path23.dirname(filePath);
   await fs17.mkdir(dir, { recursive: true });
-  const tmpPath = path21.join(
+  const tmpPath = path23.join(
     dir,
-    `.${path21.basename(filePath)}.${process.pid}.${(0, import_node_crypto7.randomBytes)(8).toString("hex")}.tmp`
+    `.${path23.basename(filePath)}.${process.pid}.${(0, import_node_crypto8.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs17.writeFile(tmpPath, content, "utf8");
@@ -4897,7 +4991,7 @@ async function buildCodexMemoraoneServer(options) {
 }
 async function setupCodexMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getCodexProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path21.resolve(options.repoRoot);
+  const workspaceRoot = path23.resolve(options.repoRoot);
   const memoraone = await buildCodexMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -4947,12 +5041,12 @@ function logCodexMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Trust this project in Codex if prompted, then restart Codex."
   );
 }
-var fs17, path21, import_node_crypto7, import_smol_toml, CODEX_MCP_SERVER_NAME, CODEX_OWNED_TABLE_PREFIX, CodexMcpTomlParseError, TABLE_HEADER_RE;
+var fs17, path23, import_node_crypto8, import_smol_toml, CODEX_MCP_SERVER_NAME, CODEX_OWNED_TABLE_PREFIX, CodexMcpTomlParseError, TABLE_HEADER_RE;
 var init_codexMcpConfig = __esm({
   "src/codexMcpConfig.ts"() {
     fs17 = __toESM(require("fs/promises"), 1);
-    path21 = __toESM(require("path"), 1);
-    import_node_crypto7 = require("crypto");
+    path23 = __toESM(require("path"), 1);
+    import_node_crypto8 = require("crypto");
     import_smol_toml = require("smol-toml");
     init_configUtils();
     init_cursorGlobalMcpConfig();
@@ -4988,7 +5082,7 @@ async function pathExists7(filePath) {
   }
 }
 function getKiroProjectMcpConfigPath(repoRoot) {
-  return path22.join(path22.resolve(repoRoot), ".kiro", "settings", "mcp.json");
+  return path24.join(path24.resolve(repoRoot), ".kiro", "settings", "mcp.json");
 }
 function buildMemoraoneKiroMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -4997,7 +5091,7 @@ function buildMemoraoneKiroMcpServer(options) {
       environment,
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path22.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path24.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -5019,11 +5113,11 @@ function mergeKiroMcpConfigObject(existing, memoraone) {
   return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeKiroMcpJsonAtomic(filePath, content) {
-  const dir = path22.dirname(filePath);
+  const dir = path24.dirname(filePath);
   await fs18.mkdir(dir, { recursive: true });
-  const tmpPath = path22.join(
+  const tmpPath = path24.join(
     dir,
-    `.${path22.basename(filePath)}.${process.pid}.${(0, import_node_crypto8.randomBytes)(8).toString("hex")}.tmp`
+    `.${path24.basename(filePath)}.${process.pid}.${(0, import_node_crypto9.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs18.writeFile(tmpPath, content, "utf8");
@@ -5101,7 +5195,7 @@ async function buildKiroMemoraoneServer(options) {
 }
 async function setupKiroMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getKiroProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path22.resolve(options.repoRoot);
+  const workspaceRoot = path24.resolve(options.repoRoot);
   const memoraone = await buildKiroMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -5160,12 +5254,12 @@ function logKiroMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Kiro and reopen this repo for MCP changes to take effect."
   );
 }
-var fs18, path22, import_node_crypto8, KiroMcpJsonParseError;
+var fs18, path24, import_node_crypto9, KiroMcpJsonParseError;
 var init_kiroMcpConfig = __esm({
   "src/kiroMcpConfig.ts"() {
     fs18 = __toESM(require("fs/promises"), 1);
-    path22 = __toESM(require("path"), 1);
-    import_node_crypto8 = require("crypto");
+    path24 = __toESM(require("path"), 1);
+    import_node_crypto9 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -5197,7 +5291,7 @@ async function pathExists8(filePath) {
   }
 }
 function getRooCodeProjectMcpConfigPath(repoRoot) {
-  return path23.join(path23.resolve(repoRoot), ".roo", "mcp.json");
+  return path25.join(path25.resolve(repoRoot), ".roo", "mcp.json");
 }
 function buildMemoraoneRooCodeMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -5207,7 +5301,7 @@ function buildMemoraoneRooCodeMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "roo-code",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path23.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path25.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -5229,11 +5323,11 @@ function mergeRooCodeMcpConfigObject(existing, memoraone) {
   return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeRooCodeMcpJsonAtomic(filePath, content) {
-  const dir = path23.dirname(filePath);
+  const dir = path25.dirname(filePath);
   await fs19.mkdir(dir, { recursive: true });
-  const tmpPath = path23.join(
+  const tmpPath = path25.join(
     dir,
-    `.${path23.basename(filePath)}.${process.pid}.${(0, import_node_crypto9.randomBytes)(8).toString("hex")}.tmp`
+    `.${path25.basename(filePath)}.${process.pid}.${(0, import_node_crypto10.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs19.writeFile(tmpPath, content, "utf8");
@@ -5311,7 +5405,7 @@ async function buildRooCodeMemoraoneServer(options) {
 }
 async function setupRooCodeMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getRooCodeProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path23.resolve(options.repoRoot);
+  const workspaceRoot = path25.resolve(options.repoRoot);
   const memoraone = await buildRooCodeMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -5376,12 +5470,12 @@ function logRooCodeMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Roo Code and reopen this repo for MCP changes to take effect."
   );
 }
-var fs19, path23, import_node_crypto9, RooCodeMcpJsonParseError;
+var fs19, path25, import_node_crypto10, RooCodeMcpJsonParseError;
 var init_rooCodeMcpConfig = __esm({
   "src/rooCodeMcpConfig.ts"() {
     fs19 = __toESM(require("fs/promises"), 1);
-    path23 = __toESM(require("path"), 1);
-    import_node_crypto9 = require("crypto");
+    path25 = __toESM(require("path"), 1);
+    import_node_crypto10 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -5413,10 +5507,10 @@ async function pathExists9(filePath) {
   }
 }
 function getClineCliRootMcpConfigPath(homeDir) {
-  return path24.join(homeDir, ".cline", "mcp.json");
+  return path26.join(homeDir, ".cline", "mcp.json");
 }
 function getClineCliGlobalMcpConfigPath(homeDir) {
-  return path24.join(homeDir, ".cline", "data", "settings", "cline_mcp_settings.json");
+  return path26.join(homeDir, ".cline", "data", "settings", "cline_mcp_settings.json");
 }
 function getClineCliMcpConfigPaths(homeDir) {
   return {
@@ -5432,7 +5526,7 @@ function buildMemoraoneClineCliMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "cline-cli",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path24.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path26.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -5450,17 +5544,20 @@ function buildMemoraoneClineCliMcpServer(options) {
     env: env2
   };
 }
-function mergeClineCliMcpConfigObject(existing, memoraone) {
+function mergeClineCliMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
   const mcpServers = typeof base.mcpServers === "object" && base.mcpServers !== null && !Array.isArray(base.mcpServers) ? { ...base.mcpServers } : {};
-  return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
+  return {
+    ...base,
+    mcpServers: ownership ? replaceMemoraoneRepositoryBindingInServerMap(mcpServers, memoraone, ownership) : replaceMemoraoneOwnedInServerMap(mcpServers, memoraone)
+  };
 }
 async function writeClineCliMcpJsonAtomic(filePath, content) {
-  const dir = path24.dirname(filePath);
+  const dir = path26.dirname(filePath);
   await fs20.mkdir(dir, { recursive: true });
-  const tmpPath = path24.join(
+  const tmpPath = path26.join(
     dir,
-    `.${path24.basename(filePath)}.${process.pid}.${(0, import_node_crypto10.randomBytes)(8).toString("hex")}.tmp`
+    `.${path26.basename(filePath)}.${process.pid}.${(0, import_node_crypto11.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs20.writeFile(tmpPath, content, "utf8");
@@ -5476,7 +5573,7 @@ async function writeClineCliMcpJsonAtomic(filePath, content) {
 function memoraoneServerMatches8(server, expected) {
   return canonicalValueMatches(server, expected);
 }
-function validateClineCliMcpConfig(parsed2, expected) {
+function validateClineCliMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!parsed2 || typeof parsed2 !== "object") {
     throw new Error("[setup-ide-files] Cline CLI MCP config must be a JSON object.");
   }
@@ -5484,7 +5581,8 @@ function validateClineCliMcpConfig(parsed2, expected) {
   if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
     throw new Error("[setup-ide-files] Cline CLI MCP config missing mcpServers object.");
   }
-  const memoraone = mcpServers.memoraone;
+  const serverMap = mcpServers;
+  const memoraone = serverMap[serverName] ?? Object.values(serverMap).find((entry) => memoraoneServerMatches8(entry, expected));
   if (!memoraoneServerMatches8(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] Cline CLI MCP config mcpServers.memoraone is missing or invalid."
@@ -5496,7 +5594,7 @@ async function readJsonConfig6(filePath) {
   if (raw.trim() === "") return null;
   return JSON.parse(stripLeadingLineComments6(raw));
 }
-async function prepareClineCliFile(filePath, memoraone) {
+async function prepareClineCliFile(filePath, memoraone, ownership) {
   const existed = await pathExists9(filePath);
   let existing = null;
   if (existed) {
@@ -5509,13 +5607,9 @@ async function prepareClineCliFile(filePath, memoraone) {
       throw new ClineCliMcpJsonParseError(filePath);
     }
   }
-  const merged = mergeClineCliMcpConfigObject(existing, memoraone);
+  const merged = mergeClineCliMcpConfigObject(existing, memoraone, ownership);
   const body = JSON.stringify(merged, null, 2) + "\n";
-  let alreadyCorrect = false;
-  if (existed && existing) {
-    const currentMemoraone = existing.mcpServers && typeof existing.mcpServers === "object" && !Array.isArray(existing.mcpServers) ? existing.mcpServers.memoraone : void 0;
-    alreadyCorrect = memoraoneServerMatches8(currentMemoraone, memoraone);
-  }
+  const alreadyCorrect = Boolean(existed && existing && canonicalValueMatches(existing, merged));
   return { filePath, existed, existing, merged, body, alreadyCorrect };
 }
 function outcomeForPrepared(prepared) {
@@ -5573,7 +5667,7 @@ async function setupClineCliMcpConfig(options) {
   const defaults = getClineCliMcpConfigPaths(homeDir);
   const rootConfigPath = options.rootConfigPath ?? defaults.rootConfigPath;
   const settingsConfigPath = options.globalConfigPath ?? defaults.settingsConfigPath;
-  const workspaceRoot = path24.resolve(options.repoRoot);
+  const workspaceRoot = path26.resolve(options.repoRoot);
   const memoraone = await buildClineCliMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -5583,8 +5677,12 @@ async function setupClineCliMcpConfig(options) {
     npxPathOverride: options.npxPathOverride,
     cliPathOverride: options.cliPathOverride
   });
-  const rootPrepared = await prepareClineCliFile(rootConfigPath, memoraone);
-  const settingsPrepared = await prepareClineCliFile(settingsConfigPath, memoraone);
+  const rootPrepared = await prepareClineCliFile(rootConfigPath, memoraone, options.ownership);
+  const settingsPrepared = await prepareClineCliFile(
+    settingsConfigPath,
+    memoraone,
+    options.ownership
+  );
   const rootOutcome = outcomeForPrepared(rootPrepared);
   const settingsOutcome = outcomeForPrepared(settingsPrepared);
   const outcome = combineClineCliOutcomes(rootOutcome, settingsOutcome);
@@ -5615,7 +5713,11 @@ async function setupClineCliMcpConfig(options) {
     await writeClineCliMcpJsonAtomic(prepared.filePath, prepared.body);
     const verifyRaw = await fs20.readFile(prepared.filePath, "utf8");
     const verifyParsed = JSON.parse(stripLeadingLineComments6(verifyRaw));
-    validateClineCliMcpConfig(verifyParsed, memoraone);
+    validateClineCliMcpConfig(
+      verifyParsed,
+      memoraone,
+      options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME
+    );
   }
   return {
     outcome,
@@ -5650,13 +5752,13 @@ function logClineCliMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Cline CLI and reopen for MCP changes to take effect."
   );
 }
-var fs20, os7, path24, import_node_crypto10, CLINE_CLI_MCP_TIMEOUT_SECONDS, ClineCliMcpJsonParseError;
+var fs20, os7, path26, import_node_crypto11, CLINE_CLI_MCP_TIMEOUT_SECONDS, ClineCliMcpJsonParseError;
 var init_clineCliMcpConfig = __esm({
   "src/clineCliMcpConfig.ts"() {
     fs20 = __toESM(require("fs/promises"), 1);
     os7 = __toESM(require("os"), 1);
-    path24 = __toESM(require("path"), 1);
-    import_node_crypto10 = require("crypto");
+    path26 = __toESM(require("path"), 1);
+    import_node_crypto11 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -5689,7 +5791,7 @@ async function pathExists10(filePath) {
   }
 }
 function getClaudeDesktopGlobalMcpConfigPath(homeDir) {
-  return path25.join(
+  return path27.join(
     homeDir,
     "Library",
     "Application Support",
@@ -5709,7 +5811,7 @@ function buildMemoraoneClaudeDesktopMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "claude-desktop",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path25.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path27.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -5725,17 +5827,17 @@ function buildMemoraoneClaudeDesktopMcpServer(options) {
     env: env2
   };
 }
-function mergeClaudeDesktopMcpConfigObject(existing, memoraone) {
+function mergeClaudeDesktopMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
   const mcpServers = typeof base.mcpServers === "object" && base.mcpServers !== null && !Array.isArray(base.mcpServers) ? { ...base.mcpServers } : {};
-  return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
+  return { ...base, mcpServers: ownership ? replaceMemoraoneRepositoryBindingInServerMap(mcpServers, memoraone, ownership) : replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeClaudeDesktopMcpJsonAtomic(filePath, content) {
-  const dir = path25.dirname(filePath);
+  const dir = path27.dirname(filePath);
   await fs21.mkdir(dir, { recursive: true });
-  const tmpPath = path25.join(
+  const tmpPath = path27.join(
     dir,
-    `.${path25.basename(filePath)}.${process.pid}.${(0, import_node_crypto11.randomBytes)(8).toString("hex")}.tmp`
+    `.${path27.basename(filePath)}.${process.pid}.${(0, import_node_crypto12.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs21.writeFile(tmpPath, content, "utf8");
@@ -5751,7 +5853,7 @@ async function writeClaudeDesktopMcpJsonAtomic(filePath, content) {
 function memoraoneServerMatches9(server, expected) {
   return canonicalValueMatches(server, expected);
 }
-function validateClaudeDesktopMcpConfig(parsed2, expected) {
+function validateClaudeDesktopMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!parsed2 || typeof parsed2 !== "object") {
     throw new Error("[setup-ide-files] Claude Desktop MCP config must be a JSON object.");
   }
@@ -5759,7 +5861,8 @@ function validateClaudeDesktopMcpConfig(parsed2, expected) {
   if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
     throw new Error("[setup-ide-files] Claude Desktop MCP config missing mcpServers object.");
   }
-  const memoraone = mcpServers.memoraone;
+  const serverMap = mcpServers;
+  const memoraone = serverMap[serverName] ?? Object.values(serverMap).find((entry) => memoraoneServerMatches9(entry, expected));
   if (!memoraoneServerMatches9(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] Claude Desktop MCP config mcpServers.memoraone is missing or invalid."
@@ -5819,7 +5922,7 @@ async function buildClaudeDesktopMemoraoneServer(options) {
 async function setupClaudeDesktopMcpConfig(options) {
   const homeDir = options.homeDir ?? os8.homedir();
   const activePath = options.globalConfigPath ?? getClaudeDesktopGlobalMcpConfigPath(homeDir);
-  const workspaceRoot = path25.resolve(options.repoRoot);
+  const workspaceRoot = path27.resolve(options.repoRoot);
   const memoraone = await buildClaudeDesktopMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -5841,11 +5944,10 @@ async function setupClaudeDesktopMcpConfig(options) {
       throw new ClaudeDesktopMcpJsonParseError(activePath);
     }
   }
-  const merged = mergeClaudeDesktopMcpConfigObject(existing, memoraone);
+  const merged = mergeClaudeDesktopMcpConfigObject(existing, memoraone, options.ownership);
   const body = JSON.stringify(merged, null, 2) + "\n";
   if (existed && existing) {
-    const currentMemoraone = existing.mcpServers && typeof existing.mcpServers === "object" && !Array.isArray(existing.mcpServers) ? existing.mcpServers.memoraone : void 0;
-    if (memoraoneServerMatches9(currentMemoraone, memoraone)) {
+    if (canonicalValueMatches(existing, merged)) {
       return { outcome: "skipped", memoraone, activeConfigPath: activePath };
     }
   }
@@ -5863,7 +5965,7 @@ async function setupClaudeDesktopMcpConfig(options) {
   await writeClaudeDesktopMcpJsonAtomic(activePath, body);
   const verifyRaw = await fs21.readFile(activePath, "utf8");
   const verifyParsed = JSON.parse(stripLeadingLineComments7(verifyRaw));
-  validateClaudeDesktopMcpConfig(verifyParsed, memoraone);
+  validateClaudeDesktopMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
   return {
     outcome: existed ? "updated" : "created",
     backupPath,
@@ -5897,13 +5999,13 @@ function logClaudeDesktopMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Claude Desktop and reopen for MCP changes to take effect."
   );
 }
-var fs21, os8, path25, import_node_crypto11, ClaudeDesktopMcpJsonParseError;
+var fs21, os8, path27, import_node_crypto12, ClaudeDesktopMcpJsonParseError;
 var init_claudeDesktopMcpConfig = __esm({
   "src/claudeDesktopMcpConfig.ts"() {
     fs21 = __toESM(require("fs/promises"), 1);
     os8 = __toESM(require("os"), 1);
-    path25 = __toESM(require("path"), 1);
-    import_node_crypto11 = require("crypto");
+    path27 = __toESM(require("path"), 1);
+    import_node_crypto12 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -5935,7 +6037,7 @@ async function pathExists11(filePath) {
   }
 }
 function getZedProjectMcpConfigPath(repoRoot) {
-  return path26.join(path26.resolve(repoRoot), ".zed", "settings.json");
+  return path28.join(path28.resolve(repoRoot), ".zed", "settings.json");
 }
 function buildMemoraoneZedMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -5945,7 +6047,7 @@ function buildMemoraoneZedMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "zed",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path26.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path28.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -5970,11 +6072,11 @@ function mergeZedMcpConfigObject(existing, memoraone) {
   };
 }
 async function writeZedMcpJsonAtomic(filePath, content) {
-  const dir = path26.dirname(filePath);
+  const dir = path28.dirname(filePath);
   await fs22.mkdir(dir, { recursive: true });
-  const tmpPath = path26.join(
+  const tmpPath = path28.join(
     dir,
-    `.${path26.basename(filePath)}.${process.pid}.${(0, import_node_crypto12.randomBytes)(8).toString("hex")}.tmp`
+    `.${path28.basename(filePath)}.${process.pid}.${(0, import_node_crypto13.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs22.writeFile(tmpPath, content, "utf8");
@@ -6052,7 +6154,7 @@ async function buildZedMemoraoneServer(options) {
 }
 async function setupZedMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getZedProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path26.resolve(options.repoRoot);
+  const workspaceRoot = path28.resolve(options.repoRoot);
   const memoraone = await buildZedMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -6115,12 +6217,12 @@ function logZedMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Zed and reopen this repo for MCP changes to take effect."
   );
 }
-var fs22, path26, import_node_crypto12, ZedMcpJsonParseError;
+var fs22, path28, import_node_crypto13, ZedMcpJsonParseError;
 var init_zedMcpConfig = __esm({
   "src/zedMcpConfig.ts"() {
     fs22 = __toESM(require("fs/promises"), 1);
-    path26 = __toESM(require("path"), 1);
-    import_node_crypto12 = require("crypto");
+    path28 = __toESM(require("path"), 1);
+    import_node_crypto13 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -6152,7 +6254,7 @@ async function pathExists12(filePath) {
   }
 }
 function getVisualStudioProjectMcpConfigPath(repoRoot) {
-  return path27.join(path27.resolve(repoRoot), ".vs", "mcp.json");
+  return path29.join(path29.resolve(repoRoot), ".vs", "mcp.json");
 }
 function buildMemoraoneVisualStudioMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -6162,7 +6264,7 @@ function buildMemoraoneVisualStudioMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "visual-studio",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path27.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path29.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -6185,11 +6287,11 @@ function mergeVisualStudioMcpConfigObject(existing, memoraone) {
   return { ...base, servers: replaceMemoraoneOwnedInServerMap(servers, memoraone) };
 }
 async function writeVisualStudioMcpJsonAtomic(filePath, content) {
-  const dir = path27.dirname(filePath);
+  const dir = path29.dirname(filePath);
   await fs23.mkdir(dir, { recursive: true });
-  const tmpPath = path27.join(
+  const tmpPath = path29.join(
     dir,
-    `.${path27.basename(filePath)}.${process.pid}.${(0, import_node_crypto13.randomBytes)(8).toString("hex")}.tmp`
+    `.${path29.basename(filePath)}.${process.pid}.${(0, import_node_crypto14.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs23.writeFile(tmpPath, content, "utf8");
@@ -6267,7 +6369,7 @@ async function buildVisualStudioMemoraoneServer(options) {
 }
 async function setupVisualStudioMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getVisualStudioProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path27.resolve(options.repoRoot);
+  const workspaceRoot = path29.resolve(options.repoRoot);
   const memoraone = await buildVisualStudioMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -6332,12 +6434,12 @@ function logVisualStudioMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Visual Studio and reopen this repo for MCP changes to take effect."
   );
 }
-var fs23, path27, import_node_crypto13, VisualStudioMcpJsonParseError;
+var fs23, path29, import_node_crypto14, VisualStudioMcpJsonParseError;
 var init_visualStudioMcpConfig = __esm({
   "src/visualStudioMcpConfig.ts"() {
     fs23 = __toESM(require("fs/promises"), 1);
-    path27 = __toESM(require("path"), 1);
-    import_node_crypto13 = require("crypto");
+    path29 = __toESM(require("path"), 1);
+    import_node_crypto14 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -6366,7 +6468,7 @@ async function pathExists13(filePath) {
   }
 }
 function getContinueProjectMcpConfigPath(repoRoot) {
-  return path28.join(path28.resolve(repoRoot), ".continue", "mcpServers", "memoraone.yaml");
+  return path30.join(path30.resolve(repoRoot), ".continue", "mcpServers", "memoraone.yaml");
 }
 function buildMemoraoneContinueMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -6376,7 +6478,7 @@ function buildMemoraoneContinueMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "continue",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path28.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path30.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -6425,11 +6527,11 @@ function mergeContinueMcpConfigObject(existing, memoraone) {
   return base;
 }
 async function writeContinueMcpYamlAtomic(filePath, content) {
-  const dir = path28.dirname(filePath);
+  const dir = path30.dirname(filePath);
   await fs24.mkdir(dir, { recursive: true });
-  const tmpPath = path28.join(
+  const tmpPath = path30.join(
     dir,
-    `.${path28.basename(filePath)}.${process.pid}.${(0, import_node_crypto14.randomBytes)(8).toString("hex")}.tmp`
+    `.${path30.basename(filePath)}.${process.pid}.${(0, import_node_crypto15.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs24.writeFile(tmpPath, content, "utf8");
@@ -6517,7 +6619,7 @@ async function buildContinueMemoraoneServer(options) {
 }
 async function setupContinueMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getContinueProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path28.resolve(options.repoRoot);
+  const workspaceRoot = path30.resolve(options.repoRoot);
   const memoraone = await buildContinueMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -6590,12 +6692,12 @@ function logContinueMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Continue and reopen this repo for MCP changes to take effect."
   );
 }
-var fs24, path28, import_node_crypto14, import_yaml, ContinueMcpYamlParseError;
+var fs24, path30, import_node_crypto15, import_yaml, ContinueMcpYamlParseError;
 var init_continueMcpConfig = __esm({
   "src/continueMcpConfig.ts"() {
     fs24 = __toESM(require("fs/promises"), 1);
-    path28 = __toESM(require("path"), 1);
-    import_node_crypto14 = require("crypto");
+    path30 = __toESM(require("path"), 1);
+    import_node_crypto15 = require("crypto");
     import_yaml = require("yaml");
     init_configUtils();
     init_cursorGlobalMcpConfig();
@@ -6627,49 +6729,8 @@ async function pathExists14(filePath) {
     return false;
   }
 }
-function getClineHostMcpConfigPath(homeDir, hostId, platform2 = process.platform) {
-  if (platform2 === "darwin") {
-    return path29.join(
-      homeDir,
-      "Library",
-      "Application Support",
-      DARWIN_APP_SUPPORT_NAMES[hostId],
-      CLINE_EXTENSION_RELATIVE
-    );
-  }
-  return path29.join(homeDir, `.cline-host-${hostId}`, CLINE_EXTENSION_RELATIVE);
-}
-function getClineHostInstallRoot(homeDir, hostId, platform2 = process.platform) {
-  if (platform2 === "darwin") {
-    return path29.join(homeDir, "Library", "Application Support", DARWIN_APP_SUPPORT_NAMES[hostId]);
-  }
-  return path29.join(homeDir, `.cline-host-${hostId}`);
-}
-function getKnownClineHostCandidates(homeDir, platform2 = process.platform) {
-  return CLINE_HOST_IDS.map((hostId) => ({
-    hostId,
-    installRoot: getClineHostInstallRoot(homeDir, hostId, platform2),
-    configPath: getClineHostMcpConfigPath(homeDir, hostId, platform2)
-  }));
-}
-async function detectClineHosts(options) {
-  const platform2 = options.platform ?? process.platform;
-  const exists = options.pathExistsFn ?? pathExists14;
-  const candidates = getKnownClineHostCandidates(options.homeDir, platform2);
-  const hostIdFilter = options.explicitHostIds ? new Set(options.explicitHostIds) : null;
-  const selected = [];
-  for (const c of candidates) {
-    if (hostIdFilter && !hostIdFilter.has(c.hostId)) continue;
-    const configPath = options.explicitHostPaths?.[c.hostId] ?? c.configPath;
-    if (hostIdFilter) {
-      selected.push({ hostId: c.hostId, configPath, installRoot: c.installRoot });
-      continue;
-    }
-    if (await exists(c.installRoot)) {
-      selected.push({ hostId: c.hostId, configPath, installRoot: c.installRoot });
-    }
-  }
-  return selected;
+function getClineProjectMcpConfigPath(repoRoot) {
+  return path31.join(path31.resolve(repoRoot), ".cline", "mcp.json");
 }
 function formatClineBackupTimestamp(d = /* @__PURE__ */ new Date()) {
   const pad = (n) => String(n).padStart(2, "0");
@@ -6683,21 +6744,10 @@ function buildMemoraoneClineMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "cline",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path29.resolve(options.workspaceRoot)
-  };
-  if (environment === "local" || options.devMode) {
-    env2.MEMORAONE_DEV_MODE = "1";
-  }
-  if ("MEMORAONE_M1_PATH" in env2 || "MEMORAONE_API_KEY" in env2) {
-    throw new Error(
-      "[setup-ide-files] Cline MCP config must not include credentials or .m1 paths"
-    );
-  }
-  return {
-    command: options.command,
-    args: options.args,
-    env: env2
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path31.resolve(options.workspaceRoot)
   };
+  if (environment === "local" || options.devMode) env2.MEMORAONE_DEV_MODE = "1";
+  return { command: options.command, args: options.args, env: env2 };
 }
 function mergeClineMcpConfigObject(existing, memoraone) {
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
@@ -6705,11 +6755,11 @@ function mergeClineMcpConfigObject(existing, memoraone) {
   return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeClineMcpJsonAtomic(filePath, content) {
-  const dir = path29.dirname(filePath);
+  const dir = path31.dirname(filePath);
   await fs25.mkdir(dir, { recursive: true });
-  const tmpPath = path29.join(
+  const tmpPath = path31.join(
     dir,
-    `.${path29.basename(filePath)}.${process.pid}.${(0, import_node_crypto15.randomBytes)(8).toString("hex")}.tmp`
+    `.${path31.basename(filePath)}.${process.pid}.${(0, import_node_crypto16.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs25.writeFile(tmpPath, content, "utf8");
@@ -6733,11 +6783,9 @@ function validateClineMcpConfig(parsed2, expected) {
   if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
     throw new Error("[setup-ide-files] Cline MCP config missing mcpServers object.");
   }
-  const memoraone = mcpServers.memoraone;
+  const memoraone = mcpServers[CANONICAL_MEMORAONE_MCP_SERVER_NAME];
   if (!memoraoneServerMatches13(memoraone, expected)) {
-    throw new Error(
-      "[setup-ide-files] Cline MCP config mcpServers.memoraone is missing or invalid."
-    );
+    throw new Error("[setup-ide-files] Cline MCP config mcpServers.memoraone is missing or invalid.");
   }
 }
 async function readJsonConfig10(filePath) {
@@ -6754,13 +6802,9 @@ async function buildClineMemoraoneServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
   if (environment === "local" || options.devMode) {
     let cliPath = options.cliPathOverride;
-    if (cliPath === void 0) {
-      cliPath = await resolveLocalCliPathAsync();
-    }
+    if (cliPath === void 0) cliPath = await resolveLocalCliPathAsync();
     if (!cliPath) {
-      throw new Error(
-        "[setup-ide-files] Dev mode requires a built CLI at packages/mcp/dist/cli.cjs. Run pnpm build first."
-      );
+      throw new Error("[setup-ide-files] Dev mode requires a built CLI at packages/mcp/dist/cli.cjs. Run pnpm build first.");
     }
     return buildMemoraoneClineMcpServer({
       command: process.execPath,
@@ -6772,13 +6816,9 @@ async function buildClineMemoraoneServer(options) {
     });
   }
   let npxPath = options.npxPathOverride;
-  if (npxPath === void 0) {
-    npxPath = await resolveNpxPath();
-  }
+  if (npxPath === void 0) npxPath = await resolveNpxPath();
   if (!npxPath) {
-    throw new Error(
-      "[setup-ide-files] Could not resolve a working npx executable. Install Node.js/npm or ensure npx is on PATH before configuring Cline MCP."
-    );
+    throw new Error("[setup-ide-files] Could not resolve a working npx executable. Install Node.js/npm or ensure npx is on PATH before configuring Cline MCP.");
   }
   const channel = options.npmPackageChannel ?? npmPackageChannelFromEnvironment(environment);
   return buildMemoraoneClineMcpServer({
@@ -6786,12 +6826,21 @@ async function buildClineMemoraoneServer(options) {
     args: ["-y", memoraoneNpmPackageSpec(channel)],
     workspaceRoot: options.workspaceRoot,
     environment,
-    devMode: false,
     apiUrl: options.apiUrl
   });
 }
-async function setupOneClineHost(options) {
-  const { configPath, hostId, memoraone, dryRun } = options;
+async function setupClineMcpConfig(options) {
+  const workspaceRoot = path31.resolve(options.repoRoot);
+  const configPath = options.projectConfigPath ?? getClineProjectMcpConfigPath(workspaceRoot);
+  const memoraone = await buildClineMemoraoneServer({
+    workspaceRoot,
+    devMode: options.devMode,
+    environment: options.environment,
+    npmPackageChannel: options.npmPackageChannel,
+    apiUrl: options.apiUrl,
+    npxPathOverride: options.npxPathOverride,
+    cliPathOverride: options.cliPathOverride
+  });
   const existed = await pathExists14(configPath);
   let existing = null;
   if (existed) {
@@ -6805,143 +6854,50 @@ async function setupOneClineHost(options) {
     }
   }
   const merged = mergeClineMcpConfigObject(existing, memoraone);
-  const body = JSON.stringify(merged, null, 2) + "\n";
-  if (existed && existing) {
-    const currentMemoraone = existing.mcpServers && typeof existing.mcpServers === "object" && !Array.isArray(existing.mcpServers) ? existing.mcpServers.memoraone : void 0;
-    if (memoraoneServerMatches13(currentMemoraone, memoraone)) {
-      return { hostId, activeConfigPath: configPath, outcome: "skipped" };
-    }
-  }
-  if (dryRun) {
-    return {
-      hostId,
-      activeConfigPath: configPath,
-      outcome: existed ? "updated" : "created"
-    };
-  }
-  let backupPath;
-  if (existed) {
-    backupPath = await backupConfigFile4(configPath);
-  }
-  await writeClineMcpJsonAtomic(configPath, body);
-  const verifyRaw = await fs25.readFile(configPath, "utf8");
-  const verifyParsed = JSON.parse(stripLeadingLineComments10(verifyRaw));
-  validateClineMcpConfig(verifyParsed, memoraone);
-  return {
-    hostId,
-    activeConfigPath: configPath,
-    outcome: existed ? "updated" : "created",
-    backupPath
-  };
-}
-async function setupClineMcpConfig(options) {
-  const homeDir = options.homeDir ?? os9.homedir();
-  const platform2 = options.platform ?? process.platform;
-  const workspaceRoot = path29.resolve(options.repoRoot);
-  const hosts = await detectClineHosts({
-    homeDir,
-    platform: platform2,
-    explicitHostIds: options.explicitHostIds,
-    explicitHostPaths: options.explicitHostPaths
-  });
-  if (hosts.length === 0) {
-    const candidates = getKnownClineHostCandidates(homeDir, platform2).map((c) => c.installRoot);
-    throw new ClineNoHostFoundError(candidates);
-  }
-  const memoraone = await buildClineMemoraoneServer({
-    workspaceRoot,
-    devMode: options.devMode,
-    environment: options.environment,
-    npmPackageChannel: options.npmPackageChannel,
-    apiUrl: options.apiUrl,
-    npxPathOverride: options.npxPathOverride,
-    cliPathOverride: options.cliPathOverride
-  });
-  const hostResults = [];
-  for (const host of hosts) {
-    hostResults.push(
-      await setupOneClineHost({
-        configPath: host.configPath,
-        hostId: host.hostId,
-        memoraone,
-        dryRun: options.dryRun
-      })
-    );
+  if (existed && existing && canonicalValueMatches(existing, merged)) {
+    return { activeConfigPath: configPath, outcome: "skipped", memoraone };
   }
-  return { hosts: hostResults, memoraone };
+  const outcome = existed ? "updated" : "created";
+  if (options.dryRun) return { activeConfigPath: configPath, outcome, memoraone };
+  const backupPath = existed ? await backupConfigFile4(configPath) : void 0;
+  await writeClineMcpJsonAtomic(configPath, JSON.stringify(merged, null, 2) + "\n");
+  validateClineMcpConfig(JSON.parse(await fs25.readFile(configPath, "utf8")), memoraone);
+  return { activeConfigPath: configPath, outcome, backupPath, memoraone };
 }
 function logClineMcpCliSummary(info, dryRun, println = console.log) {
   const prefix = dryRun ? "would be " : "";
-  for (const host of info.hosts) {
-    const label = host.hostId === "vscode" ? "VS Code" : host.hostId === "cursor" ? "Cursor" : "VSCodium";
-    if (host.outcome === "created") {
-      println(
-        `[setup-ide-files] Cline (${label}) MCP config ${prefix}created: ${host.activeConfigPath}`
-      );
-    } else if (host.outcome === "updated") {
-      println(
-        `[setup-ide-files] Cline (${label}) MCP config ${prefix}updated: ${host.activeConfigPath}`
-      );
-    } else {
-      println(
-        `[setup-ide-files] Cline (${label}) MCP config unchanged: ${host.activeConfigPath}`
-      );
-    }
-    if (host.backupPath) {
-      println(`[setup-ide-files] Cline (${label}) MCP config backup: ${host.backupPath}`);
-    }
-  }
-  if (info.npxPath) {
-    println(`[setup-ide-files] Resolved npx: ${info.npxPath}`);
+  if (info.outcome === "created") {
+    println(`[setup-ide-files] Cline MCP config ${prefix}created: ${info.activeConfigPath}`);
+  } else if (info.outcome === "updated") {
+    println(`[setup-ide-files] Cline MCP config ${prefix}updated: ${info.activeConfigPath}`);
+  } else {
+    println(`[setup-ide-files] Cline MCP config unchanged: ${info.activeConfigPath}`);
   }
-  println(
-    "[setup-ide-files] Fully quit Cline (and its host editor) and reopen for MCP changes to take effect."
-  );
+  if (info.backupPath) println(`[setup-ide-files] Cline MCP config backup: ${info.backupPath}`);
+  if (info.npxPath) println(`[setup-ide-files] Resolved npx: ${info.npxPath}`);
+  println("[setup-ide-files] Fully quit Cline and reopen this repository for MCP changes to take effect.");
 }
-var fs25, os9, path29, import_node_crypto15, CLINE_HOST_IDS, CLINE_EXTENSION_RELATIVE, DARWIN_APP_SUPPORT_NAMES, ClineMcpJsonParseError, ClineNoHostFoundError;
+var import_node_crypto16, fs25, path31, ClineMcpJsonParseError;
 var init_clineMcpConfig = __esm({
   "src/clineMcpConfig.ts"() {
+    import_node_crypto16 = require("crypto");
     fs25 = __toESM(require("fs/promises"), 1);
-    os9 = __toESM(require("os"), 1);
-    path29 = __toESM(require("path"), 1);
-    import_node_crypto15 = require("crypto");
+    path31 = __toESM(require("path"), 1);
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
     init_jetbrainsMcpConfig();
     init_packageExecutionMode();
     init_memoraoneMcpOwnership();
-    CLINE_HOST_IDS = ["vscode", "cursor", "vscodium"];
-    CLINE_EXTENSION_RELATIVE = path29.join(
-      "User",
-      "globalStorage",
-      "saoudrizwan.claude-dev",
-      "settings",
-      "cline_mcp_settings.json"
-    );
-    DARWIN_APP_SUPPORT_NAMES = {
-      vscode: "Code",
-      cursor: "Cursor",
-      vscodium: "VSCodium"
-    };
     ClineMcpJsonParseError = class extends Error {
       constructor(configPath) {
         super(
-          `[setup-ide-files] Invalid JSON in shared Cline MCP config (file preserved, not modified): ${configPath}. Fix or remove the file, then re-run setup-ide-files.`
+          `[setup-ide-files] Invalid JSON in repository-local Cline MCP config (file preserved, not modified): ${configPath}. Fix or remove the file, then re-run setup-ide-files.`
         );
         this.name = "ClineMcpJsonParseError";
         this.configPath = configPath;
       }
     };
-    ClineNoHostFoundError = class extends Error {
-      constructor(candidates) {
-        super(
-          "[setup-ide-files] No Cline host installation found. Install Cline in VS Code, Cursor, or VSCodium, or pass an explicit host path for tests/automation."
-        );
-        this.name = "ClineNoHostFoundError";
-        this.candidates = candidates;
-      }
-    };
   }
 });
 
@@ -6958,7 +6914,7 @@ async function pathExists15(filePath) {
   }
 }
 function getCopilotCliProjectMcpConfigPath(repoRoot) {
-  return path30.join(path30.resolve(repoRoot), ".github", "mcp.json");
+  return path32.join(path32.resolve(repoRoot), ".github", "mcp.json");
 }
 function buildMemoraoneCopilotCliMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -6968,7 +6924,7 @@ function buildMemoraoneCopilotCliMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "copilot-cli",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path30.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path32.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -6991,11 +6947,11 @@ function mergeCopilotCliMcpConfigObject(existing, memoraone) {
   return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeCopilotCliMcpJsonAtomic(filePath, content) {
-  const dir = path30.dirname(filePath);
+  const dir = path32.dirname(filePath);
   await fs26.mkdir(dir, { recursive: true });
-  const tmpPath = path30.join(
+  const tmpPath = path32.join(
     dir,
-    `.${path30.basename(filePath)}.${process.pid}.${(0, import_node_crypto16.randomBytes)(8).toString("hex")}.tmp`
+    `.${path32.basename(filePath)}.${process.pid}.${(0, import_node_crypto17.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs26.writeFile(tmpPath, content, "utf8");
@@ -7073,7 +7029,7 @@ async function buildCopilotCliMemoraoneServer(options) {
 }
 async function setupCopilotCliMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getCopilotCliProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path30.resolve(options.repoRoot);
+  const workspaceRoot = path32.resolve(options.repoRoot);
   const memoraone = await buildCopilotCliMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -7138,12 +7094,12 @@ function logCopilotCliMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Copilot CLI and reopen this repo for MCP changes to take effect."
   );
 }
-var fs26, path30, import_node_crypto16, CopilotCliMcpJsonParseError;
+var fs26, path32, import_node_crypto17, CopilotCliMcpJsonParseError;
 var init_copilotCliMcpConfig = __esm({
   "src/copilotCliMcpConfig.ts"() {
     fs26 = __toESM(require("fs/promises"), 1);
-    path30 = __toESM(require("path"), 1);
-    import_node_crypto16 = require("crypto");
+    path32 = __toESM(require("path"), 1);
+    import_node_crypto17 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -7175,7 +7131,7 @@ async function pathExists16(filePath) {
   }
 }
 function getAuggieProjectMcpConfigPath(repoRoot) {
-  return path31.join(path31.resolve(repoRoot), ".augment", "settings.json");
+  return path33.join(path33.resolve(repoRoot), ".augment", "settings.json");
 }
 function buildMemoraoneAuggieMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -7185,7 +7141,7 @@ function buildMemoraoneAuggieMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "auggie",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path31.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path33.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -7207,11 +7163,11 @@ function mergeAuggieMcpConfigObject(existing, memoraone) {
   return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeAuggieMcpJsonAtomic(filePath, content) {
-  const dir = path31.dirname(filePath);
+  const dir = path33.dirname(filePath);
   await fs27.mkdir(dir, { recursive: true });
-  const tmpPath = path31.join(
+  const tmpPath = path33.join(
     dir,
-    `.${path31.basename(filePath)}.${process.pid}.${(0, import_node_crypto17.randomBytes)(8).toString("hex")}.tmp`
+    `.${path33.basename(filePath)}.${process.pid}.${(0, import_node_crypto18.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs27.writeFile(tmpPath, content, "utf8");
@@ -7289,7 +7245,7 @@ async function buildAuggieMemoraoneServer(options) {
 }
 async function setupAuggieMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getAuggieProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path31.resolve(options.repoRoot);
+  const workspaceRoot = path33.resolve(options.repoRoot);
   const memoraone = await buildAuggieMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -7354,12 +7310,12 @@ function logAuggieMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Augment Code / Auggie and reopen this repo for MCP changes to take effect."
   );
 }
-var fs27, path31, import_node_crypto17, AuggieMcpJsonParseError;
+var fs27, path33, import_node_crypto18, AuggieMcpJsonParseError;
 var init_auggieMcpConfig = __esm({
   "src/auggieMcpConfig.ts"() {
     fs27 = __toESM(require("fs/promises"), 1);
-    path31 = __toESM(require("path"), 1);
-    import_node_crypto17 = require("crypto");
+    path33 = __toESM(require("path"), 1);
+    import_node_crypto18 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -7391,7 +7347,7 @@ async function pathExists17(filePath) {
   }
 }
 function getGeminiCliProjectMcpConfigPath(repoRoot) {
-  return path32.join(path32.resolve(repoRoot), ".gemini", "settings.json");
+  return path34.join(path34.resolve(repoRoot), ".gemini", "settings.json");
 }
 function buildMemoraoneGeminiCliMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -7401,7 +7357,7 @@ function buildMemoraoneGeminiCliMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "gemini-cli",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path32.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path34.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -7423,11 +7379,11 @@ function mergeGeminiCliMcpConfigObject(existing, memoraone) {
   return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeGeminiCliMcpJsonAtomic(filePath, content) {
-  const dir = path32.dirname(filePath);
+  const dir = path34.dirname(filePath);
   await fs28.mkdir(dir, { recursive: true });
-  const tmpPath = path32.join(
+  const tmpPath = path34.join(
     dir,
-    `.${path32.basename(filePath)}.${process.pid}.${(0, import_node_crypto18.randomBytes)(8).toString("hex")}.tmp`
+    `.${path34.basename(filePath)}.${process.pid}.${(0, import_node_crypto19.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs28.writeFile(tmpPath, content, "utf8");
@@ -7505,7 +7461,7 @@ async function buildGeminiCliMemoraoneServer(options) {
 }
 async function setupGeminiCliMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getGeminiCliProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path32.resolve(options.repoRoot);
+  const workspaceRoot = path34.resolve(options.repoRoot);
   const memoraone = await buildGeminiCliMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -7570,12 +7526,12 @@ function logGeminiCliMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Gemini CLI and reopen this repo for MCP changes to take effect."
   );
 }
-var fs28, path32, import_node_crypto18, GeminiCliMcpJsonParseError;
+var fs28, path34, import_node_crypto19, GeminiCliMcpJsonParseError;
 var init_geminiCliMcpConfig = __esm({
   "src/geminiCliMcpConfig.ts"() {
     fs28 = __toESM(require("fs/promises"), 1);
-    path32 = __toESM(require("path"), 1);
-    import_node_crypto18 = require("crypto");
+    path34 = __toESM(require("path"), 1);
+    import_node_crypto19 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -7607,14 +7563,14 @@ async function pathExists18(filePath) {
   }
 }
 function getAntigravityUnifiedMcpConfigPath(homeDir) {
-  return path33.join(homeDir, ".gemini", "config", "mcp_config.json");
+  return path35.join(homeDir, ".gemini", "config", "mcp_config.json");
 }
 function getAntigravityLegacyMcpConfigPath(homeDir) {
-  return path33.join(homeDir, ".gemini", "antigravity", "mcp_config.json");
+  return path35.join(homeDir, ".gemini", "antigravity", "mcp_config.json");
 }
 function getAntigravityGlobalMcpConfigPath(homeDir) {
   const unified = getAntigravityUnifiedMcpConfigPath(homeDir);
-  const migratedMarker = path33.join(homeDir, ".gemini", "config", ".migrated");
+  const migratedMarker = path35.join(homeDir, ".gemini", "config", ".migrated");
   if (fsSync.existsSync(migratedMarker) || fsSync.existsSync(unified)) {
     return unified;
   }
@@ -7628,7 +7584,7 @@ function buildMemoraoneAntigravityMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "antigravity",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path33.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path35.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -7644,10 +7600,10 @@ function buildMemoraoneAntigravityMcpServer(options) {
     env: env2
   };
 }
-function mergeAntigravityMcpConfigObject(existing, memoraone) {
+function mergeAntigravityMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && typeof existing === "object" ? { ...existing } : { mcpServers: {} };
   const mcpServers = typeof base.mcpServers === "object" && base.mcpServers !== null && !Array.isArray(base.mcpServers) ? { ...base.mcpServers } : {};
-  return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
+  return { ...base, mcpServers: ownership ? replaceMemoraoneRepositoryBindingInServerMap(mcpServers, memoraone, ownership) : replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 function stripMemoraoneFromAntigravityConfigObject(existing) {
   const base = { ...existing };
@@ -7663,11 +7619,11 @@ function stripMemoraoneFromAntigravityConfigObject(existing) {
   return { next: { ...base, mcpServers }, removed: true };
 }
 async function writeAntigravityMcpJsonAtomic(filePath, content) {
-  const dir = path33.dirname(filePath);
+  const dir = path35.dirname(filePath);
   await fs29.mkdir(dir, { recursive: true });
-  const tmpPath = path33.join(
+  const tmpPath = path35.join(
     dir,
-    `.${path33.basename(filePath)}.${process.pid}.${(0, import_node_crypto19.randomBytes)(8).toString("hex")}.tmp`
+    `.${path35.basename(filePath)}.${process.pid}.${(0, import_node_crypto20.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs29.writeFile(tmpPath, content, "utf8");
@@ -7683,7 +7639,7 @@ async function writeAntigravityMcpJsonAtomic(filePath, content) {
 function memoraoneServerMatches17(server, expected) {
   return canonicalValueMatches(server, expected);
 }
-function validateAntigravityMcpConfig(parsed2, expected) {
+function validateAntigravityMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!parsed2 || typeof parsed2 !== "object") {
     throw new Error("[setup-ide-files] Antigravity MCP config must be a JSON object.");
   }
@@ -7691,7 +7647,8 @@ function validateAntigravityMcpConfig(parsed2, expected) {
   if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
     throw new Error("[setup-ide-files] Antigravity MCP config missing mcpServers object.");
   }
-  const memoraone = mcpServers.memoraone;
+  const serverMap = mcpServers;
+  const memoraone = serverMap[serverName] ?? Object.values(serverMap).find((entry) => memoraoneServerMatches17(entry, expected));
   if (!memoraoneServerMatches17(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] Antigravity MCP config mcpServers.memoraone is missing or invalid."
@@ -7750,12 +7707,12 @@ async function buildAntigravityMemoraoneServer(options) {
   });
 }
 async function setupAntigravityMcpConfig(options) {
-  const homeDir = options.homeDir ?? os10.homedir();
+  const homeDir = options.homeDir ?? os9.homedir();
   const activePath = options.globalConfigPath ?? getAntigravityGlobalMcpConfigPath(homeDir);
   const legacyPath = options.legacyConfigPath ?? getAntigravityLegacyMcpConfigPath(homeDir);
   const unifiedPath = getAntigravityUnifiedMcpConfigPath(homeDir);
-  const writingUnified = path33.resolve(activePath) === path33.resolve(unifiedPath) && path33.resolve(activePath) !== path33.resolve(legacyPath);
-  const workspaceRoot = path33.resolve(options.repoRoot);
+  const writingUnified = path35.resolve(activePath) === path35.resolve(unifiedPath) && path35.resolve(activePath) !== path35.resolve(legacyPath);
+  const workspaceRoot = path35.resolve(options.repoRoot);
   const memoraone = await buildAntigravityMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -7787,13 +7744,17 @@ async function setupAntigravityMcpConfig(options) {
       legacyMalformed = true;
     }
   }
-  const merged = mergeAntigravityMcpConfigObject(activeExisting, memoraone);
+  const merged = mergeAntigravityMcpConfigObject(activeExisting, memoraone, options.ownership);
   const body = JSON.stringify(merged, null, 2) + "\n";
-  const activeMemoraone = extractMemoraone2(activeExisting);
-  const activeAlreadyCorrect = activeExisted && memoraoneServerMatches17(activeMemoraone, memoraone);
+  const activeAlreadyCorrect = Boolean(
+    activeExisted && activeExisting && canonicalValueMatches(activeExisting, merged)
+  );
   let legacyNeedsCleanup = false;
   if (legacyExisted && !legacyMalformed && legacyExisting) {
-    legacyNeedsCleanup = extractMemoraone2(legacyExisting) !== void 0;
+    legacyNeedsCleanup = options.ownership && legacyExisting.mcpServers && typeof legacyExisting.mcpServers === "object" && !Array.isArray(legacyExisting.mcpServers) ? stripMemoraoneRepositoryBindingFromServerMap(
+      legacyExisting.mcpServers,
+      options.ownership
+    ).removedKeys.length > 0 : extractMemoraone2(legacyExisting) !== void 0;
   }
   if (!writingUnified) {
     if (activeAlreadyCorrect) {
@@ -7817,7 +7778,7 @@ async function setupAntigravityMcpConfig(options) {
     await writeAntigravityMcpJsonAtomic(activePath, body);
     const verifyRaw = await fs29.readFile(activePath, "utf8");
     const verifyParsed = JSON.parse(stripLeadingLineComments14(verifyRaw));
-    validateAntigravityMcpConfig(verifyParsed, memoraone);
+    validateAntigravityMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
     return {
       outcome: activeExisted ? "updated" : "created",
       memoraone,
@@ -7856,7 +7817,7 @@ async function setupAntigravityMcpConfig(options) {
     await writeAntigravityMcpJsonAtomic(activePath, body);
     const verifyRaw = await fs29.readFile(activePath, "utf8");
     const verifyParsed = JSON.parse(stripLeadingLineComments14(verifyRaw));
-    validateAntigravityMcpConfig(verifyParsed, memoraone);
+    validateAntigravityMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
   }
   let legacyCleanup = "absent";
   let warning;
@@ -7866,7 +7827,11 @@ async function setupAntigravityMcpConfig(options) {
       warning = `[setup-ide-files] Legacy Antigravity MCP config has invalid JSON and was left unchanged: ${legacyPath}. Unified Antigravity config was written; fix or remove the legacy file to avoid ambiguity.`;
     } else if (legacyNeedsCleanup && legacyExisting) {
       try {
-        const { next, removed } = stripMemoraoneFromAntigravityConfigObject(legacyExisting);
+        const scoped = options.ownership && legacyExisting.mcpServers && typeof legacyExisting.mcpServers === "object" && !Array.isArray(legacyExisting.mcpServers) ? stripMemoraoneRepositoryBindingFromServerMap(
+          legacyExisting.mcpServers,
+          options.ownership
+        ) : null;
+        const { next, removed } = scoped ? { next: { ...legacyExisting, mcpServers: scoped.next }, removed: scoped.removedKeys.length > 0 } : stripMemoraoneFromAntigravityConfigObject(legacyExisting);
         if (removed) {
           const legacyBody = JSON.stringify(next, null, 2) + "\n";
           await writeAntigravityMcpJsonAtomic(legacyPath, legacyBody);
@@ -7932,14 +7897,14 @@ function logAntigravityMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Antigravity and reopen for MCP changes to take effect."
   );
 }
-var fsSync, fs29, os10, path33, import_node_crypto19, AntigravityMcpJsonParseError;
+var fsSync, fs29, os9, path35, import_node_crypto20, AntigravityMcpJsonParseError;
 var init_antigravityMcpConfig = __esm({
   "src/antigravityMcpConfig.ts"() {
     fsSync = __toESM(require("fs"), 1);
     fs29 = __toESM(require("fs/promises"), 1);
-    os10 = __toESM(require("os"), 1);
-    path33 = __toESM(require("path"), 1);
-    import_node_crypto19 = require("crypto");
+    os9 = __toESM(require("os"), 1);
+    path35 = __toESM(require("path"), 1);
+    import_node_crypto20 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -7971,7 +7936,7 @@ function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function getGooseGlobalMcpConfigPath(homeDir) {
-  return path34.join(homeDir, ".config", "goose", "config.yaml");
+  return path36.join(homeDir, ".config", "goose", "config.yaml");
 }
 function isMemoraoneOwnedGooseExtension(key, entry) {
   if (isMemoraoneOwnedServerName(key)) return true;
@@ -8019,6 +7984,34 @@ function replaceMemoraoneOwnedInGooseExtensions(extensions, canonical) {
   next[CANONICAL_MEMORAONE_MCP_SERVER_NAME] = canonical;
   return next;
 }
+function replaceMemoraoneRepositoryBindingInGooseExtensions(extensions, canonical, ownership) {
+  const generatedTargetKey = memoraoneServerNameForRepositoryBinding(
+    ownership.repositoryBindingId
+  );
+  const targetRoot = path36.resolve(ownership.workspaceRoot);
+  const matchingRootKeys = Object.entries(extensions).filter(([key, value]) => {
+    const envs = isPlainObject2(value) && isPlainObject2(value.envs) ? value.envs : void 0;
+    return key.startsWith("memoraone-") && typeof envs?.MEMORAONE_WORKSPACE_ROOT === "string" && path36.resolve(envs.MEMORAONE_WORKSPACE_ROOT) === targetRoot;
+  }).map(([key]) => key).sort();
+  const targetKey = matchingRootKeys.includes(generatedTargetKey) ? generatedTargetKey : matchingRootKeys[0] ?? generatedTargetKey;
+  const staleKeys = /* @__PURE__ */ new Set([
+    generatedTargetKey,
+    ...(ownership.replacedRepositoryBindingIds ?? []).map(
+      memoraoneServerNameForRepositoryBinding
+    )
+  ]);
+  staleKeys.delete(targetKey);
+  const next = {};
+  for (const [key, value] of Object.entries(extensions)) {
+    const envs = isPlainObject2(value) && isPlainObject2(value.envs) ? value.envs : void 0;
+    const legacyForRoot = isMemoraoneOwnedServerName(key) && !key.startsWith("memoraone-") && typeof envs?.MEMORAONE_WORKSPACE_ROOT === "string" && path36.resolve(envs.MEMORAONE_WORKSPACE_ROOT) === targetRoot;
+    if (!staleKeys.has(key) && !matchingRootKeys.includes(key) && !legacyForRoot) {
+      next[key] = value;
+    }
+  }
+  next[targetKey] = canonical;
+  return next;
+}
 function buildMemoraoneGooseMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
   const envs = {
@@ -8027,7 +8020,7 @@ function buildMemoraoneGooseMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "goose",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path34.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path36.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     envs.MEMORAONE_DEV_MODE = "1";
@@ -8047,20 +8040,20 @@ function buildMemoraoneGooseMcpServer(options) {
     timeout: 300
   };
 }
-function mergeGooseMcpConfigObject(existing, memoraone) {
+function mergeGooseMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && isPlainObject2(existing) ? { ...existing } : { extensions: {} };
   const extensions = isPlainObject2(base.extensions) ? { ...base.extensions } : {};
   return {
     ...base,
-    extensions: replaceMemoraoneOwnedInGooseExtensions(extensions, memoraone)
+    extensions: ownership ? replaceMemoraoneRepositoryBindingInGooseExtensions(extensions, memoraone, ownership) : replaceMemoraoneOwnedInGooseExtensions(extensions, memoraone)
   };
 }
 async function writeGooseMcpYamlAtomic(filePath, content) {
-  const dir = path34.dirname(filePath);
+  const dir = path36.dirname(filePath);
   await fs30.mkdir(dir, { recursive: true });
-  const tmpPath = path34.join(
+  const tmpPath = path36.join(
     dir,
-    `.${path34.basename(filePath)}.${process.pid}.${(0, import_node_crypto20.randomBytes)(8).toString("hex")}.tmp`
+    `.${path36.basename(filePath)}.${process.pid}.${(0, import_node_crypto21.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs30.writeFile(tmpPath, content, "utf8");
@@ -8076,14 +8069,14 @@ async function writeGooseMcpYamlAtomic(filePath, content) {
 function memoraoneExtensionMatches(extension, expected) {
   return canonicalValueMatches(extension, expected);
 }
-function validateGooseMcpConfig(parsed2, expected) {
+function validateGooseMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!isPlainObject2(parsed2)) {
     throw new Error("[setup-ide-files] Goose MCP config must be a YAML object.");
   }
   if (!isPlainObject2(parsed2.extensions)) {
     throw new Error("[setup-ide-files] Goose MCP config missing extensions object.");
   }
-  const memoraone = parsed2.extensions.memoraone;
+  const memoraone = parsed2.extensions[serverName] ?? Object.values(parsed2.extensions).find((entry) => memoraoneExtensionMatches(entry, expected));
   if (!memoraoneExtensionMatches(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] Goose MCP config extensions.memoraone is missing or invalid."
@@ -8147,9 +8140,9 @@ async function buildGooseMemoraoneServer(options) {
   });
 }
 async function setupGooseMcpConfig(options) {
-  const homeDir = options.homeDir ?? os11.homedir();
+  const homeDir = options.homeDir ?? os10.homedir();
   const activePath = options.globalConfigPath ?? getGooseGlobalMcpConfigPath(homeDir);
-  const workspaceRoot = path34.resolve(options.repoRoot);
+  const workspaceRoot = path36.resolve(options.repoRoot);
   const memoraone = await buildGooseMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -8172,10 +8165,10 @@ async function setupGooseMcpConfig(options) {
       throw new GooseMcpYamlParseError(activePath);
     }
   }
-  const merged = mergeGooseMcpConfigObject(existing, memoraone);
+  const merged = mergeGooseMcpConfigObject(existing, memoraone, options.ownership);
   const body = formatGooseYaml(merged);
   if (exists && existing) {
-    const preview = mergeGooseMcpConfigObject(existing, memoraone);
+    const preview = mergeGooseMcpConfigObject(existing, memoraone, options.ownership);
     if (formatGooseYaml(preview) === formatGooseYaml(existing)) {
       return { outcome: "skipped", memoraone, activeConfigPath: activePath };
     }
@@ -8195,7 +8188,7 @@ async function setupGooseMcpConfig(options) {
   } catch {
     throw new GooseMcpYamlParseError(activePath);
   }
-  validateGooseMcpConfig(verifyParsed, memoraone);
+  validateGooseMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
   return {
     outcome: exists ? "updated" : "created",
     memoraone,
@@ -8223,13 +8216,13 @@ function logGooseMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Goose and reopen for MCP changes to take effect."
   );
 }
-var fs30, os11, path34, import_node_crypto20, import_yaml2, GooseMcpYamlParseError, MEMORAONE_PACKAGE_SPEC_RE2;
+var fs30, os10, path36, import_node_crypto21, import_yaml2, GooseMcpYamlParseError, MEMORAONE_PACKAGE_SPEC_RE2;
 var init_gooseMcpConfig = __esm({
   "src/gooseMcpConfig.ts"() {
     fs30 = __toESM(require("fs/promises"), 1);
-    os11 = __toESM(require("os"), 1);
-    path34 = __toESM(require("path"), 1);
-    import_node_crypto20 = require("crypto");
+    os10 = __toESM(require("os"), 1);
+    path36 = __toESM(require("path"), 1);
+    import_node_crypto21 = require("crypto");
     import_yaml2 = require("yaml");
     init_configUtils();
     init_cursorGlobalMcpConfig();
@@ -8263,7 +8256,7 @@ async function pathExists20(filePath) {
   }
 }
 function getJunieProjectMcpConfigPath(repoRoot) {
-  return path35.join(path35.resolve(repoRoot), ".junie", "mcp", "mcp.json");
+  return path37.join(path37.resolve(repoRoot), ".junie", "mcp", "mcp.json");
 }
 function buildMemoraoneJunieMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -8273,7 +8266,7 @@ function buildMemoraoneJunieMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "junie",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path35.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path37.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -8295,11 +8288,11 @@ function mergeJunieMcpConfigObject(existing, memoraone) {
   return { ...base, mcpServers: replaceMemoraoneOwnedInServerMap(mcpServers, memoraone) };
 }
 async function writeJunieMcpJsonAtomic(filePath, content) {
-  const dir = path35.dirname(filePath);
+  const dir = path37.dirname(filePath);
   await fs31.mkdir(dir, { recursive: true });
-  const tmpPath = path35.join(
+  const tmpPath = path37.join(
     dir,
-    `.${path35.basename(filePath)}.${process.pid}.${(0, import_node_crypto21.randomBytes)(8).toString("hex")}.tmp`
+    `.${path37.basename(filePath)}.${process.pid}.${(0, import_node_crypto22.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs31.writeFile(tmpPath, content, "utf8");
@@ -8377,7 +8370,7 @@ async function buildJunieMemoraoneServer(options) {
 }
 async function setupJunieMcpConfig(options) {
   const projectPath = options.projectConfigPath ?? getJunieProjectMcpConfigPath(options.repoRoot);
-  const workspaceRoot = path35.resolve(options.repoRoot);
+  const workspaceRoot = path37.resolve(options.repoRoot);
   const memoraone = await buildJunieMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -8442,12 +8435,12 @@ function logJunieMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit JetBrains IDE / Junie and reopen this repo for MCP changes to take effect."
   );
 }
-var fs31, path35, import_node_crypto21, JunieMcpJsonParseError;
+var fs31, path37, import_node_crypto22, JunieMcpJsonParseError;
 var init_junieMcpConfig = __esm({
   "src/junieMcpConfig.ts"() {
     fs31 = __toESM(require("fs/promises"), 1);
-    path35 = __toESM(require("path"), 1);
-    import_node_crypto21 = require("crypto");
+    path37 = __toESM(require("path"), 1);
+    import_node_crypto22 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -8479,7 +8472,7 @@ async function pathExists21(filePath) {
   }
 }
 function getXcodeGlobalMcpConfigPath(homeDir) {
-  return path36.join(homeDir, ".config", "github-copilot", "xcode", "mcp.json");
+  return path38.join(homeDir, ".config", "github-copilot", "xcode", "mcp.json");
 }
 function buildMemoraoneXcodeMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -8489,7 +8482,7 @@ function buildMemoraoneXcodeMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "xcode",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path36.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path38.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -8506,17 +8499,17 @@ function buildMemoraoneXcodeMcpServer(options) {
     env: env2
   };
 }
-function mergeXcodeMcpConfigObject(existing, memoraone) {
+function mergeXcodeMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && typeof existing === "object" ? { ...existing } : { servers: {} };
   const servers = typeof base.servers === "object" && base.servers !== null && !Array.isArray(base.servers) ? { ...base.servers } : {};
-  return { ...base, servers: replaceMemoraoneOwnedInServerMap(servers, memoraone) };
+  return { ...base, servers: ownership ? replaceMemoraoneRepositoryBindingInServerMap(servers, memoraone, ownership) : replaceMemoraoneOwnedInServerMap(servers, memoraone) };
 }
 async function writeXcodeMcpJsonAtomic(filePath, content) {
-  const dir = path36.dirname(filePath);
+  const dir = path38.dirname(filePath);
   await fs32.mkdir(dir, { recursive: true });
-  const tmpPath = path36.join(
+  const tmpPath = path38.join(
     dir,
-    `.${path36.basename(filePath)}.${process.pid}.${(0, import_node_crypto22.randomBytes)(8).toString("hex")}.tmp`
+    `.${path38.basename(filePath)}.${process.pid}.${(0, import_node_crypto23.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs32.writeFile(tmpPath, content, "utf8");
@@ -8532,7 +8525,7 @@ async function writeXcodeMcpJsonAtomic(filePath, content) {
 function memoraoneServerMatches19(server, expected) {
   return canonicalValueMatches(server, expected);
 }
-function validateXcodeMcpConfig(parsed2, expected) {
+function validateXcodeMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!parsed2 || typeof parsed2 !== "object") {
     throw new Error("[setup-ide-files] Xcode MCP config must be a JSON object.");
   }
@@ -8540,7 +8533,8 @@ function validateXcodeMcpConfig(parsed2, expected) {
   if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
     throw new Error("[setup-ide-files] Xcode MCP config missing servers object.");
   }
-  const memoraone = servers.memoraone;
+  const serverMap = servers;
+  const memoraone = serverMap[serverName] ?? Object.values(serverMap).find((entry) => memoraoneServerMatches19(entry, expected));
   if (!memoraoneServerMatches19(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] Xcode MCP config servers.memoraone is missing or invalid."
@@ -8593,9 +8587,9 @@ async function buildXcodeMemoraoneServer(options) {
   });
 }
 async function setupXcodeMcpConfig(options) {
-  const homeDir = options.homeDir ?? os12.homedir();
+  const homeDir = options.homeDir ?? os11.homedir();
   const activePath = options.globalConfigPath ?? getXcodeGlobalMcpConfigPath(homeDir);
-  const workspaceRoot = path36.resolve(options.repoRoot);
+  const workspaceRoot = path38.resolve(options.repoRoot);
   const memoraone = await buildXcodeMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -8617,11 +8611,10 @@ async function setupXcodeMcpConfig(options) {
       throw new XcodeMcpJsonParseError(activePath);
     }
   }
-  const merged = mergeXcodeMcpConfigObject(existing, memoraone);
+  const merged = mergeXcodeMcpConfigObject(existing, memoraone, options.ownership);
   const body = JSON.stringify(merged, null, 2) + "\n";
   if (exists && existing) {
-    const currentMemoraone = existing.servers && typeof existing.servers === "object" && !Array.isArray(existing.servers) ? existing.servers.memoraone : void 0;
-    if (memoraoneServerMatches19(currentMemoraone, memoraone)) {
+    if (canonicalValueMatches(existing, merged)) {
       return { outcome: "skipped", memoraone, activeConfigPath: activePath };
     }
   }
@@ -8635,7 +8628,7 @@ async function setupXcodeMcpConfig(options) {
   await writeXcodeMcpJsonAtomic(activePath, body);
   const verifyRaw = await fs32.readFile(activePath, "utf8");
   const verifyParsed = JSON.parse(stripLeadingLineComments16(verifyRaw));
-  validateXcodeMcpConfig(verifyParsed, memoraone);
+  validateXcodeMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
   return {
     outcome: exists ? "updated" : "created",
     memoraone,
@@ -8663,13 +8656,13 @@ function logXcodeMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit Xcode / Copilot for Xcode and reopen for MCP changes to take effect."
   );
 }
-var fs32, os12, path36, import_node_crypto22, XcodeMcpJsonParseError;
+var fs32, os11, path38, import_node_crypto23, XcodeMcpJsonParseError;
 var init_xcodeMcpConfig = __esm({
   "src/xcodeMcpConfig.ts"() {
     fs32 = __toESM(require("fs/promises"), 1);
-    os12 = __toESM(require("os"), 1);
-    path36 = __toESM(require("path"), 1);
-    import_node_crypto22 = require("crypto");
+    os11 = __toESM(require("os"), 1);
+    path38 = __toESM(require("path"), 1);
+    import_node_crypto23 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -8701,7 +8694,7 @@ async function pathExists22(filePath) {
   }
 }
 function getCopilotJetBrainsGlobalMcpConfigPath(homeDir) {
-  return path37.join(homeDir, ".config", "github-copilot", "intellij", "mcp.json");
+  return path39.join(homeDir, ".config", "github-copilot", "intellij", "mcp.json");
 }
 function buildMemoraoneCopilotJetBrainsMcpServer(options) {
   const environment = options.environment ?? (options.devMode ? "local" : "production");
@@ -8711,7 +8704,7 @@ function buildMemoraoneCopilotJetBrainsMcpServer(options) {
       apiUrl: options.apiUrl ?? (environment === "local" ? DEV_API_URL : void 0)
     }),
     MEMORAONE_IDE_TYPE: "copilot-jetbrains",
-    [MEMORAONE_WORKSPACE_ROOT_ENV]: path37.resolve(options.workspaceRoot)
+    [MEMORAONE_WORKSPACE_ROOT_ENV]: path39.resolve(options.workspaceRoot)
   };
   if (environment === "local" || options.devMode) {
     env2.MEMORAONE_DEV_MODE = "1";
@@ -8728,17 +8721,17 @@ function buildMemoraoneCopilotJetBrainsMcpServer(options) {
     env: env2
   };
 }
-function mergeCopilotJetBrainsMcpConfigObject(existing, memoraone) {
+function mergeCopilotJetBrainsMcpConfigObject(existing, memoraone, ownership) {
   const base = existing && typeof existing === "object" ? { ...existing } : { servers: {} };
   const servers = typeof base.servers === "object" && base.servers !== null && !Array.isArray(base.servers) ? { ...base.servers } : {};
-  return { ...base, servers: replaceMemoraoneOwnedInServerMap(servers, memoraone) };
+  return { ...base, servers: ownership ? replaceMemoraoneRepositoryBindingInServerMap(servers, memoraone, ownership) : replaceMemoraoneOwnedInServerMap(servers, memoraone) };
 }
 async function writeCopilotJetBrainsMcpJsonAtomic(filePath, content) {
-  const dir = path37.dirname(filePath);
+  const dir = path39.dirname(filePath);
   await fs33.mkdir(dir, { recursive: true });
-  const tmpPath = path37.join(
+  const tmpPath = path39.join(
     dir,
-    `.${path37.basename(filePath)}.${process.pid}.${(0, import_node_crypto23.randomBytes)(8).toString("hex")}.tmp`
+    `.${path39.basename(filePath)}.${process.pid}.${(0, import_node_crypto24.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs33.writeFile(tmpPath, content, "utf8");
@@ -8754,7 +8747,7 @@ async function writeCopilotJetBrainsMcpJsonAtomic(filePath, content) {
 function memoraoneServerMatches20(server, expected) {
   return canonicalValueMatches(server, expected);
 }
-function validateCopilotJetBrainsMcpConfig(parsed2, expected) {
+function validateCopilotJetBrainsMcpConfig(parsed2, expected, serverName = CANONICAL_MEMORAONE_MCP_SERVER_NAME) {
   if (!parsed2 || typeof parsed2 !== "object") {
     throw new Error(
       "[setup-ide-files] GitHub Copilot JetBrains MCP config must be a JSON object."
@@ -8766,7 +8759,8 @@ function validateCopilotJetBrainsMcpConfig(parsed2, expected) {
       "[setup-ide-files] GitHub Copilot JetBrains MCP config missing servers object."
     );
   }
-  const memoraone = servers.memoraone;
+  const serverMap = servers;
+  const memoraone = serverMap[serverName] ?? Object.values(serverMap).find((entry) => memoraoneServerMatches20(entry, expected));
   if (!memoraoneServerMatches20(memoraone, expected)) {
     throw new Error(
       "[setup-ide-files] GitHub Copilot JetBrains MCP config servers.memoraone is missing or invalid."
@@ -8819,9 +8813,9 @@ async function buildCopilotJetBrainsMemoraoneServer(options) {
   });
 }
 async function setupCopilotJetBrainsMcpConfig(options) {
-  const homeDir = options.homeDir ?? os13.homedir();
+  const homeDir = options.homeDir ?? os12.homedir();
   const activePath = options.globalConfigPath ?? getCopilotJetBrainsGlobalMcpConfigPath(homeDir);
-  const workspaceRoot = path37.resolve(options.repoRoot);
+  const workspaceRoot = path39.resolve(options.repoRoot);
   const memoraone = await buildCopilotJetBrainsMemoraoneServer({
     workspaceRoot,
     devMode: options.devMode,
@@ -8843,11 +8837,10 @@ async function setupCopilotJetBrainsMcpConfig(options) {
       throw new CopilotJetBrainsMcpJsonParseError(activePath);
     }
   }
-  const merged = mergeCopilotJetBrainsMcpConfigObject(existing, memoraone);
+  const merged = mergeCopilotJetBrainsMcpConfigObject(existing, memoraone, options.ownership);
   const body = JSON.stringify(merged, null, 2) + "\n";
   if (exists && existing) {
-    const currentMemoraone = existing.servers && typeof existing.servers === "object" && !Array.isArray(existing.servers) ? existing.servers.memoraone : void 0;
-    if (memoraoneServerMatches20(currentMemoraone, memoraone)) {
+    if (canonicalValueMatches(existing, merged)) {
       return { outcome: "skipped", memoraone, activeConfigPath: activePath };
     }
   }
@@ -8861,7 +8854,7 @@ async function setupCopilotJetBrainsMcpConfig(options) {
   await writeCopilotJetBrainsMcpJsonAtomic(activePath, body);
   const verifyRaw = await fs33.readFile(activePath, "utf8");
   const verifyParsed = JSON.parse(stripLeadingLineComments17(verifyRaw));
-  validateCopilotJetBrainsMcpConfig(verifyParsed, memoraone);
+  validateCopilotJetBrainsMcpConfig(verifyParsed, memoraone, options.ownership ? memoraoneServerNameForRepositoryBinding(options.ownership.repositoryBindingId) : CANONICAL_MEMORAONE_MCP_SERVER_NAME);
   return {
     outcome: exists ? "updated" : "created",
     memoraone,
@@ -8893,13 +8886,13 @@ function logCopilotJetBrainsMcpCliSummary(info, dryRun, println = console.log) {
     "[setup-ide-files] Fully quit JetBrains IDE / GitHub Copilot and reopen for MCP changes to take effect."
   );
 }
-var fs33, os13, path37, import_node_crypto23, CopilotJetBrainsMcpJsonParseError;
+var fs33, os12, path39, import_node_crypto24, CopilotJetBrainsMcpJsonParseError;
 var init_copilotJetBrainsMcpConfig = __esm({
   "src/copilotJetBrainsMcpConfig.ts"() {
     fs33 = __toESM(require("fs/promises"), 1);
-    os13 = __toESM(require("os"), 1);
-    path37 = __toESM(require("path"), 1);
-    import_node_crypto23 = require("crypto");
+    os12 = __toESM(require("os"), 1);
+    path39 = __toESM(require("path"), 1);
+    import_node_crypto24 = require("crypto");
     init_configUtils();
     init_cursorGlobalMcpConfig();
     init_initializeBinding();
@@ -9305,7 +9298,6 @@ var setupIdeFiles_exports = {};
 __export(setupIdeFiles_exports, {
   CANONICAL_MEMORAONE_MCP_SERVER_NAME: () => CANONICAL_MEMORAONE_MCP_SERVER_NAME,
   CLINE_CLI_MCP_TIMEOUT_SECONDS: () => CLINE_CLI_MCP_TIMEOUT_SECONDS,
-  ClineNoHostFoundError: () => ClineNoHostFoundError,
   GITIGNORE_MEMORAONE_COMMENT: () => GITIGNORE_MEMORAONE_COMMENT,
   GITIGNORE_MEMORAONE_ENTRY: () => GITIGNORE_MEMORAONE_ENTRY,
   JETBRAINS_DEBUG_ENV_VARS: () => JETBRAINS_DEBUG_ENV_VARS,
@@ -9340,7 +9332,6 @@ __export(setupIdeFiles_exports, {
   cliSetupIdeFiles: () => cliSetupIdeFiles,
   cursorConfigHasManagedMemoraone: () => cursorConfigHasManagedMemoraone,
   cursorEnvironmentFromFlags: () => cursorEnvironmentFromFlags,
-  detectClineHosts: () => detectClineHosts,
   detectCursorGlobalMcpConfig: () => detectCursorGlobalMcpConfig,
   findRepoRoot: () => findRepoRoot,
   formatJetBrainsBackupTimestamp: () => formatJetBrainsBackupTimestamp,
@@ -9354,8 +9345,7 @@ __export(setupIdeFiles_exports, {
   getClineCliGlobalMcpConfigPath: () => getClineCliGlobalMcpConfigPath,
   getClineCliMcpConfigPaths: () => getClineCliMcpConfigPaths,
   getClineCliRootMcpConfigPath: () => getClineCliRootMcpConfigPath,
-  getClineHostInstallRoot: () => getClineHostInstallRoot,
-  getClineHostMcpConfigPath: () => getClineHostMcpConfigPath,
+  getClineProjectMcpConfigPath: () => getClineProjectMcpConfigPath,
   getCodexGlobalMcpConfigPath: () => getCodexGlobalMcpConfigPath,
   getCodexProjectMcpConfigPath: () => getCodexProjectMcpConfigPath,
   getContinueProjectMcpConfigPath: () => getContinueProjectMcpConfigPath,
@@ -9366,7 +9356,6 @@ __export(setupIdeFiles_exports, {
   getGooseGlobalMcpConfigPath: () => getGooseGlobalMcpConfigPath,
   getJunieProjectMcpConfigPath: () => getJunieProjectMcpConfigPath,
   getKiroProjectMcpConfigPath: () => getKiroProjectMcpConfigPath,
-  getKnownClineHostCandidates: () => getKnownClineHostCandidates,
   getKnownCursorGlobalMcpConfigCandidates: () => getKnownCursorGlobalMcpConfigCandidates,
   getKnownJetBrainsMcpConfigLocations: () => getKnownJetBrainsMcpConfigLocations,
   getOpenCodeGlobalMcpConfigPath: () => getOpenCodeGlobalMcpConfigPath,
@@ -9476,7 +9465,7 @@ function buildMemoraoneMcpServer(ideType, options = {}) {
   };
   const includeWorkspaceRoot = options.workspaceRoot !== void 0 && (environment === "local" || ideType === "cursor" || ideType === "claude-code");
   if (includeWorkspaceRoot) {
-    env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path38.resolve(options.workspaceRoot);
+    env2[MEMORAONE_WORKSPACE_ROOT_ENV] = path40.resolve(options.workspaceRoot);
   }
   if (environment === "local") {
     if (!options.cliPath) {
@@ -9496,9 +9485,9 @@ function buildMemoraoneMcpServer(ideType, options = {}) {
   };
 }
 function assertUnderRepoRoot(repoRoot, absPath) {
-  const normRoot = path38.resolve(repoRoot) + path38.sep;
-  const normPath = path38.resolve(absPath);
-  if (normPath !== path38.resolve(repoRoot) && !normPath.startsWith(normRoot)) {
+  const normRoot = path40.resolve(repoRoot) + path40.sep;
+  const normPath = path40.resolve(absPath);
+  if (normPath !== path40.resolve(repoRoot) && !normPath.startsWith(normRoot)) {
     throw new Error(`[setup-ide-files] Refusing to write outside repo root: ${absPath}`);
   }
 }
@@ -9522,18 +9511,18 @@ async function ensureGitignoreMemoraone(_repoRoot, _opts) {
   return "skipped";
 }
 async function findRepoRoot(startDir) {
-  let current = path38.resolve(startDir);
-  const root = path38.parse(current).root;
+  let current = path40.resolve(startDir);
+  const root = path40.parse(current).root;
   while (true) {
-    const gitPath = path38.join(current, ".git");
-    const m1Path = path38.join(current, "memoraone.m1");
+    const gitPath = path40.join(current, ".git");
+    const m1Path = path40.join(current, "memoraone.m1");
     if (await pathExists23(gitPath) || await pathExists23(m1Path)) {
       return current;
     }
     if (current === root) {
       return null;
     }
-    current = path38.dirname(current);
+    current = path40.dirname(current);
   }
 }
 function stripLeadingLineComments18(text) {
@@ -9592,11 +9581,11 @@ function buildVscodeMcpJsonBody(existing, options = {}) {
   return mcpJsonHeader() + JSON.stringify(merged, null, 2) + "\n";
 }
 async function writeSharedMcpJsonAtomic(filePath, content) {
-  const dir = path38.dirname(filePath);
+  const dir = path40.dirname(filePath);
   await fs34.mkdir(dir, { recursive: true });
-  const tmpPath = path38.join(
+  const tmpPath = path40.join(
     dir,
-    `.${path38.basename(filePath)}.${process.pid}.${(0, import_node_crypto24.randomBytes)(8).toString("hex")}.tmp`
+    `.${path40.basename(filePath)}.${process.pid}.${(0, import_node_crypto25.randomBytes)(8).toString("hex")}.tmp`
   );
   try {
     await fs34.writeFile(tmpPath, content, "utf8");
@@ -9650,7 +9639,7 @@ async function writeClaudeCodeMcpJson(repoRoot, buildBody, opts) {
   return "updated";
 }
 async function writeManagedMarkdown(repoRoot, relPath, fullContent, opts) {
-  const abs = path38.join(repoRoot, relPath);
+  const abs = path40.join(repoRoot, relPath);
   assertUnderRepoRoot(repoRoot, abs);
   let prior = "";
   let existed = false;
@@ -9662,25 +9651,25 @@ async function writeManagedMarkdown(repoRoot, relPath, fullContent, opts) {
   }
   if (!existed) {
     if (opts.dryRun) return "created";
-    await fs34.mkdir(path38.dirname(abs), { recursive: true });
+    await fs34.mkdir(path40.dirname(abs), { recursive: true });
     await fs34.writeFile(abs, fullContent, "utf8");
     return "created";
   }
   if (prior.includes(MANAGED_MARKER)) {
     if (prior === fullContent) return "skipped";
     if (opts.dryRun) return "updated";
-    await fs34.mkdir(path38.dirname(abs), { recursive: true });
+    await fs34.mkdir(path40.dirname(abs), { recursive: true });
     await fs34.writeFile(abs, fullContent, "utf8");
     return "updated";
   }
   if (!opts.force) return "skipped-untracked";
   if (opts.dryRun) return "updated";
-  await fs34.mkdir(path38.dirname(abs), { recursive: true });
+  await fs34.mkdir(path40.dirname(abs), { recursive: true });
   await fs34.writeFile(abs, fullContent, "utf8");
   return "updated";
 }
 async function writeIdeMcpJson(repoRoot, relPath, buildBody, opts) {
-  const abs = path38.join(repoRoot, relPath);
+  const abs = path40.join(repoRoot, relPath);
   assertUnderRepoRoot(repoRoot, abs);
   let raw = "";
   let existed = false;
@@ -10274,7 +10263,7 @@ async function runSetupIdeFiles(o) {
   let junieMcp;
   let xcodeMcp;
   let copilotJetBrainsMcp;
-  const repoRoot = o.workspaceRoot !== void 0 && o.workspaceRoot !== "" ? path38.resolve(o.workspaceRoot) : await findRepoRoot(o.cwd);
+  const repoRoot = o.workspaceRoot !== void 0 && o.workspaceRoot !== "" ? path40.resolve(o.workspaceRoot) : await findRepoRoot(o.cwd);
   if (!repoRoot) {
     return {
       exitCode: 1,
@@ -10316,6 +10305,13 @@ async function runSetupIdeFiles(o) {
     environment: localOrDev ? "local" : cursorEnvironment,
     apiUrl: resolvedApiUrl2
   });
+  const bindingRecord = o.repositoryBindingId ? void 0 : await findBindingRecordByWorkspaceRoot(repoRoot, o.homeDir);
+  const repositoryBindingId = o.repositoryBindingId ?? bindingRecord?.repositoryBindingId;
+  const globalOwnership = repositoryBindingId ? {
+    repositoryBindingId,
+    replacedRepositoryBindingIds: o.replacedRepositoryBindingIds,
+    workspaceRoot: repoRoot
+  } : void 0;
   if (!o.dryRun && resolvedApiUrl2) {
     await persistBindingApiUrl(repoRoot, effectiveApiUrl, o.homeDir, o.dryRun);
   }
@@ -10496,7 +10492,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
       { force: o.force, dryRun: o.dryRun }
     );
     try {
-      const homeDir = o.jetbrainsHomeDir ?? os14.homedir();
+      const homeDir = o.jetbrainsHomeDir ?? os13.homedir();
       const activePath = o.jetbrainsGlobalMcpConfigPath ?? getJetBrainsGlobalMcpConfigPath(homeDir);
       const jetbrainsSetup = await setupJetBrainsMcpConfig({
         homeDir,
@@ -10512,7 +10508,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         repair: o.repair ?? false,
         verify: o.verifyHandshake ?? !o.dryRun,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride
+        cliPathOverride: o.cliPathOverride,
+        ownership: globalOwnership
       });
       jetbrainsMcp = {
         activeConfigPath: activePath,
@@ -10606,7 +10603,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
   }
   if (o.targets.windsurf) {
     try {
-      const homeDir = o.windsurfHomeDir ?? os14.homedir();
+      const homeDir = o.windsurfHomeDir ?? os13.homedir();
       const activePath = o.windsurfGlobalMcpConfigPath ?? getWindsurfGlobalMcpConfigPath(homeDir);
       const legacyPath = o.windsurfLegacyMcpConfigPath ?? getWindsurfLegacyMcpConfigPath(homeDir);
       const windsurfSetup = await setupWindsurfMcpConfig({
@@ -10622,7 +10619,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
+        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride,
+        ownership: globalOwnership
       });
       windsurfMcp = {
         activeConfigPath: windsurfSetup.activeConfigPath,
@@ -10802,13 +10800,10 @@ description: MemoraOne MCP \u2014 IDE agent instructions
   }
   if (o.targets.cline) {
     try {
-      const homeDir = o.clineHomeDir ?? o.homeDir ?? os14.homedir();
+      const activeConfigPath = o.clineProjectMcpConfigPath ?? getClineProjectMcpConfigPath(repoRoot);
       const clineSetup = await setupClineMcpConfig({
-        homeDir,
         repoRoot,
-        platform: o.clinePlatform,
-        explicitHostIds: o.clineExplicitHostIds,
-        explicitHostPaths: o.clineExplicitHostPaths,
+        projectConfigPath: activeConfigPath,
         dryRun: o.dryRun,
         devMode: localOrDev,
         environment: localOrDev ? "local" : cursorEnvironment,
@@ -10818,39 +10813,34 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
       });
       clineMcp = {
-        hosts: clineSetup.hosts,
-        npxPath: clineSetup.memoraone?.command
+        activeConfigPath: clineSetup.activeConfigPath,
+        outcome: clineSetup.outcome,
+        npxPath: clineSetup.memoraone?.command,
+        backupPath: clineSetup.backupPath
       };
-      for (const host of clineSetup.hosts) {
-        outcomes[`cline-${host.hostId}:${host.activeConfigPath}`] = host.outcome;
-      }
+      outcomes[".cline/mcp.json"] = clineSetup.outcome;
     } catch (err) {
-      if (err instanceof ClineNoHostFoundError && o.requireClineHosts === false) {
-        outcomes["cline"] = "skipped";
-        clineMcp = { hosts: [] };
-      } else {
-        const message = err instanceof Error ? err.message : String(err);
-        return {
-          exitCode: 1,
-          repoRoot,
-          outcomes,
-          cursorMcp,
-          jetbrainsMcp,
-          windsurfMcp,
-          opencodeMcp,
-          codexMcp,
-          kiroMcp,
-          rooCodeMcp,
-          clineMcp,
-          daemonCleanup,
-          error: message
-        };
-      }
+      const message = err instanceof Error ? err.message : String(err);
+      return {
+        exitCode: 1,
+        repoRoot,
+        outcomes,
+        cursorMcp,
+        jetbrainsMcp,
+        windsurfMcp,
+        opencodeMcp,
+        codexMcp,
+        kiroMcp,
+        rooCodeMcp,
+        clineMcp,
+        daemonCleanup,
+        error: message
+      };
     }
   }
   if (o.targets.clineCli) {
     try {
-      const homeDir = o.clineCliHomeDir ?? o.homeDir ?? os14.homedir();
+      const homeDir = o.clineCliHomeDir ?? o.homeDir ?? os13.homedir();
       const settingsPath = o.clineCliGlobalMcpConfigPath ?? getClineCliGlobalMcpConfigPath(homeDir);
       const rootPath = o.clineCliRootMcpConfigPath ?? getClineCliRootMcpConfigPath(homeDir);
       const clineCliSetup = await setupClineCliMcpConfig({
@@ -10864,7 +10854,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
+        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride,
+        ownership: globalOwnership
       });
       clineCliMcp = {
         activeConfigPath: clineCliSetup.activeConfigPath,
@@ -10899,7 +10890,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
   }
   if (o.targets.claudeDesktop) {
     try {
-      const homeDir = o.claudeDesktopHomeDir ?? o.homeDir ?? os14.homedir();
+      const homeDir = o.claudeDesktopHomeDir ?? o.homeDir ?? os13.homedir();
       const activePath = o.claudeDesktopGlobalMcpConfigPath ?? getClaudeDesktopGlobalMcpConfigPath(homeDir);
       const claudeDesktopSetup = await setupClaudeDesktopMcpConfig({
         homeDir,
@@ -10911,7 +10902,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
+        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride,
+        ownership: globalOwnership
       });
       claudeDesktopMcp = {
         activeConfigPath: claudeDesktopSetup.activeConfigPath,
@@ -11206,7 +11198,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
   }
   if (o.targets.antigravity) {
     try {
-      const homeDir = o.antigravityHomeDir ?? o.homeDir ?? os14.homedir();
+      const homeDir = o.antigravityHomeDir ?? o.homeDir ?? os13.homedir();
       const activePath = o.antigravityGlobalMcpConfigPath ?? getAntigravityGlobalMcpConfigPath(homeDir);
       const legacyPath = o.antigravityLegacyMcpConfigPath ?? getAntigravityLegacyMcpConfigPath(homeDir);
       const antigravitySetup = await setupAntigravityMcpConfig({
@@ -11220,7 +11212,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
+        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride,
+        ownership: globalOwnership
       });
       antigravityMcp = {
         activeConfigPath: antigravitySetup.activeConfigPath,
@@ -11261,7 +11254,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
   }
   if (o.targets.goose) {
     try {
-      const homeDir = o.gooseHomeDir ?? o.homeDir ?? os14.homedir();
+      const homeDir = o.gooseHomeDir ?? o.homeDir ?? os13.homedir();
       const activePath = o.gooseGlobalMcpConfigPath ?? getGooseGlobalMcpConfigPath(homeDir);
       const gooseSetup = await setupGooseMcpConfig({
         homeDir,
@@ -11273,7 +11266,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
+        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride,
+        ownership: globalOwnership
       });
       gooseMcp = {
         activeConfigPath: gooseSetup.activeConfigPath,
@@ -11362,7 +11356,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
   }
   if (o.targets.xcode) {
     try {
-      const homeDir = o.xcodeHomeDir ?? o.homeDir ?? os14.homedir();
+      const homeDir = o.xcodeHomeDir ?? o.homeDir ?? os13.homedir();
       const activePath = o.xcodeGlobalMcpConfigPath ?? getXcodeGlobalMcpConfigPath(homeDir);
       const xcodeSetup = await setupXcodeMcpConfig({
         homeDir,
@@ -11374,7 +11368,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
+        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride,
+        ownership: globalOwnership
       });
       xcodeMcp = {
         activeConfigPath: xcodeSetup.activeConfigPath,
@@ -11415,7 +11410,7 @@ description: MemoraOne MCP \u2014 IDE agent instructions
   }
   if (o.targets.copilotJetBrains) {
     try {
-      const homeDir = o.copilotJetBrainsHomeDir ?? o.homeDir ?? os14.homedir();
+      const homeDir = o.copilotJetBrainsHomeDir ?? o.homeDir ?? os13.homedir();
       const activePath = o.copilotJetBrainsGlobalMcpConfigPath ?? getCopilotJetBrainsGlobalMcpConfigPath(homeDir);
       const copilotJetBrainsSetup = await setupCopilotJetBrainsMcpConfig({
         homeDir,
@@ -11427,7 +11422,8 @@ description: MemoraOne MCP \u2014 IDE agent instructions
         npmPackageChannel,
         apiUrl: resolvedApiUrl2,
         npxPathOverride: o.npxPathOverride,
-        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride
+        cliPathOverride: o.cliPathOverride ?? o.cursorLocalCliPathOverride,
+        ownership: globalOwnership
       });
       copilotJetBrainsMcp = {
         activeConfigPath: copilotJetBrainsSetup.activeConfigPath,
@@ -11601,13 +11597,13 @@ async function cliSetupIdeFiles(argv, options = {}) {
   }
   return 0;
 }
-var fs34, os14, path38, import_node_crypto24, MANAGED_MARKER, GITIGNORE_MEMORAONE_COMMENT, GITIGNORE_MEMORAONE_ENTRY, SharedMcpJsonParseError;
+var fs34, os13, path40, import_node_crypto25, MANAGED_MARKER, GITIGNORE_MEMORAONE_COMMENT, GITIGNORE_MEMORAONE_ENTRY, SharedMcpJsonParseError;
 var init_setupIdeFiles = __esm({
   "src/setupIdeFiles.ts"() {
     fs34 = __toESM(require("fs/promises"), 1);
-    os14 = __toESM(require("os"), 1);
-    path38 = __toESM(require("path"), 1);
-    import_node_crypto24 = require("crypto");
+    os13 = __toESM(require("os"), 1);
+    path40 = __toESM(require("path"), 1);
+    import_node_crypto25 = require("crypto");
     init_cleanup();
     init_cursorGlobalMcpConfig();
     init_jetbrainsMcpConfig();
@@ -11677,10 +11673,10 @@ var init_setupIdeFiles = __esm({
 
 // src/localState/replaceRootLocalState.ts
 function canonicalizeWorkspaceRoot(workspaceRoot) {
-  return path39.resolve(workspaceRoot);
+  return path41.resolve(workspaceRoot);
 }
 function getWorkspaceMapPathForHome(homeDir) {
-  return path39.join(getMemoraoneStateDir(homeDir), WORKSPACE_MAP_FILENAME);
+  return path41.join(getMemoraoneStateDir(homeDir), WORKSPACE_MAP_FILENAME);
 }
 async function loadWorkspaceMapFile(homeDir) {
   const filePath = getWorkspaceMapPathForHome(homeDir);
@@ -11695,7 +11691,7 @@ async function saveWorkspaceMapFile(map, homeDir) {
   await writeJsonAtomic(getWorkspaceMapPathForHome(homeDir), map);
 }
 function rootsMatch(a, b) {
-  return path39.resolve(a) === path39.resolve(b);
+  return path41.resolve(a) === path41.resolve(b);
 }
 async function collectRootAssociatedBindingIds(workspaceRoot, options = {}) {
   const canonicalRoot = canonicalizeWorkspaceRoot(workspaceRoot);
@@ -11852,11 +11848,11 @@ async function restoreRootLocalState(snapshot, options = {}) {
     await writeInstallationCredentials(creds, options.credentialOptions);
   }
 }
-var fs35, path39, WORKSPACE_MAP_FILENAME, FINGERPRINT_REGEX;
+var fs35, path41, WORKSPACE_MAP_FILENAME, FINGERPRINT_REGEX;
 var init_replaceRootLocalState = __esm({
   "src/localState/replaceRootLocalState.ts"() {
     fs35 = __toESM(require("fs/promises"), 1);
-    path39 = __toESM(require("path"), 1);
+    path41 = __toESM(require("path"), 1);
     init_installationCredentials();
     init_bindingStore();
     init_localLocks();
@@ -11920,9 +11916,6 @@ async function defaultRemoveSocket2(socketPath) {
   } catch {
   }
 }
-function rootsMatch2(a, b) {
-  return path40.resolve(a) === path40.resolve(b);
-}
 function classifyMemoraoneDaemonForConnect(proc, opts) {
   const newBinding = opts.newRepositoryBindingId.trim();
   if (proc.repositoryBindingId && proc.repositoryBindingId === newBinding) {
@@ -11937,11 +11930,11 @@ function classifyMemoraoneDaemonForConnect(proc, opts) {
   }
   return "preserve";
 }
-function classifyClineHubForConnect(proc, workspaceRoot) {
-  return rootsMatch2(proc.cwd, workspaceRoot) ? "preserve" : "stale";
+function classifyClineHubForConnect(_proc, _workspaceRoot) {
+  return "preserve";
 }
 async function runConnectRuntimeCleanup(options) {
-  const workspaceRoot = path40.resolve(options.workspaceRoot);
+  const workspaceRoot = path42.resolve(options.workspaceRoot);
   const newRepositoryBindingId = options.newRepositoryBindingId.trim();
   const replacedBindingIds = new Set(
     (options.replacedBindingIds ?? []).map((id) => id.trim()).filter(Boolean)
@@ -12112,10 +12105,10 @@ async function runConnectRuntimeCleanup(options) {
     staleRuntimeRemains
   };
 }
-var path40, import_node_child_process6, import_node_util5, fs36, execFileAsync5, CLINE_HUB_DAEMON_MARKER;
+var path42, import_node_child_process6, import_node_util5, fs36, execFileAsync5, CLINE_HUB_DAEMON_MARKER;
 var init_connectRuntimeCleanup = __esm({
   "src/connectRuntimeCleanup.ts"() {
-    path40 = __toESM(require("path"), 1);
+    path42 = __toESM(require("path"), 1);
     import_node_child_process6 = require("child_process");
     import_node_util5 = require("util");
     fs36 = __toESM(require("fs/promises"), 1);
@@ -12149,7 +12142,7 @@ function normalizeGitRemote(remoteUrl) {
   return normalized.toLowerCase() || null;
 }
 async function detectLegacyM1Warning2(workspaceRoot) {
-  const candidate = path41.join(path41.resolve(workspaceRoot), CANONICAL_M1_FILENAME);
+  const candidate = path43.join(path43.resolve(workspaceRoot), CANONICAL_M1_FILENAME);
   try {
     await fs37.access(candidate);
     return candidate;
@@ -12166,9 +12159,9 @@ async function rollbackFailedConnect(options) {
 }
 async function runConnectCommand(options) {
   const code = normalizeConnectCode(options.code);
-  const cwd2 = path41.resolve(options.cwd ?? process.cwd());
+  const cwd2 = path43.resolve(options.cwd ?? process.cwd());
   const apiUrl = (options.apiUrl ?? config2.apiUrl).replace(/\/+$/, "");
-  const homeDir = options.homeDir ?? os15.homedir();
+  const homeDir = options.homeDir ?? os14.homedir();
   const environment = "local";
   const verifyLocalBinding = options.verifyLocalBinding ?? resolveLocalBinding;
   const executionMode = await resolvePackageExecutionMode({
@@ -12195,7 +12188,7 @@ async function runConnectCommand(options) {
   const legacyM1WarningPath = await detectLegacyM1Warning2(cwd2);
   if (legacyM1WarningPath) {
     process.stderr.write(
-      `[memoraone-mcp] warning: ignoring legacy ${path41.basename(legacyM1WarningPath)} at ${legacyM1WarningPath} (credentials and binding are package-managed)
+      `[memoraone-mcp] warning: ignoring legacy ${path43.basename(legacyM1WarningPath)} at ${legacyM1WarningPath} (credentials and binding are package-managed)
 `
     );
   }
@@ -12379,6 +12372,8 @@ async function runConnectCommand(options) {
           cwd: cwd2,
           // Use the exact bound workspace root — do not rediscover via .git / .m1.
           workspaceRoot: cwd2,
+          repositoryBindingId,
+          replacedRepositoryBindingIds: snapshot.bindingIds,
           targets,
           force: true,
           dryRun: false,
@@ -12388,8 +12383,6 @@ async function runConnectCommand(options) {
           homeDir,
           // Propagate the redeemed binding API URL (backend only — not execution mode).
           apiUrl,
-          // Connect configures every writer; skip Cline when no host IDE is installed.
-          requireClineHosts: false,
           ...modeSetup,
           ...options.setupIdeOptions
         });
@@ -12599,12 +12592,12 @@ async function cliConnect(argv, options = {}) {
     return 1;
   }
 }
-var fs37, path41, os15;
+var fs37, path43, os14;
 var init_connectCommand = __esm({
   "src/localState/connectCommand.ts"() {
     fs37 = __toESM(require("fs/promises"), 1);
-    path41 = __toESM(require("path"), 1);
-    os15 = __toESM(require("os"), 1);
+    path43 = __toESM(require("path"), 1);
+    os14 = __toESM(require("os"), 1);
     init_config();
     init_projectBinding();
     init_packageExecutionMode();
@@ -12765,8 +12758,8 @@ var init_bridgeClientRoots = __esm({
         if (this.closed) {
           return null;
         }
-        return new Promise((resolve38) => {
-          this.waiters.push(resolve38);
+        return new Promise((resolve40) => {
+          this.waiters.push(resolve40);
         });
       }
       /** Re-queue lines read during an intermediate protocol step (e.g. roots/list) for the main bridge loop. */
@@ -12993,9 +12986,9 @@ function extractJsonRpcId(line) {
   }
 }
 function connectWithRetry(socketPath, log, maxRetries, retryDelayMs, connect2) {
-  return new Promise((resolve38, reject) => {
+  return new Promise((resolve40, reject) => {
     const tryConnect = (attempt) => {
-      connect2(socketPath).then(resolve38).catch((err) => {
+      connect2(socketPath).then(resolve40).catch((err) => {
         if (attempt >= maxRetries) {
           reject(err);
           return;
@@ -13191,8 +13184,8 @@ var init_bridgeProxy = __esm({
         this.maxRetries = options.maxRetries ?? 5;
         this.retryDelayMs = options.retryDelayMs ?? 200;
         this.lineReader = options.lineReader ?? null;
-        this.connectImpl = options.connect ?? ((socketPath) => new Promise((resolve38, reject) => {
-          const socket = net.connect(socketPath, () => resolve38(socket));
+        this.connectImpl = options.connect ?? ((socketPath) => new Promise((resolve40, reject) => {
+          const socket = net.connect(socketPath, () => resolve40(socket));
           socket.on("error", reject);
         }));
         this.spawnDaemonImpl = options.spawnDaemon ?? (async (binding) => {
@@ -13324,7 +13317,7 @@ var init_bridgeProxy = __esm({
       }
       waitForDaemonJsonRpcResponse(id, timeoutMs = 3e4) {
         const key = this.waiterKey(id);
-        return new Promise((resolve38, reject) => {
+        return new Promise((resolve40, reject) => {
           const timer = setTimeout(() => {
             this.pendingDaemonResponseWaiters.delete(key);
             reject(
@@ -13333,7 +13326,7 @@ var init_bridgeProxy = __esm({
               )
             );
           }, timeoutMs);
-          this.pendingDaemonResponseWaiters.set(key, { resolve: resolve38, reject, timer });
+          this.pendingDaemonResponseWaiters.set(key, { resolve: resolve40, reject, timer });
         });
       }
       notifyDaemonResponseWaiters(line) {