From 8be467de8d13fe80e02aba18d2c5674b344a94d6 Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]"
 <219766164+opencode-agent[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 16:55:37 -0500
Subject: [PATCH] fix(core): respect disabled Plan agent config (#44761)

Co-authored-by: rekram1-node <63023139+rekram1-node@users.noreply.github.com>
---
 packages/core/src/plugin/internal.ts     |  2 +-
 packages/core/test/config/plugin.test.ts | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts
index 547528ab68b..3205ac8c645 100644
--- a/packages/core/src/plugin/internal.ts
+++ b/packages/core/src/plugin/internal.ts
@@ -236,6 +236,7 @@ const pre = [
   MCPCodeModeExclusionPlugin.Plugin,
   WellKnownPlugin.Plugin,
   AgentPlugin.Plugin,
+  PlanPlugin.Plugin,
   CommandPlugin.Plugin,
   SkillPlugin.Plugin,
   ...SystemPromptPlugin.Plugins,
@@ -274,7 +275,6 @@ const post = [
   ConfigWebSearchPlugin.Plugin,
   VariantPlugin.Plugin,
   ConfigPolicyPlugin.Plugin,
-  PlanPlugin.Plugin,
 ] as const satisfies readonly InternalPlugin[]
 
 export const list = Effect.fn("PluginInternal.list")(function* () {
diff --git a/packages/core/test/config/plugin.test.ts b/packages/core/test/config/plugin.test.ts
index 34184bccd79..c243a5ef5ce 100644
--- a/packages/core/test/config/plugin.test.ts
+++ b/packages/core/test/config/plugin.test.ts
@@ -52,6 +52,17 @@ describe("PluginSupervisor config", () => {
     ),
   )
 
+  it.live("allows the built-in Plan agent to be disabled", () =>
+    withLocation(
+      { agents: { plan: { disabled: true } } },
+      Effect.gen(function* () {
+        yield* ready()
+        const agents = yield* Agent.Service
+        expect(yield* agents.get(Agent.ID.make("plan"))).toBeUndefined()
+      }),
+    ),
+  )
+
   it.live("loads configured Promise plugins with options", () =>
     withLocation(
       {