chore: remove verbose comments and section separators

Tarquinen · Tarquinen · commit 1da911d91b28 · 2025-12-04T22:39:40.000-05:00
diff --git a/lib/fetch-wrapper/formats/bedrock.ts b/lib/fetch-wrapper/formats/bedrock.ts
@@ -3,10 +3,6 @@ import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
 import { cacheToolParametersFromMessages } from "../../state/tool-cache"
 
-// ============================================================================
-// Format-specific injection helpers (reuses OpenAI Chat logic)
-// ============================================================================
-
 function isNudgeMessage(msg: any, nudgeText: string): boolean {
     if (typeof msg.content === 'string') {
         return msg.content === nudgeText
@@ -18,7 +14,6 @@ function injectSynth(messages: any[], instruction: string, nudgeText: string): b
     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') {
@@ -73,27 +68,15 @@ function injectPrunableList(messages: any[], injection: string): boolean {
     return true
 }
 
-// ============================================================================
-// Format Descriptor
-// ============================================================================
-
 /**
- * Format descriptor for AWS Bedrock Converse API.
- * 
- * Bedrock format characteristics:
- * - Top-level `system` array for system messages
- * - `messages` array with only 'user' and 'assistant' roles
- * - `inferenceConfig` for model parameters (maxTokens, temperature, etc.)
- * - Tool calls: `toolUse` blocks in assistant content with `toolUseId`
- * - Tool results: `toolResult` blocks in user content with `toolUseId`
- * - Cache points: `cachePoint` blocks that should be preserved
+ * Bedrock uses top-level `system` array + `inferenceConfig` (distinguishes from OpenAI/Anthropic).
+ * Tool calls: `toolUse` blocks in assistant content with `toolUseId`
+ * Tool results: `toolResult` blocks in user content with `toolUseId`
  */
 export const bedrockFormat: FormatDescriptor = {
     name: 'bedrock',
 
     detect(body: any): boolean {
-        // Bedrock has a top-level system array AND inferenceConfig (not model params in messages)
-        // This distinguishes it from OpenAI/Anthropic which put system in messages
         return (
             Array.isArray(body.system) &&
             body.inferenceConfig !== undefined &&
@@ -106,8 +89,7 @@ export const bedrockFormat: FormatDescriptor = {
     },
 
     cacheToolParameters(data: any[], state: PluginState, logger?: Logger): void {
-        // Bedrock stores tool calls in assistant message content as toolUse blocks
-        // We need to extract toolUseId and tool name for later correlation
+        // Extract toolUseId and tool name from assistant toolUse blocks
         for (const m of data) {
             if (m.role === 'assistant' && Array.isArray(m.content)) {
                 for (const block of m.content) {
@@ -125,7 +107,6 @@ export const bedrockFormat: FormatDescriptor = {
                 }
             }
         }
-        // Also use the generic message caching for any compatible structures
         cacheToolParametersFromMessages(data, state, logger)
     },
 
@@ -145,7 +126,6 @@ export const bedrockFormat: FormatDescriptor = {
         const outputs: ToolOutput[] = []
 
         for (const m of data) {
-            // Bedrock tool results are in user messages as toolResult blocks
             if (m.role === 'user' && Array.isArray(m.content)) {
                 for (const block of m.content) {
                     if (block.toolResult && block.toolResult.toolUseId) {
@@ -170,13 +150,11 @@ export const bedrockFormat: FormatDescriptor = {
         for (let i = 0; i < data.length; i++) {
             const m = data[i]
 
-            // Tool results are in user messages as toolResult blocks
             if (m.role === 'user' && Array.isArray(m.content)) {
                 let messageModified = false
                 const newContent = m.content.map((block: any) => {
                     if (block.toolResult && block.toolResult.toolUseId?.toLowerCase() === toolIdLower) {
                         messageModified = true
-                        // Replace the content array inside toolResult with pruned message
                         return {
                             ...block,
                             toolResult: {
diff --git a/lib/fetch-wrapper/formats/gemini.ts b/lib/fetch-wrapper/formats/gemini.ts
@@ -2,10 +2,6 @@ import type { FormatDescriptor, ToolOutput, ToolTracker } from "../types"
 import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
 
-// ============================================================================
-// 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]
@@ -18,7 +14,6 @@ function injectSynth(contents: any[], instruction: string, nudgeText: string): b
     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(
@@ -61,18 +56,8 @@ function injectPrunableList(contents: any[], injection: string): boolean {
     return true
 }
 
-// ============================================================================
-// Format Descriptor
-// ============================================================================
-
 /**
- * Format descriptor for Google/Gemini API.
- * 
- * Uses body.contents array with:
- * - parts[].functionCall for tool invocations
- * - parts[].functionResponse for tool results
- * 
- * IMPORTANT: Gemini doesn't include tool call IDs in its native format.
+ * Gemini doesn't include tool call IDs in its native format.
  * We use position-based correlation via state.googleToolCallMapping which maps
  * "toolName:index" -> "toolCallId" (populated by hooks.ts from message events).
  */
@@ -88,10 +73,7 @@ export const geminiFormat: FormatDescriptor = {
     },
 
     cacheToolParameters(_data: any[], _state: PluginState, _logger?: Logger): void {
-        // Gemini format doesn't include tool parameters in the request body.
-        // Tool parameters are captured via message events in hooks.ts and stored
-        // in state.googleToolCallMapping for position-based correlation.
-        // No-op here.
+        // No-op: Gemini tool parameters are captured via message events in hooks.ts
     },
 
     injectSynth(data: any[], instruction: string, nudgeText: string): boolean {
diff --git a/lib/fetch-wrapper/formats/openai-chat.ts b/lib/fetch-wrapper/formats/openai-chat.ts
@@ -3,10 +3,6 @@ import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
 import { cacheToolParametersFromMessages } from "../../state/tool-cache"
 
-// ============================================================================
-// Format-specific injection helpers
-// ============================================================================
-
 function isNudgeMessage(msg: any, nudgeText: string): boolean {
     if (typeof msg.content === 'string') {
         return msg.content === nudgeText
@@ -18,7 +14,6 @@ function injectSynth(messages: any[], instruction: string, nudgeText: string): b
     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') {
@@ -73,21 +68,6 @@ function injectPrunableList(messages: any[], injection: string): boolean {
     return true
 }
 
-// ============================================================================
-// Format Descriptor
-// ============================================================================
-
-/**
- * Format descriptor for OpenAI Chat Completions and Anthropic APIs.
- * 
- * OpenAI Chat format:
- * - Messages with role='tool' and tool_call_id
- * - Assistant messages with tool_calls[] array
- * 
- * Anthropic format:
- * - Messages with role='user' containing content[].type='tool_result' and tool_use_id
- * - Assistant messages with content[].type='tool_use'
- */
 export const openaiChatFormat: FormatDescriptor = {
     name: 'openai-chat',
 
diff --git a/lib/fetch-wrapper/formats/openai-responses.ts b/lib/fetch-wrapper/formats/openai-responses.ts
@@ -3,10 +3,6 @@ import type { PluginState } from "../../state"
 import type { Logger } from "../../logger"
 import { cacheToolParametersFromInput } from "../../state/tool-cache"
 
-// ============================================================================
-// Format-specific injection helpers
-// ============================================================================
-
 function isNudgeItem(item: any, nudgeText: string): boolean {
     if (typeof item.content === 'string') {
         return item.content === nudgeText
@@ -18,7 +14,6 @@ function injectSynth(input: any[], instruction: string, nudgeText: string): bool
     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') {
@@ -60,18 +55,6 @@ function injectPrunableList(input: any[], injection: string): boolean {
     return true
 }
 
-// ============================================================================
-// Format Descriptor
-// ============================================================================
-
-/**
- * Format descriptor for OpenAI Responses API (GPT-5 models via sdk.responses()).
- * 
- * Uses body.input array with:
- * - type='function_call' items for tool calls
- * - type='function_call_output' items for tool results
- * - type='message' items for user/assistant messages
- */
 export const openaiResponsesFormat: FormatDescriptor = {
     name: 'openai-responses',
 
diff --git a/lib/fetch-wrapper/handler.ts b/lib/fetch-wrapper/handler.ts
@@ -3,28 +3,13 @@ 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
@@ -42,9 +27,6 @@ async function fetchSessionMessages(
     }
 }
 
-/**
- * Get all pruned IDs from the current session.
- */
 async function getAllPrunedIds(
     client: any,
     state: PluginState,
@@ -70,16 +52,6 @@ async function getAllPrunedIds(
     return { allSessions, allPrunedIds }
 }
 
-/**
- * Generic format handler that processes any API format using a FormatDescriptor.
- * 
- * This consolidates the common logic from all format-specific handlers:
- * 1. Cache tool parameters
- * 2. Inject synthetic instructions (if strategies enabled)
- * 3. Build and inject prunable tools list
- * 4. Replace pruned tool outputs
- * 5. Log and save context
- */
 export async function handleFormat(
     body: any,
     ctx: FetchHandlerContext,
diff --git a/lib/fetch-wrapper/prunable-list.ts b/lib/fetch-wrapper/prunable-list.ts
@@ -1,11 +1,3 @@
-/**
- * Prunable tools list and nudge injection for DCP.
- * 
- * Builds and injects a single message at the end of the conversation containing:
- * - Nudge instruction (when toolResultCount > nudge_freq)
- * - Prunable tools list
- */
-
 import { extractParameterKey } from '../ui/display-utils'
 import { getOrCreateNumericId } from '../state/id-mapping'
 
@@ -14,10 +6,6 @@ export interface ToolMetadata {
     parameters?: any
 }
 
-// ============================================================================
-// Prompt Content
-// ============================================================================
-
 const SYSTEM_REMINDER = `<system-reminder>
 These instructions are injected by a plugin and are invisible to the user. Do not acknowledge or reference them in your response - simply follow them silently.
 </system-reminder>`
@@ -26,19 +14,11 @@ const NUDGE_INSTRUCTION = `<instruction name=agent_nudge>
 You have accumulated several tool outputs. If you have completed a discrete unit of work and distilled relevant understanding in writing for the user to keep, use the prune tool to remove obsolete tool outputs from this conversation and optimize token usage.
 </instruction>`
 
-// ============================================================================
-// List Building
-// ============================================================================
-
 export interface PrunableListResult {
     list: string
     numericIds: number[]
 }
 
-/**
- * Builds the prunable tools list section.
- * Returns both the formatted list and the numeric IDs for logging.
- */
 export function buildPrunableToolsList(
     sessionId: string,
     unprunedToolCallIds: string[],
@@ -50,16 +30,12 @@ export function buildPrunableToolsList(
 
     for (const actualId of unprunedToolCallIds) {
         const metadata = toolMetadata.get(actualId)
-
-        // Skip if no metadata or if tool is protected
         if (!metadata) continue
         if (protectedTools.includes(metadata.tool)) continue
 
-        // Get or create numeric ID for this tool call
         const numericId = getOrCreateNumericId(sessionId, actualId)
         numericIds.push(numericId)
 
-        // Format: "1: read, src/components/Button.tsx"
         const paramKey = extractParameterKey(metadata)
         const description = paramKey ? `${metadata.tool}, ${paramKey}` : metadata.tool
         lines.push(`${numericId}: ${description}`)
@@ -75,19 +51,10 @@ export function buildPrunableToolsList(
     }
 }
 
-/**
- * Builds the end-of-conversation injection message.
- * Contains the system reminder, nudge (if active), and the prunable tools list.
- * 
- * @param prunableList - The prunable tools list string (or empty string if none)
- * @param includeNudge - Whether to include the nudge instruction
- * @returns The injection string, or empty string if nothing to inject
- */
 export function buildEndInjection(
     prunableList: string,
     includeNudge: boolean
 ): string {
-    // If no prunable tools, don't inject anything
     if (!prunableList) {
         return ''
     }
diff --git a/lib/fetch-wrapper/tool-tracker.ts b/lib/fetch-wrapper/tool-tracker.ts
@@ -1,7 +1,3 @@
-/**
- * Tool tracker for tracking tool results and managing nudge frequency.
- */
-
 export interface ToolTracker {
     seenToolResultIds: Set<string>
     toolResultCount: number  // Tools since last prune
diff --git a/lib/fetch-wrapper/types.ts b/lib/fetch-wrapper/types.ts
diff --git a/notes/error-input-pruning-research.md b/notes/error-input-pruning-research.md
