refactor: simplify compression timing

Author: spoons-and-mirrors

lib/compress/message.ts

@@ -53,7 +53,7 @@ export function createCompressMessageTool(ctx: ToolContext): ReturnType<typeof t
                 typeof (toolCtx as unknown as { callID?: unknown }).callID === "string"
                     ? (toolCtx as unknown as { callID: string }).callID
                     : undefined
-            const durationMs = consumeCompressionDuration(ctx.state, toolCtx.messageID, callId)
+            const durationMs = consumeCompressionDuration(ctx.state, callId)
 
             const { rawMessages, searchContext } = await prepareSession(
                 ctx,

lib/compress/range.ts

@@ -64,7 +64,7 @@ export function createCompressRangeTool(ctx: ToolContext): ReturnType<typeof too
                 typeof (toolCtx as unknown as { callID?: unknown }).callID === "string"
                     ? (toolCtx as unknown as { callID: string }).callID
                     : undefined
-            const durationMs = consumeCompressionDuration(ctx.state, toolCtx.messageID, callId)
+            const durationMs = consumeCompressionDuration(ctx.state, callId)
 
             const { rawMessages, searchContext } = await prepareSession(
                 ctx,

lib/compress/state.ts

@@ -29,53 +29,18 @@ export function allocateRunId(state: SessionState): number {
 export function recordCompressionDuration(
     state: SessionState,
     callId: string,
-    messageId: string,
     durationMs: number,
 ): void {
     state.compressionDurations.set(callId, durationMs)
-
-    const queue = state.compressionDurationQueue.get(messageId)
-    if (!queue) {
-        state.compressionDurationQueue.set(messageId, [callId])
-        return
-    }
-
-    queue.push(callId)
 }
 
-export function consumeCompressionDuration(
-    state: SessionState,
-    messageId: string,
-    callId?: string,
-): number {
-    if (callId && state.compressionDurations.has(callId)) {
-        const queue = state.compressionDurationQueue.get(messageId)
-        if (queue) {
-            const next = queue.filter((id) => id !== callId)
-            if (next.length === 0) {
-                state.compressionDurationQueue.delete(messageId)
-            } else {
-                state.compressionDurationQueue.set(messageId, next)
-            }
-        }
-
-        const durationMs = state.compressionDurations.get(callId) || 0
-        state.compressionDurations.delete(callId)
-        return durationMs
-    }
-
-    const queue = state.compressionDurationQueue.get(messageId)
-    const queuedCallId = queue?.shift()
-    if (queue && queue.length === 0) {
-        state.compressionDurationQueue.delete(messageId)
-    }
-
-    if (!queuedCallId) {
+export function consumeCompressionDuration(state: SessionState, callId?: string): number {
+    if (!callId || !state.compressionDurations.has(callId)) {
         return 0
     }
 
-    const durationMs = state.compressionDurations.get(queuedCallId) || 0
-    state.compressionDurations.delete(queuedCallId)
+    const durationMs = state.compressionDurations.get(callId) || 0
+    state.compressionDurations.delete(callId)
     return durationMs
 }
 

lib/hooks.ts

@@ -325,7 +325,7 @@ export function createEventHandler(state: SessionState, logger: Logger) {
 
             state.compressionStarts.delete(part.callID)
             const durationMs = Math.max(0, runningAt - start.startedAt)
-            recordCompressionDuration(state, part.callID, start.messageId, durationMs)
+            recordCompressionDuration(state, part.callID, durationMs)
 
             logger.info("Recorded compression time", {
                 callID: part.callID,

lib/state/state.ts

@@ -83,7 +83,6 @@ export function createSessionState(): SessionState {
         },
         compressionStarts: new Map<string, CompressionStart>(),
         compressionDurations: new Map<string, number>(),
-        compressionDurationQueue: new Map<string, string[]>(),
         toolParameters: new Map<string, ToolParameterEntry>(),
         subAgentResultCache: new Map<string, string>(),
         toolIdList: [],
@@ -121,7 +120,6 @@ export function resetSessionState(state: SessionState): void {
     }
     state.compressionStarts.clear()
     state.compressionDurations.clear()
-    state.compressionDurationQueue.clear()
     state.toolParameters.clear()
     state.subAgentResultCache.clear()
     state.toolIdList = []

lib/state/types.ts

@@ -104,7 +104,6 @@ export interface SessionState {
     stats: SessionStats
     compressionStarts: Map<string, CompressionStart>
     compressionDurations: Map<string, number>
-    compressionDurationQueue: Map<string, string[]>
     toolParameters: Map<string, ToolParameterEntry>
     subAgentResultCache: Map<string, string>
     toolIdList: string[]

tests/hooks-permission.test.ts

@@ -207,7 +207,6 @@ test("event hook records compress input generation duration", async () => {
     }
 
     assert.equal(state.compressionDurations.get("call-1"), 225)
-    assert.deepEqual(state.compressionDurationQueue.get("message-1"), ["call-1"])
     assert.equal(state.compressionStarts.has("call-1"), false)
 })
 
@@ -302,12 +301,12 @@ test("compression duration consumption handles multiple calls in one message", a
         Date.now = originalNow
     }
 
-    assert.equal(consumeCompressionDuration(state, "message-1"), 225)
-    assert.equal(consumeCompressionDuration(state, "message-1"), 310)
-    assert.equal(consumeCompressionDuration(state, "message-1"), 0)
+    assert.equal(consumeCompressionDuration(state, "call-1"), 225)
+    assert.equal(consumeCompressionDuration(state, "call-2"), 310)
+    assert.equal(consumeCompressionDuration(state, "call-1"), 0)
 })
 
-test("compression duration consumption supports explicit call id lookup", async () => {
+test("compression duration consumption returns zero for unknown call id", async () => {
     const state = createSessionState()
     state.sessionId = "session-1"
     const handler = createEventHandler(state, new Logger(false))
@@ -398,9 +397,10 @@ test("compression duration consumption supports explicit call id lookup", async
         Date.now = originalNow
     }
 
-    assert.equal(consumeCompressionDuration(state, "message-1", "call-2"), 310)
-    assert.equal(consumeCompressionDuration(state, "message-1"), 225)
-    assert.equal(consumeCompressionDuration(state, "message-1"), 0)
+    assert.equal(consumeCompressionDuration(state, "call-2"), 310)
+    assert.equal(consumeCompressionDuration(state, "missing-call"), 0)
+    assert.equal(consumeCompressionDuration(state, undefined), 0)
+    assert.equal(consumeCompressionDuration(state, "call-1"), 225)
 })
 
 test("event hook ignores non-compress tool parts", async () => {