refactor: normalize helper function names in format files

Tarquinen · Tarquinen · commit 3bd8caf10278 · 2025-12-04T22:24:05.000-05:00
Remove format-specific suffixes (Gemini, Responses) from private
helper functions since they're now scoped to their own files.
diff --git a/lib/fetch-wrapper/formats/bedrock.ts b/lib/fetch-wrapper/formats/bedrock.ts
@@ -1,10 +1,81 @@
-import type { FormatDescriptor, ToolOutput } from "../types"
+import type { FormatDescriptor, ToolOutput, ToolTracker } from "../types"
 import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
-import type { ToolTracker } from "../../api-formats/synth-instruction"
 import { cacheToolParametersFromMessages } from "../../state/tool-cache"
-import { injectSynth, trackNewToolResults } from "../../api-formats/synth-instruction"
-import { injectPrunableList } from "../../api-formats/prunable-list"
+
+// ============================================================================
+// Format-specific injection helpers (reuses OpenAI Chat logic)
+// ============================================================================
+
+function isNudgeMessage(msg: any, nudgeText: string): boolean {
+    if (typeof msg.content === 'string') {
+        return msg.content === nudgeText
+    }
+    return false
+}
+
+function injectSynth(messages: any[], instruction: string, nudgeText: string): boolean {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const msg = messages[i]
+        if (msg.role === 'user') {
+            // Skip nudge messages - find real user message
+            if (isNudgeMessage(msg, nudgeText)) continue
+            
+            if (typeof msg.content === 'string') {
+                if (msg.content.includes(instruction)) return false
+                msg.content = msg.content + '\n\n' + instruction
+            } else if (Array.isArray(msg.content)) {
+                const alreadyInjected = msg.content.some(
+                    (part: any) => part?.type === 'text' && typeof part.text === 'string' && part.text.includes(instruction)
+                )
+                if (alreadyInjected) return false
+                msg.content.push({ type: 'text', text: instruction })
+            }
+            return true
+        }
+    }
+    return false
+}
+
+function trackNewToolResults(messages: any[], tracker: ToolTracker, protectedTools: Set<string>): number {
+    let newCount = 0
+    for (const m of messages) {
+        if (m.role === 'tool' && m.tool_call_id) {
+            if (!tracker.seenToolResultIds.has(m.tool_call_id)) {
+                tracker.seenToolResultIds.add(m.tool_call_id)
+                const toolName = tracker.getToolName?.(m.tool_call_id)
+                if (!toolName || !protectedTools.has(toolName)) {
+                    tracker.toolResultCount++
+                    newCount++
+                }
+            }
+        } else if (m.role === 'user' && Array.isArray(m.content)) {
+            for (const part of m.content) {
+                if (part.type === 'tool_result' && part.tool_use_id) {
+                    if (!tracker.seenToolResultIds.has(part.tool_use_id)) {
+                        tracker.seenToolResultIds.add(part.tool_use_id)
+                        const toolName = tracker.getToolName?.(part.tool_use_id)
+                        if (!toolName || !protectedTools.has(toolName)) {
+                            tracker.toolResultCount++
+                            newCount++
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return newCount
+}
+
+function injectPrunableList(messages: any[], injection: string): boolean {
+    if (!injection) return false
+    messages.push({ role: 'user', content: injection })
+    return true
+}
+
+// ============================================================================
+// Format Descriptor
+// ============================================================================
 
 /**
  * Format descriptor for AWS Bedrock Converse API.
diff --git a/lib/fetch-wrapper/formats/gemini.ts b/lib/fetch-wrapper/formats/gemini.ts
@@ -1,10 +1,69 @@
-import type { FormatDescriptor, ToolOutput } from "../types"
-import { PRUNED_CONTENT_MESSAGE } from "../types"
+import type { FormatDescriptor, ToolOutput, ToolTracker } from "../types"
 import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
-import type { ToolTracker } from "../../api-formats/synth-instruction"
-import { injectSynthGemini, trackNewToolResultsGemini } from "../../api-formats/synth-instruction"
-import { injectPrunableListGemini } from "../../api-formats/prunable-list"
+
+// ============================================================================
+// Format-specific injection helpers
+// ============================================================================
+
+function isNudgeContent(content: any, nudgeText: string): boolean {
+    if (Array.isArray(content.parts) && content.parts.length === 1) {
+        const part = content.parts[0]
+        return part?.text === nudgeText
+    }
+    return false
+}
+
+function injectSynth(contents: any[], instruction: string, nudgeText: string): boolean {
+    for (let i = contents.length - 1; i >= 0; i--) {
+        const content = contents[i]
+        if (content.role === 'user' && Array.isArray(content.parts)) {
+            // Skip nudge messages - find real user message
+            if (isNudgeContent(content, nudgeText)) continue
+            
+            const alreadyInjected = content.parts.some(
+                (part: any) => part?.text && typeof part.text === 'string' && part.text.includes(instruction)
+            )
+            if (alreadyInjected) return false
+            content.parts.push({ text: instruction })
+            return true
+        }
+    }
+    return false
+}
+
+function trackNewToolResults(contents: any[], tracker: ToolTracker, protectedTools: Set<string>): number {
+    let newCount = 0
+    let positionCounter = 0
+    for (const content of contents) {
+        if (!Array.isArray(content.parts)) continue
+        for (const part of content.parts) {
+            if (part.functionResponse) {
+                const positionId = `gemini_pos_${positionCounter}`
+                positionCounter++
+                if (!tracker.seenToolResultIds.has(positionId)) {
+                    tracker.seenToolResultIds.add(positionId)
+                    const toolName = part.functionResponse.name
+                    if (!toolName || !protectedTools.has(toolName)) {
+                        tracker.toolResultCount++
+                        newCount++
+                    }
+                }
+            }
+        }
+    }
+    return newCount
+}
+
+function injectPrunableList(contents: any[], injection: string): boolean {
+    if (!injection) return false
+    contents.push({ role: 'user', parts: [{ text: injection }] })
+    return true
+}
+
+// ============================================================================
+// Format Descriptor
+// ============================================================================
 
 /**
  * Format descriptor for Google/Gemini API.
@@ -36,15 +95,15 @@ export const geminiFormat: FormatDescriptor = {
     },
 
     injectSynth(data: any[], instruction: string, nudgeText: string): boolean {
-        return injectSynthGemini(data, instruction, nudgeText)
+        return injectSynth(data, instruction, nudgeText)
     },
 
     trackNewToolResults(data: any[], tracker: ToolTracker, protectedTools: Set<string>): number {
-        return trackNewToolResultsGemini(data, tracker, protectedTools)
+        return trackNewToolResults(data, tracker, protectedTools)
     },
 
     injectPrunableList(data: any[], injection: string): boolean {
-        return injectPrunableListGemini(data, injection)
+        return injectPrunableList(data, injection)
     },
 
     extractToolOutputs(data: any[], state: PluginState): ToolOutput[] {
diff --git a/lib/fetch-wrapper/formats/openai-chat.ts b/lib/fetch-wrapper/formats/openai-chat.ts
@@ -1,11 +1,81 @@
-import type { FormatDescriptor, ToolOutput } from "../types"
-import { PRUNED_CONTENT_MESSAGE } from "../types"
+import type { FormatDescriptor, ToolOutput, ToolTracker } from "../types"
 import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
-import type { ToolTracker } from "../../api-formats/synth-instruction"
 import { cacheToolParametersFromMessages } from "../../state/tool-cache"
-import { injectSynth, trackNewToolResults } from "../../api-formats/synth-instruction"
-import { injectPrunableList } from "../../api-formats/prunable-list"
+
+// ============================================================================
+// Format-specific injection helpers
+// ============================================================================
+
+function isNudgeMessage(msg: any, nudgeText: string): boolean {
+    if (typeof msg.content === 'string') {
+        return msg.content === nudgeText
+    }
+    return false
+}
+
+function injectSynth(messages: any[], instruction: string, nudgeText: string): boolean {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const msg = messages[i]
+        if (msg.role === 'user') {
+            // Skip nudge messages - find real user message
+            if (isNudgeMessage(msg, nudgeText)) continue
+            
+            if (typeof msg.content === 'string') {
+                if (msg.content.includes(instruction)) return false
+                msg.content = msg.content + '\n\n' + instruction
+            } else if (Array.isArray(msg.content)) {
+                const alreadyInjected = msg.content.some(
+                    (part: any) => part?.type === 'text' && typeof part.text === 'string' && part.text.includes(instruction)
+                )
+                if (alreadyInjected) return false
+                msg.content.push({ type: 'text', text: instruction })
+            }
+            return true
+        }
+    }
+    return false
+}
+
+function trackNewToolResults(messages: any[], tracker: ToolTracker, protectedTools: Set<string>): number {
+    let newCount = 0
+    for (const m of messages) {
+        if (m.role === 'tool' && m.tool_call_id) {
+            if (!tracker.seenToolResultIds.has(m.tool_call_id)) {
+                tracker.seenToolResultIds.add(m.tool_call_id)
+                const toolName = tracker.getToolName?.(m.tool_call_id)
+                if (!toolName || !protectedTools.has(toolName)) {
+                    tracker.toolResultCount++
+                    newCount++
+                }
+            }
+        } else if (m.role === 'user' && Array.isArray(m.content)) {
+            for (const part of m.content) {
+                if (part.type === 'tool_result' && part.tool_use_id) {
+                    if (!tracker.seenToolResultIds.has(part.tool_use_id)) {
+                        tracker.seenToolResultIds.add(part.tool_use_id)
+                        const toolName = tracker.getToolName?.(part.tool_use_id)
+                        if (!toolName || !protectedTools.has(toolName)) {
+                            tracker.toolResultCount++
+                            newCount++
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return newCount
+}
+
+function injectPrunableList(messages: any[], injection: string): boolean {
+    if (!injection) return false
+    messages.push({ role: 'user', content: injection })
+    return true
+}
+
+// ============================================================================
+// Format Descriptor
+// ============================================================================
 
 /**
  * Format descriptor for OpenAI Chat Completions and Anthropic APIs.
diff --git a/lib/fetch-wrapper/formats/openai-responses.ts b/lib/fetch-wrapper/formats/openai-responses.ts
@@ -1,11 +1,68 @@
-import type { FormatDescriptor, ToolOutput } from "../types"
-import { PRUNED_CONTENT_MESSAGE } from "../types"
+import type { FormatDescriptor, ToolOutput, ToolTracker } from "../types"
 import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
-import type { ToolTracker } from "../../api-formats/synth-instruction"
 import { cacheToolParametersFromInput } from "../../state/tool-cache"
-import { injectSynthResponses, trackNewToolResultsResponses } from "../../api-formats/synth-instruction"
-import { injectPrunableListResponses } from "../../api-formats/prunable-list"
+
+// ============================================================================
+// Format-specific injection helpers
+// ============================================================================
+
+function isNudgeItem(item: any, nudgeText: string): boolean {
+    if (typeof item.content === 'string') {
+        return item.content === nudgeText
+    }
+    return false
+}
+
+function injectSynth(input: any[], instruction: string, nudgeText: string): boolean {
+    for (let i = input.length - 1; i >= 0; i--) {
+        const item = input[i]
+        if (item.type === 'message' && item.role === 'user') {
+            // Skip nudge messages - find real user message
+            if (isNudgeItem(item, nudgeText)) continue
+            
+            if (typeof item.content === 'string') {
+                if (item.content.includes(instruction)) return false
+                item.content = item.content + '\n\n' + instruction
+            } else if (Array.isArray(item.content)) {
+                const alreadyInjected = item.content.some(
+                    (part: any) => part?.type === 'input_text' && typeof part.text === 'string' && part.text.includes(instruction)
+                )
+                if (alreadyInjected) return false
+                item.content.push({ type: 'input_text', text: instruction })
+            }
+            return true
+        }
+    }
+    return false
+}
+
+function trackNewToolResults(input: any[], tracker: ToolTracker, protectedTools: Set<string>): number {
+    let newCount = 0
+    for (const item of input) {
+        if (item.type === 'function_call_output' && item.call_id) {
+            if (!tracker.seenToolResultIds.has(item.call_id)) {
+                tracker.seenToolResultIds.add(item.call_id)
+                const toolName = tracker.getToolName?.(item.call_id)
+                if (!toolName || !protectedTools.has(toolName)) {
+                    tracker.toolResultCount++
+                    newCount++
+                }
+            }
+        }
+    }
+    return newCount
+}
+
+function injectPrunableList(input: any[], injection: string): boolean {
+    if (!injection) return false
+    input.push({ type: 'message', role: 'user', content: injection })
+    return true
+}
+
+// ============================================================================
+// Format Descriptor
+// ============================================================================
 
 /**
  * Format descriptor for OpenAI Responses API (GPT-5 models via sdk.responses()).
@@ -31,15 +88,15 @@ export const openaiResponsesFormat: FormatDescriptor = {
     },
 
     injectSynth(data: any[], instruction: string, nudgeText: string): boolean {
-        return injectSynthResponses(data, instruction, nudgeText)
+        return injectSynth(data, instruction, nudgeText)
     },
 
     trackNewToolResults(data: any[], tracker: ToolTracker, protectedTools: Set<string>): number {
-        return trackNewToolResultsResponses(data, tracker, protectedTools)
+        return trackNewToolResults(data, tracker, protectedTools)
     },
 
     injectPrunableList(data: any[], injection: string): boolean {
-        return injectPrunableListResponses(data, injection)
+        return injectPrunableList(data, injection)
     },
 
     extractToolOutputs(data: any[], state: PluginState): ToolOutput[] {
