@querypanel/node-sdk 1.0.51 → 1.0.53

package/dist/index.d.cts

@@ -180,6 +180,7 @@ declare const QueryErrorCode: {
     readonly SQL_GENERATION_FAILED: "SQL_GENERATION_FAILED";
     readonly SQL_VALIDATION_FAILED: "SQL_VALIDATION_FAILED";
     readonly CONTEXT_RETRIEVAL_FAILED: "CONTEXT_RETRIEVAL_FAILED";
+    readonly CLARIFICATION_NEEDED: "CLARIFICATION_NEEDED";
     readonly INTERNAL_ERROR: "INTERNAL_ERROR";
     readonly AUTHENTICATION_REQUIRED: "AUTHENTICATION_REQUIRED";
     readonly VALIDATION_ERROR: "VALIDATION_ERROR";
@@ -208,6 +209,10 @@ declare class QueryPipelineError extends Error {
      * Check if this is any guardrail error (relevance or security)
      */
     isGuardrailError(): boolean;
+    /**
+     * Check if this is a clarification needed error (v2 pipeline)
+     */
+    isClarificationNeeded(): boolean;
 }
 
 type ParamValue = string | number | boolean | string[] | number[];
@@ -514,6 +519,40 @@ interface AskOptions {
      * Use this to reuse a previously returned session for follow-up prompts.
      */
     querypanelSessionId?: string;
+    /**
+     * Pipeline version to use for query generation.
+     * - "v1" (default): Original query pipeline
+     * - "v2": Improved pipeline with intent planning, hybrid retrieval, schema linking, and SQL reflection
+     */
+    pipeline?: "v1" | "v2";
+}
+/**
+ * Intent analysis result from the v2 pipeline.
+ */
+interface IntentResult {
+    intent: string;
+    confidence: number;
+    plan: {
+        tables: string[];
+        operations: string[];
+        filters: string[];
+        orderBy?: string;
+        limit?: number;
+    };
+    ambiguities: Array<{
+        issue: string;
+        suggestion: string;
+    }>;
+}
+/**
+ * Pipeline execution trace with step-level timing.
+ */
+interface PipelineTrace {
+    totalDurationMs: number;
+    steps: Array<{
+        step: string;
+        durationMs: number;
+    }>;
 }
 /**
  * Response returned after executing a query.
@@ -545,6 +584,10 @@ interface AskResponse {
     target_db?: string;
     /** QueryPanel session ID for follow-up queries. */
     querypanelSessionId?: string;
+    /** Intent analysis from v2 pipeline. */
+    intent?: IntentResult;
+    /** Pipeline execution trace from v2 pipeline. */
+    trace?: PipelineTrace;
 }
 declare function anonymizeResults(rows: Array<Record<string, unknown>>): Array<Record<string, string>>;
 
@@ -688,6 +731,12 @@ interface ChartModifyOptions {
     chartMaxRetries?: number;
     /** Chart generation method: 'vega-lite' or 'vizspec' */
     chartType?: "vega-lite" | "vizspec";
+    /**
+     * Pipeline version to use for SQL regeneration.
+     * - "v1" (default): Original query pipeline
+     * - "v2": Improved pipeline with intent planning, hybrid retrieval, schema linking, and SQL reflection
+     */
+    pipeline?: "v1" | "v2";
 }
 /**
  * Response from modifyChart(), extending AskResponse with modification metadata.
@@ -1283,4 +1332,4 @@ declare class QueryPanelSdkAPI {
     }, signal?: AbortSignal): Promise<void>;
 }
 
-export { type ActiveChartCreateInput, type ActiveChartListOptions, type ActiveChartUpdateInput, type AggregateOp, type AskOptions, type AskResponse, type AxisField, type AxisFieldInput, type ChartCreateInput, type ChartEncoding, type ChartEnvelope, type ChartListOptions, type ChartModifyInput, type ChartModifyOptions, type ChartModifyResponse, type ChartSpec, type ChartType, type ChartUpdateInput, ClickHouseAdapter, type ClickHouseAdapterOptions, type ClickHouseClientFn, type ContextDocument, type DatabaseAdapter, type DatabaseDialect, type DateRangeInput, type EncodingHints, type FieldRef, type FieldRefInput, type FieldType, type IngestResponse, type MetricEncoding, type MetricField, type MetricSpec, type PaginatedResponse$1 as PaginatedResponse, type PaginationInfo$1 as PaginationInfo, type PaginationQuery$1 as PaginationQuery, type ParamRecord, type ParamValue, PostgresAdapter, type PostgresAdapterOptions, type PostgresClientFn, QueryErrorCode, QueryErrorCode as QueryErrorCodeType, QueryPanelSdkAPI, QueryPipelineError, type SchemaIntrospection, type SchemaSyncOptions, type SdkActiveChart, type SdkChart, type SdkSession, type SdkSessionTurn, type SessionGetOptions, type SessionListOptions, type SessionUpdateInput, type SqlModifications, type StackingMode, type TableColumn, type TableEncoding, type TableSpec, type TimeUnit, type ValueFormat, type VizModifications, type VizSpec, type VizSpecGenerateInput, type VizSpecGenerateOptions, type VizSpecGeneratorInput, type VizSpecKind, type VizSpecResponse, type VizSpecResult, anonymizeResults };
+export { type ActiveChartCreateInput, type ActiveChartListOptions, type ActiveChartUpdateInput, type AggregateOp, type AskOptions, type AskResponse, type AxisField, type AxisFieldInput, type ChartCreateInput, type ChartEncoding, type ChartEnvelope, type ChartListOptions, type ChartModifyInput, type ChartModifyOptions, type ChartModifyResponse, type ChartSpec, type ChartType, type ChartUpdateInput, ClickHouseAdapter, type ClickHouseAdapterOptions, type ClickHouseClientFn, type ContextDocument, type DatabaseAdapter, type DatabaseDialect, type DateRangeInput, type EncodingHints, type FieldRef, type FieldRefInput, type FieldType, type IngestResponse, type IntentResult, type MetricEncoding, type MetricField, type MetricSpec, type PaginatedResponse$1 as PaginatedResponse, type PaginationInfo$1 as PaginationInfo, type PaginationQuery$1 as PaginationQuery, type ParamRecord, type ParamValue, type PipelineTrace, PostgresAdapter, type PostgresAdapterOptions, type PostgresClientFn, QueryErrorCode, QueryErrorCode as QueryErrorCodeType, QueryPanelSdkAPI, QueryPipelineError, type SchemaIntrospection, type SchemaSyncOptions, type SdkActiveChart, type SdkChart, type SdkSession, type SdkSessionTurn, type SessionGetOptions, type SessionListOptions, type SessionUpdateInput, type SqlModifications, type StackingMode, type TableColumn, type TableEncoding, type TableSpec, type TimeUnit, type ValueFormat, type VizModifications, type VizSpec, type VizSpecGenerateInput, type VizSpecGenerateOptions, type VizSpecGeneratorInput, type VizSpecKind, type VizSpecResponse, type VizSpecResult, anonymizeResults };

package/dist/index.d.ts

@@ -180,6 +180,7 @@ declare const QueryErrorCode: {
     readonly SQL_GENERATION_FAILED: "SQL_GENERATION_FAILED";
     readonly SQL_VALIDATION_FAILED: "SQL_VALIDATION_FAILED";
     readonly CONTEXT_RETRIEVAL_FAILED: "CONTEXT_RETRIEVAL_FAILED";
+    readonly CLARIFICATION_NEEDED: "CLARIFICATION_NEEDED";
     readonly INTERNAL_ERROR: "INTERNAL_ERROR";
     readonly AUTHENTICATION_REQUIRED: "AUTHENTICATION_REQUIRED";
     readonly VALIDATION_ERROR: "VALIDATION_ERROR";
@@ -208,6 +209,10 @@ declare class QueryPipelineError extends Error {
      * Check if this is any guardrail error (relevance or security)
      */
     isGuardrailError(): boolean;
+    /**
+     * Check if this is a clarification needed error (v2 pipeline)
+     */
+    isClarificationNeeded(): boolean;
 }
 
 type ParamValue = string | number | boolean | string[] | number[];
@@ -514,6 +519,40 @@ interface AskOptions {
      * Use this to reuse a previously returned session for follow-up prompts.
      */
     querypanelSessionId?: string;
+    /**
+     * Pipeline version to use for query generation.
+     * - "v1" (default): Original query pipeline
+     * - "v2": Improved pipeline with intent planning, hybrid retrieval, schema linking, and SQL reflection
+     */
+    pipeline?: "v1" | "v2";
+}
+/**
+ * Intent analysis result from the v2 pipeline.
+ */
+interface IntentResult {
+    intent: string;
+    confidence: number;
+    plan: {
+        tables: string[];
+        operations: string[];
+        filters: string[];
+        orderBy?: string;
+        limit?: number;
+    };
+    ambiguities: Array<{
+        issue: string;
+        suggestion: string;
+    }>;
+}
+/**
+ * Pipeline execution trace with step-level timing.
+ */
+interface PipelineTrace {
+    totalDurationMs: number;
+    steps: Array<{
+        step: string;
+        durationMs: number;
+    }>;
 }
 /**
  * Response returned after executing a query.
@@ -545,6 +584,10 @@ interface AskResponse {
     target_db?: string;
     /** QueryPanel session ID for follow-up queries. */
     querypanelSessionId?: string;
+    /** Intent analysis from v2 pipeline. */
+    intent?: IntentResult;
+    /** Pipeline execution trace from v2 pipeline. */
+    trace?: PipelineTrace;
 }
 declare function anonymizeResults(rows: Array<Record<string, unknown>>): Array<Record<string, string>>;
 
@@ -688,6 +731,12 @@ interface ChartModifyOptions {
     chartMaxRetries?: number;
     /** Chart generation method: 'vega-lite' or 'vizspec' */
     chartType?: "vega-lite" | "vizspec";
+    /**
+     * Pipeline version to use for SQL regeneration.
+     * - "v1" (default): Original query pipeline
+     * - "v2": Improved pipeline with intent planning, hybrid retrieval, schema linking, and SQL reflection
+     */
+    pipeline?: "v1" | "v2";
 }
 /**
  * Response from modifyChart(), extending AskResponse with modification metadata.
@@ -1283,4 +1332,4 @@ declare class QueryPanelSdkAPI {
     }, signal?: AbortSignal): Promise<void>;
 }
 
-export { type ActiveChartCreateInput, type ActiveChartListOptions, type ActiveChartUpdateInput, type AggregateOp, type AskOptions, type AskResponse, type AxisField, type AxisFieldInput, type ChartCreateInput, type ChartEncoding, type ChartEnvelope, type ChartListOptions, type ChartModifyInput, type ChartModifyOptions, type ChartModifyResponse, type ChartSpec, type ChartType, type ChartUpdateInput, ClickHouseAdapter, type ClickHouseAdapterOptions, type ClickHouseClientFn, type ContextDocument, type DatabaseAdapter, type DatabaseDialect, type DateRangeInput, type EncodingHints, type FieldRef, type FieldRefInput, type FieldType, type IngestResponse, type MetricEncoding, type MetricField, type MetricSpec, type PaginatedResponse$1 as PaginatedResponse, type PaginationInfo$1 as PaginationInfo, type PaginationQuery$1 as PaginationQuery, type ParamRecord, type ParamValue, PostgresAdapter, type PostgresAdapterOptions, type PostgresClientFn, QueryErrorCode, QueryErrorCode as QueryErrorCodeType, QueryPanelSdkAPI, QueryPipelineError, type SchemaIntrospection, type SchemaSyncOptions, type SdkActiveChart, type SdkChart, type SdkSession, type SdkSessionTurn, type SessionGetOptions, type SessionListOptions, type SessionUpdateInput, type SqlModifications, type StackingMode, type TableColumn, type TableEncoding, type TableSpec, type TimeUnit, type ValueFormat, type VizModifications, type VizSpec, type VizSpecGenerateInput, type VizSpecGenerateOptions, type VizSpecGeneratorInput, type VizSpecKind, type VizSpecResponse, type VizSpecResult, anonymizeResults };
+export { type ActiveChartCreateInput, type ActiveChartListOptions, type ActiveChartUpdateInput, type AggregateOp, type AskOptions, type AskResponse, type AxisField, type AxisFieldInput, type ChartCreateInput, type ChartEncoding, type ChartEnvelope, type ChartListOptions, type ChartModifyInput, type ChartModifyOptions, type ChartModifyResponse, type ChartSpec, type ChartType, type ChartUpdateInput, ClickHouseAdapter, type ClickHouseAdapterOptions, type ClickHouseClientFn, type ContextDocument, type DatabaseAdapter, type DatabaseDialect, type DateRangeInput, type EncodingHints, type FieldRef, type FieldRefInput, type FieldType, type IngestResponse, type IntentResult, type MetricEncoding, type MetricField, type MetricSpec, type PaginatedResponse$1 as PaginatedResponse, type PaginationInfo$1 as PaginationInfo, type PaginationQuery$1 as PaginationQuery, type ParamRecord, type ParamValue, type PipelineTrace, PostgresAdapter, type PostgresAdapterOptions, type PostgresClientFn, QueryErrorCode, QueryErrorCode as QueryErrorCodeType, QueryPanelSdkAPI, QueryPipelineError, type SchemaIntrospection, type SchemaSyncOptions, type SdkActiveChart, type SdkChart, type SdkSession, type SdkSessionTurn, type SessionGetOptions, type SessionListOptions, type SessionUpdateInput, type SqlModifications, type StackingMode, type TableColumn, type TableEncoding, type TableSpec, type TimeUnit, type ValueFormat, type VizModifications, type VizSpec, type VizSpecGenerateInput, type VizSpecGenerateOptions, type VizSpecGeneratorInput, type VizSpecKind, type VizSpecResponse, type VizSpecResult, anonymizeResults };

package/dist/index.js

@@ -888,6 +888,8 @@ var QueryErrorCode = {
   SQL_VALIDATION_FAILED: "SQL_VALIDATION_FAILED",
   // Context retrieval errors
   CONTEXT_RETRIEVAL_FAILED: "CONTEXT_RETRIEVAL_FAILED",
+  // Clarification errors (v2)
+  CLARIFICATION_NEEDED: "CLARIFICATION_NEEDED",
   // General errors
   INTERNAL_ERROR: "INTERNAL_ERROR",
   AUTHENTICATION_REQUIRED: "AUTHENTICATION_REQUIRED",
@@ -924,6 +926,12 @@ var QueryPipelineError = class extends Error {
   isGuardrailError() {
     return this.isRelevanceError() || this.isSecurityError();
   }
+  /**
+   * Check if this is a clarification needed error (v2 pipeline)
+   */
+  isClarificationNeeded() {
+    return this.code === QueryErrorCode.CLARIFICATION_NEEDED;
+  }
 };
 
 // src/routes/charts.ts
@@ -1235,6 +1243,7 @@ async function ask(client, queryEngine, question, options, signal) {
   let attempt = 0;
   let lastError = options.lastError;
   let previousSql = options.previousSql;
+  const queryEndpoint = options.pipeline === "v2" ? "/v2/query" : "/query";
   while (attempt <= maxRetry) {
     console.log({ lastError, previousSql });
     const databaseName = options.database ?? queryEngine.getDefaultDatabase();
@@ -1248,7 +1257,7 @@ async function ask(client, queryEngine, question, options, signal) {
       };
     }
     const queryResponse = await client.postWithHeaders(
-      "/query",
+      queryEndpoint,
       {
         question,
         ...querypanelSessionId ? { session_id: querypanelSessionId } : {},
@@ -1364,7 +1373,9 @@ async function ask(client, queryEngine, question, options, signal) {
         context: queryResponse.data.context,
         attempts: attempt + 1,
         target_db: dbName,
-        querypanelSessionId: responseSessionId ?? void 0
+        querypanelSessionId: responseSessionId ?? void 0,
+        intent: queryResponse.data.intent,
+        trace: queryResponse.data.trace
       };
     } catch (error) {
       attempt++;
@@ -1403,21 +1414,39 @@ function anonymizeResults(rows) {
 }
 
 // src/routes/modify.ts
-function buildModifiedQuestion(originalQuestion, modifications) {
+function buildModifiedQuestion(originalQuestion, modifications, pipeline) {
   const hints = [];
   if (modifications.timeGranularity) {
     hints.push(`group results by ${modifications.timeGranularity}`);
   }
   if (modifications.dateRange) {
-    const parts = [];
-    if (modifications.dateRange.from) {
-      parts.push(`from ${modifications.dateRange.from}`);
-    }
-    if (modifications.dateRange.to) {
-      parts.push(`to ${modifications.dateRange.to}`);
-    }
-    if (parts.length > 0) {
-      hints.push(`filter date range ${parts.join(" ")}`);
+    if (pipeline === "v2") {
+      const from = normalizeDateInput(modifications.dateRange.from);
+      const to = normalizeDateInput(modifications.dateRange.to);
+      if (from && to) {
+        hints.push(
+          `replace any existing date filters with exact date range from ${from} to ${to} (inclusive, do not add extra days)`
+        );
+      } else if (from) {
+        hints.push(
+          `replace any existing date filters with exact start date ${from} (do not shift this date)`
+        );
+      } else if (to) {
+        hints.push(
+          `replace any existing date filters with exact end date ${to} (inclusive, do not add extra days)`
+        );
+      }
+    } else {
+      const parts = [];
+      if (modifications.dateRange.from) {
+        parts.push(`from ${modifications.dateRange.from}`);
+      }
+      if (modifications.dateRange.to) {
+        parts.push(`to ${modifications.dateRange.to}`);
+      }
+      if (parts.length > 0) {
+        hints.push(`filter date range ${parts.join(" ")}`);
+      }
     }
   }
   if (modifications.additionalInstructions) {
@@ -1428,6 +1457,67 @@ function buildModifiedQuestion(originalQuestion, modifications) {
   }
   return `${originalQuestion} (${hints.join(", ")})`;
 }
+var START_PARAM_KEY_REGEX = /(^|_)(start|from)(_|$)/i;
+var END_PARAM_KEY_REGEX = /(^|_)(end|to)(_|$)/i;
+var ISO_DATETIME_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?Z?$/;
+var SQL_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+var SQL_DATETIME_RE = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+function normalizeDateInput(value) {
+  if (!value) return void 0;
+  const trimmed = value.trim();
+  if (!trimmed) return void 0;
+  if (ISO_DATETIME_RE.test(trimmed)) {
+    return trimmed.replace("T", " ").replace(/\.\d+Z?$/, "").replace(/Z$/, "");
+  }
+  return trimmed;
+}
+function keyLooksLikeDateBoundary(key, boundary) {
+  return boundary === "start" ? START_PARAM_KEY_REGEX.test(key) : END_PARAM_KEY_REGEX.test(key);
+}
+function hasTimeComponent(value) {
+  return typeof value === "string" && /\d{2}:\d{2}:\d{2}/.test(value);
+}
+function formatDateOverride(dateValue, boundary, existingValue) {
+  if (SQL_DATE_RE.test(dateValue) && !hasTimeComponent(existingValue)) {
+    return dateValue;
+  }
+  if (SQL_DATE_RE.test(dateValue)) {
+    return `${dateValue} ${boundary === "start" ? "00:00:00" : "23:59:59"}`;
+  }
+  if (SQL_DATETIME_RE.test(dateValue)) {
+    return dateValue;
+  }
+  return dateValue;
+}
+function normalizeGeneratedParamKey(param, index) {
+  const nameCandidate = typeof param.name === "string" && param.name.trim() || typeof param.placeholder === "string" && param.placeholder.trim() || typeof param.position === "number" && String(param.position) || String(index + 1);
+  return nameCandidate.replace(/[{}]/g, "").replace(/(.+):.*$/, "$1").replace(/^[:$]/, "").trim();
+}
+function applyDateRangeOverrides(dateRange, params, paramMetadata) {
+  if (!dateRange) return;
+  const from = normalizeDateInput(dateRange.from);
+  const to = normalizeDateInput(dateRange.to);
+  if (!from && !to) return;
+  for (const [key, value] of Object.entries(params)) {
+    if (from && keyLooksLikeDateBoundary(key, "start")) {
+      params[key] = formatDateOverride(from, "start", value);
+    }
+    if (to && keyLooksLikeDateBoundary(key, "end")) {
+      params[key] = formatDateOverride(to, "end", value);
+    }
+  }
+  for (let i = 0; i < paramMetadata.length; i++) {
+    const param = paramMetadata[i];
+    if (!param) continue;
+    const key = normalizeGeneratedParamKey(param, i);
+    if (from && keyLooksLikeDateBoundary(key, "start")) {
+      param.value = formatDateOverride(from, "start", param.value);
+    }
+    if (to && keyLooksLikeDateBoundary(key, "end")) {
+      param.value = formatDateOverride(to, "end", param.value);
+    }
+  }
+}
 function buildVizHints(modifications) {
   const hints = {};
   if (modifications.kind) {
@@ -1460,6 +1550,9 @@ function stripVizSpecOnlyHints(hints) {
   const { kind: _kind, ...rest } = hints;
   return rest;
 }
+function isDateRangeOnly(mods) {
+  return !!mods.dateRange && !mods.timeGranularity && !mods.additionalInstructions && !mods.customSql;
+}
 function resolveTenantId5(client, tenantId) {
   const resolved = tenantId ?? client.getDefaultTenantId();
   if (!resolved) {
@@ -1476,12 +1569,14 @@ async function modifyChart(client, queryEngine, input, options, signal) {
   const hasSqlMods = !!input.sqlModifications;
   const hasVizMods = !!input.vizModifications;
   const hasCustomSql = !!input.sqlModifications?.customSql;
+  const queryEndpoint = options?.pipeline === "v2" ? "/v2/query" : "/query";
   let finalSql = input.sql;
   let finalParams = input.params ?? {};
   let paramMetadata = [];
   let rationale;
   let queryId;
   let sqlChanged = false;
+  let finalQuestion = input.question;
   const databaseName = input.database ?? queryEngine.getDefaultDatabase();
   if (!databaseName) {
     throw new Error(
@@ -1502,13 +1597,89 @@ async function modifyChart(client, queryEngine, input, options, signal) {
     finalParams = {};
     paramMetadata = [];
     sqlChanged = true;
+  } else if (hasSqlMods && options?.pipeline === "v2" && isDateRangeOnly(input.sqlModifications)) {
+    let usedFastPath = false;
+    try {
+      const rewriteResponse = await client.post(
+        "/v2/rewrite-datefilter",
+        {
+          previous_sql: input.sql,
+          previous_params: input.params ? Object.entries(input.params).map(([name, value]) => ({
+            name,
+            value
+          })) : [],
+          date_range: input.sqlModifications.dateRange,
+          question: input.question,
+          ...tenantSettings ? { tenant_settings: tenantSettings } : {},
+          ...databaseName ? { database: databaseName } : {},
+          ...metadata?.dialect ? { dialect: metadata.dialect } : {}
+        },
+        tenantId,
+        options?.userId,
+        options?.scopes,
+        signal,
+        sessionId
+      );
+      finalSql = rewriteResponse.sql;
+      paramMetadata = Array.isArray(rewriteResponse.params) ? rewriteResponse.params : [];
+      finalParams = queryEngine.mapGeneratedParams(paramMetadata);
+      applyDateRangeOverrides(
+        input.sqlModifications?.dateRange,
+        finalParams,
+        paramMetadata
+      );
+      rationale = rewriteResponse.rationale;
+      queryId = rewriteResponse.queryId;
+      sqlChanged = finalSql !== input.sql;
+      usedFastPath = true;
+    } catch {
+    }
+    if (!usedFastPath) {
+      const modifiedQuestion = buildModifiedQuestion(
+        input.question,
+        input.sqlModifications,
+        "v2"
+      );
+      finalQuestion = modifiedQuestion;
+      const queryResponse = await client.post(
+        queryEndpoint,
+        {
+          question: modifiedQuestion,
+          previous_sql: input.sql,
+          ...options?.maxRetry ? { max_retry: options.maxRetry } : {},
+          ...tenantSettings ? { tenant_settings: tenantSettings } : {},
+          ...databaseName ? { database: databaseName } : {},
+          ...metadata?.dialect ? { dialect: metadata.dialect } : {}
+        },
+        tenantId,
+        options?.userId,
+        options?.scopes,
+        signal,
+        sessionId
+      );
+      finalSql = queryResponse.sql;
+      paramMetadata = Array.isArray(queryResponse.params) ? queryResponse.params : [];
+      finalParams = queryEngine.mapGeneratedParams(paramMetadata);
+      applyDateRangeOverrides(
+        input.sqlModifications?.dateRange,
+        finalParams,
+        paramMetadata
+      );
+      rationale = queryResponse.rationale;
+      queryId = queryResponse.queryId;
+      sqlChanged = finalSql !== input.sql;
+    }
   } else if (hasSqlMods && !hasCustomSql) {
     const modifiedQuestion = buildModifiedQuestion(
       input.question,
-      input.sqlModifications
+      input.sqlModifications,
+      options?.pipeline
     );
+    if (options?.pipeline === "v2") {
+      finalQuestion = modifiedQuestion;
+    }
     const queryResponse = await client.post(
-      "/query",
+      queryEndpoint,
       {
         question: modifiedQuestion,
         previous_sql: input.sql,
@@ -1526,6 +1697,13 @@ async function modifyChart(client, queryEngine, input, options, signal) {
     finalSql = queryResponse.sql;
     paramMetadata = Array.isArray(queryResponse.params) ? queryResponse.params : [];
     finalParams = queryEngine.mapGeneratedParams(paramMetadata);
+    if (options?.pipeline === "v2") {
+      applyDateRangeOverrides(
+        input.sqlModifications?.dateRange,
+        finalParams,
+        paramMetadata
+      );
+    }
     rationale = queryResponse.rationale;
     queryId = queryResponse.queryId;
     sqlChanged = finalSql !== input.sql;
@@ -1548,7 +1726,7 @@ async function modifyChart(client, queryEngine, input, options, signal) {
       const vizspecResponse = await client.post(
         "/vizspec",
         {
-          question: input.question,
+          question: finalQuestion,
           sql: finalSql,
           rationale,
           fields: execution.fields,
@@ -1573,7 +1751,7 @@ async function modifyChart(client, queryEngine, input, options, signal) {
       const chartResponse = await client.post(
         "/chart",
         {
-          question: input.question,
+          question: finalQuestion,
           sql: finalSql,
           rationale,
           fields: execution.fields,