@memoraone/mcp 0.1.46 → 0.1.48

package/dist/cli.cjs

@@ -231,7 +231,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@memoraone/mcp",
-      version: "0.1.46",
+      version: "0.1.48",
       type: "module",
       main: "dist/index.cjs",
       exports: {
@@ -531,7 +531,7 @@ async function acquireLocalLock(lockName, options = {}) {
             `[memoraone-mcp] Failed to acquire lock ${lockName} after ${maxRetries} retries`
           );
         }
-        await new Promise((resolve43) => setTimeout(resolve43, retryDelayMs));
+        await new Promise((resolve44) => setTimeout(resolve44, retryDelayMs));
         continue;
       }
       throw err;
@@ -1092,9 +1092,9 @@ var init_memoraClient = __esm({
 });
 
 // src/localState/localConnectClient.ts
-async function requestJson(baseUrl, method, path47, options = {}) {
+async function requestJson(baseUrl, method, path48, options = {}) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const url = `${baseUrl.replace(/\/+$/, "")}${path47.startsWith("/") ? path47 : `/${path47}`}`;
+  const url = `${baseUrl.replace(/\/+$/, "")}${path48.startsWith("/") ? path48 : `/${path48}`}`;
   const res = await fetchImpl(url, {
     method,
     headers: {
@@ -3950,7 +3950,7 @@ function formatOptionalJetBrainsHandshakeUnavailableDetail(detail) {
 async function verifyJetBrainsMcpHandshake(options) {
   const timeoutMs = options.timeoutMs ?? 15e3;
   const { server } = options;
-  return new Promise((resolve43) => {
+  return new Promise((resolve44) => {
     let settled = false;
     const finish = (ok, detail, optionalUnavailable) => {
       if (settled) return;
@@ -3960,7 +3960,7 @@ async function verifyJetBrainsMcpHandshake(options) {
         child.kill();
       } catch {
       }
-      resolve43({ ok, detail, optionalUnavailable });
+      resolve44({ ok, detail, optionalUnavailable });
     };
     const child = (0, import_node_child_process4.spawn)(server.command, [...server.args], {
       env: { ...process.env, ...server.env },
@@ -12854,7 +12854,7 @@ var init_pluginPairing = __esm({
             ideType: this.source,
             fetchImpl: this.connectOptions.fetchImpl ?? this.fetchImpl,
             // Plugin pairing configures only the IDE that initiated the pairing.
-            configureIdes: true,
+            configureIdes: this.source !== "cursor",
             setupIdeOptions: {
               ...this.connectOptions.setupIdeOptions,
               targets: {
@@ -12993,13 +12993,13 @@ function writeEvent(event, stdoutWrite) {
 }
 function delay(ms, signal) {
   if (ms <= 0 || signal?.aborted) return Promise.resolve();
-  return new Promise((resolve43) => {
+  return new Promise((resolve44) => {
     const timer = setTimeout(finish, ms);
     const onAbort = () => finish();
     function finish() {
       clearTimeout(timer);
       signal?.removeEventListener("abort", onAbort);
-      resolve43();
+      resolve44();
     }
     signal?.addEventListener("abort", onAbort, { once: true });
   });
@@ -13442,8 +13442,8 @@ var init_bridgeClientRoots = __esm({
         if (this.closed) {
           return null;
         }
-        return new Promise((resolve43) => {
-          this.waiters.push(resolve43);
+        return new Promise((resolve44) => {
+          this.waiters.push(resolve44);
         });
       }
       /** Re-queue lines read during an intermediate protocol step (e.g. roots/list) for the main bridge loop. */
@@ -13463,6 +13463,153 @@ var init_bridgeClientRoots = __esm({
   }
 });
 
+// src/pluginStartupBindingWait.ts
+function errorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function isUnboundPluginStartupBindingMessage(message) {
+  return UNBOUND_MESSAGE_MARKERS.some((marker) => message.includes(marker));
+}
+function isCredentialsMissingMessage(message) {
+  return message.includes(CREDENTIALS_MISSING_MARKER);
+}
+async function pendingBindingWindowOpen(isPendingBinding) {
+  if (!isPendingBinding) {
+    return false;
+  }
+  try {
+    return Boolean(await isPendingBinding());
+  } catch {
+    return false;
+  }
+}
+function shouldWaitForPluginStartupBinding(options = {}) {
+  const env2 = options.env ?? process.env;
+  if (env2[MEMORAONE_PLUGIN_ENV] !== MEMORAONE_CURSOR_PLUGIN) {
+    return false;
+  }
+  if (options.daemonBindingHint) {
+    return false;
+  }
+  return true;
+}
+function collectPluginStartupBindingRoots(options) {
+  const seen = /* @__PURE__ */ new Set();
+  const roots = [];
+  const add = (raw) => {
+    if (raw === void 0 || raw === null || raw.trim() === "") {
+      return;
+    }
+    const resolved = path47.resolve(raw);
+    if (seen.has(resolved)) {
+      return;
+    }
+    seen.add(resolved);
+    roots.push(resolved);
+  };
+  for (const root of options.initializeRoots ?? []) {
+    add(root);
+  }
+  for (const uri of options.rootsListUris ?? []) {
+    add(uriToPath(uri));
+  }
+  add(getRepoScopedWorkspaceHint(options.env));
+  return roots;
+}
+async function hasPendingPluginStartupBinding(workspaceRoots, options = {}) {
+  for (const root of workspaceRoots) {
+    try {
+      const identity = await lookupLocalBindingIdentity(root, {
+        homeDir: options.homeDir
+      });
+      if (identity.status !== "resolved") {
+        continue;
+      }
+      const record = await readBindingRecord(
+        identity.repositoryBindingId,
+        options.homeDir
+      );
+      if (record?.status === "pending") {
+        return true;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return false;
+}
+async function isRetryablePluginStartupBindingError(err, options = {}) {
+  const message = errorMessage(err);
+  if (isUnboundPluginStartupBindingMessage(message)) {
+    return true;
+  }
+  if (isCredentialsMissingMessage(message) && await pendingBindingWindowOpen(options.isPendingBinding)) {
+    return true;
+  }
+  return false;
+}
+function defaultSleep(ms) {
+  return new Promise((resolve44) => {
+    setTimeout(resolve44, ms);
+  });
+}
+async function waitForPluginStartupBinding(resolve44, options = {}) {
+  const now = options.now ?? Date.now;
+  const sleep = options.sleep ?? defaultSleep;
+  const timeoutMs = options.timeoutMs ?? PLUGIN_STARTUP_BINDING_WAIT_TIMEOUT_MS;
+  const intervalMs = options.intervalMs ?? PLUGIN_STARTUP_BINDING_WAIT_INTERVAL_MS;
+  const startedAt = now();
+  let waitingLogged = false;
+  let lastError;
+  while (true) {
+    try {
+      const binding = await resolve44();
+      if (waitingLogged) {
+        options.log?.(
+          `local MemoraOne binding available after Cursor plugin pairing (${now() - startedAt}ms)`
+        );
+      }
+      return binding;
+    } catch (err) {
+      lastError = err;
+      const retryable = await isRetryablePluginStartupBindingError(err, {
+        isPendingBinding: options.isPendingBinding
+      });
+      if (!retryable) {
+        throw err;
+      }
+      if (now() - startedAt >= timeoutMs) {
+        throw lastError;
+      }
+      if (!waitingLogged) {
+        options.log?.(
+          "waiting for local MemoraOne binding after Cursor plugin pairing"
+        );
+        waitingLogged = true;
+      }
+      await sleep(intervalMs);
+    }
+  }
+}
+var path47, MEMORAONE_PLUGIN_ENV, MEMORAONE_CURSOR_PLUGIN, PLUGIN_STARTUP_BINDING_WAIT_TIMEOUT_MS, PLUGIN_STARTUP_BINDING_WAIT_INTERVAL_MS, UNBOUND_MESSAGE_MARKERS, CREDENTIALS_MISSING_MARKER;
+var init_pluginStartupBindingWait = __esm({
+  "src/pluginStartupBindingWait.ts"() {
+    path47 = __toESM(require("path"), 1);
+    init_initializeBinding();
+    init_bindingStore();
+    init_resolveLocalBinding();
+    MEMORAONE_PLUGIN_ENV = "MEMORAONE_PLUGIN";
+    MEMORAONE_CURSOR_PLUGIN = "cursor";
+    PLUGIN_STARTUP_BINDING_WAIT_TIMEOUT_MS = 5 * 60 * 1e3;
+    PLUGIN_STARTUP_BINDING_WAIT_INTERVAL_MS = 250;
+    UNBOUND_MESSAGE_MARKERS = [
+      "No local MemoraOne binding for this workspace",
+      "No local binding for workspace"
+    ];
+    CREDENTIALS_MISSING_MARKER = "Installation credentials missing";
+  }
+});
+
 // src/ideType.ts
 function mapReliableClientInfoName(name) {
   if (typeof name !== "string") {
@@ -13670,9 +13817,9 @@ function extractJsonRpcId(line) {
   }
 }
 function connectWithRetry(socketPath, log, maxRetries, retryDelayMs, connect2) {
-  return new Promise((resolve43, reject) => {
+  return new Promise((resolve44, reject) => {
     const tryConnect = (attempt) => {
-      connect2(socketPath).then(resolve43).catch((err) => {
+      connect2(socketPath).then(resolve44).catch((err) => {
         if (attempt >= maxRetries) {
           reject(err);
           return;
@@ -13841,6 +13988,7 @@ var init_bridgeProxy = __esm({
     init_bridgeClientRoots();
     init_cleanup();
     init_initializeBinding();
+    init_pluginStartupBindingWait();
     init_projectBinding();
     init_ideType();
     init_socketPaths();
@@ -13868,8 +14016,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((resolve43, reject) => {
-          const socket = net.connect(socketPath, () => resolve43(socket));
+        this.connectImpl = options.connect ?? ((socketPath) => new Promise((resolve44, reject) => {
+          const socket = net.connect(socketPath, () => resolve44(socket));
           socket.on("error", reject);
         }));
         this.spawnDaemonImpl = options.spawnDaemon ?? (async (binding) => {
@@ -13953,10 +14101,20 @@ var init_bridgeProxy = __esm({
             );
           }
         }
-        const binding = await resolveBridgeSessionBinding(params, this.env, {
+        const resolveBinding = () => resolveBridgeSessionBinding(params, this.env, {
           rootsListUris,
           rootsListAttempted
         });
+        const binding = shouldWaitForPluginStartupBinding({ env: this.env }) ? await waitForPluginStartupBinding(resolveBinding, {
+          isPendingBinding: () => hasPendingPluginStartupBinding(
+            collectPluginStartupBindingRoots({
+              initializeRoots,
+              rootsListUris,
+              env: this.env
+            })
+          ),
+          log: this.log
+        }) : await resolveBinding();
         const environmentLog = binding.environment !== void 0 ? ` environment=${binding.environment}` : "";
         this.log(
           `session binding binding=${binding.repositoryBindingId} project=${binding.projectId} workspace=${binding.workspaceRoot} source=${binding.bindingSource}${environmentLog}`
@@ -14001,7 +14159,7 @@ var init_bridgeProxy = __esm({
       }
       waitForDaemonJsonRpcResponse(id, timeoutMs = 3e4) {
         const key = this.waiterKey(id);
-        return new Promise((resolve43, reject) => {
+        return new Promise((resolve44, reject) => {
           const timer = setTimeout(() => {
             this.pendingDaemonResponseWaiters.delete(key);
             reject(
@@ -14010,7 +14168,7 @@ var init_bridgeProxy = __esm({
               )
             );
           }, timeoutMs);
-          this.pendingDaemonResponseWaiters.set(key, { resolve: resolve43, reject, timer });
+          this.pendingDaemonResponseWaiters.set(key, { resolve: resolve44, reject, timer });
         });
       }
       notifyDaemonResponseWaiters(line) {

package/dist/daemon.cjs

@@ -416,7 +416,7 @@ async function acquireLocalLock(lockName, options = {}) {
             `[memoraone-mcp] Failed to acquire lock ${lockName} after ${maxRetries} retries`
           );
         }
-        await new Promise((resolve10) => setTimeout(resolve10, retryDelayMs));
+        await new Promise((resolve11) => setTimeout(resolve11, retryDelayMs));
         continue;
       }
       throw err;
@@ -980,9 +980,9 @@ var MemoraClient = class {
       ...options?.headers ?? {}
     };
   }
-  async perform(method, path15, body, options, retried = false) {
+  async perform(method, path16, body, options, retried = false) {
     const nonce = crypto2.randomBytes(8).toString("hex");
-    const url = `${this.baseUrl}${path15.startsWith("/") ? path15 : `/${path15}`}`;
+    const url = `${this.baseUrl}${path16.startsWith("/") ? path16 : `/${path16}`}`;
     this.resolveProjectId();
     console.error(
       `[memoraone-mcp][info] requestJson nonce=${nonce} stage=before_fetch method=${method} url=${url}`
@@ -1009,7 +1009,7 @@ var MemoraClient = class {
       if (res.status === 401 && !options?.skipAuthRefresh && !retried) {
         try {
           await this.refreshAccessToken();
-          return this.perform(method, path15, body, options, true);
+          return this.perform(method, path16, body, options, true);
         } catch (err) {
           if (err instanceof ReconnectRequiredError) {
             await this.markReconnectRequired();
@@ -1029,22 +1029,22 @@ var MemoraClient = class {
     }
     return res.text ? JSON.parse(res.text) : null;
   }
-  async post(path15, body, options) {
-    console.error(`[memoraone-mcp][info] MemoraClient.post ENTER path=${path15}`);
-    const result = await this.perform("POST", path15, body, options);
-    console.error(`[memoraone-mcp][info] MemoraClient.post EXIT path=${path15}`);
+  async post(path16, body, options) {
+    console.error(`[memoraone-mcp][info] MemoraClient.post ENTER path=${path16}`);
+    const result = await this.perform("POST", path16, body, options);
+    console.error(`[memoraone-mcp][info] MemoraClient.post EXIT path=${path16}`);
     return result;
   }
-  async get(path15, options) {
-    return this.perform("GET", path15, void 0, options);
+  async get(path16, options) {
+    return this.perform("GET", path16, void 0, options);
   }
 };
 var memoraClient_default = MemoraClient;
 
 // src/localState/localConnectClient.ts
-async function requestJson2(baseUrl, method, path15, options = {}) {
+async function requestJson2(baseUrl, method, path16, options = {}) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const url = `${baseUrl.replace(/\/+$/, "")}${path15.startsWith("/") ? path15 : `/${path15}`}`;
+  const url = `${baseUrl.replace(/\/+$/, "")}${path16.startsWith("/") ? path16 : `/${path16}`}`;
   const res = await fetchImpl(url, {
     method,
     headers: {
@@ -1228,6 +1228,30 @@ async function ensureRepositoryBindingForRoot(workspaceRoot, options = {}) {
     legacyM1WarningPath
   };
 }
+async function lookupLocalBindingIdentity(workspaceRoot, options = {}) {
+  const resolved = path9.resolve(workspaceRoot);
+  const identity = await captureRootFilesystemIdentity(resolved, options.identityDeps);
+  const index = await loadPathIndex(options.homeDir);
+  const lookup = lookupPathIndex(index, resolved, identity);
+  if (lookup.kind !== "path") {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  const record = await readBindingRecord(lookup.repositoryBindingId, options.homeDir);
+  if (!record) {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  if (path9.resolve(record.workspaceRoot) !== resolved) {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  if (!identityMatchesStored(record.filesystemIdentity, identity)) {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  return {
+    status: "resolved",
+    workspaceRoot: resolved,
+    repositoryBindingId: record.repositoryBindingId
+  };
+}
 async function resolveLocalBinding(workspaceRoot, options = {}) {
   const resolved = path9.resolve(workspaceRoot);
   const { repositoryBindingId, legacyM1WarningPath } = await ensureRepositoryBindingForRoot(
@@ -1793,6 +1817,145 @@ async function resolveBindingFromInitializeParams(params, options = {}) {
   });
 }
 
+// src/pluginStartupBindingWait.ts
+var path14 = __toESM(require("path"), 1);
+var MEMORAONE_PLUGIN_ENV = "MEMORAONE_PLUGIN";
+var MEMORAONE_CURSOR_PLUGIN = "cursor";
+var PLUGIN_STARTUP_BINDING_WAIT_TIMEOUT_MS = 5 * 60 * 1e3;
+var PLUGIN_STARTUP_BINDING_WAIT_INTERVAL_MS = 250;
+var UNBOUND_MESSAGE_MARKERS = [
+  "No local MemoraOne binding for this workspace",
+  "No local binding for workspace"
+];
+var CREDENTIALS_MISSING_MARKER = "Installation credentials missing";
+function errorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function isUnboundPluginStartupBindingMessage(message) {
+  return UNBOUND_MESSAGE_MARKERS.some((marker) => message.includes(marker));
+}
+function isCredentialsMissingMessage(message) {
+  return message.includes(CREDENTIALS_MISSING_MARKER);
+}
+async function pendingBindingWindowOpen(isPendingBinding) {
+  if (!isPendingBinding) {
+    return false;
+  }
+  try {
+    return Boolean(await isPendingBinding());
+  } catch {
+    return false;
+  }
+}
+function shouldWaitForPluginStartupBinding(options = {}) {
+  const env2 = options.env ?? process.env;
+  if (env2[MEMORAONE_PLUGIN_ENV] !== MEMORAONE_CURSOR_PLUGIN) {
+    return false;
+  }
+  if (options.daemonBindingHint) {
+    return false;
+  }
+  return true;
+}
+function collectPluginStartupBindingRoots(options) {
+  const seen = /* @__PURE__ */ new Set();
+  const roots = [];
+  const add = (raw) => {
+    if (raw === void 0 || raw === null || raw.trim() === "") {
+      return;
+    }
+    const resolved = path14.resolve(raw);
+    if (seen.has(resolved)) {
+      return;
+    }
+    seen.add(resolved);
+    roots.push(resolved);
+  };
+  for (const root of options.initializeRoots ?? []) {
+    add(root);
+  }
+  for (const uri of options.rootsListUris ?? []) {
+    add(uriToPath(uri));
+  }
+  add(getRepoScopedWorkspaceHint(options.env));
+  return roots;
+}
+async function hasPendingPluginStartupBinding(workspaceRoots, options = {}) {
+  for (const root of workspaceRoots) {
+    try {
+      const identity = await lookupLocalBindingIdentity(root, {
+        homeDir: options.homeDir
+      });
+      if (identity.status !== "resolved") {
+        continue;
+      }
+      const record = await readBindingRecord(
+        identity.repositoryBindingId,
+        options.homeDir
+      );
+      if (record?.status === "pending") {
+        return true;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return false;
+}
+async function isRetryablePluginStartupBindingError(err, options = {}) {
+  const message = errorMessage(err);
+  if (isUnboundPluginStartupBindingMessage(message)) {
+    return true;
+  }
+  if (isCredentialsMissingMessage(message) && await pendingBindingWindowOpen(options.isPendingBinding)) {
+    return true;
+  }
+  return false;
+}
+function defaultSleep(ms) {
+  return new Promise((resolve11) => {
+    setTimeout(resolve11, ms);
+  });
+}
+async function waitForPluginStartupBinding(resolve11, options = {}) {
+  const now = options.now ?? Date.now;
+  const sleep = options.sleep ?? defaultSleep;
+  const timeoutMs = options.timeoutMs ?? PLUGIN_STARTUP_BINDING_WAIT_TIMEOUT_MS;
+  const intervalMs = options.intervalMs ?? PLUGIN_STARTUP_BINDING_WAIT_INTERVAL_MS;
+  const startedAt = now();
+  let waitingLogged = false;
+  let lastError;
+  while (true) {
+    try {
+      const binding = await resolve11();
+      if (waitingLogged) {
+        options.log?.(
+          `local MemoraOne binding available after Cursor plugin pairing (${now() - startedAt}ms)`
+        );
+      }
+      return binding;
+    } catch (err) {
+      lastError = err;
+      const retryable = await isRetryablePluginStartupBindingError(err, {
+        isPendingBinding: options.isPendingBinding
+      });
+      if (!retryable) {
+        throw err;
+      }
+      if (now() - startedAt >= timeoutMs) {
+        throw lastError;
+      }
+      if (!waitingLogged) {
+        options.log?.(
+          "waiting for local MemoraOne binding after Cursor plugin pairing"
+        );
+        waitingLogged = true;
+      }
+      await sleep(intervalMs);
+    }
+  }
+}
+
 // src/bridgeClientRoots.ts
 var readline = __toESM(require("readline"), 1);
 var TRUTHY = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
@@ -2227,9 +2390,9 @@ function buildPersonalContextPath(parsed2) {
 }
 async function handleGetPersonalContext(client, args) {
   const parsed2 = getPersonalContextInputSchema.parse(args ?? {});
-  const path15 = buildPersonalContextPath(parsed2);
+  const path16 = buildPersonalContextPath(parsed2);
   try {
-    const result = await client.get(path15);
+    const result = await client.get(path16);
     return { ok: true, result };
   } catch (err) {
     if (err instanceof MemoraOneHttpError) {
@@ -2701,8 +2864,8 @@ async function handleCreateConceptVersion(client, args) {
   if (input.tags !== void 0) body.tags = input.tags;
   if (input.parent_id !== void 0) body.parent_id = input.parent_id;
   try {
-    const path15 = `/concepts/${encodeURIComponent(input.id)}/versions`;
-    return projectCreatedConceptVersionResponse(await client.post(path15, body));
+    const path16 = `/concepts/${encodeURIComponent(input.id)}/versions`;
+    return projectCreatedConceptVersionResponse(await client.post(path16, body));
   } catch (error) {
     rethrowToolRequestError("memora_create_concept_version", error);
   }
@@ -2737,7 +2900,7 @@ function handleBindingStatus(binding, options = {}) {
 // src/heartbeat.ts
 var crypto5 = __toESM(require("crypto"), 1);
 var fs10 = __toESM(require("fs"), 1);
-var path14 = __toESM(require("path"), 1);
+var path15 = __toESM(require("path"), 1);
 
 // src/localState/mcpSessionId.ts
 var import_node_crypto4 = require("crypto");
@@ -2770,9 +2933,9 @@ function resolvePackageVersion() {
   if (fromEnv) return fromEnv;
   const moduleDir = typeof __dirname !== "undefined" ? __dirname : void 0;
   const candidates = [
-    ...moduleDir ? [path14.join(moduleDir, "..", "package.json"), path14.join(moduleDir, "package.json")] : [],
-    path14.join(process.cwd(), "package.json"),
-    path14.join(process.cwd(), "packages", "mcp", "package.json")
+    ...moduleDir ? [path15.join(moduleDir, "..", "package.json"), path15.join(moduleDir, "package.json")] : [],
+    path15.join(process.cwd(), "package.json"),
+    path15.join(process.cwd(), "packages", "mcp", "package.json")
   ];
   for (const candidate of candidates) {
     try {
@@ -3291,8 +3454,8 @@ function registerToolWithWorklog(server, runtime, sessionContext, toolName, desc
 async function main(opts = {}) {
   let bindingReadyResolve = null;
   let bindingReadyReject = null;
-  const bindingReady = new Promise((resolve10, reject) => {
-    bindingReadyResolve = resolve10;
+  const bindingReady = new Promise((resolve11, reject) => {
+    bindingReadyResolve = resolve11;
     bindingReadyReject = reject;
   });
   const devMode = Boolean(config2.devMode);
@@ -3373,12 +3536,25 @@ async function main(opts = {}) {
         console.error("[memoraone-mcp][init-debug] Workspace resolution strategy: initialize.rootUri");
       }
     }
-    const binding = await resolveBindingFromInitializeParams(params, {
+    const resolveBinding = () => resolveBindingFromInitializeParams(params, {
       fallbackWorkspaceRoots: getEnvWorkspaceRootCandidates(),
       rootsListUris,
       rootsListAttempted,
       ...getBridgeBindingResolveOptions()
     });
+    const binding = shouldWaitForPluginStartupBinding({
+      env: process.env,
+      daemonBindingHint: opts.daemonBindingHint
+    }) ? await waitForPluginStartupBinding(resolveBinding, {
+      isPendingBinding: () => hasPendingPluginStartupBinding(
+        collectPluginStartupBindingRoots({
+          initializeRoots,
+          rootsListUris,
+          env: process.env
+        })
+      ),
+      log: (msg) => console.error(`[memoraone-mcp] ${msg}`)
+    }) : await resolveBinding();
     workspaceRoot = binding.workspaceRoot;
     return binding;
   };
@@ -3765,10 +3941,10 @@ async function main(opts = {}) {
     console.error("[memoraone-mcp] MCP server ready");
   }
   if (opts.sessionSocket) {
-    await new Promise((resolve10) => {
+    await new Promise((resolve11) => {
       opts.sessionSocket.once("close", () => {
         shutdown("session closed", false);
-        resolve10();
+        resolve11();
       });
     });
   }
@@ -3812,7 +3988,7 @@ async function ensureSocketClean(socketPath) {
   } catch {
     return;
   }
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     const client = net.createConnection({ path: socketPath }, () => {
       client.destroy();
       log("daemon already running, exiting");
@@ -3824,7 +4000,7 @@ async function ensureSocketClean(socketPath) {
         log("stale socket removed");
       } catch {
       }
-      resolve10();
+      resolve11();
     });
   });
 }
@@ -3915,14 +4091,14 @@ async function runDaemon() {
   process.on("SIGINT", () => shutdownNow("SIGINT"));
   process.on("SIGTERM", () => shutdownNow("SIGTERM"));
   process.on("exit", cleanupSocketFile);
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     server.listen(socketPath, () => {
       writeBindingSidecar(socketPath, binding, ideType ?? "");
       log(`daemon started, listening on ${socketPath}`);
       void daemonHeartbeat.start().catch((err) => {
         log(`daemon heartbeat start error: ${String(err)}`);
       });
-      resolve10();
+      resolve11();
     });
   });
 }

package/dist/index.cjs

@@ -593,7 +593,7 @@ async function acquireLocalLock(lockName, options = {}) {
             `[memoraone-mcp] Failed to acquire lock ${lockName} after ${maxRetries} retries`
           );
         }
-        await new Promise((resolve10) => setTimeout(resolve10, retryDelayMs));
+        await new Promise((resolve11) => setTimeout(resolve11, retryDelayMs));
         continue;
       }
       throw err;
@@ -612,9 +612,9 @@ async function withLocalLock(lockName, fn, options = {}) {
 
 // src/localState/localConnectClient.ts
 var path6 = __toESM(require("path"), 1);
-async function requestJson(baseUrl, method, path15, options = {}) {
+async function requestJson(baseUrl, method, path16, options = {}) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const url = `${baseUrl.replace(/\/+$/, "")}${path15.startsWith("/") ? path15 : `/${path15}`}`;
+  const url = `${baseUrl.replace(/\/+$/, "")}${path16.startsWith("/") ? path16 : `/${path16}`}`;
   const res = await fetchImpl(url, {
     method,
     headers: {
@@ -950,9 +950,9 @@ var MemoraClient = class {
       ...options?.headers ?? {}
     };
   }
-  async perform(method, path15, body, options, retried = false) {
+  async perform(method, path16, body, options, retried = false) {
     const nonce = crypto2.randomBytes(8).toString("hex");
-    const url = `${this.baseUrl}${path15.startsWith("/") ? path15 : `/${path15}`}`;
+    const url = `${this.baseUrl}${path16.startsWith("/") ? path16 : `/${path16}`}`;
     this.resolveProjectId();
     console.error(
       `[memoraone-mcp][info] requestJson nonce=${nonce} stage=before_fetch method=${method} url=${url}`
@@ -979,7 +979,7 @@ var MemoraClient = class {
       if (res.status === 401 && !options?.skipAuthRefresh && !retried) {
         try {
           await this.refreshAccessToken();
-          return this.perform(method, path15, body, options, true);
+          return this.perform(method, path16, body, options, true);
         } catch (err) {
           if (err instanceof ReconnectRequiredError) {
             await this.markReconnectRequired();
@@ -999,14 +999,14 @@ var MemoraClient = class {
     }
     return res.text ? JSON.parse(res.text) : null;
   }
-  async post(path15, body, options) {
-    console.error(`[memoraone-mcp][info] MemoraClient.post ENTER path=${path15}`);
-    const result = await this.perform("POST", path15, body, options);
-    console.error(`[memoraone-mcp][info] MemoraClient.post EXIT path=${path15}`);
+  async post(path16, body, options) {
+    console.error(`[memoraone-mcp][info] MemoraClient.post ENTER path=${path16}`);
+    const result = await this.perform("POST", path16, body, options);
+    console.error(`[memoraone-mcp][info] MemoraClient.post EXIT path=${path16}`);
     return result;
   }
-  async get(path15, options) {
-    return this.perform("GET", path15, void 0, options);
+  async get(path16, options) {
+    return this.perform("GET", path16, void 0, options);
   }
 };
 var memoraClient_default = MemoraClient;
@@ -1313,6 +1313,30 @@ async function ensureRepositoryBindingForRoot(workspaceRoot, options = {}) {
     legacyM1WarningPath
   };
 }
+async function lookupLocalBindingIdentity(workspaceRoot, options = {}) {
+  const resolved = path10.resolve(workspaceRoot);
+  const identity = await captureRootFilesystemIdentity(resolved, options.identityDeps);
+  const index = await loadPathIndex(options.homeDir);
+  const lookup = lookupPathIndex(index, resolved, identity);
+  if (lookup.kind !== "path") {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  const record = await readBindingRecord(lookup.repositoryBindingId, options.homeDir);
+  if (!record) {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  if (path10.resolve(record.workspaceRoot) !== resolved) {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  if (!identityMatchesStored(record.filesystemIdentity, identity)) {
+    return { status: "unbound", workspaceRoot: resolved };
+  }
+  return {
+    status: "resolved",
+    workspaceRoot: resolved,
+    repositoryBindingId: record.repositoryBindingId
+  };
+}
 async function resolveLocalBinding(workspaceRoot, options = {}) {
   const resolved = path10.resolve(workspaceRoot);
   const { repositoryBindingId, legacyM1WarningPath } = await ensureRepositoryBindingForRoot(
@@ -1690,9 +1714,148 @@ async function resolveBindingFromInitializeParams(params, options = {}) {
   });
 }
 
+// src/pluginStartupBindingWait.ts
+var path13 = __toESM(require("path"), 1);
+var MEMORAONE_PLUGIN_ENV = "MEMORAONE_PLUGIN";
+var MEMORAONE_CURSOR_PLUGIN = "cursor";
+var PLUGIN_STARTUP_BINDING_WAIT_TIMEOUT_MS = 5 * 60 * 1e3;
+var PLUGIN_STARTUP_BINDING_WAIT_INTERVAL_MS = 250;
+var UNBOUND_MESSAGE_MARKERS = [
+  "No local MemoraOne binding for this workspace",
+  "No local binding for workspace"
+];
+var CREDENTIALS_MISSING_MARKER = "Installation credentials missing";
+function errorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function isUnboundPluginStartupBindingMessage(message) {
+  return UNBOUND_MESSAGE_MARKERS.some((marker) => message.includes(marker));
+}
+function isCredentialsMissingMessage(message) {
+  return message.includes(CREDENTIALS_MISSING_MARKER);
+}
+async function pendingBindingWindowOpen(isPendingBinding) {
+  if (!isPendingBinding) {
+    return false;
+  }
+  try {
+    return Boolean(await isPendingBinding());
+  } catch {
+    return false;
+  }
+}
+function shouldWaitForPluginStartupBinding(options = {}) {
+  const env2 = options.env ?? process.env;
+  if (env2[MEMORAONE_PLUGIN_ENV] !== MEMORAONE_CURSOR_PLUGIN) {
+    return false;
+  }
+  if (options.daemonBindingHint) {
+    return false;
+  }
+  return true;
+}
+function collectPluginStartupBindingRoots(options) {
+  const seen = /* @__PURE__ */ new Set();
+  const roots = [];
+  const add = (raw) => {
+    if (raw === void 0 || raw === null || raw.trim() === "") {
+      return;
+    }
+    const resolved = path13.resolve(raw);
+    if (seen.has(resolved)) {
+      return;
+    }
+    seen.add(resolved);
+    roots.push(resolved);
+  };
+  for (const root of options.initializeRoots ?? []) {
+    add(root);
+  }
+  for (const uri of options.rootsListUris ?? []) {
+    add(uriToPath(uri));
+  }
+  add(getRepoScopedWorkspaceHint(options.env));
+  return roots;
+}
+async function hasPendingPluginStartupBinding(workspaceRoots, options = {}) {
+  for (const root of workspaceRoots) {
+    try {
+      const identity = await lookupLocalBindingIdentity(root, {
+        homeDir: options.homeDir
+      });
+      if (identity.status !== "resolved") {
+        continue;
+      }
+      const record = await readBindingRecord(
+        identity.repositoryBindingId,
+        options.homeDir
+      );
+      if (record?.status === "pending") {
+        return true;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return false;
+}
+async function isRetryablePluginStartupBindingError(err, options = {}) {
+  const message = errorMessage(err);
+  if (isUnboundPluginStartupBindingMessage(message)) {
+    return true;
+  }
+  if (isCredentialsMissingMessage(message) && await pendingBindingWindowOpen(options.isPendingBinding)) {
+    return true;
+  }
+  return false;
+}
+function defaultSleep(ms) {
+  return new Promise((resolve11) => {
+    setTimeout(resolve11, ms);
+  });
+}
+async function waitForPluginStartupBinding(resolve11, options = {}) {
+  const now = options.now ?? Date.now;
+  const sleep = options.sleep ?? defaultSleep;
+  const timeoutMs = options.timeoutMs ?? PLUGIN_STARTUP_BINDING_WAIT_TIMEOUT_MS;
+  const intervalMs = options.intervalMs ?? PLUGIN_STARTUP_BINDING_WAIT_INTERVAL_MS;
+  const startedAt = now();
+  let waitingLogged = false;
+  let lastError;
+  while (true) {
+    try {
+      const binding = await resolve11();
+      if (waitingLogged) {
+        options.log?.(
+          `local MemoraOne binding available after Cursor plugin pairing (${now() - startedAt}ms)`
+        );
+      }
+      return binding;
+    } catch (err) {
+      lastError = err;
+      const retryable = await isRetryablePluginStartupBindingError(err, {
+        isPendingBinding: options.isPendingBinding
+      });
+      if (!retryable) {
+        throw err;
+      }
+      if (now() - startedAt >= timeoutMs) {
+        throw lastError;
+      }
+      if (!waitingLogged) {
+        options.log?.(
+          "waiting for local MemoraOne binding after Cursor plugin pairing"
+        );
+        waitingLogged = true;
+      }
+      await sleep(intervalMs);
+    }
+  }
+}
+
 // src/bindingSidecar.ts
 var fs9 = __toESM(require("fs"), 1);
-var path13 = __toESM(require("path"), 1);
+var path14 = __toESM(require("path"), 1);
 function bindingSidecarPath(socketPath) {
   if (socketPath.endsWith(".sock")) {
     return `${socketPath.slice(0, -".sock".length)}.binding.json`;
@@ -2153,9 +2316,9 @@ function buildPersonalContextPath(parsed2) {
 }
 async function handleGetPersonalContext(client, args) {
   const parsed2 = getPersonalContextInputSchema.parse(args ?? {});
-  const path15 = buildPersonalContextPath(parsed2);
+  const path16 = buildPersonalContextPath(parsed2);
   try {
-    const result = await client.get(path15);
+    const result = await client.get(path16);
     return { ok: true, result };
   } catch (err) {
     if (err instanceof MemoraOneHttpError) {
@@ -2627,8 +2790,8 @@ async function handleCreateConceptVersion(client, args) {
   if (input.tags !== void 0) body.tags = input.tags;
   if (input.parent_id !== void 0) body.parent_id = input.parent_id;
   try {
-    const path15 = `/concepts/${encodeURIComponent(input.id)}/versions`;
-    return projectCreatedConceptVersionResponse(await client.post(path15, body));
+    const path16 = `/concepts/${encodeURIComponent(input.id)}/versions`;
+    return projectCreatedConceptVersionResponse(await client.post(path16, body));
   } catch (error) {
     rethrowToolRequestError("memora_create_concept_version", error);
   }
@@ -2663,7 +2826,7 @@ function handleBindingStatus(binding, options = {}) {
 // src/heartbeat.ts
 var crypto5 = __toESM(require("crypto"), 1);
 var fs10 = __toESM(require("fs"), 1);
-var path14 = __toESM(require("path"), 1);
+var path15 = __toESM(require("path"), 1);
 
 // src/localState/mcpSessionId.ts
 var import_node_crypto4 = require("crypto");
@@ -2696,9 +2859,9 @@ function resolvePackageVersion() {
   if (fromEnv) return fromEnv;
   const moduleDir = typeof __dirname !== "undefined" ? __dirname : void 0;
   const candidates = [
-    ...moduleDir ? [path14.join(moduleDir, "..", "package.json"), path14.join(moduleDir, "package.json")] : [],
-    path14.join(process.cwd(), "package.json"),
-    path14.join(process.cwd(), "packages", "mcp", "package.json")
+    ...moduleDir ? [path15.join(moduleDir, "..", "package.json"), path15.join(moduleDir, "package.json")] : [],
+    path15.join(process.cwd(), "package.json"),
+    path15.join(process.cwd(), "packages", "mcp", "package.json")
   ];
   for (const candidate of candidates) {
     try {
@@ -3217,8 +3380,8 @@ function registerToolWithWorklog(server, runtime, sessionContext, toolName, desc
 async function main(opts = {}) {
   let bindingReadyResolve = null;
   let bindingReadyReject = null;
-  const bindingReady = new Promise((resolve10, reject) => {
-    bindingReadyResolve = resolve10;
+  const bindingReady = new Promise((resolve11, reject) => {
+    bindingReadyResolve = resolve11;
     bindingReadyReject = reject;
   });
   const devMode = Boolean(config2.devMode);
@@ -3299,12 +3462,25 @@ async function main(opts = {}) {
         console.error("[memoraone-mcp][init-debug] Workspace resolution strategy: initialize.rootUri");
       }
     }
-    const binding = await resolveBindingFromInitializeParams(params, {
+    const resolveBinding = () => resolveBindingFromInitializeParams(params, {
       fallbackWorkspaceRoots: getEnvWorkspaceRootCandidates(),
       rootsListUris,
       rootsListAttempted,
       ...getBridgeBindingResolveOptions()
     });
+    const binding = shouldWaitForPluginStartupBinding({
+      env: process.env,
+      daemonBindingHint: opts.daemonBindingHint
+    }) ? await waitForPluginStartupBinding(resolveBinding, {
+      isPendingBinding: () => hasPendingPluginStartupBinding(
+        collectPluginStartupBindingRoots({
+          initializeRoots,
+          rootsListUris,
+          env: process.env
+        })
+      ),
+      log: (msg) => console.error(`[memoraone-mcp] ${msg}`)
+    }) : await resolveBinding();
     workspaceRoot = binding.workspaceRoot;
     return binding;
   };
@@ -3691,10 +3867,10 @@ async function main(opts = {}) {
     console.error("[memoraone-mcp] MCP server ready");
   }
   if (opts.sessionSocket) {
-    await new Promise((resolve10) => {
+    await new Promise((resolve11) => {
       opts.sessionSocket.once("close", () => {
         shutdown("session closed", false);
-        resolve10();
+        resolve11();
       });
     });
   }

package/dist/pluginPairing.cjs

@@ -9982,7 +9982,7 @@ var PluginRepositoryPairingSession = class {
         ideType: this.source,
         fetchImpl: this.connectOptions.fetchImpl ?? this.fetchImpl,
         // Plugin pairing configures only the IDE that initiated the pairing.
-        configureIdes: true,
+        configureIdes: this.source !== "cursor",
         setupIdeOptions: {
           ...this.connectOptions.setupIdeOptions,
           targets: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memoraone/mcp",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "type": "module",
   "main": "dist/index.cjs",
   "exports": {