semantics changes

Author: spoons-and-mirrors

index.ts

@@ -5,7 +5,7 @@ import { Logger } from "./lib/logger"
 import { Janitor, type SessionStats } from "./lib/janitor"
 import { checkForUpdates } from "./lib/version-checker"
 import { loadPrompt } from "./lib/prompt"
-import { injectSynthInstruction, createToolResultTracker, maybeInjectToolResultNudge } from "./lib/synth-instruction"
+import { injectSynth, createToolTracker, injectNudge } from "./lib/synth-instruction"
 
 async function isSubagentSession(client: any, sessionID: string): Promise<boolean> {
     try {
@@ -16,9 +16,9 @@ async function isSubagentSession(client: any, sessionID: string): Promise<boolea
     }
 }
 
-const TOOL_SYNTH_INSTRUCTION = loadPrompt("synthetic")
-const TOOL_CONTEXT_PRUNING_DESCRIPTION = loadPrompt("context_pruning")
-const TOOL_TOOL_PART_NUDGE = loadPrompt("tool-result-nudge")
+const SYNTH_INSTRUCTION = loadPrompt("synthetic")
+const TOOL_INSTRUCTION = loadPrompt("context_pruning")
+const NUDGE_INSTRUCTION = loadPrompt("nudge")
 
 const plugin: Plugin = (async (ctx) => {
     const { config, migrations } = getConfig(ctx)
@@ -37,7 +37,7 @@ const plugin: Plugin = (async (ctx) => {
     const toolParametersCache = new Map<string, any>()
     const modelCache = new Map<string, { providerID: string; modelID: string }>()
     const janitor = new Janitor(ctx.client, prunedIdsState, statsState, logger, toolParametersCache, config.protectedTools, modelCache, config.model, config.showModelErrorToasts, config.strictModelSelection, config.pruning_summary, ctx.directory)
-    const toolResultTracker = createToolResultTracker()
+    const toolTracker = createToolTracker()
 
     const cacheToolParameters = (messages: any[]) => {
         for (const message of messages) {
@@ -79,17 +79,17 @@ const plugin: Plugin = (async (ctx) => {
 
                     // Inject periodic nudge every 5 tool results
                     if (config.strategies.onTool.length > 0) {
-                        if (maybeInjectToolResultNudge(body.messages, toolResultTracker, TOOL_TOOL_PART_NUDGE)) {
+                        if (injectNudge(body.messages, toolTracker, NUDGE_INSTRUCTION)) {
                             logger.debug("fetch", "Injected tool-result nudge", {
-                                toolResultCount: toolResultTracker.toolResultCount
+                                toolResultCount: toolTracker.toolResultCount
                             })
                             modified = true
                         }
                     }
 
                     // Inject synthInstruction for the context_pruning tool
                     if (config.strategies.onTool.length > 0) {
-                        if (injectSynthInstruction(body.messages, TOOL_SYNTH_INSTRUCTION)) {
+                        if (injectSynth(body.messages, SYNTH_INSTRUCTION)) {
                             logger.debug("fetch", "Injected synthInstruction")
                             modified = true
                         }
@@ -263,7 +263,7 @@ const plugin: Plugin = (async (ctx) => {
 
         tool: config.strategies.onTool.length > 0 ? {
             context_pruning: tool({
-                description: TOOL_CONTEXT_PRUNING_DESCRIPTION,
+                description: TOOL_INSTRUCTION,
                 args: {
                     reason: tool.schema.string().optional().describe(
                         "Brief reason for triggering pruning (e.g., 'task complete', 'switching focus')"

lib/prompts/tool-result-nudge.txt lib/prompts/nudge.txtlib/prompts/tool-result-nudge.txt renamed to lib/prompts/nudge.txt

@@ -1,16 +1,16 @@
-export interface ToolResultTracker {
+export interface ToolTracker {
     seenToolResultIds: Set<string>
     toolResultCount: number
 }
 
-export function createToolResultTracker(): ToolResultTracker {
+export function createToolTracker(): ToolTracker {
     return {
         seenToolResultIds: new Set(),
         toolResultCount: 0
     }
 }
 
-function countNewToolResults(messages: any[], tracker: ToolResultTracker): number {
+function countToolResults(messages: any[], tracker: ToolTracker): number {
     let newCount = 0
 
     for (const m of messages) {
@@ -41,21 +41,21 @@ function countNewToolResults(messages: any[], tracker: ToolResultTracker): numbe
  * Counts new tool results and injects nudge instruction every 5th tool result.
  * Returns true if injection happened.
  */
-export function maybeInjectToolResultNudge(
+export function injectNudge(
     messages: any[],
-    tracker: ToolResultTracker,
+    tracker: ToolTracker,
     nudgeText: string
 ): boolean {
     const prevCount = tracker.toolResultCount
-    const newCount = countNewToolResults(messages, tracker)
+    const newCount = countToolResults(messages, tracker)
 
     if (newCount > 0) {
         // Check if we crossed a multiple of 5
         const prevBucket = Math.floor(prevCount / 5)
         const newBucket = Math.floor(tracker.toolResultCount / 5)
         if (newBucket > prevBucket) {
             // Inject at the END of messages so it's in immediate context
-            return injectNudgeAtEnd(messages, nudgeText)
+            return appendNudge(messages, nudgeText)
         }
     }
     return false
@@ -82,10 +82,10 @@ export function isIgnoredUserMessage(msg: any): boolean {
 }
 
 /**
- * Injects a nudge message at the END of the messages array as a new user message.
+ * Appends a nudge message at the END of the messages array as a new user message.
  * This ensures it's in the model's immediate context, not buried in old messages.
  */
-export function injectNudgeAtEnd(messages: any[], nudgeText: string): boolean {
+function appendNudge(messages: any[], nudgeText: string): boolean {
     messages.push({
         role: 'user',
         content: nudgeText,
@@ -94,7 +94,7 @@ export function injectNudgeAtEnd(messages: any[], nudgeText: string): boolean {
     return true
 }
 
-export function injectSynthInstruction(messages: any[], instruction: string): boolean {
+export function injectSynth(messages: any[], instruction: string): boolean {
     // Find the last user message that is not ignored
     for (let i = messages.length - 1; i >= 0; i--) {
         const msg = messages[i]