on-idle re-implemented

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 { createPruneTool } from "./lib/strategies/prune-tool"
+import { createPruneTool } from "./lib/strategies"
 import { createChatMessageTransformHandler, createEventHandler } from "./lib/hooks"
 
 const plugin: Plugin = (async (ctx) => {
@@ -54,7 +54,7 @@ const plugin: Plugin = (async (ctx) => {
                 logger.info("Added 'prune' to experimental.primary_tools via config mutation")
             }
         },
-        event: createEventHandler(ctx.client, config, state, logger),
+        event: createEventHandler(ctx.client, config, state, logger, ctx.directory),
     }
 }) satisfies Plugin
 

lib/hooks.ts

@@ -5,6 +5,7 @@ import { syncToolCache } from "./state/tool-cache"
 import { deduplicate } from "./strategies"
 import { prune, insertPruneToolContext } from "./messages"
 import { checkSession } from "./state"
+import { runOnIdle } from "./strategies/on-idle"
 
 
 export function createChatMessageTransformHandler(
@@ -36,7 +37,8 @@ export function createEventHandler(
     client: any,
     config: PluginConfig,
     state: SessionState,
-    logger: Logger
+    logger: Logger,
+    workingDirectory?: string
 ) {
     return async (
         { event }: { event: any }
@@ -49,6 +51,22 @@ export function createEventHandler(
             if (!config.strategies.onIdle.enabled) {
                 return
             }
+            if (state.lastToolPrune) {
+                logger.info("Skipping OnIdle pruning - last tool was prune")
+                return
+            }
+
+            try {
+                await runOnIdle(
+                    client,
+                    state,
+                    logger,
+                    config,
+                    workingDirectory
+                )
+            } catch (err: any) {
+                logger.error("OnIdle pruning failed", { error: err.message })
+            }
         }
     }
 }

lib/messages/prune.ts

@@ -40,6 +40,10 @@ export const insertPruneToolContext = (
     logger: Logger,
     messages: WithParts[]
 ): void => {
+    if (!config.strategies.pruneTool.enabled) {
+        return
+    }
+
     const lastUserMessage = getLastUserMessage(messages)
     if (!lastUserMessage || lastUserMessage.info.role !== 'user') {
         return
@@ -48,7 +52,7 @@ export const insertPruneToolContext = (
     const prunableToolsList = buildPrunableToolsList(state, config, logger, messages)
 
     let nudgeString = ""
-    if (config.strategies.pruneTool.nudge.enabled && state.nudgeCounter >= config.strategies.pruneTool.nudge.frequency) {
+    if (state.nudgeCounter >= config.strategies.pruneTool.nudge.frequency) {
         logger.info("Inserting prune nudge message")
         nudgeString = "\n" + NUDGE_STRING
     }

lib/strategies/index.ts

@@ -1,2 +1,3 @@
 export { deduplicate } from "./deduplication"
-
+export { runOnIdle } from "./on-idle"
+export { createPruneTool } from "./prune-tool"