refactor(gateway): trim chat abort cleanup inputs

src/gateway/chat-abort.test.ts

@@ -44,6 +44,13 @@ function createOps(params: {
   broadcast: ReturnType<typeof vi.fn>;
   nodeSendToSession: ReturnType<typeof vi.fn>;
   removeChatRun: ReturnType<typeof vi.fn>;
+  clearedState: {
+    chatDeltaSentAt: Map<string, number>;
+    chatDeltaLastBroadcastLen: Map<string, number>;
+    chatDeltaLastBroadcastText: Map<string, string>;
+    agentDeltaSentAt: Map<string, number>;
+    bufferedAgentEvents: Map<string, unknown>;
+  };
 } {
   const { runId, entry, buffer } = params;
   const broadcast = vi.fn();
@@ -54,7 +61,7 @@ function createOps(params: {
   const chatDeltaLastBroadcastLen = new Map([[runId, buffer?.length ?? 0]]);
   const chatDeltaLastBroadcastText = new Map(buffer !== undefined ? [[runId, buffer]] : []);
   const agentDeltaSentAt = new Map([[`${runId}:assistant`, Date.now()]]);
-  const bufferedAgentEvents: ChatAbortOps["bufferedAgentEvents"] = new Map([
+  const bufferedAgentEvents = new Map<string, unknown>([
     [
       `${runId}:assistant`,
       {
@@ -72,11 +79,6 @@ function createOps(params: {
   return {
     chatAbortControllers: new Map([[runId, entry]]),
     chatRunBuffers,
-    chatDeltaSentAt,
-    chatDeltaLastBroadcastLen,
-    chatDeltaLastBroadcastText,
-    agentDeltaSentAt,
-    bufferedAgentEvents,
     chatAbortedRuns: new Map(),
     clearChatRunState: (id: string) => {
       chatRunBuffers.delete(id);
@@ -92,6 +94,13 @@ function createOps(params: {
     agentRunSeq: new Map(),
     broadcast,
     nodeSendToSession,
+    clearedState: {
+      chatDeltaSentAt,
+      chatDeltaLastBroadcastLen,
+      chatDeltaLastBroadcastText,
+      agentDeltaSentAt,
+      bufferedAgentEvents,
+    },
   };
 }
 
@@ -142,11 +151,11 @@ describe("abortChatRunById", () => {
     expect(entry.controller.signal.aborted).toBe(true);
     expect(ops.chatAbortControllers.has(runId)).toBe(false);
     expect(ops.chatRunBuffers.has(runId)).toBe(false);
-    expect(ops.chatDeltaSentAt.has(runId)).toBe(false);
-    expect(ops.chatDeltaLastBroadcastLen.has(runId)).toBe(false);
-    expect(ops.chatDeltaLastBroadcastText.has(runId)).toBe(false);
-    expect(ops.agentDeltaSentAt?.has(`${runId}:assistant`)).toBe(false);
-    expect(ops.bufferedAgentEvents?.has(`${runId}:assistant`)).toBe(false);
+    expect(ops.clearedState.chatDeltaSentAt.has(runId)).toBe(false);
+    expect(ops.clearedState.chatDeltaLastBroadcastLen.has(runId)).toBe(false);
+    expect(ops.clearedState.chatDeltaLastBroadcastText.has(runId)).toBe(false);
+    expect(ops.clearedState.agentDeltaSentAt.has(`${runId}:assistant`)).toBe(false);
+    expect(ops.clearedState.bufferedAgentEvents.has(`${runId}:assistant`)).toBe(false);
     expect(ops.removeChatRun).toHaveBeenCalledWith(runId, runId, sessionKey);
     expect(ops.agentRunSeq.has(runId)).toBe(false);
     expect(ops.agentRunSeq.has("client-run-1")).toBe(false);

src/gateway/chat-abort.ts

@@ -1,6 +1,5 @@
 import { isAbortRequestText } from "../auto-reply/reply/abort-primitives.js";
 import { emitAgentEvent } from "../infra/agent-events.js";
-import type { BufferedAgentEvent } from "./server-chat-state.js";
 
 const DEFAULT_CHAT_RUN_ABORT_GRACE_MS = 60_000;
 
@@ -139,11 +138,6 @@ function normalizeProviderIdForActiveRun(providerId: string | undefined): string
 export type ChatAbortOps = {
   chatAbortControllers: Map<string, ChatAbortControllerEntry>;
   chatRunBuffers: Map<string, string>;
-  chatDeltaSentAt: Map<string, number>;
-  chatDeltaLastBroadcastLen: Map<string, number>;
-  chatDeltaLastBroadcastText: Map<string, string>;
-  agentDeltaSentAt: Map<string, number>;
-  bufferedAgentEvents: Map<string, BufferedAgentEvent>;
   chatAbortedRuns: Map<string, number>;
   clearChatRunState: (runId: string) => void;
   removeChatRun: (

src/gateway/server-close.ts

@@ -180,11 +180,6 @@ function abortActiveRunsForRestart(params: {
       {
         chatAbortControllers: params.chatAbortControllers,
         chatRunBuffers: params.chatRunState.buffers,
-        chatDeltaSentAt: params.chatRunState.deltaSentAt,
-        chatDeltaLastBroadcastLen: params.chatRunState.deltaLastBroadcastLen,
-        chatDeltaLastBroadcastText: params.chatRunState.deltaLastBroadcastText,
-        agentDeltaSentAt: params.chatRunState.agentDeltaSentAt,
-        bufferedAgentEvents: params.chatRunState.bufferedAgentEvents,
         chatAbortedRuns: params.chatRunState.abortedRuns,
         clearChatRunState: params.chatRunState.clearRun,
         removeChatRun: params.removeChatRun,

src/gateway/server-maintenance.ts

@@ -190,11 +190,6 @@ export function startGatewayMaintenanceTimers(params: {
         {
           chatAbortControllers: params.chatAbortControllers,
           chatRunBuffers: params.chatRunBuffers,
-          chatDeltaSentAt: params.chatDeltaSentAt,
-          chatDeltaLastBroadcastLen: params.chatDeltaLastBroadcastLen,
-          chatDeltaLastBroadcastText: params.chatRunState.deltaLastBroadcastText,
-          agentDeltaSentAt: params.chatRunState.agentDeltaSentAt,
-          bufferedAgentEvents: params.chatRunState.bufferedAgentEvents,
           chatAbortedRuns: params.chatRunState.abortedRuns,
           clearChatRunState: params.chatRunState.clearRun,
           removeChatRun: params.removeChatRun,

src/gateway/server-methods/chat.ts

@@ -1607,11 +1607,6 @@ function createChatAbortOps(context: GatewayRequestContext): ChatAbortOps {
   return {
     chatAbortControllers: context.chatAbortControllers,
     chatRunBuffers: context.chatRunBuffers,
-    chatDeltaSentAt: context.chatDeltaSentAt,
-    chatDeltaLastBroadcastLen: context.chatDeltaLastBroadcastLen,
-    chatDeltaLastBroadcastText: context.chatDeltaLastBroadcastText,
-    agentDeltaSentAt: context.agentDeltaSentAt,
-    bufferedAgentEvents: context.bufferedAgentEvents,
     chatAbortedRuns: context.chatAbortedRuns,
     clearChatRunState: context.clearChatRunState,
     removeChatRun: context.removeChatRun,

src/gateway/server-methods/models-auth-status.ts

@@ -114,11 +114,6 @@ function createAuthLogoutAbortOps(context: GatewayRequestContext): ChatAbortOps
   return {
     chatAbortControllers: context.chatAbortControllers,
     chatRunBuffers: context.chatRunBuffers,
-    chatDeltaSentAt: context.chatDeltaSentAt,
-    chatDeltaLastBroadcastLen: context.chatDeltaLastBroadcastLen,
-    chatDeltaLastBroadcastText: context.chatDeltaLastBroadcastText,
-    agentDeltaSentAt: context.agentDeltaSentAt,
-    bufferedAgentEvents: context.bufferedAgentEvents,
     chatAbortedRuns: context.chatAbortedRuns,
     clearChatRunState: context.clearChatRunState,
     removeChatRun: context.removeChatRun,