diff --git a/.gitignore b/.gitignore
index afacf2a947..b3d907c544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,5 @@ gemini-debug.log
 .gemini-clipboard/
 .eslintcache
 evals/logs/
+
+.tracker/
diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index bc89030524..6ad728874d 100644
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -1913,7 +1913,7 @@ export class Config {
   getTrackerService(): TrackerService {
     if (!this.trackerService) {
       this.trackerService = new TrackerService(
-        this.storage.getProjectTempTrackerDir(this.sessionId),
+        this.storage.getProjectTempTrackerDir(),
       );
     }
     return this.trackerService;
diff --git a/packages/core/src/config/storage.ts b/packages/core/src/config/storage.ts
index ebfedb80c1..4ff95aca7b 100644
--- a/packages/core/src/config/storage.ts
+++ b/packages/core/src/config/storage.ts
@@ -245,13 +245,8 @@ export class Storage {
     return path.join(this.getProjectTempDir(), 'plans');
   }
 
-  getProjectTempTrackerDir(sessionId: string): string {
-    return path.join(
-      this.getProjectTempDir(),
-      sessionId,
-      '.tracker',
-      sessionId,
-    );
+  getProjectTempTrackerDir(): string {
+    return path.join(this.getProjectTempDir(), 'tracker');
   }
 
   getExtensionsDir(): string {
diff --git a/packages/core/src/services/trackerService.test.ts b/packages/core/src/services/trackerService.test.ts
index b809489c19..10456242d2 100644
--- a/packages/core/src/services/trackerService.test.ts
+++ b/packages/core/src/services/trackerService.test.ts
@@ -28,7 +28,7 @@ describe('TrackerService', () => {
 
   it('should initialize the tracker directory', async () => {
     await service.ensureInitialized();
-    const tasksDir = path.join(testTrackerDir, 'tasks');
+    const tasksDir = testTrackerDir;
     const stats = await fs.stat(tasksDir);
     expect(stats.isDirectory()).toBe(true);
   });
diff --git a/packages/core/src/services/trackerService.ts b/packages/core/src/services/trackerService.ts
index 8af40c8637..b9a13d077b 100644
--- a/packages/core/src/services/trackerService.ts
+++ b/packages/core/src/services/trackerService.ts
@@ -13,7 +13,7 @@ export class TrackerService {
   private readonly tasksDir: string;
 
   constructor(readonly trackerDir: string) {
-    this.tasksDir = path.join(this.trackerDir, 'tasks');
+    this.tasksDir = trackerDir;
   }
 
   /**
diff --git a/packages/core/src/tools/trackerTools.test.ts b/packages/core/src/tools/trackerTools.test.ts
index 9074caf6d9..51601a5e80 100644
--- a/packages/core/src/tools/trackerTools.test.ts
+++ b/packages/core/src/tools/trackerTools.test.ts
@@ -47,7 +47,7 @@ describe('Tracker Tools Integration', () => {
 
     expect(result.llmContent).toContain('Task tracker initialized');
     const trackerDir = config.getTrackerService().trackerDir;
-    const tasksDir = path.join(trackerDir, 'tasks');
+    const tasksDir = trackerDir;
     const stats = await fs.stat(tasksDir);
     expect(stats.isDirectory()).toBe(true);
     // Verify it is NOT in the tempDir root (which was the old behavior)
diff --git a/packages/core/src/tools/trackerTools.ts b/packages/core/src/tools/trackerTools.ts
index ea92fea754..c64349c4ff 100644
--- a/packages/core/src/tools/trackerTools.ts
+++ b/packages/core/src/tools/trackerTools.ts
@@ -69,7 +69,7 @@ class TrackerInitInvocation extends BaseTrackerInvocation<
   override async execute(_signal: AbortSignal): Promise<ToolResult> {
     await this.service.ensureInitialized();
     return {
-      llmContent: `Task tracker initialized successfully. Storage is ready at ${this.service.trackerDir}/tasks/`,
+      llmContent: `Task tracker initialized successfully. Storage is ready at ${this.service.trackerDir}`,
       returnDisplay: 'Tracker initialized.',
     };
   }