@autorag/librarian 2.13.2 → 2.13.4

package/dist/cli/index.js

@@ -2381,6 +2381,51 @@ var init_credential = __esm(() => {
   init_models();
 });
 
+// src/cloud/context-overflow.ts
+import {
+  createAssistantMessageEventStream,
+  isContextOverflow
+} from "@earendil-works/pi-ai";
+import { getApiProvider } from "@earendil-works/pi-ai/compat";
+function recordRequestEstimate(model, estimatedTokens) {
+  lastEstimates.set(modelKey(model), estimatedTokens);
+}
+function noteContextOverflow(model) {
+  const key = modelKey(model);
+  const failed = lastEstimates.get(key);
+  if (failed === undefined)
+    return;
+  ceilings.set(key, Math.min(Math.floor(failed / 2), ceilings.get(key) ?? Number.POSITIVE_INFINITY));
+}
+function contextOverflowCeiling(model) {
+  return ceilings.get(modelKey(model));
+}
+function streamDazziSimple(model, context, options) {
+  const api = getApiProvider(model.api);
+  if (api === undefined)
+    throw new Error(`No API provider registered for api: ${model.api}`);
+  const inner = api.streamSimple(model, context, options);
+  const stream = createAssistantMessageEventStream();
+  (async () => {
+    try {
+      for await (const event of inner) {
+        if (event.type === "error" && event.error.stopReason === "error" && isContextOverflow(event.error)) {
+          noteContextOverflow(model);
+        }
+        stream.push(event);
+      }
+    } finally {
+      stream.end();
+    }
+  })();
+  return stream;
+}
+var lastEstimates, ceilings, modelKey = (model) => `${model.provider}/${model.id}`;
+var init_context_overflow = __esm(() => {
+  lastEstimates = new Map;
+  ceilings = new Map;
+});
+
 // src/cloud/authorize.ts
 function buildAuthorizeUrl(params) {
   const url = new URL(`${normalizeBaseUrl(params.baseUrl)}${AUTHORIZE_PATH}`);
@@ -2736,6 +2781,7 @@ function createDazziProviderConfig(env = process.env) {
     name: PROVIDER_NAME,
     baseUrl: endpoints.apiBaseUrl,
     api: "openai-responses",
+    streamSimple: streamDazziSimple,
     oauth: {
       name: PROVIDER_NAME,
       login: (callbacks) => loginDazzi(callbacks, { baseUrl }),
@@ -2751,6 +2797,7 @@ async function registerDazziProvider(runtime, env = process.env) {
 }
 var init_provider = __esm(() => {
   init_config2();
+  init_context_overflow();
   init_models();
   init_oauth_login();
 });
@@ -14530,413 +14577,6 @@ var init_slack = __esm(() => {
   };
 });
 
-// src/datasource/skills/spotlight/connector.ts
-import { spawn as spawn13 } from "node:child_process";
-import { createHash as createHash10 } from "node:crypto";
-import { readFile as fsReadFile, stat as stat2 } from "node:fs/promises";
-import { basename as basename6, extname as extname6 } from "node:path";
-
-class SpotlightConnector {
-  options;
-  run;
-  readFile;
-  platform;
-  constructor(options = {}) {
-    this.options = options;
-    this.run = options.run ?? spawnRunner;
-    this.readFile = options.readFile ?? ((path) => fsReadFile(path, "utf8"));
-    this.platform = options.platform ?? process.platform;
-  }
-  async probe() {
-    const queries = (this.options.queries ?? []).map((query) => query.trim()).filter((query) => query.length > 0);
-    const failure = await this.readinessFailure(queries);
-    return failure ?? { ok: true, documents: [] };
-  }
-  async search(query, limit = DEFAULT_MAX_DOCUMENTS4, acceptDocument) {
-    const trimmed = query.trim();
-    if (trimmed.length === 0 || limit <= 0)
-      return { ok: true, documents: [] };
-    const queries = (this.options.queries ?? []).map((query) => query.trim()).filter((query) => query.length > 0);
-    const failure = await this.readinessFailure(queries);
-    if (failure !== undefined)
-      return failure;
-    const timeoutMs = this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS8;
-    const maxPerQuery = this.options.maxResultsPerQuery ?? DEFAULT_MAX_RESULTS_PER_QUERY;
-    const maxDocuments = Math.min(this.options.maxDocuments ?? DEFAULT_MAX_DOCUMENTS4, limit);
-    const seen = new Set;
-    const paths = [];
-    const textQuery = trimmed.split(/\s+/u).map((term) => `"${term.replace(/\\/gu, "\\\\").replace(/"/gu, "\\\"")}"`).join(" AND ");
-    let mdfindMissing = false;
-    let failedQueries = 0;
-    const failures = [];
-    for (const filter of queries) {
-      const query = `(${filter}) AND (${textQuery})`;
-      const args = this.options.onlyIn !== undefined ? ["-onlyin", this.options.onlyIn, query] : [query];
-      const result = await this.run("mdfind", args, timeoutMs);
-      if (!result.ok) {
-        if (result.error === "ENOENT") {
-          mdfindMissing = true;
-          break;
-        }
-        failedQueries += 1;
-        failures.push(result);
-        continue;
-      }
-      let kept = 0;
-      for (const line of result.stdout.split(`
-`)) {
-        const path = line.trim();
-        if (path.length === 0 || seen.has(path))
-          continue;
-        if (kept >= maxPerQuery)
-          break;
-        seen.add(path);
-        paths.push(path);
-        kept += 1;
-      }
-    }
-    if (mdfindMissing) {
-      return { ok: false, reason: "unavailable", message: "mdfind binary not found; Spotlight requires macOS" };
-    }
-    if (failedQueries === queries.length) {
-      return {
-        ok: false,
-        reason: "unavailable",
-        message: "every configured mdfind query failed",
-        stderr: failures[0]?.stderr,
-        stdout: failures[0]?.stdout,
-        code: failures[0]?.code
-      };
-    }
-    const documents = [];
-    let permissionDenied = 0;
-    let readFailures = 0;
-    const maxBytes = this.options.maxBytesPerFile ?? DEFAULT_MAX_BYTES_PER_FILE2;
-    const maxContentChars = this.options.maxContentChars ?? MAX_CONTENT_CHARS3;
-    for (const path of paths) {
-      if (documents.length >= maxDocuments)
-        break;
-      const docId = createHash10("sha256").update(path).digest("hex").slice(0, 16);
-      if (acceptDocument !== undefined && !acceptDocument(docId))
-        continue;
-      try {
-        const info = await stat2(path);
-        if (!info.isFile() || info.size > maxBytes)
-          continue;
-        const text = await this.readFile(path);
-        const content = text.trim().slice(0, maxContentChars);
-        if (content.length === 0)
-          continue;
-        documents.push({
-          docId,
-          hierarchy: ["files"],
-          title: basename6(path),
-          content,
-          publishedAt: info.mtimeMs,
-          metadata: { path, extension: extname6(path).toLowerCase() }
-        });
-      } catch (error) {
-        const code = error.code;
-        if (code === "EPERM" || code === "EACCES")
-          permissionDenied += 1;
-        else
-          readFailures += 1;
-      }
-    }
-    if (documents.length === 0 && permissionDenied > 0) {
-      return {
-        ok: false,
-        reason: "permission",
-        message: `macOS denied access to all Spotlight hits; ${FDA_GUIDANCE}`
-      };
-    }
-    if (documents.length === 0 && failedQueries > 0) {
-      return {
-        ok: false,
-        reason: "unavailable",
-        message: "some mdfind queries failed and no readable hits remained",
-        stderr: failures[0]?.stderr,
-        stdout: failures[0]?.stdout,
-        code: failures[0]?.code
-      };
-    }
-    const warnings = [];
-    if (failedQueries > 0)
-      warnings.push(`${failedQueries} mdfind quer(y/ies) failed`);
-    if (permissionDenied > 0) {
-      warnings.push(`${permissionDenied} Spotlight hit(s) were denied by macOS privacy protections; ${FDA_GUIDANCE}`);
-    }
-    if (readFailures > 0)
-      warnings.push(`${readFailures} Spotlight hit(s) failed to read`);
-    return { ok: true, documents, ...warnings.length > 0 ? { warnings } : {} };
-  }
-  async readinessFailure(queries) {
-    if (this.platform !== "darwin") {
-      return { ok: false, reason: "unavailable", message: "spotlight datasource is supported on macOS only" };
-    }
-    if (queries.length === 0) {
-      return { ok: false, reason: "not-configured", message: "no spotlight queries configured" };
-    }
-    const timeoutMs = this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS8;
-    const status = await this.run("mdutil", ["-s", "/"], timeoutMs);
-    if (status.ok && /indexing disabled/iu.test(status.stdout)) {
-      return {
-        ok: false,
-        reason: "unavailable",
-        message: "Spotlight indexing is disabled; enable it with `sudo mdutil -i on /`"
-      };
-    }
-    return;
-  }
-}
-var DEFAULT_MAX_RESULTS_PER_QUERY = 100, DEFAULT_MAX_DOCUMENTS4 = 300, DEFAULT_MAX_BYTES_PER_FILE2, DEFAULT_TIMEOUT_MS8 = 15000, MAX_CONTENT_CHARS3 = 1e5, MAX_BUFFER_BYTES, FDA_GUIDANCE = "grant Full Disk Access to the terminal or app running AutoRAG (System Settings -> Privacy & Security -> Full Disk Access), then restart it", spawnRunner = (command, args, timeoutMs) => new Promise((resolve) => {
-  const child = spawn13(command, [...args], { stdio: ["ignore", "pipe", "pipe"] });
-  let stdout = "";
-  let stderr = "";
-  let settled = false;
-  const finish = (result) => {
-    if (settled)
-      return;
-    settled = true;
-    clearTimeout(timer);
-    resolve(result);
-  };
-  const timer = setTimeout(() => {
-    child.kill("SIGKILL");
-    finish({ ok: false, stdout, stderr: "process timed out", code: null });
-  }, timeoutMs);
-  child.stdout.setEncoding("utf8");
-  child.stderr.setEncoding("utf8");
-  child.stdout.on("data", (chunk) => {
-    if (stdout.length < MAX_BUFFER_BYTES)
-      stdout += chunk;
-  });
-  child.stderr.on("data", (chunk) => {
-    if (stderr.length < MAX_BUFFER_BYTES)
-      stderr += chunk;
-  });
-  child.on("error", (error) => {
-    finish({ ok: false, stdout, stderr: error.message, code: null, error: error.code });
-  });
-  child.on("close", (code) => {
-    finish({ ok: code === 0, stdout, stderr, code });
-  });
-});
-var init_connector5 = __esm(() => {
-  DEFAULT_MAX_BYTES_PER_FILE2 = 256 * 1024;
-  MAX_BUFFER_BYTES = 4 * 1024 * 1024;
-});
-
-// src/datasource/skills/spotlight/skill.ts
-class SpotlightSkill {
-  connector;
-  skillName;
-  instanceId;
-  instances;
-  tags;
-  lastIndexedAt;
-  lastError;
-  constructor(options = {}) {
-    this.skillName = options.skillName ?? "spotlight";
-    this.instanceId = options.instanceId ?? "default";
-    this.instances = options.instances !== undefined && options.instances.length > 0 ? options.instances : [this.instanceId];
-    this.tags = options.tags ?? DEFAULT_TAGS4;
-    this.connector = options.connector ?? new SpotlightConnector(options.connectorOptions ?? {});
-  }
-  describe() {
-    return {
-      name: this.skillName,
-      id: this.skillName,
-      type: "spotlight-search",
-      description: "Live macOS Spotlight search via the built-in mdfind CLI",
-      capabilities: ["files", "macos-only", "local-search", "live-search", "scoped", "external-cli"],
-      tags: this.tags,
-      status: "active",
-      requiresExternalCli: true,
-      datasourceId: this.skillName,
-      instanceId: this.instanceId,
-      instances: this.instances
-    };
-  }
-  polling() {
-    return {
-      mode: "none",
-      ...this.lastIndexedAt !== undefined ? { lastIndexedAt: this.lastIndexedAt } : {},
-      ...this.lastError !== undefined ? { lastError: this.lastError } : {}
-    };
-  }
-  async index() {
-    try {
-      const result = await this.connector.probe();
-      if (!result.ok) {
-        const code = connectorFailureToDiagnosticCode(result.reason);
-        const message = boundDiagnosticText(result.message ?? result.reason);
-        this.lastError = message;
-        return this.fail(code, message);
-      }
-      this.lastError = undefined;
-      this.lastIndexedAt = Date.now();
-      return {
-        ok: true,
-        instanceId: this.instanceId,
-        skill: this.skillName,
-        chunkCount: 0,
-        indexedAt: this.lastIndexedAt,
-        diagnostics: [this.note(LIVE_NOTE, "datasource-empty", "info")]
-      };
-    } catch (error) {
-      const message = boundDiagnosticText(error instanceof Error ? error.message : "spotlight probe failed");
-      this.lastError = message;
-      return this.fail("datasource-unavailable", message);
-    }
-  }
-  retrievalMethods() {
-    return [new SpotlightLiveMethod(this)];
-  }
-  describeSources() {
-    return this.instances.map((instanceId) => ({
-      source: datasourceSourcePath(this.skillName, instanceId),
-      datasourceId: this.skillName,
-      skill: this.skillName,
-      instanceId,
-      contentType: "document",
-      metadata: { datasourceId: this.skillName, instanceId, tags: this.tags }
-    }));
-  }
-  skillManifest() {
-    const scopes = this.instances.map((instanceId) => `- \`${datasourceSourcePath(this.skillName, instanceId)}\``).join(`
-`);
-    return {
-      name: `datasource-${this.skillName}`,
-      description: "Search the current macOS Spotlight index directly. AutoRAG keeps no file snapshot.",
-      content: [
-        "# macOS Spotlight (live mdfind search)",
-        "",
-        "Search files indexed by macOS Spotlight via the built-in `mdfind` CLI. macOS owns and refreshes the index; AutoRAG does not copy files into a local snapshot.",
-        "",
-        "## Platform requirements",
-        "- macOS only: this datasource is unavailable on any other platform.",
-        "- Spotlight indexing must be enabled (`sudo mdutil -i on /`; check with `mdutil -s /`).",
-        "- Full Disk Access may be required to read protected hits. Grant it under System Settings -> Privacy & Security -> Full Disk Access, then restart the host app.",
-        "",
-        "## How to search",
-        `Call the dedicated \`${datasourceSearchToolName(this.skillName)}\` tool with a query and optional narrowing scope. Available scopes:`,
-        scopes,
-        "Each configured Spotlight filter is AND-ed with the user query. Only the requested hits are read; refresh performs a readiness probe without running `mdfind`.",
-        "Result metadata carries the real absolute file path (`path`) so hits are traceable back to disk. If paths must not leave this machine, run AutoRAG with a local LLM.",
-        "",
-        "## Native CLI",
-        "- `mdfind <query>` searches Spotlight; `mdfind -onlyin <dir> <query>` scopes to a directory; `mdfind -name <text>` matches file names.",
-        "- `mdls <file>` shows Spotlight metadata for one file.",
-        "- `mdutil -s /` checks index status; `sudo mdutil -i on /` enables indexing."
-      ].join(`
-`)
-    };
-  }
-  async search(query, options) {
-    const trimmed = query.trim();
-    if (trimmed.length === 0)
-      return [];
-    const scope = options.scope?.trim() ? normalizeVirtualPath2(options.scope) : undefined;
-    if (scope !== undefined) {
-      const chunksRoot = normalizeVirtualPath2(`/${this.skillName}/${this.instanceId}/chunks`);
-      const scopeProbe = datasourceSourcePath(this.skillName, this.instanceId, "__scope_probe__");
-      if (!matchesDatasourceScope(chunksRoot, scope) && !matchesDatasourceScope(scopeProbe, scope) && !scope.startsWith(`${chunksRoot}/`)) {
-        return [];
-      }
-    }
-    const topK = options.topK ?? DEFAULT_TOP_K9;
-    const result = await this.connector.search(trimmed, topK, (docId) => matchesDatasourceScope(datasourceSourcePath(this.skillName, this.instanceId, docId), scope));
-    if (!result.ok) {
-      throw datasourceCliError(this.skillName, "search", {
-        reason: result.reason,
-        stderr: result.stderr ?? result.message,
-        stdout: result.stdout,
-        code: result.code
-      });
-    }
-    const hits = [];
-    for (const [index, document] of result.documents.entries()) {
-      const source = datasourceSourcePath(this.skillName, this.instanceId, document.docId);
-      if (!matchesDatasourceScope(source, options.scope))
-        continue;
-      hits.push({
-        id: `${this.skillName}:${this.instanceId}:${document.docId}`,
-        content: document.content,
-        source,
-        score: 1 / (index + 1),
-        metadata: {
-          ...document.metadata,
-          method: `${this.skillName}-live`,
-          datasourceId: this.skillName,
-          instanceId: this.instanceId,
-          chunkId: document.docId,
-          ...document.title !== undefined ? { title: document.title } : {},
-          ...document.hierarchy !== undefined && document.hierarchy.length > 0 ? { hierarchy: document.hierarchy.join("/") } : {},
-          ...document.publishedAt !== undefined ? { publishedAt: document.publishedAt } : {},
-          ...result.warnings !== undefined && result.warnings.length > 0 ? { warnings: result.warnings } : {}
-        }
-      });
-      if (hits.length >= topK)
-        break;
-    }
-    return hits;
-  }
-  fail(code, message) {
-    return {
-      ok: false,
-      instanceId: this.instanceId,
-      skill: this.skillName,
-      indexedAt: Date.now(),
-      diagnostics: [
-        this.note(message, code, code === "datasource-unavailable" || code === "datasource-empty" ? "warning" : "error")
-      ],
-      error: message,
-      code,
-      message
-    };
-  }
-  note(message, code, severity) {
-    return { code, severity, message, instanceId: this.instanceId, source: this.skillName };
-  }
-}
-
-class SpotlightLiveMethod {
-  skill;
-  constructor(skill) {
-    this.skill = skill;
-  }
-  describe() {
-    const descriptor = this.skill.describe();
-    return {
-      name: `${descriptor.datasourceId ?? "spotlight"}-live`,
-      type: "remote",
-      description: "Live macOS Spotlight search via mdfind",
-      status: "active",
-      capabilities: ["live-search", "scoped", "external-cli", "path-opaque-sources"],
-      datasourceId: descriptor.datasourceId,
-      tags: descriptor.tags
-    };
-  }
-  retrieve(query, options) {
-    return this.skill.search(query, options);
-  }
-}
-var DEFAULT_TAGS4, DEFAULT_TOP_K9 = 20, LIVE_NOTE = "live-search datasource: macOS owns the Spotlight index; AutoRAG stores no snapshot";
-var init_skill12 = __esm(() => {
-  init_connector();
-  init_errors2();
-  init_scope2();
-  init_connector5();
-  DEFAULT_TAGS4 = ["spotlight", "files"];
-});
-
-// src/datasource/skills/spotlight/index.ts
-var init_spotlight = __esm(() => {
-  init_connector5();
-  init_skill12();
-});
-
 // src/datasource/skills/telecrawl/index.ts
 function globalArgs3(options) {
   return [
@@ -15341,7 +14981,6 @@ var init_factory = __esm(() => {
   init_obsidian();
   init_rss();
   init_slack();
-  init_spotlight();
   init_telecrawl();
   init_wacrawl();
   BUILDERS = {
@@ -15478,12 +15117,6 @@ var init_factory = __esm(() => {
       ...common(config, workspaceRoot),
       skillName: registrationName,
       connectorOptions: config.connector
-    }),
-    spotlight: (config, _workspaceRoot, registrationName) => new SpotlightSkill({
-      ...config.instanceId !== undefined ? { instanceId: config.instanceId } : {},
-      ...config.tags !== undefined ? { tags: config.tags } : {},
-      skillName: registrationName,
-      connectorOptions: config.connector
     })
   };
   PLATFORM_ONLY_SKILLS = { kakao: "darwin" };
@@ -15765,7 +15398,7 @@ var init_types3 = __esm(() => {
 // src/cli/config.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { existsSync as existsSync16, mkdirSync as mkdirSync14, readFileSync as readFileSync19, unlinkSync as unlinkSync2, writeFileSync as writeFileSync10 } from "node:fs";
-import { basename as basename7, dirname as dirname15, isAbsolute as isAbsolute6, join as join27, resolve as resolve7 } from "node:path";
+import { basename as basename6, dirname as dirname15, isAbsolute as isAbsolute6, join as join27, resolve as resolve7 } from "node:path";
 import { findEnvKeys, getEnvApiKey } from "@earendil-works/pi-ai/compat";
 import { getAgentDir as getAgentDir2, ModelRuntime, SettingsManager } from "@earendil-works/pi-coding-agent";
 function resolveConfigPath(input) {
@@ -15839,7 +15472,7 @@ function acquireConfigWriteLock(configPath) {
   });
 }
 function replaceFileAtomically(path, contents, assertCommitAllowed) {
-  const temporaryPath = join27(dirname15(path), `.${basename7(path)}.${process.pid}.${randomUUID4()}.tmp`);
+  const temporaryPath = join27(dirname15(path), `.${basename6(path)}.${process.pid}.${randomUUID4()}.tmp`);
   try {
     writeFileSync10(temporaryPath, contents, { encoding: "utf8", flag: "wx", flush: true, mode: 384 });
     assertCommitAllowed?.();
@@ -17351,7 +16984,7 @@ function loopGuardPrompt(rule) {
 }
 
 // src/convert/cli.ts
-import { spawn as spawn14 } from "node:child_process";
+import { spawn as spawn13 } from "node:child_process";
 import { accessSync as accessSync2, constants as constants2, existsSync as existsSync17 } from "node:fs";
 import { delimiter as delimiter4, dirname as dirname16, join as join29, resolve as resolve8 } from "node:path";
 async function convertWithFilee(request, options = {}) {
@@ -17429,7 +17062,7 @@ function spawnFilee(executable, args, options) {
     }
     const portable = portableSpawnCommand(executable, args);
     const env = options.dataDir === undefined ? process.env : { ...process.env, FILEE_DATA_DIR: resolve8(options.dataDir) };
-    const child = spawn14(portable.command, [...portable.args], {
+    const child = spawn13(portable.command, [...portable.args], {
       cwd: options.cwd,
       env,
       stdio: ["ignore", "pipe", "pipe"]
@@ -17501,7 +17134,7 @@ var init_cli = __esm(() => {
 });
 
 // src/convert/installer.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 import { createReadStream as createReadStream2, createWriteStream as createWriteStream2, existsSync as existsSync18, mkdirSync as mkdirSync15, readdirSync as readdirSync4, renameSync as renameSync4, rmSync as rmSync6 } from "node:fs";
 import { mkdtemp as mkdtemp2 } from "node:fs/promises";
 import { join as join30 } from "node:path";
@@ -17574,7 +17207,7 @@ async function downloadFile2(url, destination) {
   await pipeline2(Readable.fromWeb(response.body), createWriteStream2(destination));
 }
 async function verifySha2562(path, expected, name) {
-  const hash = createHash11("sha256");
+  const hash = createHash10("sha256");
   await pipeline2(createReadStream2(path), hash);
   const actual = hash.digest("hex");
   if (actual !== expected) {
@@ -18118,7 +17751,7 @@ var init_matrix = __esm(() => {
 });
 
 // src/dupey/cli.ts
-import { spawn as spawn15 } from "node:child_process";
+import { spawn as spawn14 } from "node:child_process";
 import { resolve as resolve9 } from "node:path";
 function runDupey(args, options) {
   return options.run ? options.run(args) : spawnDupey(options.executable ?? "dupey", args, options);
@@ -18190,7 +17823,7 @@ function isScanResult(value) {
 function spawnDupey(executable, args, options) {
   return new Promise((resolveOutput, reject) => {
     const portable = portableSpawnCommand(executable, args);
-    const child = spawn15(portable.command, [...portable.args], {
+    const child = spawn14(portable.command, [...portable.args], {
       cwd: options.cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -18238,7 +17871,7 @@ var init_cli2 = __esm(() => {
 });
 
 // src/dupey/filter.ts
-import { stat as stat3 } from "node:fs/promises";
+import { stat as stat2 } from "node:fs/promises";
 import { resolve as resolve10 } from "node:path";
 async function selectExactDuplicateExclusions(root, scan, isUnavailable) {
   const byHash = new Map;
@@ -18293,7 +17926,7 @@ async function rankExactCandidates(paths, dupeyRanking, errors) {
   }
   const ranked = await Promise.all(paths.map(async (path) => {
     try {
-      const info = await stat3(path);
+      const info = await stat2(path);
       return { path, mtimeMs: info.mtimeMs };
     } catch {
       errors.push("dupey exact duplicate path disappeared before indexing.");
@@ -18462,7 +18095,7 @@ var init_retry = __esm(() => {
 });
 
 // src/everything/bundle.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 import { existsSync as existsSync19, mkdirSync as mkdirSync16, readFileSync as readFileSync20, rmSync as rmSync7, writeFileSync as writeFileSync11 } from "node:fs";
 import { dirname as dirname17, join as join31 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -18580,7 +18213,7 @@ function writeAtomic(path, bytes) {
   }
 }
 function sha256(bytes) {
-  return createHash12("sha256").update(bytes).digest("hex");
+  return createHash11("sha256").update(bytes).digest("hex");
 }
 function errorMessage2(error) {
   return error instanceof Error ? error.message : String(error);
@@ -18610,13 +18243,13 @@ function createPathExclusionMatcher(excludedPaths, platform = process.platform)
 var init_path_exclusions = () => {};
 
 // src/everything/client.ts
-import { spawn as spawn16 } from "node:child_process";
-import { createHash as createHash13 } from "node:crypto";
+import { spawn as spawn15 } from "node:child_process";
+import { createHash as createHash12 } from "node:crypto";
 import { mkdirSync as mkdirSync17, writeFileSync as writeFileSync12 } from "node:fs";
 import { join as join32, resolve as resolve11 } from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
 function everythingInstanceName(root) {
-  return `autorag-${createHash13("sha256").update(resolve11(root).toLowerCase()).digest("hex").slice(0, 12)}`;
+  return `autorag-${createHash12("sha256").update(resolve11(root).toLowerCase()).digest("hex").slice(0, 12)}`;
 }
 function buildEverythingIni(input) {
   const list = (values) => values.map((value) => `"${value.replace(/\\/g, "\\\\")}"`).join(",");
@@ -18755,7 +18388,7 @@ class EverythingClient {
         };
       }
       const es = { ok: true, esPath: binaries.esPath };
-      const timeoutMs = this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9;
+      const timeoutMs = this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS8;
       if ((this.options.excludeFolders?.length ?? 0) > 0) {
         return this.searchWithExclusions(es.esPath, request, timeoutMs);
       }
@@ -18840,7 +18473,7 @@ class EverythingClient {
       const binaries = await this.resolveBinaries("cached");
       if (!binaries.ok)
         return;
-      await this.run(binaries.esPath, ["-instance", this.instanceName, "-exit"], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9);
+      await this.run(binaries.esPath, ["-instance", this.instanceName, "-exit"], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS8);
     });
   }
   serialize(task) {
@@ -18870,7 +18503,7 @@ class EverythingClient {
     const binaries = await this.resolveBinaries("install");
     if (!binaries.ok)
       return binaries;
-    const timeoutMs = this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9;
+    const timeoutMs = this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS8;
     let ping = await this.ping(binaries.esPath);
     if (ping.code === 0 && !reconfigure)
       return { ok: true, esPath: binaries.esPath };
@@ -18927,7 +18560,7 @@ class EverythingClient {
     };
   }
   async ping(esPath) {
-    const result = await this.run(esPath, ["-instance", this.instanceName, "-get-everything-version"], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9);
+    const result = await this.run(esPath, ["-instance", this.instanceName, "-get-everything-version"], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS8);
     return result.code === 0 && !VERSION_PATTERN.test(result.stdout.trim()) ? { ...result, code: -1 } : result;
   }
   failure(reason, esPath, args, result) {
@@ -18943,7 +18576,7 @@ function runProcess(command, args, timeoutMs) {
   const promise = new Promise((resolve) => {
     resolvePromise = resolve;
   });
-  const child = spawn16(command, args, { windowsHide: true, stdio: ["ignore", "pipe", "pipe"] });
+  const child = spawn15(command, args, { windowsHide: true, stdio: ["ignore", "pipe", "pipe"] });
   const stdout = [];
   const stderr = [];
   let bytes = 0;
@@ -18978,11 +18611,11 @@ killed by ${signal} after ${timeoutMs}ms` : err
   return promise;
 }
 function launchDetached(command, args) {
-  const child = spawn16(command, args, { detached: true, stdio: "ignore", windowsHide: true });
+  const child = spawn15(command, args, { detached: true, stdio: "ignore", windowsHide: true });
   child.on("error", () => {});
   child.unref();
 }
-var DEFAULT_TIMEOUT_MS9 = 30000, DEFAULT_STARTUP_TIMEOUT_MS = 20000, DEFAULT_INDEX_TIMEOUT_MS2, DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_MAX_RESULTS = 100, MAX_FILTER_CANDIDATES = 1000, MAX_OUTPUT_BYTES, VERSION_PATTERN;
+var DEFAULT_TIMEOUT_MS8 = 30000, DEFAULT_STARTUP_TIMEOUT_MS = 20000, DEFAULT_INDEX_TIMEOUT_MS2, DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_MAX_RESULTS = 100, MAX_FILTER_CANDIDATES = 1000, MAX_OUTPUT_BYTES, VERSION_PATTERN;
 var init_client8 = __esm(() => {
   init_path_exclusions();
   init_bundle();
@@ -18998,8 +18631,8 @@ var init_everything = __esm(() => {
 });
 
 // src/fsearch/walk.ts
-import { readdir, stat as stat4 } from "node:fs/promises";
-import { basename as basename8, join as join33, sep as sep5 } from "node:path";
+import { readdir, stat as stat3 } from "node:fs/promises";
+import { basename as basename7, join as join33, sep as sep5 } from "node:path";
 function compare(a, b) {
   return a < b ? -1 : a > b ? 1 : 0;
 }
@@ -19010,11 +18643,11 @@ async function walkFileSearch(folders, request, options = {}) {
   const deadline = Date.now() + (options.deadlineMs ?? DEFAULT_DEADLINE_MS);
   const matches = request.regex ? (() => {
     const pattern = new RegExp(request.query, request.matchCase ? "" : "i");
-    return (path) => pattern.test(request.matchPath ? path : basename8(path));
+    return (path) => pattern.test(request.matchPath ? path : basename7(path));
   })() : (() => {
     const needle = request.matchCase ? request.query : request.query.toLowerCase();
     return (path) => {
-      const haystack = request.matchPath ? path : basename8(path);
+      const haystack = request.matchPath ? path : basename7(path);
       return (request.matchCase ? haystack : haystack.toLowerCase()).includes(needle);
     };
   })();
@@ -19062,14 +18695,14 @@ async function walkFileSearch(folders, request, options = {}) {
         if (!matches(path))
           continue;
         try {
-          const info = await stat4(path);
+          const info = await stat3(path);
           if (request.kind === "folders" && !info.isDirectory())
             continue;
           if (request.kind === "files" && info.isDirectory())
             continue;
           collected.push({
             path,
-            name: basename8(path),
+            name: basename7(path),
             type: info.isDirectory() ? "folder" : "file",
             size: info.isDirectory() ? undefined : info.size,
             dateModified: info.mtime.toISOString()
@@ -19089,12 +18722,12 @@ async function walkFileSearch(folders, request, options = {}) {
     if (request.kind === "files")
       continue;
     try {
-      const info = await stat4(folder);
+      const info = await stat3(folder);
       if (!info.isDirectory())
         continue;
       collected.push({
         path: folder,
-        name: basename8(folder),
+        name: basename7(folder),
         type: "folder",
         size: undefined,
         dateModified: info.mtime.toISOString()
@@ -19124,10 +18757,10 @@ var init_walk = __esm(() => {
 });
 
 // src/fsearch/client.ts
-import { spawn as spawn17 } from "node:child_process";
-import { createHash as createHash14 } from "node:crypto";
+import { spawn as spawn16 } from "node:child_process";
+import { createHash as createHash13 } from "node:crypto";
 import { existsSync as existsSync20, mkdirSync as mkdirSync18, readFileSync as readFileSync21, realpathSync as realpathSync3, rmSync as rmSync8, writeFileSync as writeFileSync13 } from "node:fs";
-import { basename as basename9, join as join34, resolve as resolve12, sep as sep6 } from "node:path";
+import { basename as basename8, join as join34, resolve as resolve12, sep as sep6 } from "node:path";
 import { setTimeout as sleep2 } from "node:timers/promises";
 function fsearchSocketPath(dbPath) {
   let canonical;
@@ -19136,7 +18769,7 @@ function fsearchSocketPath(dbPath) {
   } catch {
     canonical = resolve12(dbPath);
   }
-  const hash = createHash14("sha256").update(canonical).digest("hex").slice(0, 12);
+  const hash = createHash13("sha256").update(canonical).digest("hex").slice(0, 12);
   return `/tmp/autorag-fsearch-${process.getuid?.() ?? 0}-${hash}.sock`;
 }
 function buildFSearchSearchArgs(dbPath, socketPath, request) {
@@ -19191,7 +18824,7 @@ function parseFSearchJsonLines(stdout) {
     const path = String(record.path ?? "");
     entries.push({
       path,
-      name: basename9(path),
+      name: basename8(path),
       type: record.type === "folder" ? "folder" : "file",
       size: typeof record.size === "number" ? record.size : undefined,
       dateModified: typeof record.mtime === "number" ? new Date(record.mtime * 1000).toISOString() : undefined
@@ -19269,7 +18902,7 @@ class FSearchClient {
       const hasExclusions = (this.options.excludeFolders?.length ?? 0) > 0;
       const nativeRequest = hasExclusions ? { ...request, offset: 0, maxResults: MAX_RESULTS_CAP } : request;
       const args = buildFSearchSearchArgs(this.dbPath, this.socketPath(), nativeRequest);
-      const result = await this.run(binary.path, args, this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS10);
+      const result = await this.run(binary.path, args, this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9);
       if (result.code !== 0)
         return this.failure("search-failed", binary.path, args, result);
       let parsed;
@@ -19336,7 +18969,7 @@ class FSearchClient {
     if (indexed.code !== 0)
       return this.failure("index-failed", binaryPath, indexArgs, indexed);
     const statsArgs = ["stats", "--db", this.dbPath, "--socket", this.socketPath()];
-    const stats = await this.run(binaryPath, statsArgs, this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS10);
+    const stats = await this.run(binaryPath, statsArgs, this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9);
     if (stats.code !== 0)
       return this.failure("index-failed", binaryPath, statsArgs, stats);
     let counts;
@@ -19384,7 +19017,7 @@ class FSearchClient {
     }
   }
   async serving(binaryPath) {
-    const stats = await this.run(binaryPath, ["stats", "--db", this.dbPath, "--socket", this.socketPath()], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS10);
+    const stats = await this.run(binaryPath, ["stats", "--db", this.dbPath, "--socket", this.socketPath()], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9);
     if (stats.code !== 0)
       return false;
     try {
@@ -19417,7 +19050,7 @@ class FSearchClient {
     if (this.binary !== undefined)
       return this.binary;
     const path = this.options.binaryPath ?? "fsearch-cli";
-    const probe = await this.run(path, ["--version"], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS10);
+    const probe = await this.run(path, ["--version"], this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS9);
     this.binary = probe.code === 0 ? { ok: true, path } : {
       ok: false,
       reason: "binary-missing",
@@ -19445,7 +19078,7 @@ function runProcess2(command, args, timeoutMs) {
   const promise = new Promise((resolve) => {
     resolvePromise = resolve;
   });
-  const child = spawn17(command, args, { windowsHide: true, stdio: ["ignore", "pipe", "pipe"] });
+  const child = spawn16(command, args, { windowsHide: true, stdio: ["ignore", "pipe", "pipe"] });
   const stdout = [];
   const stderr = [];
   let bytes = 0;
@@ -19480,7 +19113,7 @@ killed by ${signal} after ${timeoutMs}ms` : err
   return promise;
 }
 function launchDetached2(command, args) {
-  const child = spawn17(command, args, { detached: true, stdio: "ignore", windowsHide: true });
+  const child = spawn16(command, args, { detached: true, stdio: "ignore", windowsHide: true });
   child.on("error", () => {});
   child.unref();
   return child.pid;
@@ -19493,7 +19126,7 @@ function defaultIsProcessAlive(pid) {
     return false;
   }
 }
-var DEFAULT_TIMEOUT_MS10 = 30000, DEFAULT_STARTUP_TIMEOUT_MS2 = 1e4, STOP_TIMEOUT_MS2 = 2000, DEFAULT_INDEX_TIMEOUT_MS3, DEFAULT_POLL_INTERVAL_MS2 = 250, DEFAULT_MAX_RESULTS2 = 100, MAX_RESULTS_CAP = 1000, MAX_OUTPUT_BYTES2, SORT_KEYS;
+var DEFAULT_TIMEOUT_MS9 = 30000, DEFAULT_STARTUP_TIMEOUT_MS2 = 1e4, STOP_TIMEOUT_MS2 = 2000, DEFAULT_INDEX_TIMEOUT_MS3, DEFAULT_POLL_INTERVAL_MS2 = 250, DEFAULT_MAX_RESULTS2 = 100, MAX_RESULTS_CAP = 1000, MAX_OUTPUT_BYTES2, SORT_KEYS;
 var init_client9 = __esm(() => {
   init_path_exclusions();
   init_walk();
@@ -19723,7 +19356,7 @@ var init_answer_pack = __esm(() => {
 });
 
 // src/jikji/installer.ts
-import { spawn as spawn18 } from "node:child_process";
+import { spawn as spawn17 } from "node:child_process";
 import { existsSync as existsSync21 } from "node:fs";
 import { delimiter as delimiter5, join as join36 } from "node:path";
 function jikjiExecutableName(platform = process.platform) {
@@ -19750,7 +19383,7 @@ function lookupExecutableInPath(executable, env) {
 }
 function defaultRunner(cargo, env) {
   return (args, timeoutMs) => new Promise((resolvePromise) => {
-    const child = spawn18(cargo, args, { env, stdio: ["ignore", "ignore", "pipe"] });
+    const child = spawn17(cargo, args, { env, stdio: ["ignore", "ignore", "pipe"] });
     let stderr = "";
     const timeout = setTimeout(() => {
       if (!child.killed)
@@ -19864,7 +19497,7 @@ class SerialQueue {
 }
 
 // src/jikji/client.ts
-import { spawn as spawn19 } from "node:child_process";
+import { spawn as spawn18 } from "node:child_process";
 import { existsSync as existsSync22, realpathSync as realpathSync5 } from "node:fs";
 
 class JikjiClient {
@@ -19978,7 +19611,7 @@ class JikjiClient {
     if (perFile <= 0)
       return;
     const files = await countFiles(root, options.includeHidden === true, signal);
-    return scaledPrepareTimeoutMs(options.timeoutMs ?? DEFAULT_TIMEOUT_MS11, perFile, files);
+    return scaledPrepareTimeoutMs(options.timeoutMs ?? DEFAULT_TIMEOUT_MS10, perFile, files);
   }
   async spawn(request) {
     return spawnJikji({
@@ -19991,7 +19624,7 @@ function spawnJikji(request) {
   return new Promise((resolve) => {
     const options = request.options;
     const portable = portableSpawnCommand(request.command, request.args);
-    const child = spawn19(portable.command, [...portable.args], {
+    const child = spawn18(portable.command, [...portable.args], {
       env: controlledEnv4(options.env),
       ...request.cwd === undefined ? {} : { cwd: request.cwd },
       detached: process.platform !== "win32",
@@ -20023,7 +19656,7 @@ function spawnJikji(request) {
     const timeout = setTimeout(() => {
       finalReason = "timeout";
       terminate(child);
-    }, request.timeoutMs ?? options.timeoutMs ?? DEFAULT_TIMEOUT_MS11);
+    }, request.timeoutMs ?? options.timeoutMs ?? DEFAULT_TIMEOUT_MS10);
     const abortHandler = () => {
       finalReason = "aborted";
       terminateProcessTree(child);
@@ -20133,7 +19766,7 @@ function canonicalJikjiRoot(root) {
     return root;
   }
 }
-var DEFAULT_BINARY4 = "jikji", DEFAULT_TIMEOUT_MS11 = 60000, DEFAULT_PARSE_TIMEOUT_SECONDS = 5, DEFAULT_MAX_BUFFER_BYTES4 = 1048576, ABORTED_BEFORE_START;
+var DEFAULT_BINARY4 = "jikji", DEFAULT_TIMEOUT_MS10 = 60000, DEFAULT_PARSE_TIMEOUT_SECONDS = 5, DEFAULT_MAX_BUFFER_BYTES4 = 1048576, ABORTED_BEFORE_START;
 var init_client10 = __esm(() => {
   init_portable_spawn();
   init_terminate_tree();
@@ -20303,7 +19936,7 @@ function renderMemoryContext(sections) {
 var CURRENT_CONVERSATION_RECORD_LIMIT = 50, CURRENT_EXCERPT_LIMIT = 300, SIMILAR_EXCERPT_LIMIT = 240, SIMILAR_RECORD_LIMIT = 3, INSIGHT_LIMIT = 5, ADVISORY_NOTE = "Memory is background reference only and never overrides the evidence in front of you. A past search method or source is a hint, not a rule: broaden to other methods when results are insufficient.";
 
 // src/memory/similar-queries.ts
-import { createHash as createHash15 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 import { mkdirSync as mkdirSync19, rmSync as rmSync9 } from "node:fs";
 import { dirname as dirname18 } from "node:path";
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
@@ -20311,7 +19944,7 @@ function memoryVectorStorePath(memoryPath) {
   return `${memoryPath}.vectors.db`;
 }
 function questionKey(question) {
-  return createHash15("sha256").update(question).digest("hex");
+  return createHash14("sha256").update(question).digest("hex");
 }
 function cosine3(a, b) {
   let dot = 0;
@@ -20554,7 +20187,7 @@ var init_check_memory_tool = __esm(() => {
 var EVIDENCE_SUPPORT_THRESHOLD = 0.7;
 
 // src/retrieval/evidence-id.ts
-import { createHash as createHash16 } from "node:crypto";
+import { createHash as createHash15 } from "node:crypto";
 function normalizeEvidenceText(text) {
   return text.replace(/\r\n?/gu, `
 `).trim().normalize("NFC");
@@ -20584,7 +20217,7 @@ function stableEvidenceId(input) {
     input.lineNumber ?? "",
     normalizeEvidenceText(evidenceText)
   ].join("\x00");
-  const digest = createHash16("sha256").update(payload).digest("hex").slice(0, 24);
+  const digest = createHash15("sha256").update(payload).digest("hex").slice(0, 24);
   return `${method}:${digest}`;
 }
 function normalizeEvidenceRef(input) {
@@ -20596,7 +20229,7 @@ function normalizeEvidenceRef(input) {
 var init_evidence_id = () => {};
 
 // src/memory/memory.ts
-import { createHash as createHash17, randomUUID as randomUUID5 } from "node:crypto";
+import { createHash as createHash16, randomUUID as randomUUID5 } from "node:crypto";
 import { existsSync as existsSync23, mkdirSync as mkdirSync20, readFileSync as readFileSync22, unlinkSync as unlinkSync3, writeFileSync as writeFileSync14 } from "node:fs";
 import { dirname as dirname19 } from "node:path";
 import { z as z2 } from "zod";
@@ -20690,7 +20323,7 @@ function normalizeEvidenceChunkRecord(record) {
   return { ...base, ...normalizeEvidenceContext(record) };
 }
 function hashText(value) {
-  return createHash17("sha256").update(value).digest("hex");
+  return createHash16("sha256").update(value).digest("hex");
 }
 function resultId(sessionId, number) {
   return `${sessionId}:${number}`;
@@ -21224,7 +20857,7 @@ import {
   rmSync as rmSync10,
   writeFileSync as writeFileSync15
 } from "node:fs";
-import { basename as basename10, dirname as dirname20, isAbsolute as isAbsolute9, join as join39, relative as relative7, sep as sep8 } from "node:path";
+import { basename as basename9, dirname as dirname20, isAbsolute as isAbsolute9, join as join39, relative as relative7, sep as sep8 } from "node:path";
 function syncMinSyncWorkspace(root, options = {}) {
   const workspacePath = options.workspacePath ?? minSyncWorkspaceRoot(root);
   const filesRoot = join39(workspacePath, "files");
@@ -21265,7 +20898,7 @@ function syncMinSyncWorkspace(root, options = {}) {
   return { workspacePath, entries, excluded };
 }
 function stagingStatePath(workspacePath) {
-  return join39(dirname20(workspacePath), `.${basename10(workspacePath)}-autorag-staging.json`);
+  return join39(dirname20(workspacePath), `.${basename9(workspacePath)}-autorag-staging.json`);
 }
 function loadStagingState2(workspacePath) {
   const path = stagingStatePath(workspacePath);
@@ -21316,7 +20949,7 @@ function ensureManagedDirectory(filesRoot, directory) {
   }
 }
 function copyFileAtomically(source, destination) {
-  const temporaryPath = join39(dirname20(destination), `.${basename10(destination)}.${randomUUID6()}.tmp`);
+  const temporaryPath = join39(dirname20(destination), `.${basename9(destination)}.${randomUUID6()}.tmp`);
   try {
     copyFileSync4(source, temporaryPath);
     renameWithRetry(temporaryPath, destination);
@@ -21370,7 +21003,7 @@ var init_workspace = __esm(() => {
 
 // src/minsync/method.ts
 import { existsSync as existsSync25, readFileSync as readFileSync24, realpathSync as realpathSync6, statSync as statSync7 } from "node:fs";
-import { basename as basename11, join as join40, normalize as normalize2 } from "node:path";
+import { basename as basename10, join as join40, normalize as normalize2 } from "node:path";
 
 class MinSyncVectorMethod {
   root;
@@ -21471,7 +21104,7 @@ class MinSyncVectorMethod {
       const entry = byPath.get(hit.path);
       if (!entry || !matchesVirtualPathScope(entry.virtualPath, options.scope))
         continue;
-      const chunkDiscriminator = hit.docId ?? basename11(hit.path);
+      const chunkDiscriminator = hit.docId ?? basename10(hit.path);
       const chunkId = `minsync:${entry.virtualPath}:${chunkDiscriminator}`;
       const location = locateChunkInMirror(mirrorTexts, entry, hit.text);
       results.push({
@@ -21712,9 +21345,9 @@ var init_isolated = __esm(() => {
 });
 
 // src/mirror/sync.ts
-import { createHash as createHash18 } from "node:crypto";
-import { opendir as opendir2, readFile as readFile2, stat as stat5 } from "node:fs/promises";
-import { basename as basename12, extname as extname7, join as join42, resolve as resolve15, sep as sep9 } from "node:path";
+import { createHash as createHash17 } from "node:crypto";
+import { opendir as opendir2, readFile as readFile2, stat as stat4 } from "node:fs/promises";
+import { basename as basename11, extname as extname6, join as join42, resolve as resolve15, sep as sep9 } from "node:path";
 import { setTimeout as sleep3 } from "node:timers/promises";
 function errorCode(error) {
   if (!(error instanceof Error))
@@ -21764,7 +21397,7 @@ function parseFingerprint(options) {
     }
     return value;
   };
-  return createHash18("sha256").update(JSON.stringify(stable({ format: 1, parser: outputParserOptions(options.parserOptions) }))).digest("hex");
+  return createHash17("sha256").update(JSON.stringify(stable({ format: 1, parser: outputParserOptions(options.parserOptions) }))).digest("hex");
 }
 function outputParserOptions(options = {}) {
   const { fileTimeoutMs: _timeout, maxHeapMb: _heap, ocr, ...parser } = options;
@@ -21772,7 +21405,7 @@ function outputParserOptions(options = {}) {
 }
 function retryFingerprint(options, fingerprint) {
   const parser = options.parserOptions;
-  return createHash18("sha256").update(JSON.stringify({
+  return createHash17("sha256").update(JSON.stringify({
     fingerprint,
     fileTimeoutMs: parser?.fileTimeoutMs,
     maxHeapMb: parser?.maxHeapMb,
@@ -21991,7 +21624,7 @@ async function syncWithRegistry(options, registry, isolated) {
         }
         let info;
         try {
-          info = await stat5(entry.sourcePath, { bigint: true });
+          info = await stat4(entry.sourcePath, { bigint: true });
         } catch (error) {
           await skipFile(entry, sourceReadFailure(error));
           continue;
@@ -22023,7 +21656,7 @@ async function syncWithRegistry(options, registry, isolated) {
           continue;
         }
         await session.commit(mirrorStageKey(entry.virtualPath), versions.get(entry.virtualPath), {
-          path: basename12(outputPath),
+          path: basename11(outputPath),
           size: Buffer.byteLength(markdown)
         });
         for (const diagnostic of parsed.diagnostics ?? [])
@@ -22099,7 +21732,7 @@ async function detectMirrorStaleness(options) {
   }
 }
 function standaloneImageTooSmallMessage(virtualPath, bytes) {
-  if (!STANDALONE_OCR_IMAGE_EXTENSIONS.has(normalizeExtension2(extname7(virtualPath))))
+  if (!STANDALONE_OCR_IMAGE_EXTENSIONS.has(normalizeExtension2(extname6(virtualPath))))
     return;
   return ocrImageTooSmallMessage(bytes);
 }
@@ -22155,7 +21788,7 @@ function errnoCode2(error) {
 async function probeSearchRoot(rootPath) {
   let isDirectory;
   try {
-    isDirectory = (await stat5(rootPath)).isDirectory();
+    isDirectory = (await stat4(rootPath)).isDirectory();
   } catch (error) {
     const code = errnoCode2(error);
     return code === "ENOENT" || code === "ENOTDIR" ? "gone" : "unreadable";
@@ -22267,12 +21900,12 @@ async function collectFiles(state, directory, depth) {
       }
       if (!entry.isFile())
         continue;
-      const extension = normalizeExtension2(extname7(entry.name));
+      const extension = normalizeExtension2(extname6(entry.name));
       if (!state.supportedExtensions.has(extension))
         continue;
       let fileStat;
       try {
-        fileStat = await stat5(sourcePath, { bigint: true });
+        fileStat = await stat4(sourcePath, { bigint: true });
       } catch (error) {
         const code = errnoCode2(error);
         if (code === undefined)
@@ -26448,7 +26081,7 @@ var init_citations = __esm(() => {
 });
 
 // src/agent/evidence-ledger.ts
-import { createHash as createHash19 } from "node:crypto";
+import { createHash as createHash18 } from "node:crypto";
 import { closeSync as closeSync2, openSync as openSync2, readSync, statSync as statSync8 } from "node:fs";
 import { isAbsolute as isAbsolute10 } from "node:path";
 import { Type as Type3 } from "typebox";
@@ -26483,10 +26116,10 @@ function readFileExcerpt(path) {
   let descriptor;
   try {
     descriptor = openSync2(path, "r");
-    const buffer = Buffer.alloc(MAX_CONTENT_CHARS4 * 4);
+    const buffer = Buffer.alloc(MAX_CONTENT_CHARS3 * 4);
     const bytes = readSync(descriptor, buffer, 0, buffer.length, 0);
     const head = buffer.subarray(0, bytes);
-    return head.includes(0) ? path : head.toString("utf8").slice(0, MAX_CONTENT_CHARS4);
+    return head.includes(0) ? path : head.toString("utf8").slice(0, MAX_CONTENT_CHARS3);
   } catch {
     return path;
   } finally {
@@ -26519,8 +26152,8 @@ class EvidenceLedger {
   unsaved = new Set;
   lastOrdinal = 0;
   register(input) {
-    const content = input.content.slice(0, MAX_CONTENT_CHARS4);
-    const digest = createHash19("sha256").update(input.content.replace(/\s+/gu, " ").trim()).digest("hex");
+    const content = input.content.slice(0, MAX_CONTENT_CHARS3);
+    const digest = createHash18("sha256").update(input.content.replace(/\s+/gu, " ").trim()).digest("hex");
     const key = `${input.source}\x00${digest}`;
     const existing = this.byKey.get(key);
     if (existing !== undefined) {
@@ -26606,7 +26239,7 @@ class EvidenceLedger {
     this.lastOrdinal = Math.max(this.lastOrdinal, ordinalFloor, highestOrdinal(this.entries));
   }
 }
-var MAX_CONTENT_CHARS4 = 2000, EVIDENCE_ENTRY_TYPE = "autorag.evidence", ledgerEntrySchema, persistedEvidenceSchema;
+var MAX_CONTENT_CHARS3 = 2000, EVIDENCE_ENTRY_TYPE = "autorag.evidence", ledgerEntrySchema, persistedEvidenceSchema;
 var init_evidence_ledger = __esm(() => {
   ledgerEntrySchema = Type3.Object({
     id: Type3.String({ pattern: "^e[1-9][0-9]*$" }),
@@ -26838,7 +26471,7 @@ var init_ask_user = () => {};
 
 // src/automation/service.ts
 import { execFile as execFile2 } from "node:child_process";
-import { createHash as createHash20 } from "node:crypto";
+import { createHash as createHash19 } from "node:crypto";
 import { existsSync as existsSync28, mkdirSync as mkdirSync23, rmSync as rmSync11, writeFileSync as writeFileSync16 } from "node:fs";
 import { dirname as dirname24, join as join44, resolve as resolve16 } from "node:path";
 import { setTimeout as sleep5 } from "node:timers/promises";
@@ -26869,7 +26502,7 @@ function automationServiceDescriptor(options = {}) {
   const userHome = resolveUserHome(env);
   const defaultHome = resolve16(join44(userHome, ".autorag"));
   const home = resolve16(options.home ?? resolveAutoRAGHome(env));
-  const suffix = home === defaultHome ? "" : `-${createHash20("sha256").update(home).digest("hex").slice(0, 8)}`;
+  const suffix = home === defaultHome ? "" : `-${createHash19("sha256").update(home).digest("hex").slice(0, 8)}`;
   const automationsDir = join44(home, "automations");
   const envFilePath = join44(automationsDir, "service.env");
   const logPath = join44(automationsDir, "daemon.log");
@@ -27305,7 +26938,7 @@ var init_automation_tool = __esm(() => {
 });
 
 // src/agent/citation-links.ts
-import { basename as basename13, isAbsolute as isAbsolute12 } from "node:path";
+import { basename as basename12, isAbsolute as isAbsolute12 } from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 function openableTarget(source) {
   if (/^https?:\/\//iu.test(source)) {
@@ -27323,7 +26956,7 @@ function linkCitations(markdown, sourceOf, isFile) {
   for (const marker of answerMarkers(markdown, isFile)) {
     if (marker.kind === "number")
       continue;
-    const labels = marker.kind === "file" ? [{ label: basename13(marker.path), source: marker.path }] : marker.ids.map((id) => ({ label: id, source: sourceOf(id) }));
+    const labels = marker.kind === "file" ? [{ label: basename12(marker.path), source: marker.path }] : marker.ids.map((id) => ({ label: id, source: sourceOf(id) }));
     let linked = false;
     const parts = labels.map(({ label, source }) => {
       const target = source === undefined ? undefined : openableTarget(source);
@@ -28671,7 +28304,7 @@ class DazziJevBackend {
     this.apiKey = apiKey;
     this.baseUrl = options.baseUrl ?? resolveBaseUrl(env);
     this.defaultModel = options.defaultModel ?? DAZZI_DEFAULT_JEV_MODEL;
-    this.timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS12;
+    this.timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS11;
     this.maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
     this.fetchImpl = options.fetchImpl;
   }
@@ -28858,13 +28491,49 @@ async function extractErrorMessage(response) {
 function sleep6(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-var JEV_PATH, DAZZI_DEFAULT_JEV_MODEL = "jev-1.13", DEFAULT_TIMEOUT_MS12 = 1e4, DEFAULT_MAX_RETRIES = 2, RETRY_BASE_MS = 500, RETRY_MAX_MS = 5000;
+var JEV_PATH, DAZZI_DEFAULT_JEV_MODEL = "jev-1.13", DEFAULT_TIMEOUT_MS11 = 1e4, DEFAULT_MAX_RETRIES = 2, RETRY_BASE_MS = 500, RETRY_MAX_MS = 5000;
 var init_jev_backend = __esm(() => {
   init_config2();
   init_credential();
   JEV_PATH = `${API_PATH}/jev`;
 });
 
+// src/agent/token-count.ts
+import { createHash as createHash20 } from "node:crypto";
+import { countTokens } from "gpt-tokenizer/encoding/o200k_base";
+function estimateTextTokens(text) {
+  return Math.max(Math.ceil(text.length / 4), countText(text));
+}
+function tokensBeyondCharGuess(parts) {
+  let excess = 0;
+  for (const part of parts)
+    excess += Math.max(0, countText(part) - Math.ceil(part.length / 4));
+  return excess;
+}
+function countText(text) {
+  if (text.length === 0)
+    return 0;
+  if (text.length < CACHE_MIN_CHARS)
+    return countTokens(text, PLAIN_TEXT);
+  const key = `${text.length}:${createHash20("sha1").update(text).digest("base64")}`;
+  const hit = cache.get(key);
+  if (hit !== undefined) {
+    cache.delete(key);
+    cache.set(key, hit);
+    return hit;
+  }
+  const count = countTokens(text, PLAIN_TEXT);
+  cache.set(key, count);
+  if (cache.size > CACHE_ENTRIES)
+    cache.delete(cache.keys().next().value);
+  return count;
+}
+var PLAIN_TEXT, CACHE_MIN_CHARS = 2000, CACHE_ENTRIES = 64, cache;
+var init_token_count = __esm(() => {
+  PLAIN_TEXT = { disallowedSpecial: new Set };
+  cache = new Map;
+});
+
 // src/agent/context-token-guard.ts
 import { calculateContextTokens, estimateTokens } from "@earendil-works/pi-coding-agent";
 function createContextTokenGuardedTransform(model, base, fixedOverheadTokens = () => 0) {
@@ -28880,12 +28549,20 @@ function withBoundedOutput(model) {
   return { ...model, maxTokens: MAX_OUTPUT_TOKENS };
 }
 function guardAgentContextMessages(model, messages, useReportedUsage = true, fixedOverheadTokens = 0) {
+  const guarded = guardWithinBudget(model, messages, useReportedUsage, fixedOverheadTokens);
+  if (model !== undefined && guarded.length > 0) {
+    recordRequestEstimate(model, estimateContextMessageTokens(guarded, false) + fixedOverheadTokens);
+  }
+  return guarded;
+}
+function guardWithinBudget(model, messages, useReportedUsage = true, fixedOverheadTokens = 0) {
   if (model === undefined || !Number.isFinite(model.contextWindow) || model.contextWindow <= 0 || messages.length === 0) {
     return messages;
   }
   const usableContext = Math.floor(model.contextWindow / CONTEXT_HEADROOM);
   const outputReserve = Math.min(Math.floor(usableContext / 4), MAX_OUTPUT_TOKENS, Number.isFinite(model.maxTokens) ? Math.max(0, model.maxTokens) : 0);
-  const inputBudget = Math.max(0, usableContext - outputReserve);
+  const overflowCeiling = contextOverflowCeiling(model);
+  const inputBudget = Math.min(Math.max(0, usableContext - outputReserve), overflowCeiling ?? Number.POSITIVE_INFINITY);
   const budget = Math.max(0, inputBudget - fixedOverheadTokens);
   const reported = useReportedUsage && findLastAssistantUsage(messages) !== undefined;
   if (estimateContextMessageTokens(messages, useReportedUsage) <= (reported ? inputBudget : budget)) {
@@ -28907,50 +28584,40 @@ function guardAgentContextMessages(model, messages, useReportedUsage = true, fix
   }
   let guarded = messages;
   if (candidates.length > 0) {
-    const fixedTokens = estimateContextMessageTokens(base, false);
-    const maximumOmitted = candidates.reduce((total, section) => total + section.blocks.length, 0);
+    const entries = candidates.flatMap((section, sectionIndex) => section.blocks.map((block, blockIndex) => ({ block, sectionIndex, blockIndex })));
     const omissionMarker = (count) => `
 
 ${GUARD_MARKER} Retrieval candidates omitted: ${count}.
 `;
-    let remaining = Math.max(0, budget - fixedTokens - Math.ceil(omissionMarker(maximumOmitted).length / 4));
-    const kept = candidates.map(() => []);
-    let omitted = 0;
-    let firstOmitted = -1;
-    for (const [sectionIndex, section] of candidates.entries()) {
-      for (const block of section.blocks) {
-        const tokens = Math.max(1, Math.ceil(block.length / 4));
-        if (tokens <= remaining) {
-          kept[sectionIndex]?.push(block);
-          remaining -= tokens;
-          continue;
-        }
-        omitted += section.blocks.length - (kept[sectionIndex]?.length ?? 0);
-        for (const later of candidates.slice(sectionIndex + 1))
-          omitted += later.blocks.length;
-        firstOmitted = sectionIndex;
-        break;
-      }
-      if (firstOmitted !== -1)
+    const markerTokens = candidates.length * Math.ceil(omissionMarker(entries.length).length / 4);
+    let remaining = Math.max(0, budget - estimateContextMessageTokens(base, false) - markerTokens);
+    entries.sort((a, b) => a.block.rank - b.block.rank || a.sectionIndex - b.sectionIndex || a.blockIndex - b.blockIndex);
+    const kept = new Set;
+    for (const { block } of entries) {
+      const tokens = Math.max(1, estimateTextTokens(block.text));
+      if (tokens > remaining)
         break;
+      remaining -= tokens;
+      kept.add(block);
     }
-    if (omitted > 0) {
-      const candidateByMessage = new Map;
-      for (const [sectionIndex, messageIndex] of candidateIndexes.entries())
-        candidateByMessage.set(messageIndex, sectionIndex);
+    if (kept.size < entries.length) {
+      const sectionByMessage = new Map(candidateIndexes.map((messageIndex, i) => [messageIndex, candidates[i]]));
       guarded = base.map((message, index) => {
-        const sectionIndex = candidateByMessage.get(index);
-        if (sectionIndex === undefined)
+        const section = sectionByMessage.get(index);
+        if (section === undefined)
           return message;
-        const section = candidates[sectionIndex];
-        const marker = sectionIndex === firstOmitted ? omissionMarker(omitted) : "";
-        return replaceTextContent(message, `${section.prefix}${kept[sectionIndex]?.join("") ?? ""}${marker}${section.suffix}`);
+        const keptBlocks = section.blocks.filter((block) => kept.has(block));
+        const omitted = section.blocks.length - keptBlocks.length;
+        if (omitted === 0)
+          return messages[index] ?? message;
+        const marker = omissionMarker(omitted);
+        return replaceTextContent(message, `${section.prefix}${keptBlocks.map((block) => block.text).join("")}${marker}${section.suffix}`);
       });
     }
   }
-  if (estimateContextMessageTokens(guarded, false) <= budget && guarded !== messages)
+  if (guarded !== messages && estimateContextMessageTokens(guarded, false) <= budget)
     return guarded;
-  return trimFixedContext(guarded, budget);
+  return fitNewestToolResult(guarded, budget);
 }
 function estimateContextMessageTokens(messages, useReportedUsage = false) {
   if (useReportedUsage) {
@@ -28961,82 +28628,37 @@ function estimateContextMessageTokens(messages, useReportedUsage = false) {
   }
   return messages.reduce((total, message) => total + estimateMessageTokens(message), 0);
 }
-function trimFixedContext(messages, inputBudget) {
-  const trimmed = messages.slice();
-  const lastIndex = trimmed.length - 1;
-  const queryIndex = trimmed.reduce((found, message, index) => message.role === "user" ? index : found, -1);
-  const fits = () => estimateContextMessageTokens(trimmed, false) <= inputBudget;
-  const fitInto = (index, floorTokens) => {
-    const message = trimmed[index];
-    if (message === undefined)
-      return;
-    const others = trimmed.reduce((total, other, i) => i === index ? total : total + estimateMessageTokens(other), 0);
-    trimmed[index] = fitMessageToTokens(message, Math.max(floorTokens, inputBudget - others));
-  };
-  for (const [index, message] of trimmed.entries()) {
-    if (index === lastIndex || index === queryIndex || message.role === "system")
-      continue;
-    const replacement = replaceMessageWithMarker(message);
-    if (replacement === message || estimateMessageTokens(replacement) >= estimateMessageTokens(message))
-      continue;
-    trimmed[index] = replacement;
-    if (fits())
-      return trimmed;
-  }
-  if (lastIndex !== queryIndex && trimmed[lastIndex]?.role !== "system") {
-    fitInto(lastIndex, 0);
-    if (fits())
-      return trimmed;
-  }
-  for (const [index, message] of trimmed.entries()) {
-    if (message.role !== "system")
-      continue;
-    fitInto(index, 0);
-    if (fits())
-      return trimmed;
-  }
-  if (queryIndex >= 0)
-    fitInto(queryIndex, MIN_QUERY_TOKENS);
-  return trimmed;
+function fitNewestToolResult(messages, inputBudget) {
+  const lastIndex = messages.length - 1;
+  const last = messages[lastIndex];
+  if (last?.role !== "toolResult")
+    return messages;
+  const others = messages.reduce((total, message, index) => index === lastIndex ? total : total + estimateMessageTokens(message), 0);
+  if (others >= inputBudget)
+    return messages;
+  const fitted = fitMessageToTokens(last, inputBudget - others);
+  return fitted === last ? messages : [...messages.slice(0, lastIndex), fitted];
 }
 function fitMessageToTokens(message, maxTokens) {
   const original = textContent(message);
   if (original === undefined)
-    return stripNonTextContent(message);
+    return message;
   const marker = `
 
 ${GUARD_MARKER}
 `;
-  let low = 0;
-  let high = original.length;
-  let best = replaceTextContent(message, marker);
-  while (low <= high) {
-    const middle = Math.floor((low + high) / 2);
-    const candidate = replaceTextContent(message, excerpt(original, middle, marker));
-    if (estimateMessageTokens(candidate) <= maxTokens) {
-      best = candidate;
-      low = middle + 1;
-    } else {
-      high = middle - 1;
-    }
+  const overhead = estimateMessageTokens(replaceTextContent(message, ""));
+  const density = Math.max(0, estimateMessageTokens(message) - overhead) / Math.max(1, original.length);
+  let chars = density > 0 ? Math.floor((maxTokens - overhead) / density) : original.length;
+  for (let attempt = 0;attempt < MAX_FIT_ATTEMPTS && chars > 0; attempt++) {
+    const candidate = replaceTextContent(message, excerpt(original, chars, marker));
+    const tokens = estimateMessageTokens(candidate);
+    if (tokens <= maxTokens)
+      return candidate;
+    const scaled = Math.floor(chars * Math.max(0, maxTokens - overhead) / Math.max(1, tokens - overhead) * 0.98);
+    chars = Math.min(chars - 1, scaled);
   }
-  return best;
-}
-function stripNonTextContent(message) {
-  if (message.role !== "user" || typeof message.content === "string")
-    return replaceMessageWithMarker(message);
-  const marker = `
-
-${GUARD_MARKER}
-`;
-  let replacedImage = false;
-  const content = message.content.map((block) => {
-    if (block.type === "text")
-      return block;
-    replacedImage = true;
-    return { type: "text", text: marker };
-  });
-  return replacedImage ? { ...message, content } : message;
+  return replaceTextContent(message, marker);
 }
 function excerpt(text, maxChars, marker) {
   if (text.length <= maxChars)
@@ -29046,32 +28668,54 @@ function excerpt(text, maxChars, marker) {
   const tail = Math.max(0, available - head);
   return `${text.slice(0, head)}${marker}${tail > 0 ? text.slice(-tail) : ""}`;
 }
-function replaceMessageWithMarker(message) {
-  return replaceTextContent(message, `
-
-${GUARD_MARKER}
-`);
-}
 function estimateMessageTokens(message) {
   if (message.role === "system")
     return estimateSystemMessageTokens(message);
-  const estimate = estimateTokens(message);
+  const estimate = estimateTokens(message) + tokensBeyondCharGuess(messageTextParts(message));
   return message.role === "toolResult" ? estimate + Math.ceil(message.toolName.length / 4) : estimate;
 }
 function estimateSystemMessageTokens(message) {
-  let chars = typeof message.content === "string" ? message.content.length : 0;
-  if (Array.isArray(message.content)) {
+  const parts = [];
+  let chars = 0;
+  if (typeof message.content === "string")
+    parts.push(message.content);
+  else {
     for (const block of message.content) {
       if (block.type === "text")
-        chars += block.text.length;
+        parts.push(block.text);
       else if (block.type === "image")
         chars += 4800;
     }
   }
-  chars += JSON.stringify(message.sections ?? {}).length;
-  chars += JSON.stringify(message.toolsAdded ?? []).length;
-  chars += JSON.stringify(message.toolsRemoved ?? []).length;
-  return Math.ceil(chars / 4);
+  parts.push(JSON.stringify(message.sections ?? {}), JSON.stringify(message.toolsAdded ?? []), JSON.stringify(message.toolsRemoved ?? []));
+  for (const part of parts)
+    chars += part.length;
+  return Math.ceil(chars / 4) + tokensBeyondCharGuess(parts);
+}
+function messageTextParts(message) {
+  switch (message.role) {
+    case "user":
+    case "custom":
+    case "toolResult":
+      return typeof message.content === "string" ? [message.content] : message.content.flatMap((block) => block.type === "text" ? [block.text] : []);
+    case "assistant":
+      return message.content.flatMap((block) => {
+        if (block.type === "text")
+          return [block.text];
+        if (block.type === "thinking")
+          return [block.thinking];
+        if (block.type === "toolCall")
+          return [`${block.name}${JSON.stringify(block.arguments)}`];
+        return [];
+      });
+    case "bashExecution":
+      return [message.command, message.output];
+    case "branchSummary":
+    case "compactionSummary":
+      return [message.summary];
+    default:
+      return [];
+  }
 }
 function findLastAssistantUsage(messages) {
   for (let index = messages.length - 1;index >= 0; index--) {
@@ -29145,7 +28789,7 @@ function parseCandidateSection(message, text) {
     const sectionEnd = findBaselineSectionEnd(text, sectionStart);
     if (!/^\[e?\d+\] /mu.test(text.slice(sectionStart, sectionEnd)))
       return;
-    return splitCandidates(text, sectionStart, sectionEnd);
+    return splitCandidates(text, sectionStart, sectionEnd, { lists: true });
   }
   if (message.role !== "toolResult")
     return;
@@ -29156,7 +28800,9 @@ function parseCandidateSection(message, text) {
     const directiveStart = text.indexOf(`
 
 directive:`);
-    return splitCandidates(text, 0, directiveStart >= 0 ? directiveStart : text.length, /^- [^\n]*(?:\n|$)/gmu);
+    return splitCandidates(text, 0, directiveStart >= 0 ? directiveStart : text.length, {
+      pattern: /^- [^\n]*(?:\n|$)/gmu
+    });
   }
   const diagnosticsStart = text.indexOf(`
 
@@ -29178,17 +28824,23 @@ Formatting and content rules`
   const positions = endMarkers.map((marker) => text.indexOf(marker, startIndex)).filter((index) => index >= 0);
   return positions.length > 0 ? Math.min(...positions) : text.length;
 }
-function splitCandidates(text, sectionStart, sectionEnd, pattern = /^\[e?\d+\] [^\n]*(?:\n|$)/gmu) {
+function splitCandidates(text, sectionStart, sectionEnd, options = {}) {
   const region = text.slice(sectionStart, sectionEnd);
-  const matches = [...region.matchAll(pattern)];
+  const matches = [...region.matchAll(options.pattern ?? /^\[e?\d+\] [^\n]*(?:\n|$)/gmu)];
   const firstStart = matches[0]?.index;
   if (firstStart === undefined)
     return;
   const blocks = [];
+  let rank = 0;
+  let heading = "";
   for (const [index, match] of matches.entries()) {
     const start = match.index ?? 0;
     const end = index + 1 < matches.length ? matches[index + 1]?.index ?? region.length : region.length;
-    blocks.push(region.slice(start, end));
+    const raw = region.slice(start, end);
+    const tail = options.lists === true ? LIST_HEADING_TAIL.exec(raw) : null;
+    blocks.push({ text: heading + (tail === null ? raw : raw.slice(0, tail.index)), rank });
+    rank = tail === null ? rank + 1 : 0;
+    heading = tail === null ? "" : tail[0];
   }
   return {
     prefix: text.slice(0, sectionStart) + region.slice(0, firstStart),
@@ -29196,8 +28848,10 @@ function splitCandidates(text, sectionStart, sectionEnd, pattern = /^\[e?\d+\] [
     blocks
   };
 }
-var CONTEXT_HEADROOM = 1.2, MAX_OUTPUT_TOKENS = 32000, MIN_QUERY_TOKENS = 2000, GUARD_MARKER = "[AutoRAG context guard: omitted context to stay within the model context budget.]", RETRIEVAL_TOOL_PREFIX = "search_datasource_", RETRIEVAL_TOOL_NAMES;
+var CONTEXT_HEADROOM = 1.2, MAX_OUTPUT_TOKENS = 32000, GUARD_MARKER = "[AutoRAG context guard: omitted context to stay within the model context budget.]", RETRIEVAL_TOOL_PREFIX = "search_datasource_", RETRIEVAL_TOOL_NAMES, MAX_FIT_ATTEMPTS = 6, LIST_HEADING_TAIL;
 var init_context_token_guard = __esm(() => {
+  init_context_overflow();
+  init_token_count();
   RETRIEVAL_TOOL_NAMES = {
     jikji_find: true,
     search_all_documents: true,
@@ -29206,6 +28860,7 @@ var init_context_token_guard = __esm(() => {
     everything_search: true,
     fsearch_search: true
   };
+  LIST_HEADING_TAIL = /\n[^\n]*initial candidates[^\n]*:\n$/u;
 });
 
 // src/agent/current-date.ts
@@ -29542,7 +29197,7 @@ function guardContext(pi, contextTransform) {
   pi.on("context", async (event, ctx) => {
     const activeTools = new Set(pi.getActiveTools());
     const toolDeclarations = pi.getAllTools().filter((tool) => activeTools.has(tool.name)).map(({ name, description, parameters }) => ({ name, description, parameters }));
-    const fixedOverheadTokens = Math.ceil((ctx.getSystemPrompt().length + JSON.stringify(toolDeclarations).length) / 4);
+    const fixedOverheadTokens = estimateTextTokens(ctx.getSystemPrompt()) + estimateTextTokens(JSON.stringify(toolDeclarations));
     return {
       messages: await createContextTokenGuardedTransform(ctx.model, contextTransform, () => fixedOverheadTokens)(event.messages)
     };
@@ -29776,6 +29431,7 @@ var init_pi_session = __esm(() => {
   init_intent_tracing();
   init_mcp_client();
   init_request_limits();
+  init_token_count();
   init_welcome_header();
   PI_BUILTIN_TOOL_NAMES = ["read", "bash", "edit", "write", "grep", "find", "ls"];
 });
@@ -31547,7 +31203,7 @@ var init_page_loader = __esm(() => {
 });
 
 // src/web/fetch/url-target.ts
-import { extname as extname8 } from "node:path";
+import { extname as extname7 } from "node:path";
 function repairCollapsedScheme(value) {
   const m = value.match(/^(https?):\/(?!\/)/i);
   return m ? `${m[1]}://${value.slice(m[0].length)}` : value;
@@ -31566,7 +31222,7 @@ function getFilenameExtensionHint(filename) {
   const lower = filename.toLowerCase();
   if (lower.endsWith(".tar.gz"))
     return ".tar.gz";
-  return extname8(filename).toLowerCase();
+  return extname7(filename).toLowerCase();
 }
 function getExtensionHint(url, contentDisposition) {
   if (contentDisposition) {
@@ -31743,7 +31399,7 @@ var init_convert2 = __esm(() => {
 });
 
 // src/web/fetch/feeds.ts
-import { extname as extname9 } from "node:path";
+import { extname as extname8 } from "node:path";
 import { XMLParser as XMLParser3 } from "fast-xml-parser";
 function getHtmlAttribute(tag, attribute) {
   const pattern = new RegExp(`\\b${attribute}\\s*=\\s*(?:"([^"]*)"|'([^']*)'|([^\\s"'=<>]+))`, "i");
@@ -31806,7 +31462,7 @@ function extractDocumentLinks(html, baseUrl) {
       const href = getHtmlAttribute(tag, "href");
       if (!href)
         continue;
-      const ext = extname9(href).toLowerCase();
+      const ext = extname8(href).toLowerCase();
       if (!CONVERTIBLE_EXTENSIONS2.has(ext))
         continue;
       const resolved = href.startsWith("http") ? href : new URL(href, baseUrl).href;
@@ -33474,7 +33130,7 @@ var init_web_search_tool = __esm(() => {
 // src/agent/agent.ts
 import { randomUUID as randomUUID7 } from "node:crypto";
 import { existsSync as existsSync32, watch as fsWatch, mkdirSync as mkdirSync24, realpathSync as realpathSync7, statSync as statSync9, writeFileSync as writeFileSync18 } from "node:fs";
-import { basename as basename14, dirname as dirname26, join as join50, resolve as resolve17 } from "node:path";
+import { basename as basename13, dirname as dirname26, join as join50, resolve as resolve17 } from "node:path";
 import { clampThinkingLevel } from "@earendil-works/pi-ai/compat";
 import { getAgentDir as getAgentDir4, keyText } from "@earendil-works/pi-coding-agent";
 function positiveLimit(value, fallback, path) {
@@ -36397,7 +36053,7 @@ function toMinSyncReasonDiagnostic(reason) {
 function pinExcludedPath(path) {
   const resolvedPath = resolve17(path);
   try {
-    return join50(realpathSync7(dirname26(resolvedPath)), basename14(resolvedPath));
+    return join50(realpathSync7(dirname26(resolvedPath)), basename13(resolvedPath));
   } catch {
     return resolvedPath;
   }
@@ -37813,7 +37469,7 @@ var init_embedding2 = __esm(() => {
 });
 
 // src/datasource/skills/hister/setup.ts
-import { spawn as spawn20 } from "node:child_process";
+import { spawn as spawn19 } from "node:child_process";
 import { copyFileSync as copyFileSync5, existsSync as existsSync36, readFileSync as readFileSync31, writeFileSync as writeFileSync19 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
 import { dirname as dirname28, join as join53 } from "node:path";
@@ -37860,7 +37516,7 @@ function defaultHisterConfigPath(env, exists = existsSync36, platform = process.
 function commandRun(command, args, timeoutMs) {
   return new Promise((resolve) => {
     let stderr = "";
-    const child = spawn20(command, args, { stdio: ["ignore", "ignore", "pipe"] });
+    const child = spawn19(command, args, { stdio: ["ignore", "ignore", "pipe"] });
     const timer = setTimeout(() => {
       child.kill("SIGTERM");
       resolve({ ok: false, reason: `${command} ${args.join(" ")} timed out after ${timeoutMs}ms` });
@@ -38149,8 +37805,7 @@ function datasourceNames(config, platform) {
       "github",
       "cloud-drive",
       "obsidian",
-      "rss",
-      "spotlight"
+      "rss"
     ])
   ];
 }
@@ -38954,7 +38609,7 @@ function sanitizeMessage(raw) {
 function parseTimeoutMs(flags) {
   const raw = flags["timeout-ms"];
   if (raw === undefined || raw === true)
-    return DEFAULT_TIMEOUT_MS13;
+    return DEFAULT_TIMEOUT_MS12;
   const text = typeof raw === "string" ? raw.trim() : "";
   if (!/^\d+$/.test(text) || Number(text) <= 0) {
     return `--timeout-ms must be a positive integer (got "${text}")`;
@@ -39137,7 +38792,7 @@ async function runHealth(ctx, deps = {}) {
   ctx.stdout(renderHealth(report, { json: ctx.json, debug: ctx.debug }));
   return exitCode(probe.category);
 }
-var DEFAULT_TIMEOUT_MS13 = 1e4;
+var DEFAULT_TIMEOUT_MS12 = 1e4;
 var init_health = __esm(() => {
   init_config5();
   init_output();
@@ -39202,7 +38857,7 @@ var init_duplicates = __esm(() => {
 });
 
 // src/cli/open-target.ts
-import { spawn as spawn21 } from "node:child_process";
+import { spawn as spawn20 } from "node:child_process";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function systemOpener(url) {
   if (process.platform === "darwin")
@@ -39227,7 +38882,7 @@ function launch(spawnFn, command, args, onFailure) {
   });
   child.unref();
 }
-function openCitationTarget(url, spawnFn = spawn21) {
+function openCitationTarget(url, spawnFn = spawn20) {
   const [command, args] = systemOpener(url);
   if (!url.startsWith("file:")) {
     launch(spawnFn, command, args);