Merge pull request #30 from Tarquinen/fix/deduplicator-param-access-and-batch-exclusion

fix: deduplicator param access and batch tool exclusion

Author: Tarquinen

README.md

@@ -6,31 +6,28 @@ Automatically reduces token usage in OpenCode by removing obsolete tool outputs
 
 ![DCP in action](dcp-demo.png)
 
-## Pruning Strategies
-
-DCP implements two complementary strategies:
-
-**Deduplication** — Fast, zero-cost pruning that identifies repeated tool calls (e.g., reading the same file multiple times) and keeps only the most recent output. Runs instantly with no LLM calls.
-
-**AI Analysis** — Uses a language model to semantically analyze conversation context and identify tool outputs that are no longer relevant to the current task. More thorough but incurs LLM cost.
-
 ## Installation
 
 Add to your OpenCode config:
 
 ```jsonc
 // opencode.jsonc
 {
-  "plugins": ["@tarquinen/[email protected].17"]
+  "plugins": ["@tarquinen/[email protected].18"]
 }
 ```
 
 When a new version is available, DCP will show a toast notification. Update by changing the version number in your config.
 
 Restart OpenCode. The plugin will automatically start optimizing your sessions.
 
-> **Note:** Project `plugin` arrays override global completely—include all desired plugins in project config if using both.
+## Pruning Strategies
+
+DCP implements two complementary strategies:
 
+**Deduplication** — Fast, zero-cost pruning that identifies repeated tool calls (e.g., reading the same file multiple times) and keeps only the most recent output. Runs instantly with no LLM calls.
+
+**AI Analysis** — Uses a language model to semantically analyze conversation context and identify tool outputs that are no longer relevant to the current task. More thorough but incurs LLM cost.
 ## How It Works
 
 DCP is **non-destructive**—pruning state is kept in memory only. When requests go to your LLM, DCP replaces pruned outputs with a placeholder; original session data stays intact.

lib/deduplicator.ts

@@ -1,3 +1,5 @@
+import { extractParameterKey } from "./display-utils"
+
 export interface DuplicateDetectionResult {
     duplicateIds: string[]  // IDs to prune (older duplicates)
     deduplicationDetails: Map<string, {
@@ -85,76 +87,3 @@ function sortObjectKeys(obj: any): any {
     }
     return sorted
 }
-
-export function extractParameterKey(metadata: { tool: string, parameters?: any }): string {
-    if (!metadata.parameters) return ''
-
-    const { tool, parameters } = metadata
-
-    if (tool === "read" && parameters.filePath) {
-        return parameters.filePath
-    }
-    if (tool === "write" && parameters.filePath) {
-        return parameters.filePath
-    }
-    if (tool === "edit" && parameters.filePath) {
-        return parameters.filePath
-    }
-
-    if (tool === "list") {
-        return parameters.path || '(current directory)'
-    }
-    if (tool === "glob") {
-        if (parameters.pattern) {
-            const pathInfo = parameters.path ? ` in ${parameters.path}` : ""
-            return `"${parameters.pattern}"${pathInfo}`
-        }
-        return '(unknown pattern)'
-    }
-    if (tool === "grep") {
-        if (parameters.pattern) {
-            const pathInfo = parameters.path ? ` in ${parameters.path}` : ""
-            return `"${parameters.pattern}"${pathInfo}`
-        }
-        return '(unknown pattern)'
-    }
-
-    if (tool === "bash") {
-        if (parameters.description) return parameters.description
-        if (parameters.command) {
-            return parameters.command.length > 50
-                ? parameters.command.substring(0, 50) + "..."
-                : parameters.command
-        }
-    }
-
-    if (tool === "webfetch" && parameters.url) {
-        return parameters.url
-    }
-    if (tool === "websearch" && parameters.query) {
-        return `"${parameters.query}"`
-    }
-    if (tool === "codesearch" && parameters.query) {
-        return `"${parameters.query}"`
-    }
-
-    if (tool === "todowrite") {
-        return `${parameters.todos?.length || 0} todos`
-    }
-    if (tool === "todoread") {
-        return "read todo list"
-    }
-
-    if (tool === "task" && parameters.description) {
-        return parameters.description
-    }
-    if (tool === "batch") {
-        return `${parameters.tool_calls?.length || 0} parallel tools`
-    }
-
-    const paramStr = JSON.stringify(parameters)
-    if (paramStr === '{}' || paramStr === '[]' || paramStr === 'null') {
-        return ''
-    }
-    return paramStr.substring(0, 50)
-}

lib/display-utils.ts

@@ -0,0 +1,76 @@
+/**
+ * Extracts a human-readable key from tool metadata for display purposes.
+ * Used by both deduplication and AI analysis to show what was pruned.
+ */
+export function extractParameterKey(metadata: { tool: string, parameters?: any }): string {
+    if (!metadata.parameters) return ''
+
+    const { tool, parameters } = metadata
+
+    if (tool === "read" && parameters.filePath) {
+        return parameters.filePath
+    }
+    if (tool === "write" && parameters.filePath) {
+        return parameters.filePath
+    }
+    if (tool === "edit" && parameters.filePath) {
+        return parameters.filePath
+    }
+
+    if (tool === "list") {
+        return parameters.path || '(current directory)'
+    }
+    if (tool === "glob") {
+        if (parameters.pattern) {
+            const pathInfo = parameters.path ? ` in ${parameters.path}` : ""
+            return `"${parameters.pattern}"${pathInfo}`
+        }
+        return '(unknown pattern)'
+    }
+    if (tool === "grep") {
+        if (parameters.pattern) {
+            const pathInfo = parameters.path ? ` in ${parameters.path}` : ""
+            return `"${parameters.pattern}"${pathInfo}`
+        }
+        return '(unknown pattern)'
+    }
+
+    if (tool === "bash") {
+        if (parameters.description) return parameters.description
+        if (parameters.command) {
+            return parameters.command.length > 50
+                ? parameters.command.substring(0, 50) + "..."
+                : parameters.command
+        }
+    }
+
+    if (tool === "webfetch" && parameters.url) {
+        return parameters.url
+    }
+    if (tool === "websearch" && parameters.query) {
+        return `"${parameters.query}"`
+    }
+    if (tool === "codesearch" && parameters.query) {
+        return `"${parameters.query}"`
+    }
+
+    if (tool === "todowrite") {
+        return `${parameters.todos?.length || 0} todos`
+    }
+    if (tool === "todoread") {
+        return "read todo list"
+    }
+
+    if (tool === "task" && parameters.description) {
+        return parameters.description
+    }
+    if (tool === "batch") {
+        return `${parameters.tool_calls?.length || 0} parallel tools`
+    }
+
+    const paramStr = JSON.stringify(parameters)
+    if (paramStr === '{}' || paramStr === '[]' || paramStr === 'null') {
+        return ''
+    }
+    return paramStr.substring(0, 50)
+}

lib/janitor.ts

@@ -4,7 +4,8 @@ import type { PruningStrategy } from "./config"
 import { buildAnalysisPrompt } from "./prompt"
 import { selectModel, extractModelFromSession } from "./model-selector"
 import { estimateTokensBatch, formatTokenCount } from "./tokenizer"
-import { detectDuplicates, extractParameterKey } from "./deduplicator"
+import { detectDuplicates } from "./deduplicator"
+import { extractParameterKey } from "./display-utils"
 
 export interface SessionStats {
     totalToolsPruned: number
@@ -108,7 +109,7 @@ export class Janitor {
                             toolCallIds.push(normalizedId)
 
                             const cachedData = this.toolParametersCache.get(part.callID) || this.toolParametersCache.get(normalizedId)
-                            const parameters = cachedData?.parameters || part.parameters
+                            const parameters = cachedData?.parameters ?? part.state?.input ?? part.parameters
 
                             toolMetadata.set(normalizedId, {
                                 tool: part.tool,
@@ -668,6 +669,7 @@ export class Janitor {
             const missingTools = llmPrunedIds.filter(id => {
                 const normalizedId = id.toLowerCase()
                 const metadata = toolMetadata.get(normalizedId)
+                if (metadata?.tool === 'batch') return false
                 return !metadata || !foundToolNames.has(metadata.tool)
             })
 

package-lock.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@tarquinen/opencode-dcp",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "type": "module",
   "description": "OpenCode plugin that optimizes token usage by pruning obsolete tool outputs from conversation context",
   "main": "./dist/index.js",