@memoraone/mcp 0.1.33 → 0.1.35

package/dist/daemon.cjs

@@ -54,7 +54,9 @@ function hashBindingIdentity(projectId, workspaceRoot, ideType) {
   return crypto.createHash("sha256").update(input).digest("hex").slice(0, BINDING_SOCKET_HASH_LENGTH);
 }
 function bindingsMatch(a, b) {
-  return a.projectId.trim().toLowerCase() === b.projectId.trim().toLowerCase() && path.resolve(a.workspaceRoot) === path.resolve(b.workspaceRoot) && path.resolve(a.m1Path) === path.resolve(b.m1Path);
+  const envA = a.environment ?? void 0;
+  const envB = b.environment ?? void 0;
+  return a.projectId.trim().toLowerCase() === b.projectId.trim().toLowerCase() && path.resolve(a.workspaceRoot) === path.resolve(b.workspaceRoot) && path.resolve(a.m1Path) === path.resolve(b.m1Path) && (a.apiKey ?? null) === (b.apiKey ?? null) && envA === envB;
 }
 function formatMissingInitializeWorkspaceError(options) {
   const lines = [
@@ -125,6 +127,10 @@ function ensureBaseDir() {
 var fs2 = __toESM(require("fs/promises"), 1);
 var path3 = __toESM(require("path"), 1);
 var uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var CANONICAL_M1_FILENAME = "memoraone.m1";
+function isCanonicalM1Path(m1Path) {
+  return path3.basename(m1Path) === CANONICAL_M1_FILENAME;
+}
 function normalizeEnvironment(raw) {
   if (raw === void 0 || raw === null || typeof raw !== "string") {
     return void 0;
@@ -171,7 +177,7 @@ async function resolveProjectIdFromExplicitM1Path() {
 async function findM1WalkingUp(workspaceRoot) {
   let current = path3.resolve(workspaceRoot);
   while (true) {
-    const markerPath = path3.join(current, "memoraone.m1");
+    const markerPath = path3.join(current, CANONICAL_M1_FILENAME);
     try {
       const content = await fs2.readFile(markerPath, "utf8");
       const { projectId, apiKey, environment } = parseAndValidateM1(content, markerPath);
@@ -278,6 +284,45 @@ async function resolveAuthoritativeBinding(workspaceRoot, options = {}) {
   }
   return bindings[0];
 }
+function bindingRelevantValuesMatch(a, b) {
+  const envA = a.environment ?? void 0;
+  const envB = b.environment ?? void 0;
+  return a.projectId.trim().toLowerCase() === b.projectId.trim().toLowerCase() && path3.resolve(a.workspaceRoot) === path3.resolve(b.workspaceRoot) && path3.resolve(a.m1Path) === path3.resolve(b.m1Path) && (a.apiKey ?? null) === (b.apiKey ?? null) && envA === envB;
+}
+async function reconcileResolvedBindingWithDisk(cached) {
+  const m1Path = path3.resolve(cached.m1Path);
+  if (cached.bindingSource !== "explicit-m1-path" && !isCanonicalM1Path(m1Path)) {
+    throw new Error(
+      `[memoraone-mcp] Cached binding m1Path is not the canonical ${CANONICAL_M1_FILENAME}: ${m1Path}`
+    );
+  }
+  let content;
+  try {
+    content = await fs2.readFile(m1Path, "utf8");
+  } catch (err) {
+    if (err?.code === "ENOENT") {
+      throw new Error(
+        `[memoraone-mcp] Cached binding file missing at ${m1Path}. Open a folder containing ${CANONICAL_M1_FILENAME}.`
+      );
+    }
+    throw err;
+  }
+  const parsed2 = parseAndValidateM1(content, m1Path);
+  const resolved = resolveApiKeyWithSource(parsed2.apiKey);
+  const fresh = {
+    projectId: parsed2.projectId,
+    workspaceRoot: path3.resolve(path3.dirname(m1Path)),
+    m1Path,
+    apiKey: resolved.apiKey,
+    ...parsed2.environment !== void 0 ? { environment: parsed2.environment } : {},
+    bindingSource: cached.bindingSource,
+    apiKeySource: resolved.apiKeySource
+  };
+  if (bindingRelevantValuesMatch(cached, fresh)) {
+    return { binding: fresh, cacheRefreshed: false };
+  }
+  return { binding: fresh, cacheRefreshed: true };
+}
 function encodeResolvedBinding(binding) {
   return Buffer.from(JSON.stringify(binding), "utf8").toString("base64");
 }
@@ -523,12 +568,12 @@ var MemoraClient = class {
       ...options?.headers ?? {}
     };
   }
-  async post(path10, body, options) {
+  async post(path11, body, options) {
     console.error(
-      `[memoraone-mcp][info] MemoraClient.post ENTER path=${path10}`
+      `[memoraone-mcp][info] MemoraClient.post ENTER path=${path11}`
     );
     const nonce = crypto2.randomBytes(8).toString("hex");
-    const url = `${this.baseUrl}${path10.startsWith("/") ? path10 : `/${path10}`}`;
+    const url = `${this.baseUrl}${path11.startsWith("/") ? path11 : `/${path11}`}`;
     this.resolveProjectId();
     console.error(
       `[memoraone-mcp][info] requestJson nonce=${nonce} stage=before_fetch method=POST url=${url}`
@@ -561,13 +606,13 @@ var MemoraClient = class {
       throw new MemoraOneHttpError(res.status, res.statusText, res.text);
     }
     console.error(
-      `[memoraone-mcp][info] MemoraClient.post EXIT path=${path10}`
+      `[memoraone-mcp][info] MemoraClient.post EXIT path=${path11}`
     );
     return res.text ? JSON.parse(res.text) : null;
   }
-  async get(path10, options) {
+  async get(path11, options) {
     const nonce = crypto2.randomBytes(8).toString("hex");
-    const url = `${this.baseUrl}${path10.startsWith("/") ? path10 : `/${path10}`}`;
+    const url = `${this.baseUrl}${path11.startsWith("/") ? path11 : `/${path11}`}`;
     this.resolveProjectId();
     console.error(
       `[memoraone-mcp][info] requestJson nonce=${nonce} stage=before_fetch method=GET url=${url}`
@@ -770,6 +815,9 @@ async function resolveBindingFromInitializeParams(params, options = {}) {
   });
 }
 
+// src/index.ts
+var path10 = __toESM(require("path"), 1);
+
 // src/bridgeClientRoots.ts
 var readline = __toESM(require("readline"), 1);
 var TRUTHY = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
@@ -1215,9 +1263,9 @@ function buildPersonalContextPath(parsed2) {
 }
 async function handleGetPersonalContext(client, args) {
   const parsed2 = getPersonalContextInputSchema.parse(args ?? {});
-  const path10 = buildPersonalContextPath(parsed2);
+  const path11 = buildPersonalContextPath(parsed2);
   try {
-    const result = await client.get(path10);
+    const result = await client.get(path11);
     return { ok: true, result };
   } catch (err) {
     if (err instanceof MemoraOneHttpError) {
@@ -1639,7 +1687,7 @@ async function acquireWorkspaceMapLock() {
       if (err?.code === "EEXIST") {
         retries++;
         if (retries < maxRetries) {
-          await new Promise((resolve7) => setTimeout(resolve7, retryDelayMs));
+          await new Promise((resolve8) => setTimeout(resolve8, retryDelayMs));
           continue;
         }
         throw new Error(
@@ -1812,24 +1860,25 @@ async function handleSetProject(args) {
 }
 
 // src/tools/handlers/bindingStatus.ts
-function buildBindingStatus(binding) {
+function buildBindingStatus(binding, options = {}) {
   const status = {
     projectId: binding.projectId,
     workspaceRoot: binding.workspaceRoot,
     m1Path: binding.m1Path,
     bindingSource: binding.bindingSource,
-    apiKeySource: binding.apiKeySource
+    apiKeySource: binding.apiKeySource,
+    cacheRefreshed: options.cacheRefreshed === true
   };
   if (binding.environment !== void 0) {
     status.environment = binding.environment;
   }
   return status;
 }
-function handleBindingStatus(binding) {
+function handleBindingStatus(binding, options = {}) {
   if (!binding) {
     throw new Error("[memoraone-mcp] Binding status unavailable (not initialized)");
   }
-  return buildBindingStatus(binding);
+  return buildBindingStatus(binding, options);
 }
 
 // src/heartbeat.ts
@@ -2063,8 +2112,8 @@ function registerToolWithWorklog(server, runtime, sessionContext, toolName, desc
 async function main(opts = {}) {
   let bindingReadyResolve = null;
   let bindingReadyReject = null;
-  const bindingReady = new Promise((resolve7, reject) => {
-    bindingReadyResolve = resolve7;
+  const bindingReady = new Promise((resolve8, reject) => {
+    bindingReadyResolve = resolve8;
     bindingReadyReject = reject;
   });
   const devMode = Boolean(config2.devMode);
@@ -2076,6 +2125,7 @@ async function main(opts = {}) {
     apiKeySource: null,
     apiKeyFingerprint: null,
     authoritativeBinding: null,
+    bindingCacheRefreshed: false,
     ideType: void 0
   };
   let workspaceRoot;
@@ -2088,10 +2138,25 @@ async function main(opts = {}) {
     if (initializeRoots.length === 0 && opts.daemonBindingHint) {
       if (isInitializeDebugEnabled()) {
         console.error(
-          "[memoraone-mcp][init-debug] Workspace resolution strategy: daemonBindingHint (bridge pre-resolved)"
+          "[memoraone-mcp][init-debug] Workspace resolution strategy: daemonBindingHint (bridge pre-resolved, reconciled from disk)"
         );
       }
-      return opts.daemonBindingHint;
+      const reconciled = await reconcileResolvedBindingWithDisk(opts.daemonBindingHint);
+      runtime.bindingCacheRefreshed = reconciled.cacheRefreshed;
+      if (reconciled.cacheRefreshed) {
+        console.error(
+          `[memoraone-mcp] refreshed stale cached binding from ${reconciled.binding.m1Path}: project=${reconciled.binding.projectId}`
+        );
+        try {
+          const socketPath = getBindingSocketPath(opts.daemonBindingHint);
+          writeBindingSidecar(socketPath, reconciled.binding, runtime.ideType ?? "");
+        } catch (err) {
+          console.error(
+            `[memoraone-mcp] warning: could not rewrite binding sidecar after refresh: ${String(err)}`
+          );
+        }
+      }
+      return reconciled.binding;
     }
     let rootsListUris;
     let rootsListAttempted = false;
@@ -2218,7 +2283,9 @@ async function main(opts = {}) {
     bindingStatusShape,
     async () => runWithSessionContext(sessionContext, async () => {
       if (!runtime.authoritativeBinding) return notInitializedResult;
-      const result = handleBindingStatus(runtime.authoritativeBinding);
+      const result = handleBindingStatus(runtime.authoritativeBinding, {
+        cacheRefreshed: runtime.bindingCacheRefreshed
+      });
       return {
         content: [{ type: "text", text: JSON.stringify(result) }]
       };
@@ -2342,7 +2409,7 @@ async function main(opts = {}) {
         );
         const debugLog3 = config2.devMode || debugAuth;
         const binding = await resolveSessionBindingFromInitialize(params);
-        if (opts.daemonBindingHint && !bindingsMatch(opts.daemonBindingHint, binding)) {
+        if (opts.daemonBindingHint && path10.resolve(opts.daemonBindingHint.m1Path) !== path10.resolve(binding.m1Path)) {
           const errMsg = formatBindingMismatchError(opts.daemonBindingHint, binding);
           console.error(`[memoraone-mcp][ERROR] ${errMsg}`);
           bindingReadyReject?.(new Error(errMsg));
@@ -2362,15 +2429,23 @@ async function main(opts = {}) {
         const projectId = binding.projectId;
         const existing = getBoundProjectId();
         if (existing !== null && existing !== projectId) {
-          const requestedRoot = binding.workspaceRoot ?? workspaceRoot ?? process.cwd();
-          const action = "Open this repo in a separate window or configure a separate MCP server instance per root.";
-          const errMsg = `[memoraone-mcp] This MCP process is already bound to project ${existing}. Open a new IDE window or start a separate MCP instance for a different project.`;
-          console.error(
-            `[memoraone-mcp][ERROR] Option A conflict: boundProjectId=${existing} requestedProjectId=${projectId} workspaceRoot=${requestedRoot}. ${action}`
-          );
-          bindingReadyReject?.(new Error(errMsg));
-          setImmediate(() => process.exit(1));
-          throw new Error(errMsg);
+          if (runtime.bindingCacheRefreshed) {
+            setBoundProjectId(projectId);
+            setBoundApiKey(apiKeyToUse);
+            console.error(
+              `[memoraone-mcp] ${sessionLabel} rebound to project ${projectId} after stale memoraone.m1 cache refresh (was ${existing})`
+            );
+          } else {
+            const requestedRoot = binding.workspaceRoot ?? workspaceRoot ?? process.cwd();
+            const action = "Open this repo in a separate window or configure a separate MCP server instance per root.";
+            const errMsg = `[memoraone-mcp] This MCP process is already bound to project ${existing}. Open a new IDE window or start a separate MCP instance for a different project.`;
+            console.error(
+              `[memoraone-mcp][ERROR] Option A conflict: boundProjectId=${existing} requestedProjectId=${projectId} workspaceRoot=${requestedRoot}. ${action}`
+            );
+            bindingReadyReject?.(new Error(errMsg));
+            setImmediate(() => process.exit(1));
+            throw new Error(errMsg);
+          }
         }
         if (existing === null) {
           setBoundProjectId(projectId);
@@ -2471,10 +2546,10 @@ async function main(opts = {}) {
     console.error("[memoraone-mcp] MCP server ready");
   }
   if (opts.sessionSocket) {
-    await new Promise((resolve7) => {
+    await new Promise((resolve8) => {
       opts.sessionSocket.once("close", () => {
         shutdown("session closed", false);
-        resolve7();
+        resolve8();
       });
     });
   }
@@ -2513,7 +2588,7 @@ async function ensureSocketClean(socketPath) {
   } catch {
     return;
   }
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const client = net.createConnection({ path: socketPath }, () => {
       client.destroy();
       log("daemon already running, exiting");
@@ -2525,7 +2600,7 @@ async function ensureSocketClean(socketPath) {
         log("stale socket removed");
       } catch {
       }
-      resolve7();
+      resolve8();
     });
   });
 }
@@ -2641,14 +2716,14 @@ async function runDaemon() {
   process.on("SIGINT", () => shutdownNow("SIGINT"));
   process.on("SIGTERM", () => shutdownNow("SIGTERM"));
   process.on("exit", cleanupSocketFile);
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     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)}`);
       });
-      resolve7();
+      resolve8();
     });
   });
 }