diff --git a/packages/core/src/prompts/promptProvider.ts b/packages/core/src/prompts/promptProvider.ts
index fa15c94e0e..328353b5e7 100644
--- a/packages/core/src/prompts/promptProvider.ts
+++ b/packages/core/src/prompts/promptProvider.ts
@@ -178,11 +178,7 @@ export class PromptProvider {
           }),
           isPlanMode,
         ),
-        taskTracker: this.withSection(
-          'taskTracker',
-          () => ({}),
-          config.isTrackerEnabled(),
-        ),
+        taskTracker: config.isTrackerEnabled(),
         operationalGuidelines: this.withSection(
           'operationalGuidelines',
           () => ({
diff --git a/packages/core/src/prompts/snippets.legacy.ts b/packages/core/src/prompts/snippets.legacy.ts
index 9c927d33ea..2aa2c26397 100644
--- a/packages/core/src/prompts/snippets.legacy.ts
+++ b/packages/core/src/prompts/snippets.legacy.ts
@@ -33,7 +33,7 @@ export interface SystemPromptOptions {
   hookContext?: boolean;
   primaryWorkflows?: PrimaryWorkflowsOptions;
   planningWorkflow?: PlanningWorkflowOptions;
-  taskTracker?: TaskTrackerOptions;
+  taskTracker?: boolean;
   operationalGuidelines?: OperationalGuidelinesOptions;
   sandbox?: SandboxMode;
   interactiveYoloMode?: boolean;
@@ -83,9 +83,6 @@ export interface PlanningWorkflowOptions {
   approvedPlanPath?: string;
 }
 
-export interface TaskTrackerOptions {
-}
-
 export interface AgentSkillOptions {
   name: string;
   description: string;
@@ -120,7 +117,7 @@ ${
     : renderPrimaryWorkflows(options.primaryWorkflows)
 }
 
-${renderTaskTracker(options.taskTracker)}
+${options.taskTracker ? renderTaskTracker() : ''}
 
 ${renderOperationalGuidelines(options.operationalGuidelines)}
 
@@ -396,8 +393,7 @@ ${trimmed}
   return `\n---\n\n<loaded_context>\n${sections.join('\n')}\n</loaded_context>`;
 }
 
-export function renderTaskTracker(options?: TaskTrackerOptions): string {
-  if (!options) return '';
+export function renderTaskTracker(): string {
   const trackerCreate = `\`${TRACKER_CREATE_TASK_TOOL_NAME}\``;
   const trackerList = `\`${TRACKER_LIST_TASKS_TOOL_NAME}\``;
   const trackerUpdate = `\`${TRACKER_UPDATE_TASK_TOOL_NAME}\``;
diff --git a/packages/core/src/prompts/snippets.ts b/packages/core/src/prompts/snippets.ts
index 55f8b78823..62ee64909c 100644
--- a/packages/core/src/prompts/snippets.ts
+++ b/packages/core/src/prompts/snippets.ts
@@ -34,7 +34,7 @@ export interface SystemPromptOptions {
   hookContext?: boolean;
   primaryWorkflows?: PrimaryWorkflowsOptions;
   planningWorkflow?: PlanningWorkflowOptions;
-  taskTracker?: TaskTrackerOptions;
+  taskTracker?: boolean;
   operationalGuidelines?: OperationalGuidelinesOptions;
   sandbox?: SandboxMode;
   interactiveYoloMode?: boolean;
@@ -81,9 +81,6 @@ export interface PlanningWorkflowOptions {
   approvedPlanPath?: string;
 }
 
-export interface TaskTrackerOptions {
-}
-
 export interface AgentSkillOptions {
   name: string;
   description: string;
@@ -119,7 +116,7 @@ ${
     : renderPrimaryWorkflows(options.primaryWorkflows)
 }
 
-${renderTaskTracker(options.taskTracker)}
+${options.taskTracker ? renderTaskTracker() : ''}
 
 ${renderOperationalGuidelines(options.operationalGuidelines)}
 
@@ -417,8 +414,7 @@ ${trimmed}
   return `\n---\n\n<loaded_context>\n${sections.join('\n')}\n</loaded_context>`;
 }
 
-export function renderTaskTracker(options?: TaskTrackerOptions): string {
-  if (!options) return '';
+export function renderTaskTracker(): string {
   const trackerCreate = formatToolName(TRACKER_CREATE_TASK_TOOL_NAME);
   const trackerList = formatToolName(TRACKER_LIST_TASKS_TOOL_NAME);
   const trackerUpdate = formatToolName(TRACKER_UPDATE_TASK_TOOL_NAME);