mercury-agent 0.8.6 → 0.8.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mercury-agent",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "Personal AI assistant for chat platforms (WhatsApp, Slack, Discord, Telegram)",
   "license": "MIT",
   "author": "Avishai Tsabari",

package/src/core/runtime.ts

@@ -1288,12 +1288,43 @@ export class MercuryCoreRuntime {
       // Container-relative workspace path
       const containerWorkspace = `/spaces/${spaceId}`;
 
+      // Resolve the reply target once — reused for isolation, context assembly,
+      // and DB linkage. Non-null only when the quoted platform message is
+      // recorded in THIS conversation's history (keyed by platform +
+      // conversation + platform message id).
+      let replyMercuryMsgId: number | null = null;
+      if (
+        replyMeta?.replyToPlatformMessageId &&
+        replyMeta.platform &&
+        replyMeta.conversationExternalId
+      ) {
+        replyMercuryMsgId = this.db.lookupMercuryMessageId(
+          replyMeta.platform,
+          replyMeta.conversationExternalId,
+          replyMeta.replyToPlatformMessageId,
+        );
+      }
+      const userReplyToId = replyMercuryMsgId ?? undefined;
+
       // ── Reply-chain isolation ──────────────────────────────────────────
       // Strip quoted bot output from unprivileged group replies-to-bot
       // BEFORE hooks see the prompt (defense in depth).
+      //
+      // Only isolate when the quoted message is NOT recorded in this
+      // conversation's own history (replyMercuryMsgId === null). A recorded
+      // match means the bot posted it publicly in this same conversation and
+      // the member has already seen it — there is nothing to protect, so
+      // isolating would only strip legitimate context. A miss means the quote
+      // originated elsewhere (a DM, another space, or unverifiable content) —
+      // keep isolating. Fail-safe: if outbound recording ever missed the
+      // message, the lookup returns null and isolation still fires.
       let replyIsolated = false;
       let finalPrompt = prompt;
-      if (replyFlags?.isReplyToBot && !replyFlags.isDM) {
+      if (
+        replyFlags?.isReplyToBot &&
+        !replyFlags.isDM &&
+        replyMercuryMsgId === null
+      ) {
         const seededAdmins = this.config.admins
           ? this.config.admins
               .split(",")
@@ -1393,21 +1424,6 @@ export class MercuryCoreRuntime {
         };
       }
 
-      // Resolve reply target once — reused for context assembly and DB linkage.
-      let replyMercuryMsgId: number | null = null;
-      if (
-        replyMeta?.replyToPlatformMessageId &&
-        replyMeta.platform &&
-        replyMeta.conversationExternalId
-      ) {
-        replyMercuryMsgId = this.db.lookupMercuryMessageId(
-          replyMeta.platform,
-          replyMeta.conversationExternalId,
-          replyMeta.replyToPlatformMessageId,
-        );
-      }
-      const userReplyToId = replyMercuryMsgId ?? undefined;
-
       const replyChainDepthStr = this.db.getSpaceConfig(
         spaceId,
         "context.reply_chain_depth",

package/src/storage/pi-auth.ts

@@ -68,6 +68,10 @@ export type PiAuthCredential =
   /** An oauth entry exists but could not be turned into a usable key. */
   | { status: "refresh-failed"; error?: Error };
 
+// Deduplicate concurrent OAuth refreshes — refresh tokens are single-use, so
+// two parallel calls with the same token race and one always fails.
+const inflightRefresh = new Map<string, Promise<PiAuthCredential>>();
+
 export async function getPiAuthCredential(options: {
   provider: string;
   authPath: string;
@@ -83,6 +87,25 @@ export async function getPiAuthCredential(options: {
     return { status: "none" };
   }
 
+  // Coalesce concurrent refreshes for the same auth file so only one
+  // token-endpoint call is made; the rest share its result.
+  const key = options.authPath;
+  const existing = inflightRefresh.get(key);
+  if (existing) return existing;
+
+  const promise = doGetPiAuthCredential(options);
+  inflightRefresh.set(key, promise);
+  try {
+    return await promise;
+  } finally {
+    inflightRefresh.delete(key);
+  }
+}
+
+async function doGetPiAuthCredential(options: {
+  provider: string;
+  authPath: string;
+}): Promise<PiAuthCredential> {
   const authPath = options.authPath;
   const auth = readAuthFile(authPath);