diff --git a/.changeset/remove-experimental-plan-mode-flag.md b/.changeset/remove-experimental-plan-mode-flag.md
new file mode 100644
index 000000000000..254e3a443baa
--- /dev/null
+++ b/.changeset/remove-experimental-plan-mode-flag.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Always include the saved plan file hint when switching from Plan to Code, and remove the vestigial `KILO_EXPERIMENTAL_PLAN_MODE` flag.
diff --git a/packages/core/src/flag/flag.ts b/packages/core/src/flag/flag.ts
index e4e1f927bcca..c22a64d54eba 100644
--- a/packages/core/src/flag/flag.ts
+++ b/packages/core/src/flag/flag.ts
@@ -96,8 +96,6 @@ export const Flag = {
 
   KILO_EXPERIMENTAL_LSP_TOOL: KILO_EXPERIMENTAL || truthy("KILO_EXPERIMENTAL_LSP_TOOL"), // kilocode_change
 
-  KILO_EXPERIMENTAL_PLAN_MODE: KILO_EXPERIMENTAL || truthy("KILO_EXPERIMENTAL_PLAN_MODE"), // kilocode_change
-
   KILO_EXPERIMENTAL_SCOUT: KILO_EXPERIMENTAL || truthy("KILO_EXPERIMENTAL_SCOUT"), // kilocode_change
 
   KILO_EXPERIMENTAL_MARKDOWN: !falsy("KILO_EXPERIMENTAL_MARKDOWN"), // kilocode_change
diff --git a/packages/kilo-vscode/docs/cli-side/plan-mode-over-prompting.md b/packages/kilo-vscode/docs/cli-side/plan-mode-over-prompting.md
index 3a9887c58bce..3ab938b51ee9 100644
--- a/packages/kilo-vscode/docs/cli-side/plan-mode-over-prompting.md
+++ b/packages/kilo-vscode/docs/cli-side/plan-mode-over-prompting.md
@@ -3,7 +3,7 @@
 **Priority:** P1
 **Issue:** [#6143](https://github.com/Kilo-Org/kilocode/issues/6143)
 
-An experimental plan mode prompt exists (`Flag.KILO_EXPERIMENTAL_PLAN_MODE`) that is verbose. Agent still tends to ask "Should I implement this?" repeatedly.
+The plan mode prompt is verbose. The agent still tends to ask "Should I implement this?" repeatedly.
 
 ## Remaining Work
 
diff --git a/packages/opencode/src/effect/runtime-flags.ts b/packages/opencode/src/effect/runtime-flags.ts
index c706740749aa..e2ce52f23ff4 100644
--- a/packages/opencode/src/effect/runtime-flags.ts
+++ b/packages/opencode/src/effect/runtime-flags.ts
@@ -52,7 +52,6 @@ export class Service extends ConfigService.Service<Service>()("@opencode/Runtime
   experimentalLspTy: bool("KILO_EXPERIMENTAL_LSP_TY"),
   experimentalLspTool: enabledByExperimental("KILO_EXPERIMENTAL_LSP_TOOL"),
   experimentalOxfmt: enabledByExperimental("KILO_EXPERIMENTAL_OXFMT"),
-  experimentalPlanMode: enabledByExperimental("KILO_EXPERIMENTAL_PLAN_MODE"),
   experimentalCodeMode: enabledByExperimental("KILO_EXPERIMENTAL_CODE_MODE"),
   experimentalEventSystem: enabledByExperimental("KILO_EXPERIMENTAL_EVENT_SYSTEM"),
   experimentalSessionSwitcher: enabledByExperimental("KILO_EXPERIMENTAL_SESSION_SWITCHER"), // kilocode_change
diff --git a/packages/opencode/test/effect/runtime-flags.test.ts b/packages/opencode/test/effect/runtime-flags.test.ts
index 27e361268315..73550ddad0f4 100644
--- a/packages/opencode/test/effect/runtime-flags.test.ts
+++ b/packages/opencode/test/effect/runtime-flags.test.ts
@@ -85,7 +85,6 @@ describe("RuntimeFlags", () => {
       expect(flags.experimentalLspTy).toBe(false)
       expect(flags.experimentalLspTool).toBe(true)
       expect(flags.experimentalOxfmt).toBe(true)
-      expect(flags.experimentalPlanMode).toBe(true)
       expect(flags.experimentalEventSystem).toBe(true)
       expect(flags.experimentalWorkspaces).toBe(true)
       expect(flags.experimentalIconDiscovery).toBe(true)