@memoraone/mcp 0.1.40 → 0.1.42

package/dist/daemon.cjs

@@ -1373,9 +1373,9 @@ function bindingRelevantValuesMatch(a, b) {
   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;
 }
-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>`
@@ -1407,6 +1407,21 @@ async function reconcileResolvedBindingWithDisk(cached) {
   }
   return { binding: fresh, cacheRefreshed: true };
 }
+async function checkRuntimeBindingValidity(cached, options = {}) {
+  try {
+    const { binding: current } = await reconcileResolvedBindingWithDisk(cached, options);
+    if (current.status !== "connected") {
+      return { valid: false, reason: `binding status is ${current.status}` };
+    }
+    if (!bindingRelevantValuesMatch(cached, current)) {
+      return { valid: false, reason: "binding metadata changed" };
+    }
+    return { valid: true };
+  } catch (err) {
+    const reason = err instanceof Error && err.message.trim() ? err.message : String(err);
+    return { valid: false, reason };
+  }
+}
 function encodeResolvedBinding(binding) {
   const payload = {
     repositoryBindingId: binding.repositoryBindingId,
@@ -2860,6 +2875,8 @@ function createDaemonHeartbeat(opts) {
   let announced = false;
   let studioActive = null;
   let starting = false;
+  let tickInFlight = false;
+  let bindingAuthorityEnded = false;
   let waitingForIdeType = false;
   const sessionId = opts.sessionId ?? generateMcpSessionId();
   const packageVersion = opts.packageVersion ?? resolvePackageVersion();
@@ -2875,6 +2892,29 @@ function createDaemonHeartbeat(opts) {
     process.stderr.write(`[memoraone-mcp][daemon-heartbeat] ${redactSensitiveText(msg)}
 `);
   });
+  const validateBinding = opts.validateBinding ?? checkRuntimeBindingValidity;
+  const endBindingAuthority = (reason) => {
+    if (bindingAuthorityEnded) return;
+    bindingAuthorityEnded = true;
+    studioActive = false;
+    runGeneration += 1;
+    if (interval) {
+      clearInterval(interval);
+      interval = null;
+    }
+    log2(`heartbeat authority ended: ${redactSensitiveText(reason)}`);
+  };
+  const bindingIsValid = async () => {
+    try {
+      const result = await validateBinding(opts.binding);
+      if (result.valid) return true;
+      endBindingAuthority("reason" in result ? result.reason : "binding is no longer valid");
+      return false;
+    } catch (err) {
+      endBindingAuthority(`binding validation failed: ${String(err)}`);
+      return false;
+    }
+  };
   const ensureClient = async () => {
     if (client) return client;
     const creds = await readInstallationCredentials(opts.binding.repositoryBindingId);
@@ -2925,10 +2965,17 @@ function createDaemonHeartbeat(opts) {
     }
   };
   const tick = async (generation) => {
-    if (!client || generation !== runGeneration) return;
-    const outcome = await sendProjectHeartbeat(client, ctx);
-    if (generation !== runGeneration || !interval) return;
-    applyHeartbeatOutcome(outcome);
+    if (!client || generation !== runGeneration || bindingAuthorityEnded || tickInFlight) return;
+    tickInFlight = true;
+    try {
+      if (!await bindingIsValid()) return;
+      if (generation !== runGeneration || !interval) return;
+      const outcome = await sendProjectHeartbeat(client, ctx);
+      if (generation !== runGeneration || !interval) return;
+      applyHeartbeatOutcome(outcome);
+    } finally {
+      tickInFlight = false;
+    }
   };
   const beginInterval = () => {
     if (interval) return;
@@ -2956,8 +3003,13 @@ function createDaemonHeartbeat(opts) {
       log2("already starting (skipped duplicate start)");
       return;
     }
+    if (bindingAuthorityEnded) {
+      log2("binding authority already ended; heartbeat will not restart");
+      return;
+    }
     starting = true;
     try {
+      if (!await bindingIsValid()) return;
       const activeClient = await ensureClient();
       if (!activeClient) return;
       const ok = await ensureAnnounced(activeClient);

package/dist/index.cjs

@@ -1452,9 +1452,9 @@ function bindingRelevantValuesMatch(a, b) {
   const envB = b.environment ?? void 0;
   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>`
@@ -1486,6 +1486,21 @@ async function reconcileResolvedBindingWithDisk(cached) {
   }
   return { binding: fresh, cacheRefreshed: true };
 }
+async function checkRuntimeBindingValidity(cached, options = {}) {
+  try {
+    const { binding: current } = await reconcileResolvedBindingWithDisk(cached, options);
+    if (current.status !== "connected") {
+      return { valid: false, reason: `binding status is ${current.status}` };
+    }
+    if (!bindingRelevantValuesMatch(cached, current)) {
+      return { valid: false, reason: "binding metadata changed" };
+    }
+    return { valid: true };
+  } catch (err) {
+    const reason = err instanceof Error && err.message.trim() ? err.message : String(err);
+    return { valid: false, reason };
+  }
+}
 function encodeResolvedBinding(binding) {
   const payload = {
     repositoryBindingId: binding.repositoryBindingId,
@@ -2788,6 +2803,8 @@ function createDaemonHeartbeat(opts) {
   let announced = false;
   let studioActive = null;
   let starting = false;
+  let tickInFlight = false;
+  let bindingAuthorityEnded = false;
   let waitingForIdeType = false;
   const sessionId = opts.sessionId ?? generateMcpSessionId();
   const packageVersion = opts.packageVersion ?? resolvePackageVersion();
@@ -2803,6 +2820,29 @@ function createDaemonHeartbeat(opts) {
     process.stderr.write(`[memoraone-mcp][daemon-heartbeat] ${redactSensitiveText(msg)}
 `);
   });
+  const validateBinding = opts.validateBinding ?? checkRuntimeBindingValidity;
+  const endBindingAuthority = (reason) => {
+    if (bindingAuthorityEnded) return;
+    bindingAuthorityEnded = true;
+    studioActive = false;
+    runGeneration += 1;
+    if (interval) {
+      clearInterval(interval);
+      interval = null;
+    }
+    log(`heartbeat authority ended: ${redactSensitiveText(reason)}`);
+  };
+  const bindingIsValid = async () => {
+    try {
+      const result = await validateBinding(opts.binding);
+      if (result.valid) return true;
+      endBindingAuthority("reason" in result ? result.reason : "binding is no longer valid");
+      return false;
+    } catch (err) {
+      endBindingAuthority(`binding validation failed: ${String(err)}`);
+      return false;
+    }
+  };
   const ensureClient = async () => {
     if (client) return client;
     const creds = await readInstallationCredentials(opts.binding.repositoryBindingId);
@@ -2853,10 +2893,17 @@ function createDaemonHeartbeat(opts) {
     }
   };
   const tick = async (generation) => {
-    if (!client || generation !== runGeneration) return;
-    const outcome = await sendProjectHeartbeat(client, ctx);
-    if (generation !== runGeneration || !interval) return;
-    applyHeartbeatOutcome(outcome);
+    if (!client || generation !== runGeneration || bindingAuthorityEnded || tickInFlight) return;
+    tickInFlight = true;
+    try {
+      if (!await bindingIsValid()) return;
+      if (generation !== runGeneration || !interval) return;
+      const outcome = await sendProjectHeartbeat(client, ctx);
+      if (generation !== runGeneration || !interval) return;
+      applyHeartbeatOutcome(outcome);
+    } finally {
+      tickInFlight = false;
+    }
   };
   const beginInterval = () => {
     if (interval) return;
@@ -2884,8 +2931,13 @@ function createDaemonHeartbeat(opts) {
       log("already starting (skipped duplicate start)");
       return;
     }
+    if (bindingAuthorityEnded) {
+      log("binding authority already ended; heartbeat will not restart");
+      return;
+    }
     starting = true;
     try {
+      if (!await bindingIsValid()) return;
       const activeClient = await ensureClient();
       if (!activeClient) return;
       const ok = await ensureAnnounced(activeClient);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memoraone/mcp",
-  "version": "0.1.40",
+  "version": "0.1.42",
   "type": "module",
   "main": "dist/index.cjs",
   "bin": {