fix: cache toolIdList to prevent prune ID mismatch

Author: Tarquinen

lib/hooks.ts

@@ -4,6 +4,7 @@ import type { PluginConfig } from "./config"
 import { syncToolCache } from "./state/tool-cache"
 import { deduplicate, supersedeWrites, purgeErrors } from "./strategies"
 import { prune, insertPruneToolContext } from "./messages"
+import { buildToolIdList } from "./messages/utils"
 import { checkSession } from "./state"
 import { renderSystemPrompt } from "./prompts"
 import { handleStatsCommand } from "./commands/stats"
@@ -70,6 +71,7 @@ export function createChatMessageTransformHandler(
         }
 
         syncToolCache(state, config, logger, output.messages)
+        buildToolIdList(state, output.messages, logger)
 
         deduplicate(state, logger, config, output.messages)
         supersedeWrites(state, logger, config, output.messages)

lib/messages/inject.ts

@@ -5,7 +5,6 @@ import type { UserMessage } from "@opencode-ai/sdk/v2"
 import { renderNudge, renderCompressNudge } from "../prompts"
 import {
     extractParameterKey,
-    buildToolIdList,
     createSyntheticTextPart,
     createSyntheticToolPart,
     isIgnoredUserMessage,
@@ -110,10 +109,9 @@ const buildPrunableToolsList = (
     state: SessionState,
     config: PluginConfig,
     logger: Logger,
-    messages: WithParts[],
 ): string => {
     const lines: string[] = []
-    const toolIdList: string[] = buildToolIdList(state, messages, logger)
+    const toolIdList = state.toolIdList
 
     state.toolParameters.forEach((toolParameterEntry, toolCallId) => {
         if (state.prune.toolIds.has(toolCallId)) {
@@ -184,7 +182,7 @@ export const insertPruneToolContext = (
         contentParts.push(getCooldownMessage(config))
     } else {
         if (pruneOrDistillEnabled) {
-            const prunableToolsList = buildPrunableToolsList(state, config, logger, messages)
+            const prunableToolsList = buildPrunableToolsList(state, config, logger)
             if (prunableToolsList) {
                 // logger.debug("prunable-tools: \n" + prunableToolsList)
                 contentParts.push(prunableToolsList)

lib/messages/utils.ts

@@ -245,6 +245,7 @@ export function buildToolIdList(
             }
         }
     }
+    state.toolIdList = toolIds
     return toolIds
 }
 

lib/state/state.ts

@@ -57,6 +57,7 @@ export function createSessionState(): SessionState {
             totalPruneTokens: 0,
         },
         toolParameters: new Map<string, ToolParameterEntry>(),
+        toolIdList: [],
         nudgeCounter: 0,
         lastToolPrune: false,
         lastCompaction: 0,
@@ -79,6 +80,7 @@ export function resetSessionState(state: SessionState): void {
         totalPruneTokens: 0,
     }
     state.toolParameters.clear()
+    state.toolIdList = []
     state.nudgeCounter = 0
     state.lastToolPrune = false
     state.lastCompaction = 0

lib/state/types.ts

@@ -38,6 +38,7 @@ export interface SessionState {
     compressSummaries: CompressSummary[]
     stats: SessionStats
     toolParameters: Map<string, ToolParameterEntry>
+    toolIdList: string[]
     nudgeCounter: number
     lastToolPrune: boolean
     lastCompaction: number

lib/strategies/deduplication.ts

@@ -1,7 +1,6 @@
 import { PluginConfig } from "../config"
 import { Logger } from "../logger"
 import type { SessionState, WithParts } from "../state"
-import { buildToolIdList } from "../messages/utils"
 import { getFilePathsFromParameters, isProtected } from "../protected-file-patterns"
 import { calculateTokensSaved } from "./utils"
 
@@ -20,8 +19,7 @@ export const deduplicate = (
         return
     }
 
-    // Build list of all tool call IDs from messages (chronological order)
-    const allToolIds = buildToolIdList(state, messages, logger)
+    const allToolIds = state.toolIdList
     if (allToolIds.length === 0) {
         return
     }

lib/strategies/purge-errors.ts

@@ -1,7 +1,6 @@
 import { PluginConfig } from "../config"
 import { Logger } from "../logger"
 import type { SessionState, WithParts } from "../state"
-import { buildToolIdList } from "../messages/utils"
 import { getFilePathsFromParameters, isProtected } from "../protected-file-patterns"
 import { calculateTokensSaved } from "./utils"
 
@@ -23,8 +22,7 @@ export const purgeErrors = (
         return
     }
 
-    // Build list of all tool call IDs from messages (chronological order)
-    const allToolIds = buildToolIdList(state, messages, logger)
+    const allToolIds = state.toolIdList
     if (allToolIds.length === 0) {
         return
     }

lib/strategies/supersede-writes.ts

@@ -1,7 +1,6 @@
 import { PluginConfig } from "../config"
 import { Logger } from "../logger"
 import type { SessionState, WithParts } from "../state"
-import { buildToolIdList } from "../messages/utils"
 import { getFilePathsFromParameters, isProtected } from "../protected-file-patterns"
 import { calculateTokensSaved } from "./utils"
 
@@ -23,8 +22,7 @@ export const supersedeWrites = (
         return
     }
 
-    // Build list of all tool call IDs from messages (chronological order)
-    const allToolIds = buildToolIdList(state, messages, logger)
+    const allToolIds = state.toolIdList
     if (allToolIds.length === 0) {
         return
     }

lib/tools/prune-shared.ts

@@ -2,7 +2,6 @@ import type { SessionState, ToolParameterEntry, WithParts } from "../state"
 import type { PluginConfig } from "../config"
 import type { Logger } from "../logger"
 import type { PruneToolContext } from "./types"
-import { buildToolIdList } from "../messages/utils"
 import { syncToolCache } from "../state/tool-cache"
 import { PruneReason, sendUnifiedNotification } from "../ui/notification"
 import { formatPruningResultForTool } from "../ui/utils"
@@ -52,14 +51,15 @@ export async function executePruneOperation(
     await syncToolCache(state, config, logger, messages)
 
     const currentParams = getCurrentParams(state, messages, logger)
-    const toolIdList: string[] = buildToolIdList(state, messages, logger)
+
+    const toolIdList = state.toolIdList
 
     const validNumericIds: number[] = []
     const skippedIds: string[] = []
 
     // Validate and filter IDs
     for (const index of numericToolIds) {
-        // Validate that all numeric IDs are within bounds
+        // Validate that index is within bounds
         if (index < 0 || index >= toolIdList.length) {
             logger.debug(`Rejecting prune request - index out of bounds: ${index}`)
             skippedIds.push(index.toString())