perf(router): rely on scoped query diagnostics

Author: chrisbbreuer

storage/framework/core/router/src/stacks-router.ts

@@ -207,7 +207,7 @@ function resolveDefaultsPath(rel: string): string {
 
 import { runWithRequest } from './request-context'
 import { isApiRequest, JSON_CONTENT_TYPE } from './api-shape'
-import { clearTrackedQueries, createErrorResponse, createMiddlewareErrorResponse } from './error-handler'
+import { createErrorResponse, createMiddlewareErrorResponse } from './error-handler'
 import { applySecurityHeaders, applySecurityHeadersToRecord } from './security-headers'
 import { isCursorPaginator, isPaginator, isSimplePaginator } from '@stacksjs/pagination'
 
@@ -1908,9 +1908,6 @@ function createMiddlewareHandler(routeKey: string, handler: StacksHandler): Rout
       const baseResult = wrappedBase(enhancedReq)
       let response = baseResult instanceof Response ? baseResult : await baseResult
 
-      // Clear tracked queries after each request to prevent accumulation
-      clearTrackedQueries()
-
       // CSRF cookie seeding — on safe-method responses (GET/HEAD/OPTIONS),
       // attach a fresh `X-CSRF-Token` cookie when none is present so SPAs
       // and forms have a usable token to echo on the next unsafe request.

storage/framework/core/router/tests/request-context.test.ts

@@ -139,6 +139,25 @@ describe('Request Context - request proxy', () => {
 })
 
 describe('Request Context - clearing', () => {
+  test('fresh request scopes start with fresh query tracking', () => {
+    const previousAppEnv = process.env.APP_ENV
+    process.env.APP_ENV = 'development'
+
+    runWithRequest(makeFakeRequest(), () => {
+      trackQuery('SELECT * FROM users WHERE id = 1')
+      expect(getQueryShapeCounts().get('SELECT * FROM USERS WHERE ID = ?')).toBe(1)
+    })
+
+    runWithRequest(makeFakeRequest(), () => {
+      expect(getQueryShapeCounts().size).toBe(0)
+    })
+
+    if (previousAppEnv === undefined)
+      delete process.env.APP_ENV
+    else
+      process.env.APP_ENV = previousAppEnv
+  })
+
   test('query cleanup in an unused request does not clear the fallback scope', () => {
     clearCurrentRequest()
     const previousAppEnv = process.env.APP_ENV