pi-mega-compact 0.11.4 → 0.11.6

package/src/recallMetrics.ts

@@ -0,0 +1,388 @@
+/**
+ * recallMetrics.ts — S45 CRAG quality metrics for recall evaluation.
+ *
+ * Four metrics evaluate the quality of a set of recall hits:
+ *   - relevance:     average cosine similarity (SearchHit.score) across hits
+ *   - coverage:      fraction of query sub-terms found in at least one hit summary
+ *   - diversity:     average pairwise cosine distance among top-K embeddings (MMR-style)
+ *   - specificity:   inverse document-frequency proxy via average chunk length
+ *
+ * Pi-agnostic: no pi runtime types, no network calls (PREVENT-PI-004).
+ * All config is passed explicitly; defaults are documented but NOT hardcoded
+ * inside the metric functions (the four constants from S45A.5 are also received
+ * via config, not baked in).
+ *
+ * Best-effort: all functions handle degenerate inputs (empty hits, missing
+ * embeddings, zero query terms) and return sensible defaults instead of NaN.
+ */
+
+import type { SearchHit } from "./vectorStore.js";
+import { cosineSimilarity } from "./embedder.js";
+import { STOP_WORDS } from "./config/stopwords.js";
+
+// ---------------------------------------------------------------------------
+// Exported types
+// ---------------------------------------------------------------------------
+
+export interface RecallQualityWeights {
+  relevance: number;
+  coverage: number;
+  diversity: number;
+  specificity: number;
+}
+
+export interface RecallQualityBreakdown {
+  relevance: number;
+  coverage: number;
+  diversity: number;
+  specificity: number;
+}
+
+export interface RecallQualityResult {
+  /** Whether the overall quality passes the configured thresholds. */
+  pass: boolean;
+  /** Weighted composite score in [0, 1]. */
+  score: number;
+  /** Per-metric breakdown. */
+  breakdown: RecallQualityBreakdown;
+  /** Human-readable recommendation string, or null when everything passes. */
+  recommendation: string | null;
+  /** True when default (uncalibrated) weights/thresholds are in use. */
+  uncalibrated: boolean;
+  /** The weights used for this evaluation. */
+  weights: RecallQualityWeights;
+}
+
+export interface RecallQualityConfig {
+  /** Minimum diversity to pass. Default 0.3. Labeled uncalibrated. */
+  minDiversity: number;
+  /** Minimum coverage to pass. Default 0.4. Labeled uncalibrated. */
+  minCoverage: number;
+  /** Minimum average relevance to pass. Default 0.5. Labeled uncalibrated. */
+  minRelevance: number;
+  /** Minimum overall composite score to pass. Default 0.4. Labeled uncalibrated. */
+  minOverallScore: number;
+  /** Weight vector for the composite score. Defaults sum to 1.0. Labeled uncalibrated. */
+  weights: RecallQualityWeights;
+  /** Token-estimate divisor for specificity. Default 300. Labeled uncalibrated. */
+  specificityDivisor: number;
+  /**
+   * Below specificityOptimalMin/2 the chunk is too short → specificity = 0.
+   * Default 100. Labeled uncalibrated.
+   */
+  specificityOptimalMin: number;
+  /**
+   * Diminishing returns above this value; linear ramp-down to 0 by 2x this value.
+   * Default 500. Labeled uncalibrated.
+   */
+  specificityOptimalMax: number;
+  /**
+   * Fraction of checkpoints a term may appear in before it is considered "common"
+   * for the broaden-query strategy. Default 0.5. Labeled uncalibrated.
+   */
+  idfBroadenRatio: number;
+  /** Set of stopwords for tokenization. Defaults to English STOP_WORDS. */
+  stopwords: ReadonlySet<string>;
+  /** When true, weights/thresholds are calibrated (not defaults). Default false. */
+  calibrated: boolean;
+}
+
+/** Default config — all values marked "uncalibrated" unless CRAG_CALIBRATED=true. */
+export const DEFAULT_RECALL_QUALITY_CONFIG: RecallQualityConfig = {
+  minDiversity: 0.3,
+  minCoverage: 0.4,
+  minRelevance: 0.5,
+  minOverallScore: 0.4,
+  weights: { relevance: 0.35, coverage: 0.25, diversity: 0.25, specificity: 0.15 },
+  specificityDivisor: 300,
+  specificityOptimalMin: 100,
+  specificityOptimalMax: 500,
+  idfBroadenRatio: 0.5,
+  stopwords: STOP_WORDS,
+  calibrated: false,
+};
+
+// ---------------------------------------------------------------------------
+// Metric helpers (exported individually for unit testing)
+// ---------------------------------------------------------------------------
+
+/**
+ * S45A.2: Relevance — average of SearchHit.score across all hits.
+ * Scores are already cosine similarities in [0, 1].
+ * Empty hits → 0.
+ */
+export function computeRelevance(hits: SearchHit[]): number {
+  if (hits.length === 0) return 0;
+  let sum = 0;
+  for (const h of hits) sum += h.score;
+  return sum / hits.length;
+}
+
+/**
+ * S45A.3: Coverage — fraction of query subterms present in at least one
+ * hit's `checkpoint.summary`. Tokenization removes stopwords and short terms.
+ * Zero query terms after filtering → coverage = 1.0 (trivially satisfied).
+ */
+export function computeCoverage(
+  query: string,
+  hits: SearchHit[],
+  stopwords: ReadonlySet<string> = STOP_WORDS,
+): number {
+  const queryTerms = tokenizeTerms(query, stopwords);
+  if (queryTerms.length === 0) return 1.0;
+  if (hits.length === 0) return 0;
+
+  let foundCount = 0;
+  for (const qt of queryTerms) {
+    const found = hits.some((h) => {
+      const summary = h.checkpoint.summary ?? "";
+      return summary.toLowerCase().includes(qt);
+    });
+    if (found) foundCount++;
+  }
+  return foundCount / queryTerms.length;
+}
+
+/**
+ * S45A.4: Diversity — average pairwise cosine distance (1 - similarity)
+ * among hit embeddings. Filtered to hits with non-empty embedding arrays.
+ *
+ * Edge cases:
+ *   - < 2 valid hits → 1.0 (nothing to compare)
+ *   - empty-embedding checkpoints are skipped (no NaN path)
+ */
+export function computeDiversity(hits: SearchHit[]): number {
+  const valid = hits.filter(
+    (h) => Array.isArray(h.checkpoint.embedding) && h.checkpoint.embedding.length > 0,
+  );
+  if (valid.length < 2) return 1.0;
+
+  let totalDist = 0;
+  let pairCount = 0;
+  for (let i = 0; i < valid.length; i++) {
+    for (let j = i + 1; j < valid.length; j++) {
+      const sim = cosineSimilarity(valid[i].checkpoint.embedding, valid[j].checkpoint.embedding);
+      // cosineSimilarity returns 0 for empty vectors, but we've filtered those out.
+      // NaN/Infinity could theoretically arise from degenerate floats; guard defensively.
+      const dist = Number.isFinite(sim) ? 1 - sim : 1.0;
+      totalDist += dist;
+      pairCount++;
+    }
+  }
+  return pairCount > 0 ? totalDist / pairCount : 1.0;
+}
+
+/**
+ * S45A.5: Specificity — average chunk length (tokenEstimate) as a proxy
+ * for information density.
+ *
+ * Formula (all constants from config, NOT hardcoded):
+ *   avg = mean(tokenEstimate across hits; hits missing tokenEstimate → 0)
+ *   If avg < optimalMin / 2 → 0 (too short to be specific)
+ *   base = avg / divisor
+ *   If avg > optimalMax:
+ *     ramp = 1 - (avg - optimalMax) / optimalMax  // linear to 0 at 2*optimalMax
+ *     capped = max(0, ramp)
+ *     specificity = min(base, capped)
+ *   else:
+ *     specificity = min(base, 1)
+ *
+ * Edge cases: empty hits → 1.0 (nothing to penalize).
+ */
+export function computeSpecificity(
+  hits: SearchHit[],
+  config: Pick<RecallQualityConfig, "specificityDivisor" | "specificityOptimalMin" | "specificityOptimalMax">,
+): number {
+  if (hits.length === 0) return 1.0;
+
+  const { specificityDivisor: divisor, specificityOptimalMin: optMin, specificityOptimalMax: optMax } = config;
+
+  let sum = 0;
+  for (const h of hits) {
+    sum += h.checkpoint.tokenEstimate ?? 0;
+  }
+  const avg = sum / hits.length;
+
+  // Below optMin/2 → too short to be specific
+  if (avg < optMin / 2) return 0;
+
+  const base = divisor > 0 ? avg / divisor : 0;
+  const clamped = base > 1 ? 1 : base;
+
+  if (avg > optMax) {
+    // Linear ramp-down from optMax to 0 at 2*optMax
+    const ramp = optMax > 0 ? 1 - (avg - optMax) / optMax : 0;
+    const capped = ramp > 0 ? ramp : 0;
+    return clamped < capped ? clamped : capped;
+  }
+  return clamped;
+}
+
+// ---------------------------------------------------------------------------
+// Composite evaluation
+// ---------------------------------------------------------------------------
+
+/**
+ * Normalize a four-weight vector so its components sum to 1.0.
+ * If all weights are 0, return equal weights (0.25 each).
+ * Used defensively since users may set non-sum-1 weights via env.
+ */
+export function normalizeWeights(w: RecallQualityWeights): RecallQualityWeights {
+  const sum = w.relevance + w.coverage + w.diversity + w.specificity;
+  if (sum === 0) return { relevance: 0.25, coverage: 0.25, diversity: 0.25, specificity: 0.25 };
+  return {
+    relevance: w.relevance / sum,
+    coverage: w.coverage / sum,
+    diversity: w.diversity / sum,
+    specificity: w.specificity / sum,
+  };
+}
+
+/**
+ * S45A.6: Evaluate recall quality — compute all four metrics and return a
+ * composite result with pass/fail + recommendation.
+ */
+export function evaluateRecall(
+  query: string,
+  hits: SearchHit[],
+  config: RecallQualityConfig,
+): RecallQualityResult {
+  const weights = normalizeWeights(config.weights);
+  const breakdown: RecallQualityBreakdown = {
+    relevance: computeRelevance(hits),
+    coverage: computeCoverage(query, hits, config.stopwords),
+    diversity: computeDiversity(hits),
+    specificity: computeSpecificity(hits, config),
+  };
+
+  const score =
+    weights.relevance * breakdown.relevance +
+    weights.coverage * breakdown.coverage +
+    weights.diversity * breakdown.diversity +
+    weights.specificity * breakdown.specificity;
+
+  const pass =
+    score >= config.minOverallScore &&
+    breakdown.relevance >= config.minRelevance &&
+    breakdown.coverage >= config.minCoverage &&
+    breakdown.diversity >= config.minDiversity;
+
+  const recommendation = buildRecommendation(breakdown, score, config);
+
+  return {
+    pass,
+    score,
+    breakdown,
+    recommendation,
+    uncalibrated: !config.calibrated,
+    weights,
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Recommendation builder
+// ---------------------------------------------------------------------------
+
+/**
+ * Build a human-readable recommendation based on which metric is lowest.
+ * Uses env-overridable thresholds from config (not hardcoded).
+ */
+function buildRecommendation(
+  breakdown: RecallQualityBreakdown,
+  score: number,
+  config: RecallQualityConfig,
+): string | null {
+  // Check each metric against its threshold (lowest first for specificity).
+  const issues: string[] = [];
+
+  if (breakdown.diversity < config.minDiversity) {
+    issues.push("chunks are too similar — consider expanding K or using MMR");
+  }
+  if (breakdown.coverage < config.minCoverage) {
+    issues.push("query terms not well covered — consider query expansion");
+  }
+  if (breakdown.relevance < config.minRelevance) {
+    issues.push("chunks may be irrelevant — consider stricter threshold");
+  }
+  if (score < config.minOverallScore) {
+    issues.push("quality is low — recommend re-retrieval with expanded query");
+  }
+
+  return issues.length > 0 ? issues.join("; ") : null;
+}
+
+// ---------------------------------------------------------------------------
+// Unified entry point (pi-agnostic, matches task spec)
+// ---------------------------------------------------------------------------
+
+export interface RecallMetrics {
+  /** Per-metric breakdown. */
+  breakdown: RecallQualityBreakdown;
+  /** Weighted composite score. */
+  score: number;
+  /** Whether quality passes all thresholds. */
+  pass: boolean;
+  /** Human-readable recommendation. */
+  recommendation: string | null;
+  /** Whether default config was used (uncalibrated). */
+  uncalibrated: boolean;
+}
+
+/**
+ * Compute recall quality metrics for a set of search hits.
+ *
+ * Pi-agnostic: takes query text and SearchHit results directly, no pi types.
+ * The `config` parameter is optional — when omitted, DEFAULT_RECALL_QUALITY_CONFIG
+ * is used (labelled uncalibrated).
+ *
+ * This is the primary export for external callers (e.g., recall.ts integration).
+ */
+export function computeRecallMetrics(
+  query: string,
+  results: SearchHit[],
+  config?: Partial<RecallQualityConfig>,
+): RecallMetrics {
+  const effectiveConfig: RecallQualityConfig = {
+    ...DEFAULT_RECALL_QUALITY_CONFIG,
+    ...config,
+    // Merge weights shallowly if both sides exist
+    weights: {
+      ...DEFAULT_RECALL_QUALITY_CONFIG.weights,
+      ...(config?.weights ?? {}),
+    },
+  };
+
+  const result = evaluateRecall(query, results, effectiveConfig);
+
+  return {
+    breakdown: result.breakdown,
+    score: result.score,
+    pass: result.pass,
+    recommendation: result.recommendation,
+    uncalibrated: result.uncalibrated,
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Tokenize text into lowercased alphanumeric terms, filtering stop words
+ * and terms shorter than 3 characters.
+ */
+function tokenizeTerms(text: string, stopwords: ReadonlySet<string>): string[] {
+  return text
+    .toLowerCase()
+    .split(/[^a-z0-9]+/)
+    .filter((t) => t.length >= 3 && !stopwords.has(t));
+}
+
+/**
+ * Estimate block tokens for a piece of text (rough approximation).
+ * Used by the specificity metric fallback when tokenEstimate is missing.
+ */
+export function estimateBlockTokens(text: string): number {
+  // ~4 chars per token for English text
+  return Math.ceil(text.length / 4);
+}

package/src/store/sqlite/cache-stripes.ts

@@ -0,0 +1,196 @@
+/**
+ * src/store/sqlite/cache-stripes.ts — Cache stripe distribution reader (A3, PLAN_V2 Phase 4).
+ *
+ * Reads from the cache_stripes table (schema.ts) to produce stripe distribution
+ * stats, stability aggregates, and a composite health score. Pi-agnostic.
+ *
+ * PREVENT-002: all queries use parameterized SQL.
+ */
+import { getStateDir } from "../../store.js";
+import { openStore } from "./utils.js";
+
+// ---------------------------------------------------------------------------
+// Types (mirrors api-contracts/cache-stripes.ts but as a plain domain type).
+// ---------------------------------------------------------------------------
+
+export interface StripeBucket {
+  readonly stripe: number;
+  readonly label: string;
+  readonly count: number;
+  readonly avgStability: number;
+  readonly minStability: number;
+  readonly maxStability: number;
+}
+
+export interface CacheHealthScore {
+  readonly score: number;
+  readonly label: string;
+  readonly dominantTier: number;
+  readonly churnRate: number;
+}
+
+export interface CacheStripesResult {
+  readonly buckets: StripeBucket[];
+  readonly health: CacheHealthScore;
+  readonly epochId: string | null;
+  readonly lastRefreshAt: number;
+  readonly totalChunks: number;
+}
+
+/** Human-readable labels for each stripe tier (0=permanent .. 4=volatile). */
+const STRIPE_LABELS: Record<number, string> = {
+  0: "Permanent",
+  1: "Epoch",
+  2: "Topic",
+  3: "Thread",
+  4: "Volatile",
+};
+
+/** Weight per stripe for health scoring (higher = more stable = better). */
+const STRIPE_HEALTH_WEIGHTS: Record<number, number> = {
+  0: 1.0,
+  1: 0.8,
+  2: 0.5,
+  3: 0.25,
+  4: 0.0,
+};
+
+/**
+ * Read cache stripe distribution from the database.
+ *
+ * Returns aggregated per-stripe buckets with stability stats and a composite
+ * health score. Returns empty buckets (all zeros) when the table is empty,
+ * so the dashboard always has a valid response.
+ */
+export function readCacheStripes(
+  stateDir: string = getStateDir(),
+): CacheStripesResult {
+  const db = openStore(stateDir);
+
+  // ── Fetch per-stripe aggregates ──
+  const rows = db
+    .prepare(
+      `SELECT
+         stripe,
+         COUNT(*)                                         AS count,
+         ROUND(AVG(stability), 4)                         AS avgStability,
+         ROUND(MIN(stability), 4)                         AS minStability,
+         ROUND(MAX(stability), 4)                         AS maxStability
+       FROM cache_stripes
+       GROUP BY stripe
+       ORDER BY stripe ASC`,
+    )
+    .all() as Array<{
+    stripe: number;
+    count: number;
+    avgStability: number;
+    minStability: number;
+    maxStability: number;
+  }>;
+
+  // ── Latest epoch ──
+  const epochRow = db
+    .prepare(
+      `SELECT epoch_id, MAX(assigned_at) AS last_refresh
+       FROM cache_stripes
+       WHERE epoch_id IS NOT NULL`,
+    )
+    .get() as { epoch_id: string; last_refresh: number } | undefined;
+
+  // ── Total chunk count ──
+  const totalRow = db
+    .prepare("SELECT COUNT(*) AS cnt FROM cache_stripes")
+    .get() as { cnt: number };
+
+  const totalChunks = totalRow?.cnt ?? 0;
+
+  // ── Build bucket array (always 5 entries, stripe 0–4) ──
+  const rowMap = new Map<number, (typeof rows)[number]>();
+  for (const r of rows) rowMap.set(r.stripe, r);
+
+  const buckets: StripeBucket[] = [];
+  for (let s = 0; s <= 4; s++) {
+    const r = rowMap.get(s);
+    buckets.push({
+      stripe: s,
+      label: STRIPE_LABELS[s] ?? `Stripe ${s}`,
+      count: r?.count ?? 0,
+      avgStability: r?.avgStability ?? 0,
+      minStability: r?.minStability ?? 0,
+      maxStability: r?.maxStability ?? 0,
+    });
+  }
+
+  // ── Compute health score ──
+  const health = computeCacheHealth(buckets, totalChunks, stateDir);
+
+  return {
+    buckets,
+    health,
+    epochId: epochRow?.epoch_id ?? null,
+    lastRefreshAt: epochRow?.last_refresh ?? 0,
+    totalChunks,
+  };
+}
+
+/**
+ * Compute cache health from bucket distribution.
+ *
+ * Score = weighted sum of stripe fractions (normalised 0..1).
+ * Dominant tier = fraction of chunks in the top 2 stripes (0+1).
+ * Label: >= 0.8 = good, >= 0.6 = fair, >= 0.4 = degraded, else poor.
+ */
+function computeCacheHealth(
+  buckets: StripeBucket[],
+  total: number,
+  stateDir: string,
+): CacheHealthScore {
+  if (total === 0) {
+    return { score: 1, label: "good", dominantTier: 1, churnRate: 0 };
+  }
+
+  let weightedSum = 0;
+  let dominantCount = 0;
+
+  for (const b of buckets) {
+    const w = STRIPE_HEALTH_WEIGHTS[b.stripe] ?? 0;
+    weightedSum += (b.count / total) * w;
+    if (b.stripe <= 1) dominantCount += b.count;
+  }
+
+  const dominantTier = dominantCount / total;
+
+  // ── Churn rate: open a new DB connection for the churn query ──
+  let churnRate = 0;
+  try {
+    const churnDb = openStore(stateDir);
+    const churnRow = churnDb
+      .prepare(
+        `WITH
+          ranked AS (
+            SELECT chunk_id, epoch_id,
+                   ROW_NUMBER() OVER (PARTITION BY chunk_id ORDER BY assigned_at DESC) AS rn
+            FROM cache_stripes
+          ),
+          cur AS (SELECT chunk_id, epoch_id FROM ranked WHERE rn = 1),
+          prev AS (SELECT chunk_id, epoch_id FROM ranked WHERE rn = 2)
+        SELECT
+          COUNT(*) AS total_changed
+        FROM cur c
+        JOIN prev p ON c.chunk_id = p.chunk_id AND c.epoch_id != p.epoch_id`,
+      )
+      .get() as { total_changed: number } | undefined;
+
+    if (churnRow && total > 0) {
+      churnRate = Math.min(1, (churnRow.total_changed ?? 0) / total);
+    }
+  } catch {
+    // churn unavailable — keep 0
+  }
+
+  const score = Math.round(weightedSum * 100) / 100;
+  const label =
+    score >= 0.8 ? "good" : score >= 0.6 ? "fair" : score >= 0.4 ? "degraded" : "poor";
+
+  return { score, label, dominantTier, churnRate };
+}

package/src/store/sqlite/fts5-search.ts

@@ -0,0 +1,90 @@
+/**
+ * fts5-search.ts — FTS5 trigram search helper (L1 tier in the S44 tiered router).
+ *
+ * Runs BM25-ranked trigram search against the existing `context_chunks_trgm`
+ * virtual table (pg_trgm-equivalent, created in schema.ts). All queries are
+ * parameterized (PREVENT-002). Pi-agnostic — pure SQL over a node:sqlite
+ * DatabaseSync handle.
+ *
+ * The virtual table stores (id UNINDEXED, normalized_text) with tokenize='trigram'.
+ * FTS5 trigram queries tokenize the user query into overlapping 3-grams at query
+ * time automatically — no manual n-gram splitting needed. The BM25 rank from
+ * fts5 ranks results by trigram-overlap density.
+ */
+
+import type { DatabaseSync } from "node:sqlite";
+
+export interface Fts5Hit {
+	/** checkpoint id (chkpt_001 etc.) from the context_chunks_trgm row. */
+	id: string;
+	/** BM25 relevance score from FTS5 (higher = better match). */
+	score: number;
+}
+
+/**
+ * Search the context_chunks_trgm FTS5 table for checkpoints whose
+ * `normalized_text` matches `query` via trigram similarity.
+ *
+ * @param query  Raw search text (FTS5 trigram tokenizer handles n-gram splitting
+ *               automatically; input is NOT SQL-concatenated — bound as ? param).
+ * @param reader A sync-reader handle against the SQLite store.
+ * @param limit  Max results to return (default 10).
+ * @returns BM25-ranked hits, highest score first.
+ */
+export function fts5Search(
+	query: string,
+	reader: DatabaseSync,
+	limit = 10,
+): Fts5Hit[] {
+	const sql = `
+    SELECT id, bm25(context_chunks_trgm, 0.0, 1.0) AS score
+    FROM context_chunks_trgm
+    WHERE context_chunks_trgm MATCH ?
+    ORDER BY score
+    LIMIT ?
+  `;
+	const rows = reader
+		.prepare(sql)
+		.all(query, limit) as Array<{ id: string; score: number }>;
+
+	return rows.map((r) => ({ id: r.id, score: r.score }));
+}
+
+/**
+ * Search with an optional session_id filter for scoped FTS5 recall.
+ *
+ * JOINs the FTS5 virtual table against the real `context_chunks` table on `id`
+ * so we can filter by `session_id` while still using FTS5 MATCH. The vtab
+ * stores `id UNINDEXED` (it's a row-key passthrough, not searchable text), so
+ * the join is safe and efficient via the `idx_chunks_pk` index.
+ *
+ * @param query     Raw search text.
+ * @param reader    Sync-reader handle against the SQLite store.
+ * @param sessionId Scope to a specific session (omit for cross-session search).
+ * @param limit     Max results (default 10).
+ */
+export function fts5SearchScoped(
+	query: string,
+	reader: DatabaseSync,
+	sessionId: string | undefined,
+	limit = 10,
+): Fts5Hit[] {
+	if (sessionId) {
+		const sql = `
+      SELECT t.id, bm25(context_chunks_trgm, 0.0, 1.0) AS score
+      FROM context_chunks_trgm AS t
+      INNER JOIN context_chunks AS c ON c.id = t.id
+      WHERE t.context_chunks_trgm MATCH ?
+        AND c.session_id = ?
+      ORDER BY score
+      LIMIT ?
+    `;
+		const rows = reader
+			.prepare(sql)
+			.all(query, sessionId, limit) as Array<{ id: string; score: number }>;
+		return rows.map((r) => ({ id: r.id, score: r.score }));
+	}
+
+	// No session filter — plain FTS5 search across all sessions.
+	return fts5Search(query, reader, limit);
+}