feat(plan): unify workflow location in system prompt to optimize caching (#18258)

packages/core/src/prompts/snippets.ts

@@ -27,6 +27,7 @@ export interface SystemPromptOptions {
   agentSkills?: AgentSkillOptions[];
   hookContext?: boolean;
   primaryWorkflows?: PrimaryWorkflowsOptions;
+  planningWorkflow?: PlanningWorkflowOptions;
   operationalGuidelines?: OperationalGuidelinesOptions;
   sandbox?: SandboxMode;
   gitRepo?: GitRepoOptions;
@@ -65,7 +66,7 @@ export interface FinalReminderOptions {
   readFileToolName: string;
 }
 
-export interface ApprovalModePlanOptions {
+export interface PlanningWorkflowOptions {
   planModeToolsList: string;
   plansDir: string;
 }
@@ -93,7 +94,11 @@ ${renderAgentSkills(options.agentSkills)}
 
 ${renderHookContext(options.hookContext)}
 
-${renderPrimaryWorkflows(options.primaryWorkflows)}
+${
+  options.planningWorkflow
+    ? renderPlanningWorkflow(options.planningWorkflow)
+    : renderPrimaryWorkflows(options.primaryWorkflows)
+}
 
 ${renderOperationalGuidelines(options.operationalGuidelines)}
 
@@ -111,14 +116,11 @@ ${renderFinalReminder(options.finalReminder)}
 export function renderFinalShell(
   basePrompt: string,
   userMemory?: string,
-  planOptions?: ApprovalModePlanOptions,
 ): string {
   return `
 ${basePrompt.trim()}
 
 ${renderUserMemory(userMemory)}
-
-${renderApprovalModePlan(planOptions)}
 `.trim();
 }
 
@@ -290,8 +292,8 @@ export function renderUserMemory(memory?: string): string {
   return `\n---\n\n${memory.trim()}`;
 }
 
-export function renderApprovalModePlan(
-  options?: ApprovalModePlanOptions,
+export function renderPlanningWorkflow(
+  options?: PlanningWorkflowOptions,
 ): string {
   if (!options) return '';
   return `