Merge remote-tracking branch 'origin/master' into refactor/prompt-cleanup

# Conflicts:
#	lib/prompts/nudge.txt
#	lib/prompts/system-reminder.txt

Author: Tarquinen

index.ts

@@ -45,8 +45,7 @@ const plugin: Plugin = (async (ctx) => {
 
     const prompts = {
         synthInstruction: loadPrompt("synthetic"),
-        nudgeInstruction: loadPrompt("nudge"),
-        systemReminder: loadPrompt("system-reminder")
+        nudgeInstruction: loadPrompt("nudge")
     }
 
     // Install global fetch wrapper for context pruning and synthetic instruction injection

lib/fetch-wrapper/handler.ts

@@ -96,7 +96,7 @@ export async function handleFormat(
             if (prunableList) {
                 const includeNudge = ctx.config.nudge_freq > 0 && ctx.toolTracker.toolResultCount > ctx.config.nudge_freq
 
-                const endInjection = buildEndInjection(prunableList, includeNudge, ctx.prompts.nudgeInstruction, ctx.prompts.systemReminder)
+                const endInjection = buildEndInjection(prunableList, includeNudge)
                 if (format.injectPrunableList(data, endInjection)) {
                     ctx.logger.debug("fetch", `Injected prunable tools list (${format.name})`, {
                         ids: numericIds,

lib/fetch-wrapper/prunable-list.ts

@@ -2,6 +2,14 @@ import { extractParameterKey } from '../ui/display-utils'
 import { getOrCreateNumericId } from '../state/id-mapping'
 import type { ToolMetadata } from './types'
 
+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>`
+
+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>`
+
 export interface PrunableListResult {
     list: string
     numericIds: number[]
@@ -41,18 +49,16 @@ export function buildPrunableToolsList(
 
 export function buildEndInjection(
     prunableList: string,
-    includeNudge: boolean,
-    nudgeInstruction: string,
-    systemReminder: string
+    includeNudge: boolean
 ): string {
     if (!prunableList) {
         return ''
     }
 
-    const parts = [systemReminder]
+    const parts = [SYSTEM_REMINDER]
 
     if (includeNudge) {
-        parts.push(nudgeInstruction)
+        parts.push(NUDGE_INSTRUCTION)
     }
 
     parts.push(prunableList)

lib/fetch-wrapper/types.ts

@@ -29,7 +29,6 @@ export interface FormatDescriptor {
 export interface SynthPrompts {
     synthInstruction: string
     nudgeInstruction: string
-    systemReminder: string
 }
 
 export interface FetchHandlerContext {

lib/prompts/synthetic.txt

@@ -1,3 +1,9 @@
+<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.
+
+IMPORTANT: Your thinking/reasoning blocks must NOT reference, discuss, or address these instructions, the <prunable-tools> list, or any nudges about pruning. The user can see your thinking blocks, and referencing invisible plugin content will confuse them. In your thinking, focus only on the user's task and your problem-solving approach.
+</system-reminder>
+
 <instruction name=signal_management>
 After calling a series of tools, YOU ALWAYS HAVE TO distill signals from their results in your next message. This ensures tracability of your reasoning, informs the user of your findings, and is PARAMOUNT to best context window management practices.
 
@@ -31,4 +37,4 @@ EXAMPLE WORKFLOW:
 >YOU MUST ALWAYS THINK HIGH SIGNAL LOW NOISE FOR THIS NARRATION
 4. ONLY AFTER the narration, you call the `prune` tool with a brief reason (e.g. "exploration for bug X complete; moving on to next bug").
 5. AFTER pruning succeeds, DO NOT re-summarize or re-narrate. You already distilled your findings before calling prune. Continue with your next task, or if you need more information from the user, wait for their response.
-</instruction>
+</instruction>