fix

Author: jorgenwh

lib/hooks.ts

@@ -48,6 +48,11 @@ export function createEventHandler(
             return
         }
 
+        if (event.type === "session.compacted") {
+            logger.info("Session compaction detected - updating state")
+            state.lastCompaction = Date.now()
+        }
+
         if (event.type === "session.status" && event.properties.status.type === "idle") {
             if (!config.strategies.onIdle.enabled) {
                 return

lib/messages/prune.ts

@@ -3,7 +3,7 @@ import type { Logger } from "../logger"
 import type { PluginConfig } from "../config"
 import { loadPrompt } from "../prompt"
 import { extractParameterKey, buildToolIdList } from "./utils"
-import { getLastUserMessage } from "../shared-utils"
+import { getLastUserMessage, isMessageCompacted } from "../shared-utils"
 import { UserMessage } from "@opencode-ai/sdk"
 
 const PRUNED_TOOL_INPUT_REPLACEMENT = '[Input removed to save context]'
@@ -17,7 +17,7 @@ const buildPrunableToolsList = (
     messages: WithParts[],
 ): string => {
     const lines: string[] = []
-    const toolIdList: string[] = buildToolIdList(messages)
+    const toolIdList: string[] = buildToolIdList(state, messages, logger)
 
     state.toolParameters.forEach((toolParameterEntry, toolCallId) => {
         if (state.prune.toolIds.includes(toolCallId)) {
@@ -26,9 +26,6 @@ const buildPrunableToolsList = (
         if (config.strategies.pruneTool.protectedTools.includes(toolParameterEntry.tool)) {
             return
         }
-        if (toolParameterEntry.compacted) {
-            return
-        }
         const numericId = toolIdList.indexOf(toolCallId)
         const paramKey = extractParameterKey(toolParameterEntry.tool, toolParameterEntry.parameters)
         const description = paramKey ? `${toolParameterEntry.tool}, ${paramKey}` : toolParameterEntry.tool
@@ -111,6 +108,10 @@ const pruneToolOutputs = (
     messages: WithParts[]
 ): void => {
     for (const msg of messages) {
+        if (isMessageCompacted(state, msg)) {
+            continue
+        }
+
         for (const part of msg.parts) {
             if (part.type !== 'tool') {
                 continue

lib/messages/utils.ts

@@ -1,4 +1,6 @@
-import type { WithParts } from "../state"
+import { Logger } from "../logger"
+import { isMessageCompacted } from "../shared-utils"
+import type { SessionState, WithParts } from "../state"
 
 /**
  * Extracts a human-readable key from tool metadata for display purposes.
@@ -71,9 +73,16 @@ export const extractParameterKey = (tool: string, parameters: any): string => {
     return paramStr.substring(0, 50)
 }
 
-export function buildToolIdList(messages: WithParts[]): string[] {
+export function buildToolIdList(
+    state: SessionState,
+    messages: WithParts[],
+    logger: Logger
+): string[] {
     const toolIds: string[] = []
     for (const msg of messages) {
+        if (isMessageCompacted(state, msg)) {
+            continue
+        }
         if (msg.parts) {
             for (const part of msg.parts) {
                 if (part.type === 'tool' && part.callID && part.tool) {

lib/shared-utils.ts

@@ -1,4 +1,12 @@
-import { WithParts } from "./state"
+import { Logger } from "./logger"
+import { SessionState, WithParts } from "./state"
+
+export const isMessageCompacted = (
+    state: SessionState,
+    msg: WithParts
+): boolean => {
+    return msg.info.time.created < state.lastCompaction
+}
 
 export const getLastUserMessage = (
     messages: WithParts[]
@@ -11,3 +19,13 @@ export const getLastUserMessage = (
     }
     return null
 }
+
+export const checkForCompaction = (
+    state: SessionState,
+    messages: WithParts[],
+    logger: Logger
+): void => {
+    for (const msg of messages) {
+
+    }
+}

lib/state/persistence.ts

@@ -16,6 +16,7 @@ export interface PersistedSessionState {
     prune: Prune
     stats: SessionStats;
     lastUpdated: string;
+    lastCompacted: number
 }
 
 const STORAGE_DIR = join(
@@ -55,6 +56,7 @@ export async function saveSessionState(
             prune: sessionState.prune,
             stats: sessionState.stats,
             lastUpdated: new Date().toISOString(),
+            lastCompacted: sessionState.lastCompaction
         };
 
         const filePath = getSessionFilePath(sessionState.sessionId);
@@ -99,8 +101,7 @@ export async function loadSessionState(
         }
 
         logger.info("Loaded session state from disk", {
-            sessionId: sessionId,
-            totalTokensSaved: state.stats.totalPruneTokens
+            sessionId: sessionId
         });
 
         return state;

lib/state/state.ts

@@ -41,7 +41,8 @@ export function createSessionState(): SessionState {
         },
         toolParameters: new Map<string, ToolParameterEntry>(),
         nudgeCounter: 0,
-        lastToolPrune: false
+        lastToolPrune: false,
+        lastCompaction: 0
     }
 }
 
@@ -58,6 +59,7 @@ export function resetSessionState(state: SessionState): void {
     state.toolParameters.clear()
     state.nudgeCounter = 0
     state.lastToolPrune = false
+    state.lastCompaction = 0
 }
 
 export async function ensureSessionInitialized(
@@ -95,4 +97,5 @@ export async function ensureSessionInitialized(
         pruneTokenCounter: persisted.stats?.pruneTokenCounter || 0,
         totalPruneTokens: persisted.stats?.totalPruneTokens || 0,
     }
+    state.lastCompaction = persisted.lastCompacted || 0
 }

lib/state/tool-cache.ts

@@ -1,6 +1,7 @@
 import type { SessionState, ToolStatus, WithParts } from "./index"
 import type { Logger } from "../logger"
 import { PluginConfig } from "../config"
+import { isMessageCompacted } from "../shared-utils"
 
 const MAX_TOOL_CACHE_SIZE = 1000
 
@@ -17,13 +18,19 @@ export async function syncToolCache(
         logger.info("Syncing tool parameters from OpenCode messages")
 
         state.nudgeCounter = 0
-        state.toolParameters.clear()
 
         for (const msg of messages) {
+            if (isMessageCompacted(state, msg)) {
+                continue
+            }
+
             for (const part of msg.parts) {
                 if (part.type !== "tool" || !part.callID) {
                     continue
                 }
+                if (state.toolParameters.has(part.callID)) {
+                    continue
+                }
 
                 if (part.tool === "prune") {
                     state.nudgeCounter = 0
@@ -32,22 +39,19 @@ export async function syncToolCache(
                 }
                 state.lastToolPrune = part.tool === "prune"
 
-                if (state.toolParameters.has(part.callID)) {
-                    continue
-                }
-
                 state.toolParameters.set(
                     part.callID,
                     {
                         tool: part.tool,
                         parameters: part.state?.input ?? {},
                         status: part.state.status as ToolStatus | undefined,
                         error: part.state.status === "error" ? part.state.error : undefined,
-                        compacted: part.state.status === "completed" && !!part.state.time.compacted,
                     }
                 )
+                logger.info("Cached tool id: " + part.callID)
             }
         }
+        logger.info("Synced cache - size: " + state.toolParameters.size)
         trimToolParametersCache(state)
     } catch (error) {
         logger.warn("Failed to sync tool parameters from OpenCode", {

lib/state/types.ts

@@ -12,7 +12,6 @@ export interface ToolParameterEntry {
     parameters: any
     status?: ToolStatus
     error?: string
-    compacted?: boolean
 }
 
 export interface SessionStats {
@@ -32,4 +31,5 @@ export interface SessionState {
     toolParameters: Map<string, ToolParameterEntry>
     nudgeCounter: number
     lastToolPrune: boolean
+    lastCompaction: number
 }

lib/strategies/deduplication.ts

@@ -20,7 +20,7 @@ export const deduplicate = (
     }
 
     // Build list of all tool call IDs from messages (chronological order)
-    const allToolIds = buildToolIdList(messages)
+    const allToolIds = buildToolIdList(state, messages, logger)
     if (allToolIds.length === 0) {
         return
     }
@@ -68,7 +68,7 @@ export const deduplicate = (
         }
     }
 
-    state.stats.totalPruneTokens += calculateTokensSaved(messages, newPruneIds)
+    state.stats.totalPruneTokens += calculateTokensSaved(state, messages, newPruneIds)
 
     if (newPruneIds.length > 0) {
         state.prune.toolIds.push(...newPruneIds)

lib/strategies/on-idle.ts

@@ -273,7 +273,7 @@ export async function runOnIdle(
         const allPrunedIds = [...new Set([...alreadyPrunedIds, ...newlyPrunedIds])]
         state.prune.toolIds = allPrunedIds
 
-        state.stats.pruneTokenCounter += calculateTokensSaved(messages, newlyPrunedIds)
+        state.stats.pruneTokenCounter += calculateTokensSaved(state, messages, newlyPrunedIds)
 
         // Build tool metadata map for notification
         const prunedToolMetadata = new Map<string, ToolParameterEntry>()