fix(clawsweeper): address review for gitcrawl-4952-google-chat-dm-threading-broken-each-response-creates-new-thread (1)

clawsweeper[bot] · clawsweeper[bot] · commit ca92a51d7ccb · 2026-06-23T23:58:24.000Z
Co-authored-by: Jai Govindani &lt;1943284+jai@users.noreply.github.com&gt;

Co-authored-by: banddude &lt;127166397+banddude@users.noreply.github.com&gt;

Co-authored-by: Neerav Makwana &lt;261249544+neeravmakwana@users.noreply.github.com&gt;

Co-authored-by: Novan Adrian &lt;316959+novan@users.noreply.github.com&gt;

Co-authored-by: clawsweeper[bot] &lt;274271284+clawsweeper[bot]@users.noreply.github.com&gt;
diff --git a/extensions/googlechat/src/monitor-reply-delivery.ts b/extensions/googlechat/src/monitor-reply-delivery.ts
@@ -27,18 +27,35 @@ export async function deliverGoogleChatReply(params: {
   config: OpenClawConfig;
   statusSink?: (patch: { lastInboundAt?: number; lastOutboundAt?: number }) => void;
   typingMessageName?: string;
+  typingMessageThreadName?: string;
 }): Promise<void> {
   const { payload, account, spaceId, runtime, core, config, statusSink } = params;
   // Clear this whenever the typing message is deleted or unavailable; otherwise
   // text delivery can keep retrying a dead message and drop content.
   let typingMessageName = params.typingMessageName;
+  const replyThreadName = payload.replyToId?.trim() || undefined;
+  const typingMessageThreadName = params.typingMessageThreadName?.trim() || undefined;
   const reply = resolveSendableOutboundReplyParts(payload);
   const mediaCount = reply.mediaCount;
   const hasMedia = reply.hasMedia;
   const text = reply.text;
   let firstTextChunk = true;
   let suppressCaption = false;
 
+  if (typingMessageName && typingMessageThreadName !== replyThreadName) {
+    // The typing placeholder was created before replyToMode filtered the payload.
+    // Do not edit a stale threaded placeholder into the final assistant reply.
+    try {
+      await deleteGoogleChatMessage({
+        account,
+        messageName: typingMessageName,
+      });
+    } catch (err) {
+      runtime.error?.(`Google Chat typing cleanup failed: ${String(err)}`);
+    }
+    typingMessageName = undefined;
+  }
+
   if (hasMedia && typingMessageName) {
     try {
       await deleteGoogleChatMessage({
@@ -76,7 +93,7 @@ export async function deliverGoogleChatReply(params: {
       account,
       space: spaceId,
       text: chunk,
-      thread: payload.replyToId,
+      thread: replyThreadName,
     });
   };
   await deliverTextOrMediaReply({
@@ -131,7 +148,7 @@ export async function deliverGoogleChatReply(params: {
           account,
           space: spaceId,
           text: caption,
-          thread: payload.replyToId,
+          thread: replyThreadName,
           attachments: [
             { attachmentUploadToken: upload.attachmentUploadToken, contentName: loaded.fileName },
           ],
diff --git a/extensions/googlechat/src/monitor.reply-delivery.test.ts b/extensions/googlechat/src/monitor.reply-delivery.test.ts
@@ -80,6 +80,7 @@ describe("Google Chat reply delivery", () => {
       config,
       statusSink,
       typingMessageName: "spaces/AAA/messages/typing",
+      typingMessageThreadName: "spaces/AAA/threads/root",
     });
 
     expect(mocks.updateGoogleChatMessage).toHaveBeenCalledWith({
@@ -106,6 +107,36 @@ describe("Google Chat reply delivery", () => {
     );
   });
 
+  it("does not update a threaded typing message when replyToMode removed the reply target", async () => {
+    const core = createCore();
+    const runtime = createRuntime();
+    mocks.deleteGoogleChatMessage.mockResolvedValue(undefined);
+    mocks.sendGoogleChatMessage.mockResolvedValue({ messageName: "spaces/AAA/messages/reply" });
+
+    await deliverGoogleChatReply({
+      payload: { text: "off-mode reply" },
+      account,
+      spaceId: "spaces/AAA",
+      runtime,
+      core,
+      config,
+      typingMessageName: "spaces/AAA/messages/typing",
+      typingMessageThreadName: "spaces/AAA/threads/root",
+    });
+
+    expect(mocks.deleteGoogleChatMessage).toHaveBeenCalledWith({
+      account,
+      messageName: "spaces/AAA/messages/typing",
+    });
+    expect(mocks.updateGoogleChatMessage).not.toHaveBeenCalled();
+    expect(mocks.sendGoogleChatMessage).toHaveBeenCalledWith({
+      account,
+      space: "spaces/AAA",
+      text: "off-mode reply",
+      thread: undefined,
+    });
+  });
+
   it("does not update a deleted typing message before sending media with a caption", async () => {
     const core = createCore({
       media: { buffer: Buffer.from("image"), contentType: "image/png", fileName: "reply.png" },
diff --git a/extensions/googlechat/src/monitor.ts b/extensions/googlechat/src/monitor.ts
@@ -430,6 +430,7 @@ async function processMessageWithPipeline(params: {
               config,
               statusSink,
               typingMessageName,
+              typingMessageThreadName: replyThreadName,
             });
             // Only use typing message for first delivery
             typingMessageName = undefined;
