refactor: consolidate api-formats into fetch-wrapper

- Move ToolTracker to fetch-wrapper/tool-tracker.ts
- Move prunable list logic to fetch-wrapper/prunable-list.ts
- Move session helpers into handler.ts
- Delete lib/api-formats/ directory
- Update all imports

Author: Tarquinen

index.ts

@@ -7,7 +7,7 @@ import { createPluginState } from "./lib/state"
 import { installFetchWrapper } from "./lib/fetch-wrapper"
 import { createPruningTool } from "./lib/pruning-tool"
 import { createEventHandler, createChatParamsHandler } from "./lib/hooks"
-import { createToolTracker } from "./lib/api-formats/synth-instruction"
+import { createToolTracker } from "./lib/fetch-wrapper/tool-tracker"
 import { loadPrompt } from "./lib/core/prompt"
 
 const plugin: Plugin = (async (ctx) => {

lib/api-formats/synth-instruction.ts

@@ -1,10 +1,74 @@
-import type { FetchHandlerContext, FetchHandlerResult, FormatDescriptor } from "./types"
-import {
-    PRUNED_CONTENT_MESSAGE,
-    getAllPrunedIds,
-    fetchSessionMessages
-} from "./types"
-import { buildPrunableToolsList, buildEndInjection } from "../api-formats/prunable-list"
+import type { FetchHandlerContext, FetchHandlerResult, FormatDescriptor, PrunedIdData } from "./types"
+import { type PluginState, ensureSessionRestored } from "../state"
+import type { Logger } from "../logger"
+import { buildPrunableToolsList, buildEndInjection } from "./prunable-list"
+
+// ============================================================================
+// Constants
+// ============================================================================
+
+/** The message used to replace pruned tool output content */
+const PRUNED_CONTENT_MESSAGE = '[Output removed to save context - information superseded or no longer needed]'
+
+// ============================================================================
+// Session Helpers
+// ============================================================================
+
+/**
+ * Get the most recent active (non-subagent) session.
+ */
+function getMostRecentActiveSession(allSessions: any): any | undefined {
+    const activeSessions = allSessions.data?.filter((s: any) => !s.parentID) || []
+    return activeSessions.length > 0 ? activeSessions[0] : undefined
+}
+
+/**
+ * Fetch session messages for logging purposes.
+ */
+async function fetchSessionMessages(
+    client: any,
+    sessionId: string
+): Promise<any[] | undefined> {
+    try {
+        const messagesResponse = await client.session.messages({
+            path: { id: sessionId },
+            query: { limit: 100 }
+        })
+        return Array.isArray(messagesResponse.data)
+            ? messagesResponse.data
+            : Array.isArray(messagesResponse) ? messagesResponse : undefined
+    } catch (e) {
+        return undefined
+    }
+}
+
+/**
+ * Get all pruned IDs from the current session.
+ */
+async function getAllPrunedIds(
+    client: any,
+    state: PluginState,
+    logger?: Logger
+): Promise<PrunedIdData> {
+    const allSessions = await client.session.list()
+    const allPrunedIds = new Set<string>()
+
+    const currentSession = getMostRecentActiveSession(allSessions)
+    if (currentSession) {
+        await ensureSessionRestored(state, currentSession.id, logger)
+        const prunedIds = state.prunedIds.get(currentSession.id) ?? []
+        prunedIds.forEach((id: string) => allPrunedIds.add(id.toLowerCase()))
+        
+        if (logger && prunedIds.length > 0) {
+            logger.debug("fetch", "Loaded pruned IDs for replacement", {
+                sessionId: currentSession.id,
+                prunedCount: prunedIds.length
+            })
+        }
+    }
+
+    return { allSessions, allPrunedIds }
+}
 
 /**
  * Generic format handler that processes any API format using a FormatDescriptor.

lib/fetch-wrapper/handler.ts

@@ -1,7 +1,7 @@
 import type { PluginState } from "../state"
 import type { Logger } from "../logger"
 import type { FetchHandlerContext, SynthPrompts } from "./types"
-import type { ToolTracker } from "../api-formats/synth-instruction"
+import type { ToolTracker } from "./types"
 import type { PluginConfig } from "../config"
 import { openaiChatFormat, openaiResponsesFormat, geminiFormat, bedrockFormat } from "./formats"
 import { handleFormat } from "./handler"

lib/fetch-wrapper/index.ts

@@ -4,10 +4,6 @@
  * Builds and injects a single message at the end of the conversation containing:
  * - Nudge instruction (when toolResultCount > nudge_freq)
  * - Prunable tools list
- * 
- * Note: The base synthetic instructions (signal_management, context_window_management,
- * context_pruning) are still appended to the last user message separately via
- * synth-instruction.ts - that behavior is unchanged.
  */
 
 import { extractParameterKey } from '../ui/display-utils'
@@ -106,54 +102,3 @@ export function buildEndInjection(
 
     return parts.join('\n\n')
 }
-
-// ============================================================================
-// OpenAI Chat / Anthropic Format
-// ============================================================================
-
-/**
- * Injects the prunable list (and optionally nudge) at the end of OpenAI/Anthropic messages.
- * Appends a new user message at the end.
- */
-export function injectPrunableList(
-    messages: any[],
-    injection: string
-): boolean {
-    if (!injection) return false
-    messages.push({ role: 'user', content: injection })
-    return true
-}
-
-// ============================================================================
-// Google/Gemini Format
-// ============================================================================
-
-/**
- * Injects the prunable list (and optionally nudge) at the end of Gemini contents.
- * Appends a new user content at the end.
- */
-export function injectPrunableListGemini(
-    contents: any[],
-    injection: string
-): boolean {
-    if (!injection) return false
-    contents.push({ role: 'user', parts: [{ text: injection }] })
-    return true
-}
-
-// ============================================================================
-// OpenAI Responses API Format
-// ============================================================================
-
-/**
- * Injects the prunable list (and optionally nudge) at the end of OpenAI Responses API input.
- * Appends a new user message at the end.
- */
-export function injectPrunableListResponses(
-    input: any[],
-    injection: string
-): boolean {
-    if (!injection) return false
-    input.push({ type: 'message', role: 'user', content: injection })
-    return true
-}

lib/api-formats/prunable-list.ts lib/fetch-wrapper/prunable-list.tslib/api-formats/prunable-list.ts renamed to lib/fetch-wrapper/prunable-list.ts

@@ -0,0 +1,18 @@
+/**
+ * Tool tracker for tracking tool results and managing nudge frequency.
+ */
+
+export interface ToolTracker {
+    seenToolResultIds: Set<string>
+    toolResultCount: number  // Tools since last prune
+    skipNextIdle: boolean
+    getToolName?: (callId: string) => string | undefined
+}
+
+export function createToolTracker(): ToolTracker {
+    return { seenToolResultIds: new Set(), toolResultCount: 0, skipNextIdle: false }
+}
+
+export function resetToolTrackerCount(tracker: ToolTracker): void {
+    tracker.toolResultCount = 0
+}