From cbbd4c280d2785d6574d861942fe9e488ad139c1 Mon Sep 17 00:00:00 2001
From: Kyle Mistele <kyle@humanlayer.dev>
Date: Fri, 14 Aug 2026 15:25:35 -0700
Subject: [PATCH] fix(codelayer): remove broad RPI delegation guidance

HumanLayer-Session: https://app.dev.codelayer.gg/sessions/01a00177-5f25-7139-86e4-11b3c04c7a5a
---
 agents/codelayer/src/agent.ts       | 8 ++------
 agents/codelayer/test/agent.test.ts | 5 +++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/agents/codelayer/src/agent.ts b/agents/codelayer/src/agent.ts
index c2a20bc..b815623 100644
--- a/agents/codelayer/src/agent.ts
+++ b/agents/codelayer/src/agent.ts
@@ -363,7 +363,6 @@ export async function createCodelayerAgent(opts: CodelayerAgentOptions): Promise
 		tools: toolOpts,
 		systemPromptAdditions = [],
 		rlm = false,
-		rpi = false,
 		tars = false,
 		exaApiKey,
 		context7ApiKey,
@@ -428,7 +427,7 @@ export async function createCodelayerAgent(opts: CodelayerAgentOptions): Promise
 			includeEnvironment: environment?.include,
 			date: environment?.date,
 			platform: environment?.platform,
-			systemPromptAdditions: [ORCHESTRATOR_PROMPT, ...(rpi ? ['RPI specialist subagents are enabled. Prefer delegating specialized research and codebase analysis tasks to subagents when appropriate.'] : []), ...personaPromptAdditions],
+			systemPromptAdditions: [ORCHESTRATOR_PROMPT, ...personaPromptAdditions],
 		})
 		const aux = await createCodingAgentAuxToolset({
 			cwd,
@@ -505,10 +504,7 @@ export async function createCodelayerAgent(opts: CodelayerAgentOptions): Promise
 		includeEnvironment: environment?.include,
 		date: environment?.date,
 		platform: environment?.platform,
-		systemPromptAdditions: [
-			...(rpi ? ['RPI specialist subagents are enabled. Prefer delegating specialized research and codebase analysis tasks to subagents when appropriate.'] : []),
-			...personaPromptAdditions,
-		],
+		systemPromptAdditions: personaPromptAdditions,
 	})
 
 	return new Agent({
diff --git a/agents/codelayer/test/agent.test.ts b/agents/codelayer/test/agent.test.ts
index 007029e..0bac8a3 100644
--- a/agents/codelayer/test/agent.test.ts
+++ b/agents/codelayer/test/agent.test.ts
@@ -865,14 +865,15 @@ describe('createCodelayerAgent', () => {
 		expect(system.some((entry) => entry.includes('You are TARS'))).toBe(true)
 	})
 
-	test('adds the rpi specialist guidance when requested', async () => {
+	test('does not add broad delegation guidance when rpi specialists are requested', async () => {
 		const agent = await createCodelayerAgent({
 			model: createMockModel('claude-sonnet-4-5'),
 			cwd: '/tmp',
 			rpi: true,
 		})
 		const system = getSystemEntries(agent)
-		expect(system.some((entry) => entry.includes('RPI specialist subagents are enabled'))).toBe(true)
+		expect(system.some((entry) => entry.includes('RPI specialist subagents are enabled'))).toBe(false)
+		expect(system.some((entry) => entry.includes('Prefer delegating specialized research'))).toBe(false)
 	})
 
 	test('allows environment prompt controls', async () => {