fix(diagnostics): clear stale session activity

clawsweeper[bot] · clawsweeper[bot] · commit e32fc453ae5a · 2026-05-28T17:31:53.000Z
diff --git a/src/auto-reply/reply/session-reset-cleanup.test.ts b/src/auto-reply/reply/session-reset-cleanup.test.ts
@@ -106,6 +106,32 @@ describe("clearSessionResetRuntimeState", () => {
     ).toBe("tool_call");
   });
 
+  it("clears key-only diagnostic activity for explicitly retired session keys", () => {
+    markDiagnosticToolStartedForTest({
+      sessionKey: "agent:main:telegram:chat-1",
+      runId: "run-old-key-only",
+      toolName: "bash",
+      toolCallId: "tool-old-key-only",
+    });
+
+    const result = clearSessionResetRuntimeState({
+      sessionKeys: ["agent:main:telegram:chat-1"],
+      retiredSessionKeys: ["agent:main:telegram:chat-1"],
+    });
+
+    expect(result.diagnosticActivityCleared).toEqual({
+      activeEmbeddedRunsCleared: 0,
+      activeToolsCleared: 1,
+      activeModelCallsCleared: 0,
+      activitiesCleared: 1,
+    });
+    expect(
+      getDiagnosticSessionActivitySnapshot({
+        sessionKey: "agent:main:telegram:chat-1",
+      }).activeWorkKind,
+    ).toBeUndefined();
+  });
+
   it("can defer retired-session diagnostic cleanup until the active run settles", () => {
     markDiagnosticEmbeddedRunStarted({
       sessionId: "session-active",
diff --git a/src/auto-reply/reply/session-reset-cleanup.ts b/src/auto-reply/reply/session-reset-cleanup.ts
@@ -13,9 +13,15 @@ export type ClearSessionResetRuntimeStateResult = ClearSessionQueueResult & {
 export type ClearSessionResetRuntimeStateParams = {
   sessionKeys: Array<string | undefined>;
   retiredSessionIds?: Array<string | undefined>;
+  retiredSessionKeys?: Array<string | undefined>;
   clearRetiredDiagnosticActivity?: boolean;
 };
 
+type RetiredSessionDiagnosticRef = {
+  sessionId?: string;
+  sessionKey?: string;
+};
+
 const emptyDiagnosticActivityResult = (): ClearDiagnosticSessionActivityResult => ({
   activeEmbeddedRunsCleared: 0,
   activeToolsCleared: 0,
@@ -24,11 +30,13 @@ const emptyDiagnosticActivityResult = (): ClearDiagnosticSessionActivityResult =
 });
 
 export function clearRetiredSessionDiagnosticActivity(
-  retiredSessionIds: Array<string | undefined>,
+  retiredSessionRefs: Array<RetiredSessionDiagnosticRef | string | undefined>,
 ): ClearDiagnosticSessionActivityResult {
-  return retiredSessionIds.reduce<ClearDiagnosticSessionActivityResult>((acc, key) => {
+  return retiredSessionRefs.reduce<ClearDiagnosticSessionActivityResult>((acc, ref) => {
+    const sessionRef = typeof ref === "string" ? { sessionId: ref } : ref;
     const result = clearDiagnosticSessionActivity({
-      sessionId: key,
+      sessionId: sessionRef?.sessionId,
+      sessionKey: sessionRef?.sessionKey,
       reason: "session_reset",
     });
     acc.activeEmbeddedRunsCleared += result.activeEmbeddedRunsCleared;
@@ -42,6 +50,7 @@ export function clearRetiredSessionDiagnosticActivity(
 export function clearSessionResetRuntimeState({
   sessionKeys,
   retiredSessionIds = [],
+  retiredSessionKeys = [],
   clearRetiredDiagnosticActivity = true,
 }: ClearSessionResetRuntimeStateParams): ClearSessionResetRuntimeStateResult {
   const cleared = clearSessionQueues([...sessionKeys, ...retiredSessionIds]);
@@ -52,7 +61,10 @@ export function clearSessionResetRuntimeState({
   }
 
   const diagnosticActivityCleared = clearRetiredDiagnosticActivity
-    ? clearRetiredSessionDiagnosticActivity(retiredSessionIds)
+    ? clearRetiredSessionDiagnosticActivity([
+        ...retiredSessionIds.map((sessionId) => ({ sessionId })),
+        ...retiredSessionKeys.map((sessionKey) => ({ sessionKey })),
+      ])
     : emptyDiagnosticActivityResult();
 
   return {
diff --git a/src/auto-reply/reply/session.ts b/src/auto-reply/reply/session.ts
@@ -489,6 +489,7 @@ export async function initSessionState(params: {
     clearSessionResetRuntimeState({
       sessionKeys: [sessionKey],
       retiredSessionIds: [previousSessionEntry.sessionId],
+      retiredSessionKeys: [sessionKey],
     });
   }
 
diff --git a/src/gateway/session-reset-service.ts b/src/gateway/session-reset-service.ts
@@ -396,7 +396,12 @@ async function ensureSessionRuntimeCleanup(params: {
   const ended = await waitForEmbeddedAgentRunEnd(params.sessionId, 15_000);
   clearBootstrapSnapshot(params.target.canonicalKey);
   if (ended) {
-    clearRetiredSessionDiagnosticActivity([params.sessionId]);
+    clearRetiredSessionDiagnosticActivity([
+      {
+        sessionId: params.sessionId,
+        sessionKey: params.target.canonicalKey,
+      },
+    ]);
     await retireSessionMcpRuntime({
       sessionId: params.sessionId,
       reason: "gateway-session-cleanup",

Original file line number	Diff line number	Diff line change
`@@ -489,6 +489,7 @@ export async function initSessionState(params: {`
`489`	`489`	`clearSessionResetRuntimeState({`
`490`	`490`	`sessionKeys: [sessionKey],`
`491`	`491`	`retiredSessionIds: [previousSessionEntry.sessionId],`
	`492`	`+ retiredSessionKeys: [sessionKey],`
`492`	`493`	`});`
`493`	`494`	`}`
`494`	`495`