refactor: filter protected tools at cache time

- Skip caching protected tools in syncToolParametersFromOpenCode()
- Use missing toolName as protected signal in handler replacement loop
- Remove totalCached from log output (internal detail)

Author: Tarquinen

lib/fetch-wrapper/handler.ts

@@ -67,9 +67,11 @@ export async function handleFormat(
     let modified = false
 
     // Sync tool parameters from OpenCode's session API (single source of truth)
+    // Also tracks new tool results for nudge injection
     const sessionId = ctx.state.lastSeenSessionId
+    const protectedSet = new Set(ctx.config.protectedTools)
     if (sessionId) {
-        await syncToolParametersFromOpenCode(ctx.client, sessionId, ctx.state, ctx.logger)
+        await syncToolParametersFromOpenCode(ctx.client, sessionId, ctx.state, ctx.toolTracker, protectedSet, ctx.logger)
     }
 
     if (ctx.config.strategies.onTool.length > 0) {
@@ -91,8 +93,6 @@ export async function handleFormat(
             )
 
             if (prunableList) {
-                const protectedSet = new Set(ctx.config.protectedTools)
-                format.trackNewToolResults(data, ctx.toolTracker, protectedSet)
                 const includeNudge = ctx.config.nudge_freq > 0 && ctx.toolTracker.toolResultCount > ctx.config.nudge_freq
 
                 const endInjection = buildEndInjection(prunableList, includeNudge)
@@ -119,14 +119,12 @@ export async function handleFormat(
     }
 
     const toolOutputs = format.extractToolOutputs(data, ctx.state)
-    const protectedToolsLower = new Set(ctx.config.protectedTools.map(t => t.toLowerCase()))
     let replacedCount = 0
     let prunableCount = 0
 
     for (const output of toolOutputs) {
-        if (output.toolName && protectedToolsLower.has(output.toolName.toLowerCase())) {
-            continue
-        }
+        // Skip tools not in cache (protected tools are excluded from cache)
+        if (!output.toolName) continue
         prunableCount++
 
         if (allPrunedIds.has(output.id)) {

lib/state/tool-cache.ts

@@ -1,5 +1,6 @@
 import type { PluginState, ToolStatus } from "./index"
 import type { Logger } from "../logger"
+import type { ToolTracker } from "../fetch-wrapper/tool-tracker"
 
 /** Maximum number of entries to keep in the tool parameters cache */
 const MAX_TOOL_CACHE_SIZE = 500
@@ -8,11 +9,16 @@ const MAX_TOOL_CACHE_SIZE = 500
  * Sync tool parameters from OpenCode's session.messages() API.
  * This is the single source of truth for tool parameters, replacing
  * format-specific parsing from LLM API requests.
+ * 
+ * Also tracks new tool results for nudge injection, consolidating
+ * what was previously done via format-specific trackNewToolResults().
  */
 export async function syncToolParametersFromOpenCode(
     client: any,
     sessionId: string,
     state: PluginState,
+    tracker?: ToolTracker,
+    protectedTools?: Set<string>,
     logger?: Logger
 ): Promise<void> {
     try {
@@ -36,9 +42,21 @@ export async function syncToolParametersFromOpenCode(
 
                 const id = part.callID.toLowerCase()
 
-                // Skip if already cached (optimization)
+                // Track tool results for nudge injection (replaces format-specific trackNewToolResults)
+                if (tracker && !tracker.seenToolResultIds.has(id)) {
+                    tracker.seenToolResultIds.add(id)
+                    // Only count non-protected tools toward nudge threshold
+                    if (!part.tool || !protectedTools?.has(part.tool)) {
+                        tracker.toolResultCount++
+                    }
+                }
+
+                // Skip if already cached (optimization for parameter caching only)
                 if (state.toolParameters.has(id)) continue
 
+                // Skip protected tools - they shouldn't be in the cache at all
+                if (part.tool && protectedTools?.has(part.tool)) continue
+
                 const status = part.state?.status as ToolStatus | undefined
                 state.toolParameters.set(id, {
                     tool: part.tool,
@@ -55,8 +73,7 @@ export async function syncToolParametersFromOpenCode(
         if (logger && synced > 0) {
             logger.debug("tool-cache", "Synced tool parameters from OpenCode", {
                 sessionId: sessionId.slice(0, 8),
-                synced,
-                totalCached: state.toolParameters.size
+                synced
             })
         }
     } catch (error) {