From 8c2df3640513e1c9e3d1621996293fc067e25503 Mon Sep 17 00:00:00 2001 From: Aiden Cline Date: Mon, 29 Jun 2026 08:48:46 -0500 Subject: [PATCH] refactor(opencode): name deferred MCP instructions --- packages/opencode/src/session/prompt.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts index 41b57a30bf..ceadf1d65d 100644 --- a/packages/opencode/src/session/prompt.ts +++ b/packages/opencode/src/session/prompt.ts @@ -1254,16 +1254,17 @@ export const layer = Layer.effect( yield* summary.summarize({ sessionID, messageID: lastUser.id }).pipe(Effect.ignore, Effect.forkIn(scope)) yield* plugin.trigger("experimental.chat.messages.transform", {}, { messages: msgs }) + const deferredMcpInstructions = SessionMcpTools.systemPrompt({ agent, session, messages: msgs }).pipe( + Effect.provideService(MCP.Service, mcp), + Effect.provideService(RuntimeFlags.Service, flags), + ) const [skills, env, instructions, mcpInstructions, deferredToolInstructions, modelMsgs] = yield* Effect.all([ sys.skills(agent), sys.environment(model), instruction.system().pipe(Effect.orDie), sys.mcp(agent, session.permission), - SessionMcpTools.systemPrompt({ agent, session, messages: msgs }).pipe( - Effect.provideService(MCP.Service, mcp), - Effect.provideService(RuntimeFlags.Service, flags), - ), + deferredMcpInstructions, MessageV2.toModelMessagesEffect(msgs, model), ]) const system = [