deduplicate tool id logic

Author: jorgenwh

index.ts

@@ -2,7 +2,7 @@ import type { Plugin } from "@opencode-ai/plugin"
 import { getConfig } from "./lib/config"
 import { Logger } from "./lib/logger"
 import { createSessionState } from "./lib/state"
-import { createPruningTool } from "./lib/strategies/pruning-tool"
+import { createPruneTool } from "./lib/strategies/prune-tool"
 import { createChatMessageTransformHandler } from "./lib/hooks"
 
 const plugin: Plugin = (async (ctx) => {
@@ -34,7 +34,7 @@ const plugin: Plugin = (async (ctx) => {
             config
         ),
         tool: config.strategies.pruneTool.enabled ? {
-            prune: createPruningTool({
+            prune: createPruneTool({
                 client: ctx.client,
                 state,
                 logger,

lib/config.ts

@@ -493,4 +493,4 @@ export function getConfig(ctx: PluginInput): PluginConfig {
     }
 
     return config
-
+}

lib/hooks.ts

@@ -18,5 +18,7 @@ export function createChatMessageTransformHandler(
         syncToolCache(state, logger, output.messages);
 
         deduplicate(state, logger, config, output.messages)
+
+        prune(state, logger, config, output.messages)
     }
 }

lib/state/persistence.ts

@@ -63,7 +63,7 @@ export async function saveSessionState(
 
         logger.info("persist", "Saved session state to disk", {
             sessionId: sessionState.sessionId.slice(0, 8),
-            totalTokensSaved: state.stats.totalTokensSaved,
+            totalTokensSaved: state.stats.totalPruneTokens
         });
     } catch (error: any) {
         logger.error("persist", "Failed to save session state", {
@@ -100,7 +100,7 @@ export async function loadSessionState(
 
         logger.info("persist", "Loaded session state from disk", {
             sessionId: sessionId.slice(0, 8),
-            totalTokensSaved: state.stats.totalTokensSaved,
+            totalTokensSaved: state.stats.totalPruneTokens
         });
 
         return state;

lib/strategies/deduplication.ts

@@ -2,11 +2,119 @@ import { PluginConfig } from "../config"
 import { Logger } from "../logger"
 import type { SessionState, WithParts } from "../state"
 
+/**
+ * Deduplication strategy - prunes older tool calls that have identical
+ * tool name and parameters, keeping only the most recent occurrence.
+ * Modifies the session state in place to add pruned tool call IDs.
+ */
 export const deduplicate = (
     state: SessionState,
     logger: Logger,
     config: PluginConfig,
     messages: WithParts[]
-) => {
+): void => {
+    if (!config.strategies.deduplication.enabled) {
+        return
+    }
 
+    // Build list of all tool call IDs from messages (chronological order)
+    const allToolIds = buildToolIdList(messages)
+    if (allToolIds.length === 0) {
+        return
+    }
+
+    // Filter out IDs already pruned
+    const alreadyPruned = new Set(state.prune.toolIds)
+    const unprunedIds = allToolIds.filter(id => !alreadyPruned.has(id))
+
+    if (unprunedIds.length === 0) {
+        return
+    }
+
+    const protectedTools = config.strategies.deduplication.protectedTools
+
+    // Group by signature (tool name + normalized parameters)
+    const signatureMap = new Map<string, string[]>()
+
+    for (const id of unprunedIds) {
+        const metadata = state.toolParameters.get(id)
+        if (!metadata) {
+            logger.warn("deduplication", `Missing metadata for tool call ID: ${id}`)
+            continue
+        }
+
+        // Skip protected tools
+        if (protectedTools.includes(metadata.tool)) {
+            continue
+        }
+
+        const signature = createToolSignature(metadata.tool, metadata.parameters)
+        if (!signatureMap.has(signature)) {
+            signatureMap.set(signature, [])
+        }
+        signatureMap.get(signature)!.push(id)
+    }
+
+    // Find duplicates - keep only the most recent (last) in each group
+    const newPruneIds: string[] = []
+
+    for (const [, ids] of signatureMap.entries()) {
+        if (ids.length > 1) {
+            // All except last (most recent) should be pruned
+            const idsToRemove = ids.slice(0, -1)
+            newPruneIds.push(...idsToRemove)
+        }
+    }
+
+    if (newPruneIds.length > 0) {
+        state.prune.toolIds.push(...newPruneIds)
+        logger.debug("dedulication", `Marked ${newPruneIds.length} duplicate tool calls for pruning`)
+    }
+}
+
+function buildToolIdList(messages: WithParts[]): string[] {
+    const toolIds: string[] = []
+    for (const msg of messages) {
+        if (msg.parts) {
+            for (const part of msg.parts) {
+                if (part.type === 'tool' && part.callID && part.tool) {
+                    toolIds.push(part.callID)
+                }
+            }
+        }
+    }
+    return toolIds
+}
+
+function createToolSignature(tool: string, parameters?: any): string {
+    if (!parameters) {
+        return tool
+    }
+    const normalized = normalizeParameters(parameters)
+    const sorted = sortObjectKeys(normalized)
+    return `${tool}::${JSON.stringify(sorted)}`
+}
+
+function normalizeParameters(params: any): any {
+    if (typeof params !== 'object' || params === null) return params
+    if (Array.isArray(params)) return params
+
+    const normalized: any = {}
+    for (const [key, value] of Object.entries(params)) {
+        if (value !== undefined && value !== null) {
+            normalized[key] = value
+        }
+    }
+    return normalized
+}
+
+function sortObjectKeys(obj: any): any {
+    if (typeof obj !== 'object' || obj === null) return obj
+    if (Array.isArray(obj)) return obj.map(sortObjectKeys)
+
+    const sorted: any = {}
+    for (const key of Object.keys(obj).sort()) {
+        sorted[key] = sortObjectKeys(obj[key])
+    }
+    return sorted
 }

lib/strategies/pruning-tool.ts lib/strategies/prune-tool.tslib/strategies/pruning-tool.ts renamed to lib/strategies/prune-tool.ts

@@ -1,5 +1,5 @@
 import { tool } from "@opencode-ai/plugin"
-import type { SessionState, ToolParameterEntry} from "../state"
+import type { SessionState, ToolParameterEntry } from "../state"
 import type { PluginConfig } from "../config"
 import { findCurrentAgent, buildToolIdList, getPruneToolIds } from "../utils"
 import { PruneReason, sendUnifiedNotification } from "../ui/notification"
@@ -25,7 +25,7 @@ export interface PruneToolContext {
  * Creates the prune tool definition.
  * Accepts numeric IDs from the <prunable-tools> list and prunes those tool outputs.
  */
-export function createPruningTool(
+export function createPruneTool(
     ctx: PruneToolContext,
 ): ReturnType<typeof tool> {
     return tool({