switchroom 0.13.51 → 0.13.53

package/telegram-plugin/gateway/disconnect-flush.ts

@@ -37,6 +37,11 @@ export interface DisconnectFlushDeps<Ctrl extends { finalize: (reason?: 'done' |
   activeReactionMsgIds: Map<string, { chatId: string; messageId: number }>
   /** Mirror map: same keys → turn-start timestamps. */
   activeTurnStartedAt: Map<string, number>
+  /** PR3b: keys claude has actually been handed (delivered, not just
+   *  received). Cleared on disconnect for the same reason as
+   *  activeTurnStartedAt — the bridge just died, every turn it
+   *  was handed is dead by definition. */
+  claudeBusyKeys: Set<string>
 
   /** Open draft-stream handles keyed by chat:thread:replyId. */
   activeDraftStreams: Map<string, Stream>
@@ -78,6 +83,7 @@ export function flushOnAgentDisconnect<
     activeStatusReactions,
     activeReactionMsgIds,
     activeTurnStartedAt,
+    claudeBusyKeys,
     activeDraftStreams,
     activeDraftParseModes,
     clearActiveReactions,
@@ -105,6 +111,7 @@ export function flushOnAgentDisconnect<
     activeStatusReactions.delete(key)
     activeReactionMsgIds.delete(key)
     activeTurnStartedAt.delete(key)
+    claudeBusyKeys.delete(key)
   }
   clearActiveReactions()
 
@@ -124,6 +131,7 @@ export function flushOnAgentDisconnect<
     for (const k of danglingKeys) {
       activeTurnStartedAt.delete(k)
       activeReactionMsgIds.delete(k)
+      claudeBusyKeys.delete(k)
     }
     log(
       `telegram gateway: disconnect-flush swept ${danglingKeys.length} dangling turn key(s) ` +
@@ -132,6 +140,30 @@ export function flushOnAgentDisconnect<
     onDanglingTurnsSwept?.(danglingKeys)
   }
 
+  // PR3b orphan-sweep (#1880 follow-up): claudeBusyKeys can hold keys
+  // that activeTurnStartedAt does NOT — specifically when a synthetic
+  // inbound (cron via onInjectInbound, reaction dispatch, vault
+  // grant-approved / -denied / save-discarded / -failed / -completed,
+  // button-callback) was delivered. Those paths bypass handleInbound's
+  // fresh-turn branch (which is what would set activeTurnStartedAt),
+  // so the sweep loop above wouldn't notice them. Pre-PR3b this was
+  // invisible because the fleet gate read activeTurnStartedAt.size —
+  // synthetic-only turns never registered. PR3b's claudeBusyKeys.add
+  // is the more-accurate "claude is busy on this" gate, which means
+  // a synthetic-delivered turn that dies WITHOUT turn_end leaves an
+  // orphan that the activeTurnStartedAt-keyed sweep can't see.
+  // Cure: clear any leftover busy keys here. Bridge died → every
+  // busy key is dead by definition. Same justification as the
+  // dangling-sweep above for activeTurnStartedAt.
+  if (claudeBusyKeys.size > 0) {
+    const orphanCount = claudeBusyKeys.size
+    claudeBusyKeys.clear()
+    log(
+      `telegram gateway: disconnect-flush cleared ${orphanCount} orphan claudeBusyKeys ` +
+      `entr${orphanCount === 1 ? 'y' : 'ies'} (synthetic-inbound deliveries that never turn_ended)`,
+    )
+  }
+
   // Stop coalesce timers that could emit into a finalized draft stream, but
   // preserve chats with pendingCompletion=true — those have background
   // sub-agents that legitimately outlive the parent bridge disconnect. The