fix(fetch-wrapper): prepend system reminder to synthetic instructions

Author: Tarquinen

lib/fetch-wrapper/formats/bedrock.ts

@@ -8,21 +8,22 @@ function isNudgeMessage(msg: any, nudgeText: string): boolean {
     return false
 }
 
-function injectSynth(messages: any[], instruction: string, nudgeText: string): boolean {
+function injectSynth(messages: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+    const fullInstruction = systemReminder + '\n\n' + instruction
     for (let i = messages.length - 1; i >= 0; i--) {
         const msg = messages[i]
         if (msg.role === 'user') {
             if (isNudgeMessage(msg, nudgeText)) continue
 
             if (typeof msg.content === 'string') {
                 if (msg.content.includes(instruction)) return false
-                msg.content = msg.content + '\n\n' + instruction
+                msg.content = msg.content + '\n\n' + fullInstruction
             } 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 })
+                msg.content.push({ type: 'text', text: fullInstruction })
             }
             return true
         }
@@ -56,8 +57,8 @@ export const bedrockFormat: FormatDescriptor = {
         return body.messages
     },
 
-    injectSynth(data: any[], instruction: string, nudgeText: string): boolean {
-        return injectSynth(data, instruction, nudgeText)
+    injectSynth(data: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+        return injectSynth(data, instruction, nudgeText, systemReminder)
     },
 
     injectPrunableList(data: any[], injection: string): boolean {

lib/fetch-wrapper/formats/gemini.ts

@@ -9,7 +9,8 @@ function isNudgeContent(content: any, nudgeText: string): boolean {
     return false
 }
 
-function injectSynth(contents: any[], instruction: string, nudgeText: string): boolean {
+function injectSynth(contents: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+    const fullInstruction = systemReminder + '\n\n' + instruction
     for (let i = contents.length - 1; i >= 0; i--) {
         const content = contents[i]
         if (content.role === 'user' && Array.isArray(content.parts)) {
@@ -19,7 +20,7 @@ function injectSynth(contents: any[], instruction: string, nudgeText: string): b
                 (part: any) => part?.text && typeof part.text === 'string' && part.text.includes(instruction)
             )
             if (alreadyInjected) return false
-            content.parts.push({ text: instruction })
+            content.parts.push({ text: fullInstruction })
             return true
         }
     }
@@ -48,8 +49,8 @@ export const geminiFormat: FormatDescriptor = {
         return body.contents
     },
 
-    injectSynth(data: any[], instruction: string, nudgeText: string): boolean {
-        return injectSynth(data, instruction, nudgeText)
+    injectSynth(data: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+        return injectSynth(data, instruction, nudgeText, systemReminder)
     },
 
     injectPrunableList(data: any[], injection: string): boolean {

lib/fetch-wrapper/formats/openai-chat.ts

@@ -8,21 +8,22 @@ function isNudgeMessage(msg: any, nudgeText: string): boolean {
     return false
 }
 
-function injectSynth(messages: any[], instruction: string, nudgeText: string): boolean {
+function injectSynth(messages: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+    const fullInstruction = systemReminder + '\n\n' + instruction
     for (let i = messages.length - 1; i >= 0; i--) {
         const msg = messages[i]
         if (msg.role === 'user') {
             if (isNudgeMessage(msg, nudgeText)) continue
 
             if (typeof msg.content === 'string') {
                 if (msg.content.includes(instruction)) return false
-                msg.content = msg.content + '\n\n' + instruction
+                msg.content = msg.content + '\n\n' + fullInstruction
             } 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 })
+                msg.content.push({ type: 'text', text: fullInstruction })
             }
             return true
         }
@@ -47,8 +48,8 @@ export const openaiChatFormat: FormatDescriptor = {
         return body.messages
     },
 
-    injectSynth(data: any[], instruction: string, nudgeText: string): boolean {
-        return injectSynth(data, instruction, nudgeText)
+    injectSynth(data: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+        return injectSynth(data, instruction, nudgeText, systemReminder)
     },
 
     injectPrunableList(data: any[], injection: string): boolean {

lib/fetch-wrapper/formats/openai-responses.ts

@@ -8,21 +8,22 @@ function isNudgeItem(item: any, nudgeText: string): boolean {
     return false
 }
 
-function injectSynth(input: any[], instruction: string, nudgeText: string): boolean {
+function injectSynth(input: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+    const fullInstruction = systemReminder + '\n\n' + instruction
     for (let i = input.length - 1; i >= 0; i--) {
         const item = input[i]
         if (item.type === 'message' && item.role === 'user') {
             if (isNudgeItem(item, nudgeText)) continue
 
             if (typeof item.content === 'string') {
                 if (item.content.includes(instruction)) return false
-                item.content = item.content + '\n\n' + instruction
+                item.content = item.content + '\n\n' + fullInstruction
             } 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 })
+                item.content.push({ type: 'input_text', text: fullInstruction })
             }
             return true
         }
@@ -47,8 +48,8 @@ export const openaiResponsesFormat: FormatDescriptor = {
         return body.input
     },
 
-    injectSynth(data: any[], instruction: string, nudgeText: string): boolean {
-        return injectSynth(data, instruction, nudgeText)
+    injectSynth(data: any[], instruction: string, nudgeText: string, systemReminder: string): boolean {
+        return injectSynth(data, instruction, nudgeText, systemReminder)
     },
 
     injectPrunableList(data: any[], injection: string): boolean {

lib/fetch-wrapper/handler.ts

@@ -76,7 +76,7 @@ export async function handleFormat(
     }
 
     if (ctx.config.strategies.onTool.length > 0) {
-        if (format.injectSynth(data, ctx.prompts.synthInstruction, ctx.prompts.nudgeInstruction)) {
+        if (format.injectSynth(data, ctx.prompts.synthInstruction, ctx.prompts.nudgeInstruction, ctx.prompts.systemReminder)) {
             modified = true
         }
 

lib/fetch-wrapper/types.ts

@@ -18,7 +18,7 @@ export interface FormatDescriptor {
     name: string
     detect(body: any): boolean
     getDataArray(body: any): any[] | undefined
-    injectSynth(data: any[], instruction: string, nudgeText: string): boolean
+    injectSynth(data: any[], instruction: string, nudgeText: string, systemReminder: string): boolean
     injectPrunableList(data: any[], injection: string): boolean
     extractToolOutputs(data: any[], state: PluginState): ToolOutput[]
     replaceToolOutput(data: any[], toolId: string, prunedMessage: string, state: PluginState): boolean