refactor: update all consumers to use new config paths

Author: Tarquinen

index.ts

@@ -27,8 +27,8 @@ const plugin: Plugin = (async (ctx) => {
 
     return {
         "experimental.chat.system.transform": async (_input: unknown, output: { system: string[] }) => {
-            const discardEnabled = config.strategies.discardTool.enabled
-            const extractEnabled = config.strategies.extractTool.enabled
+            const discardEnabled = config.tools.discard.enabled
+            const extractEnabled = config.tools.extract.enabled
 
             let promptName: string
             if (discardEnabled && extractEnabled) {
@@ -51,7 +51,7 @@ const plugin: Plugin = (async (ctx) => {
             config
         ),
         tool: {
-            ...(config.strategies.discardTool.enabled && {
+            ...(config.tools.discard.enabled && {
                 discard: createDiscardTool({
                     client: ctx.client,
                     state,
@@ -60,7 +60,7 @@ const plugin: Plugin = (async (ctx) => {
                     workingDirectory: ctx.directory
                 }),
             }),
-            ...(config.strategies.extractTool.enabled && {
+            ...(config.tools.extract.enabled && {
                 extract: createExtractTool({
                     client: ctx.client,
                     state,
@@ -74,8 +74,8 @@ const plugin: Plugin = (async (ctx) => {
             // Add enabled tools to primary_tools by mutating the opencode config
             // This works because config is cached and passed by reference
             const toolsToAdd: string[] = []
-            if (config.strategies.discardTool.enabled) toolsToAdd.push("discard")
-            if (config.strategies.extractTool.enabled) toolsToAdd.push("extract")
+            if (config.tools.discard.enabled) toolsToAdd.push("discard")
+            if (config.tools.extract.enabled) toolsToAdd.push("extract")
 
             if (toolsToAdd.length > 0) {
                 const existingPrimaryTools = opencodeConfig.experimental?.primary_tools ?? []

lib/messages/prune.ts

@@ -9,8 +9,8 @@ import { UserMessage } from "@opencode-ai/sdk"
 const PRUNED_TOOL_INPUT_REPLACEMENT = '[Input removed to save context]'
 const PRUNED_TOOL_OUTPUT_REPLACEMENT = '[Output removed to save context - information superseded or no longer needed]'
 const getNudgeString = (config: PluginConfig): string => {
-    const discardEnabled = config.strategies.discardTool.enabled
-    const extractEnabled = config.strategies.extractTool.enabled
+    const discardEnabled = config.tools.discard.enabled
+    const extractEnabled = config.tools.extract.enabled
 
     if (discardEnabled && extractEnabled) {
         return loadPrompt("nudge/nudge-both")
@@ -28,8 +28,8 @@ ${content}
 </prunable-tools>`
 
 const getCooldownMessage = (config: PluginConfig): string => {
-    const discardEnabled = config.strategies.discardTool.enabled
-    const extractEnabled = config.strategies.extractTool.enabled
+    const discardEnabled = config.tools.discard.enabled
+    const extractEnabled = config.tools.extract.enabled
 
     let toolName: string
     if (discardEnabled && extractEnabled) {
@@ -61,10 +61,7 @@ const buildPrunableToolsList = (
         if (state.prune.toolIds.includes(toolCallId)) {
             return
         }
-        const allProtectedTools = [
-            ...config.strategies.discardTool.protectedTools,
-            ...config.strategies.extractTool.protectedTools
-        ]
+        const allProtectedTools = config.tools.settings.protectedTools
         if (allProtectedTools.includes(toolParameterEntry.tool)) {
             return
         }
@@ -92,7 +89,7 @@ export const insertPruneToolContext = (
     logger: Logger,
     messages: WithParts[]
 ): void => {
-    if (!config.strategies.discardTool.enabled && !config.strategies.extractTool.enabled) {
+    if (!config.tools.discard.enabled && !config.tools.extract.enabled) {
         return
     }
 
@@ -115,13 +112,7 @@ export const insertPruneToolContext = (
         logger.debug("prunable-tools: \n" + prunableToolsList)
 
         let nudgeString = ""
-        // TODO: Using Math.min() means the lower frequency dominates when both tools are enabled.
-        // Consider using separate counters for each tool's nudge, or documenting this behavior.
-        const nudgeFrequency = Math.min(
-            config.strategies.discardTool.nudge.frequency,
-            config.strategies.extractTool.nudge.frequency
-        )
-        if (state.nudgeCounter >= nudgeFrequency) {
+        if (config.tools.settings.nudgeEnabled && state.nudgeCounter >= config.tools.settings.nudgeFrequency) {
             logger.info("Inserting prune nudge message")
             nudgeString = "\n" + getNudgeString(config)
         }

lib/state/tool-cache.ts

@@ -35,22 +35,15 @@ export async function syncToolCache(
                     continue
                 }
 
-                const turnProtectionEnabled = config.strategies.discardTool.turnProtection.enabled || 
-                    config.strategies.extractTool.turnProtection.enabled
-                const turnProtectionTurns = Math.max(
-                    config.strategies.discardTool.turnProtection.turns,
-                    config.strategies.extractTool.turnProtection.turns
-                )
+                const turnProtectionEnabled = config.turnProtection.enabled
+                const turnProtectionTurns = config.turnProtection.turns
                 const isProtectedByTurn = turnProtectionEnabled &&
                     turnProtectionTurns > 0 &&
                     (state.currentTurn - turnCounter) < turnProtectionTurns
 
                 state.lastToolPrune = part.tool === "discard" || part.tool === "extract"
 
-                const allProtectedTools = [
-                    ...config.strategies.discardTool.protectedTools,
-                    ...config.strategies.extractTool.protectedTools
-                ]
+                const allProtectedTools = config.tools.settings.protectedTools
 
                 if (part.tool === "discard" || part.tool === "extract") {
                     state.nudgeCounter = 0

lib/strategies/tools.ts

@@ -76,10 +76,7 @@ async function executePruneOperation(
             logger.debug("Rejecting prune request - ID not in cache (turn-protected or hallucinated)", { index, id })
             return "Invalid IDs provided. Only use numeric IDs from the <prunable-tools> list."
         }
-        const allProtectedTools = [
-            ...config.strategies.discardTool.protectedTools,
-            ...config.strategies.extractTool.protectedTools
-        ]
+        const allProtectedTools = config.tools.settings.protectedTools
         if (allProtectedTools.includes(metadata.tool)) {
             logger.debug("Rejecting prune request - protected tool", { index, id, tool: metadata.tool })
             return "Invalid IDs provided. Only use numeric IDs from the <prunable-tools> list."
@@ -114,7 +111,7 @@ async function executePruneOperation(
         workingDirectory
     )
 
-    if (distillation && config.strategies.extractTool.showDistillation) {
+    if (distillation && config.tools.extract.showDistillation) {
         await sendDistillationNotification(
             client,
             logger,

lib/ui/notification.ts

@@ -70,11 +70,11 @@ export async function sendUnifiedNotification(
         return false
     }
 
-    if (config.pruningSummary === 'off') {
+    if (config.pruneNotification === 'off') {
         return false
     }
 
-    const message = config.pruningSummary === 'minimal'
+    const message = config.pruneNotification === 'minimal'
         ? buildMinimalMessage(state, reason)
         : buildDetailedMessage(state, reason, pruneToolIds, toolMetadata, workingDirectory)