From 1d8ae4c81b113d12d96c2651335bf05417d87c4b Mon Sep 17 00:00:00 2001
From: Xetera <contact@xetera.dev>
Date: Wed, 4 Feb 2026 23:50:51 +0300
Subject: [PATCH] fix: remove accidental duplicate optimizations

Because `optimizer.run` already does a baseline run, we don't actually
need to do a manual baseline run ourselves.
---
 src/remote/query-optimizer.ts | 37 +++++------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/remote/query-optimizer.ts b/src/remote/query-optimizer.ts
index 01f7f62..d18ba3d 100644
--- a/src/remote/query-optimizer.ts
+++ b/src/remote/query-optimizer.ts
@@ -382,28 +382,6 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
     options: { timeoutMs: number },
   ): Promise<LiveQueryOptimization> {
     const builder = new PostgresQueryBuilder(recent.query);
-    let cost: number;
-    let explainPlan: PostgresExplainStage | undefined;
-    try {
-      const explain = await withTimeout(
-        target.optimizer.testQueryWithStats(builder),
-        options.timeoutMs,
-      );
-      cost = explain.Plan["Total Cost"];
-      explainPlan = explain.Plan;
-    } catch (error) {
-      console.error("Error with baseline run", error);
-      if (error instanceof TimeoutError) {
-        return this.onTimeout(recent, options.timeoutMs);
-      } else if (error instanceof Error) {
-        return this.onError(recent, error.message);
-      } else {
-        return this.onError(recent, "Internal error");
-      }
-    }
-    if (cost === 0) {
-      return this.onZeroCostPlan(recent, explainPlan);
-    }
     const indexes = this.getPotentialIndexCandidates(
       target.statistics,
       recent,
@@ -423,16 +401,13 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
       if (error instanceof TimeoutError) {
         return this.onTimeout(recent, options.timeoutMs);
       } else if (error instanceof Error) {
-        return this.onError(recent, error.message, explainPlan);
+        return this.onError(recent, error.message);
       } else {
-        return this.onError(recent, "Internal error", explainPlan);
+        return this.onError(recent, "Internal error");
       }
     }
 
-    if (!explainPlan) {
-      throw new Error("explainPlan should be defined after baseline run");
-    }
-    return this.onOptimizeReady(result, recent, explainPlan);
+    return this.onOptimizeReady(result, recent);
   }
 
   private async dropDisabledIndexes(tx: PostgresTransaction): Promise<void> {
@@ -444,7 +419,6 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
   private onOptimizeReady(
     result: OptimizeResult,
     recent: OptimizedQuery,
-    explainPlan: PostgresExplainStage,
   ): LiveQueryOptimization {
     switch (result.kind) {
       case "ok": {
@@ -486,7 +460,7 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
       }
       // unlikely to hit if we've already checked the base plan for zero cost
       case "zero_cost_plan":
-        return this.onZeroCostPlan(recent, explainPlan);
+        return this.onZeroCostPlan(recent, result.explainPlan);
     }
   }
 
@@ -583,11 +557,10 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
   private onError(
     recent: OptimizedQuery,
     errorMessage: string,
-    explainPlan?: PostgresExplainStage,
   ): LiveQueryOptimization {
     const error = new Error(errorMessage);
     this.emit("error", error, recent);
-    return { state: "error", error: error.message, explainPlan };
+    return { state: "error", error: error.message };
   }
 
   private onTimeout(