fix(auto-reply): avoid duplicate reset hook acknowledgements

steipete · steipete · commit 3ee5490c6001 · 2026-04-28T09:37:15.000+01:00
diff --git a/src/auto-reply/reply/commands-reset-hooks.test.ts b/src/auto-reply/reply/commands-reset-hooks.test.ts
@@ -251,7 +251,7 @@ describe("handleCommands reset hooks", () => {
       },
     );
 
-    await maybeHandleResetCommand(params);
+    const result = await maybeHandleResetCommand(params);
 
     expect(routeReplyMock).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -262,6 +262,7 @@ describe("handleCommands reset hooks", () => {
         threadId: "thread-1",
       }),
     );
+    expect(result).toEqual({ shouldContinue: false });
   });
 
   it("prefers the target session entry when emitting reset hooks", async () => {
diff --git a/src/auto-reply/reply/commands-reset-hooks.ts b/src/auto-reply/reply/commands-reset-hooks.ts
@@ -104,7 +104,7 @@ export async function emitResetCommandHooks(params: {
   sessionEntry?: HandleCommandsParams["sessionEntry"];
   previousSessionEntry?: HandleCommandsParams["previousSessionEntry"];
   workspaceDir: string;
-}): Promise<void> {
+}): Promise<{ routedReply: boolean }> {
   const hookEvent = createInternalHookEvent("command", params.action, params.sessionKey ?? "", {
     sessionEntry: params.sessionEntry,
     previousSessionEntry: params.previousSessionEntry,
@@ -116,6 +116,7 @@ export async function emitResetCommandHooks(params: {
   await triggerInternalHook(hookEvent);
   params.command.resetHookTriggered = true;
 
+  let routedReply = false;
   if (hookEvent.messages.length > 0) {
     const channel = params.ctx.OriginatingChannel || params.command.channel;
     const to = params.ctx.OriginatingTo || params.command.from || params.command.to;
@@ -134,6 +135,7 @@ export async function emitResetCommandHooks(params: {
         threadId: params.ctx.MessageThreadId,
         cfg: params.cfg,
       });
+      routedReply = true;
     }
   }
 
@@ -160,4 +162,5 @@ export async function emitResetCommandHooks(params: {
       }
     })();
   }
+  return { routedReply };
 }
diff --git a/src/auto-reply/reply/commands-reset.ts b/src/auto-reply/reply/commands-reset.ts
@@ -156,7 +156,7 @@ export async function maybeHandleResetCommand(
 
   const targetSessionEntry = params.sessionStore?.[params.sessionKey] ?? params.sessionEntry;
 
-  await emitResetCommandHooks({
+  const hookResult = await emitResetCommandHooks({
     action: commandAction,
     ctx: params.ctx,
     cfg: params.cfg,
@@ -169,9 +169,13 @@ export async function maybeHandleResetCommand(
   if (!resetTail) {
     return {
       shouldContinue: false,
-      reply: {
-        text: commandAction === "reset" ? "✅ Session reset." : "✅ New session started.",
-      },
+      ...(hookResult.routedReply
+        ? {}
+        : {
+            reply: {
+              text: commandAction === "reset" ? "✅ Session reset." : "✅ New session started.",
+            },
+          }),
     };
   }
   return null;

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ export async function emitResetCommandHooks(params: {`
`104`	`104`	`sessionEntry?: HandleCommandsParams["sessionEntry"];`
`105`	`105`	`previousSessionEntry?: HandleCommandsParams["previousSessionEntry"];`
`106`	`106`	`workspaceDir: string;`
`107`		`-}): Promise<void> {`
	`107`	`+}): Promise<{ routedReply: boolean }> {`
`108`	`108`	`const hookEvent = createInternalHookEvent("command", params.action, params.sessionKey ?? "", {`
`109`	`109`	`sessionEntry: params.sessionEntry,`
`110`	`110`	`previousSessionEntry: params.previousSessionEntry,`
`@@ -116,6 +116,7 @@ export async function emitResetCommandHooks(params: {`
`116`	`116`	`await triggerInternalHook(hookEvent);`
`117`	`117`	`params.command.resetHookTriggered = true;`
`118`	`118`
	`119`	`+ let routedReply = false;`
`119`	`120`	`if (hookEvent.messages.length > 0) {`
`120`	`121`	`const channel = params.ctx.OriginatingChannel \|\| params.command.channel;`
`121`	`122`	`const to = params.ctx.OriginatingTo \|\| params.command.from \|\| params.command.to;`
`@@ -134,6 +135,7 @@ export async function emitResetCommandHooks(params: {`
`134`	`135`	`threadId: params.ctx.MessageThreadId,`
`135`	`136`	`cfg: params.cfg,`
`136`	`137`	`});`
	`138`	`+ routedReply = true;`
`137`	`139`	`}`
`138`	`140`	`}`
`139`	`141`
`@@ -160,4 +162,5 @@ export async function emitResetCommandHooks(params: {`
`160`	`162`	`}`
`161`	`163`	`})();`
`162`	`164`	`}`
	`165`	`+ return { routedReply };`
`163`	`166`	`}`