@superatomai/sdk-node 0.0.69-dsp → 0.0.70-dsp

package/dist/index.mjs

@@ -282,7 +282,13 @@ var UserPromptRequestPayloadSchema = z3.object({
     threadId: z3.string(),
     uiBlockId: z3.string()
   }).optional(),
-  responseMode: z3.enum(["component", "text"]).optional()
+  responseMode: z3.enum(["component", "text"]).optional(),
+  /**
+   * Where the question was asked from — e.g. the dashboard being viewed. See
+   * `PromptContext`. Accepted as anything so a client sending an unexpected shape
+   * is never rejected; the handler keeps only the fields it recognises.
+   */
+  context: z3.unknown().optional()
 });
 var MessageAuthContextSchema = z3.object({
   userId: z3.string(),
@@ -989,9 +995,25 @@ var SchemaResponseMessageSchema = z3.object({
 
 // src/utils/logger.ts
 import fs from "fs";
+import path from "path";
 var PREFIX = "[SuperatomSDK]";
-var LOG_FILE_PATH = "superatom-sdk.log";
-var LOGSTREAM = fs.createWriteStream(LOG_FILE_PATH, { flags: "a" });
+var LEGACY_LOG_FILE_PATH = "superatom-sdk.log";
+var LOG_DIR = "logs";
+function slugifyLabel(label) {
+  return label.trim().replace(/\s+/g, "-").replace(/[^a-zA-Z0-9_-]/g, "").slice(0, 60);
+}
+function buildLogFilePath(label) {
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const slug2 = label ? slugifyLabel(label) : "";
+  const filename = slug2 ? `sdk-${stamp}-${slug2}.log` : `sdk-${stamp}.log`;
+  return path.join(LOG_DIR, filename);
+}
+try {
+  fs.mkdirSync(LOG_DIR, { recursive: true });
+} catch {
+}
+var currentLogFilePath = LEGACY_LOG_FILE_PATH;
+var LOGSTREAM = fs.createWriteStream(LEGACY_LOG_FILE_PATH, { flags: "a" });
 var LOG_LEVEL_PRIORITY = {
   errors: 0,
   warnings: 1,
@@ -1076,17 +1098,31 @@ var Logger = class {
     }
   }
   /**
-   * Write to log file
+   * Write to log file — each line timestamped so a request that made many
+   * calls (LLM turns, tool dispatches, direct-tool runs) can be read back in
+   * order, matching "know what happened when" rather than just "what
+   * happened".
    */
   file(...args) {
-    LOGSTREAM.write(args.join(" ") + "\n");
+    LOGSTREAM.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] ${args.join(" ")}
+`);
+  }
+  /** The log file the current request is writing to — print/return this so it's easy to find afterward. */
+  getCurrentLogFilePath() {
+    return currentLogFilePath;
   }
   /**
-   * Clear the log file (call at start of new user request)
+   * Start a fresh, uniquely-named log file for a new top-level request
+   * (chat turn, dashComp request, reportComp request, ...) instead of
+   * truncating one shared file — pass a short label (a prompt snippet, a
+   * request type) so the resulting filename is identifiable at a glance.
+   * Falls back to the untimestamped legacy path when `label` is omitted, for
+   * any caller not yet updated to pass one.
    */
-  clearFile() {
+  clearFile(label) {
     LOGSTREAM.end();
-    LOGSTREAM = fs.createWriteStream(LOG_FILE_PATH, { flags: "w" });
+    currentLogFilePath = label ? buildLogFilePath(label) : LEGACY_LOG_FILE_PATH;
+    LOGSTREAM = fs.createWriteStream(currentLogFilePath, { flags: "w" });
     LOGSTREAM.write(`
 ${"=".repeat(80)}
 `);
@@ -1095,6 +1131,7 @@ ${"=".repeat(80)}
     LOGSTREAM.write(`${"=".repeat(80)}
 
 `);
+    this.info(`Logging this request to ${currentLogFilePath}`);
   }
   /**
    * Log LLM method prompts with clear labeling
@@ -1102,7 +1139,7 @@ ${"=".repeat(80)}
   logLLMPrompt(methodName, promptType, content) {
     const header = `
 ${"#".repeat(80)}
-[LLM METHOD: ${methodName}] - ${promptType.toUpperCase()} PROMPT
+[${(/* @__PURE__ */ new Date()).toISOString()}] [LLM METHOD: ${methodName}] - ${promptType.toUpperCase()} PROMPT
 ${"#".repeat(80)}
 `;
     LOGSTREAM.write(header);
@@ -1827,6 +1864,7 @@ var QueryCache = class {
     this.maxCacheSize = 5e3;
     // Max data cache entries
     this.cleanupInterval = null;
+    this.resultCacheEnabled = true;
     // Encryption for queryId tokens
     this.algorithm = "aes-256-gcm";
     const keySource = process.env.QUERY_TOKEN_SECRET || "superatom-query-cache-default-key-v1";
@@ -1850,6 +1888,15 @@ var QueryCache = class {
   getTTL() {
     return this.ttlMs / 60 / 1e3;
   }
+  /**
+   * Stop keeping result data in memory, for a host that caches results itself.
+   * `set` stores nothing and `get` finds nothing; queryId tokens are unaffected.
+   */
+  disableResultCache() {
+    this.resultCacheEnabled = false;
+    this.cache.clear();
+    logger.info("[QueryCache] Result cache disabled \u2014 the host caches query results");
+  }
   /**
    * Which access bucket this call reads and writes.
    *
@@ -1882,6 +1929,7 @@ var QueryCache = class {
    * a genuinely new key past the size limit.
    */
   set(query, data) {
+    if (!this.resultCacheEnabled) return;
     const key = this.scopedKey(query);
     if (key === null) return;
     this.cache.delete(key);
@@ -1902,6 +1950,7 @@ var QueryCache = class {
    * iteration order — turning FIFO eviction into true LRU.
    */
   get(query) {
+    if (!this.resultCacheEnabled) return null;
     const key = this.scopedKey(query);
     if (key === null) return null;
     const entry = this.cache.get(key);
@@ -2680,7 +2729,7 @@ function sendDataResponse(id, collection, op, data, meta, sendMessage) {
 
 // src/bundle.ts
 import * as fs2 from "fs";
-import * as path from "path";
+import * as path2 from "path";
 function getBundleDir(configDir) {
   const bundleDir = configDir || process.env.SA_BUNDLE_DIR;
   if (!bundleDir) {
@@ -2713,7 +2762,7 @@ function getJS(bundleDir) {
         `Could not find index-*.js file in ${bundleDir}. Expected a file matching pattern: index-*.js`
       );
     }
-    const filePath = path.join(bundleDir, indexFile);
+    const filePath = path2.join(bundleDir, indexFile);
     logger.info(`Loading bundle from ${filePath}`);
     try {
       return fs2.readFileSync(filePath, "utf8");
@@ -3152,12 +3201,12 @@ function sendDataResponse3(id, res, sendMessage, clientId) {
 
 // src/utils/user-prompt-error-logger.ts
 import fs3 from "fs";
-import path2 from "path";
+import path3 from "path";
 var UserPromptErrorLogger = class {
   constructor() {
     this.logStream = null;
     this.hasErrors = false;
-    this.logPath = process.env.USER_PROMPT_ERROR_LOG_PATH || path2.join(process.cwd(), "user-prompt-req-errors");
+    this.logPath = process.env.USER_PROMPT_ERROR_LOG_PATH || path3.join(process.cwd(), "user-prompt-req-errors");
     this.enabled = process.env.USER_PROMPT_ERROR_LOGGING !== "false";
   }
   /**
@@ -3170,7 +3219,7 @@ var UserPromptErrorLogger = class {
         this.logStream.end();
         this.logStream = null;
       }
-      const dir = path2.dirname(this.logPath);
+      const dir = path3.dirname(this.logPath);
       if (dir !== "." && !fs3.existsSync(dir)) {
         fs3.mkdirSync(dir, { recursive: true });
       }
@@ -3650,7 +3699,8 @@ var findExactMatch = async ({
   userPrompt,
   collections,
   userId,
-  maxAgeHours
+  maxAgeHours,
+  statuses
 }) => {
   try {
     if (!collections || !collections["conversation-history"] || !collections["conversation-history"]["exactMatch"]) {
@@ -3660,7 +3710,8 @@ var findExactMatch = async ({
     const result = await collections["conversation-history"]["exactMatch"]({
       userPrompt,
       userId,
-      maxAgeHours
+      maxAgeHours,
+      statuses
     });
     if (!result || !result.uiBlock) {
       logger.info("[ConversationSearch] No exact match found");
@@ -3823,7 +3874,7 @@ var TaggedStreamBuffer = class extends StreamBuffer {
   }
 };
 function streamDelay(ms = STREAM_DELAY_MS) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 async function withProgressHeartbeat(operation, progressMessage, streamBuffer, intervalMs = PROGRESS_HEARTBEAT_INTERVAL_MS) {
   if (!streamBuffer.hasCallback()) {
@@ -4016,7 +4067,7 @@ import { jsonrepair } from "jsonrepair";
 
 // src/utils/llm-usage-logger.ts
 import fs4 from "fs";
-import path3 from "path";
+import path4 from "path";
 var PRICING = {
   // Anthropic (December 2025)
   "claude-opus-4-5": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
@@ -4080,7 +4131,7 @@ var LLMUsageLogger = class {
       totalCostUSD: 0,
       totalDurationMs: 0
     };
-    this.logPath = process.env.LLM_USAGE_LOG_PATH || path3.join(process.cwd(), "llm-usage-logs.log");
+    this.logPath = process.env.LLM_USAGE_LOG_PATH || path4.join(process.cwd(), "llm-usage-logs.log");
     this.enabled = process.env.LLM_USAGE_LOGGING !== "false";
     if (this.enabled) {
       this.initLogStream();
@@ -4088,7 +4139,7 @@ var LLMUsageLogger = class {
   }
   initLogStream() {
     try {
-      const dir = path3.dirname(this.logPath);
+      const dir = path4.dirname(this.logPath);
       if (!fs4.existsSync(dir)) {
         fs4.mkdirSync(dir, { recursive: true });
       }
@@ -4754,7 +4805,7 @@ var LLM = class {
       iterations++;
       const iterationStartTime = Date.now();
       const requestId = llmUsageLogger.generateRequestId();
-      const toolChoice = iterations === 1 && options.firstIterationToolChoice ? options.firstIterationToolChoice : void 0;
+      const toolChoice = iterations === 1 && options.firstIterationToolChoice ? options.firstIterationToolChoice : iterations === 2 && options.secondIterationToolChoice ? options.secondIterationToolChoice : void 0;
       let stream;
       try {
         stream = await client.messages.create({
@@ -5712,7 +5763,7 @@ var LLM = class {
       const iterStart = Date.now();
       const requestId = llmUsageLogger.generateRequestId();
       let inputTokens = 0, outputTokens = 0, cacheReadTokens = 0;
-      const toolChoice = iterations === 1 && options.firstIterationToolChoice ? this._openaiToolChoice(options.firstIterationToolChoice) : void 0;
+      const toolChoice = iterations === 1 && options.firstIterationToolChoice ? this._openaiToolChoice(options.firstIterationToolChoice) : iterations === 2 && options.secondIterationToolChoice ? this._openaiToolChoice(options.secondIterationToolChoice) : void 0;
       const createParams = {
         model: modelName,
         messages: conversationMessages,
@@ -5903,7 +5954,7 @@ var LLM = class {
 
 // src/userResponse/prompt-loader.ts
 import fs5 from "fs";
-import path4 from "path";
+import path5 from "path";
 
 // src/userResponse/prompts.ts
 var PROMPTS = {
@@ -9317,7 +9368,7 @@ var PromptLoader = class {
     this.databaseRulesCache = /* @__PURE__ */ new Map();
     this.isInitialized = false;
     this.databaseType = "postgresql";
-    this.promptsDir = config2?.promptsDir || path4.join(process.cwd(), ".prompts");
+    this.promptsDir = config2?.promptsDir || path5.join(process.cwd(), ".prompts");
   }
   /**
    * Load a prompt template from file system OR fallback to hardcoded prompts
@@ -9326,8 +9377,8 @@ var PromptLoader = class {
    */
   loadPromptTemplate(promptName) {
     try {
-      const systemPath = path4.join(this.promptsDir, promptName, "system.md");
-      const userPath = path4.join(this.promptsDir, promptName, "user.md");
+      const systemPath = path5.join(this.promptsDir, promptName, "system.md");
+      const userPath = path5.join(this.promptsDir, promptName, "user.md");
       if (fs5.existsSync(systemPath) && fs5.existsSync(userPath)) {
         const system = fs5.readFileSync(systemPath, "utf-8");
         const user = fs5.readFileSync(userPath, "utf-8");
@@ -9477,7 +9528,7 @@ var PromptLoader = class {
     if (this.databaseRulesCache.has(this.databaseType)) {
       return this.databaseRulesCache.get(this.databaseType);
     }
-    const rulesPath = path4.join(this.promptsDir, "database-rules", `${this.databaseType}.md`);
+    const rulesPath = path5.join(this.promptsDir, "database-rules", `${this.databaseType}.md`);
     try {
       if (fs5.existsSync(rulesPath)) {
         const rules2 = fs5.readFileSync(rulesPath, "utf-8");
@@ -9503,6 +9554,8 @@ var PromptLoader = class {
       "postgres": "postgresql",
       "postgresql": "postgresql",
       "mssql": "mssql",
+      "fabric": "mssql",
+      // Microsoft Fabric SQL endpoints speak T-SQL
       "mysql": "postgresql",
       // MySQL uses similar rules to PostgreSQL
       "excel": "duckdb",
@@ -9520,7 +9573,7 @@ var PromptLoader = class {
     if (this.databaseRulesCache.has(dbType)) {
       return this.databaseRulesCache.get(dbType);
     }
-    const rulesPath = path4.join(this.promptsDir, "database-rules", `${dbType}.md`);
+    const rulesPath = path5.join(this.promptsDir, "database-rules", `${dbType}.md`);
     try {
       if (fs5.existsSync(rulesPath)) {
         const rules2 = fs5.readFileSync(rulesPath, "utf-8");
@@ -9550,7 +9603,7 @@ var PromptLoader = class {
     const cacheKey = "__script_body_contract__";
     let raw = this.databaseRulesCache.get(cacheKey);
     if (raw === void 0) {
-      const contractPath = path4.join(this.promptsDir, "script-rules", "body-contract.md");
+      const contractPath = path5.join(this.promptsDir, "script-rules", "body-contract.md");
       try {
         if (fs5.existsSync(contractPath)) {
           raw = fs5.readFileSync(contractPath, "utf-8");
@@ -9582,7 +9635,7 @@ var PromptLoader = class {
     return DATABASE_RULES[dbType] ?? DATABASE_RULES["postgresql"];
   }
 };
-var defaultPromptsPath = process.env.PROMPTS_DIR || path4.join(process.cwd(), ".prompts");
+var defaultPromptsPath = process.env.PROMPTS_DIR || path5.join(process.cwd(), ".prompts");
 var promptLoader = new PromptLoader({
   promptsDir: defaultPromptsPath
 });
@@ -10011,7 +10064,7 @@ function getDatabaseType() {
 function getDbTypeFromToolId(toolId) {
   if (!toolId) return getDatabaseType();
   const prefix = toolId.split("-")[0]?.toLowerCase();
-  if (prefix.startsWith("mssql")) return "mssql";
+  if (prefix.startsWith("mssql") || prefix === "fabric") return "mssql";
   if (prefix.startsWith("postgres")) return "postgresql";
   if (prefix.startsWith("mysql")) return "mysql";
   if (prefix.startsWith("snowflake")) return "snowflake";
@@ -10332,6 +10385,7 @@ var SourceAgent = class {
         if (toolName.endsWith("_search_schema") && schemaSearchFn) {
           const keywords = toolInput.keywords || [];
           logger.info(`[SourceAgent:${this.tool.name}] Schema search: ${keywords.join(", ")}`);
+          logger.file(`[SourceAgent:${this.tool.name}] SCHEMA SEARCH:`, keywords.join(", "));
           if (this.streamBuffer.hasCallback()) {
             this.streamBuffer.write(`\u{1F50D} **Looking up tables:** ${keywords.join(", ")}
 
@@ -10344,6 +10398,7 @@ var SourceAgent = class {
           } catch (traceErr) {
             logger.warn(`[SourceAgent:${this.tool.name}] Trace capture failed for search_schema lookup (non-blocking): ${traceErr}`);
           }
+          logger.file(`[SourceAgent:${this.tool.name}] SCHEMA SEARCH RESULT:`, result);
           return `Schema search results:
 
 ${result}`;
@@ -10387,6 +10442,7 @@ ${result}`;
           cappedInput.query = ensureQueryLimit(cappedInput.query, this.config.maxRowsFetched, this.config.maxRowsFetched, _st);
         }
         queryExecuted = cappedInput.sql || cappedInput.query || JSON.stringify(cappedInput);
+        logger.file(`[SourceAgent:${this.tool.name}] QUERY (attempt ${this.attempts}):`, queryExecuted);
         if (this.streamBuffer.hasCallback() && queryExecuted) {
           const queryDisplay = cappedInput.sql || cappedInput.query;
           if (queryDisplay) {
@@ -10415,6 +10471,7 @@ ${queryDisplay}
           if (result && result.error) {
             const errorMsg = typeof result.error === "string" ? result.error : JSON.stringify(result.error);
             logger.warn(`[SourceAgent:${this.tool.name}] Tool returned error (attempt ${this.attempts}/${this.config.maxRetries}): ${errorMsg}`);
+            logger.file(`[SourceAgent:${this.tool.name}] QUERY ERROR (attempt ${this.attempts}):`, errorMsg);
             if (this.streamBuffer.hasCallback()) {
               this.streamBuffer.write(`\u274C **Query failed:** ${errorMsg}
 
@@ -10428,6 +10485,7 @@ Analyze the error and try again with a corrected query.`;
           totalRowsMatched = result.metadata?.totalCount || result.count || resultData.length;
           querySucceeded = true;
           successfulQueries++;
+          logger.file(`[SourceAgent:${this.tool.name}] QUERY RESULT (attempt ${this.attempts}):`, `${resultData.length} rows (${totalRowsMatched} total)`, "metadata:", JSON.stringify(result.metadata ?? {}));
           if (this.streamBuffer.hasCallback()) {
             const totalInfo = totalRowsMatched > resultData.length ? ` of ${totalRowsMatched} total` : "";
             this.streamBuffer.write(`\u2705 **${resultData.length} rows${totalInfo} from ${this.tool.name}**
@@ -10835,7 +10893,7 @@ Even if a table appears in the detailed schema above, search_schema returns samp
     const match = this.tool.id.match(/^(\w+)-[a-f0-9]+_/);
     if (!match) return "unknown";
     const raw = match[1].toLowerCase();
-    if (raw.startsWith("mssql")) return "mssql";
+    if (raw.startsWith("mssql") || raw === "fabric") return "mssql";
     if (raw.startsWith("postgres")) return "postgres";
     if (raw.startsWith("mysql")) return "mysql";
     if (raw.startsWith("snowflake")) return "snowflake";
@@ -10861,7 +10919,7 @@ Even if a table appears in the detailed schema above, search_schema returns samp
 
 // src/userResponse/scripts/script-runner.ts
 import { spawn } from "child_process";
-import * as path5 from "path";
+import * as path6 from "path";
 import * as os from "os";
 
 // src/userResponse/scripts/script-ipc.ts
@@ -11004,7 +11062,7 @@ var Semaphore = class {
         `Script execution at capacity (${this.max} running, ${this.waiters.length} queued). Try again shortly.`
       );
     }
-    return new Promise((resolve3) => this.waiters.push(resolve3));
+    return new Promise((resolve4) => this.waiters.push(resolve4));
   }
   release() {
     const next = this.waiters.shift();
@@ -11022,8 +11080,8 @@ function resolveTsxBinary() {
   if (tsxBinaryPath) return tsxBinaryPath;
   try {
     const tsxPkg = __require.resolve("tsx/package.json");
-    const tsxDir = path5.dirname(tsxPkg);
-    tsxBinaryPath = path5.join(tsxDir, "dist", "cli.mjs");
+    const tsxDir = path6.dirname(tsxPkg);
+    tsxBinaryPath = path6.join(tsxDir, "dist", "cli.mjs");
     return tsxBinaryPath;
   } catch (err) {
     throw new Error(
@@ -11032,7 +11090,7 @@ function resolveTsxBinary() {
   }
 }
 function resolveBootstrapPath() {
-  return path5.resolve(__dirname, "userResponse/scripts/script-bootstrap.js");
+  return path6.resolve(__dirname, "userResponse/scripts/script-bootstrap.js");
 }
 async function runScript(recipe, scriptPath, params, options) {
   const startedAt = Date.now();
@@ -11134,7 +11192,7 @@ FIX: pass every required parameter to execute_script, or give it a default in wr
   }
 }
 function executeInSubprocess(scriptPath, params, paramSchema, externalTools, streamBuffer, timeoutMs, signal, mode, analysisData, analysisDatasets, entities, appliedPolicies) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const tsxBin = resolveTsxBinary();
     const bootstrap = resolveBootstrapPath();
     const contextToken = mintContextToken();
@@ -11190,7 +11248,7 @@ function executeInSubprocess(scriptPath, params, paramSchema, externalTools, str
       clearTimeout(timer);
       if (signal && onAbort) signal.removeEventListener("abort", onAbort);
       cleanup();
-      resolve3(r);
+      resolve4(r);
     };
     const timer = setTimeout(() => {
       finish({
@@ -11540,6 +11598,7 @@ function codeOnly(source) {
 var BARE_CONST_RE = /\bconst\s+(\w+)\s*=\s*(\d{2,}(?:\.\d+)?)\s*[;,)]/g;
 var FMT_CALL_RE = /\bfmt\.\w+\(([^)]*)\)/g;
 var DIRECT_BARE_ARG_RE = /(?<![\w.\[])(\d{2,}(?:\.\d+)?)(?![\w.\]])/;
+var OBJECT_PROP_RE = /(?<![\w.])([A-Za-z_]\w*)\s*:\s*(\d{2,}(?:\.\d+)?)\s*[,}]/g;
 function interpolationContents(source) {
   const out = [];
   for (const tpl of source.matchAll(/`(?:\\.|[^`\\])*`/g)) {
@@ -11571,6 +11630,24 @@ function findHardcodedAggregates(source) {
       reason: `a bare number ("${m[1]}") is passed directly into a fmt.*() call \u2014 it will report this SAME figure on every future replay no matter how much data actually exists then. Compute it from the data instead (e.g. \`data.length\`, a value read from \`datasets\`, or a real SQL aggregate).`
     });
   }
+  const propCandidates = [...code.matchAll(OBJECT_PROP_RE)].map((m) => ({ name: m[1], text: m[0].trim().replace(/[,}]$/, "") }));
+  for (const c of propCandidates) {
+    const accessPattern = `\\??\\.${c.name}\\b`;
+    const accessRe = new RegExp(accessPattern);
+    let flows = fmtArgLists.some((args) => accessRe.test(args));
+    if (!flows) {
+      const hop = code.match(new RegExp(`\\bconst\\s+(\\w+)\\s*=\\s*\\w+${accessPattern}`));
+      if (hop) {
+        const varRe = new RegExp(`\\b${hop[1]}\\b`);
+        flows = fmtArgLists.some((args) => varRe.test(args));
+      }
+    }
+    if (!flows) continue;
+    violations.push({
+      text: c.text,
+      reason: `"${c.name}" is an object-literal property bound directly to a bare number, later read back via .${c.name} and passed to a fmt.*() call \u2014 it will report this SAME figure on every future replay no matter how much data actually exists then. Compute it from the data (e.g. \`data.length\`, a real SQL aggregate, or a value derived at read time), never type it in as a property value.`
+    });
+  }
   return violations;
 }
 function literalChunks(source) {
@@ -11688,7 +11765,7 @@ function resolveScriptRecipeStore(collections) {
 
 // src/userResponse/scripts/script-store.ts
 import * as fs6 from "fs";
-import * as path6 from "path";
+import * as path7 from "path";
 import { createHash, randomBytes as randomBytes2 } from "crypto";
 var DEFAULT_STORE_DIR = "scripts-store";
 function stripAnalysisExport(body) {
@@ -11782,7 +11859,7 @@ export { getData };
 var ScriptStore = class {
   constructor(opts) {
     this.store = opts?.store ?? resolveScriptRecipeStore(opts?.collections) ?? null;
-    this.storeDir = opts?.baseDir || path6.join(process.cwd(), DEFAULT_STORE_DIR);
+    this.storeDir = opts?.baseDir || path7.join(process.cwd(), DEFAULT_STORE_DIR);
     this.projectId = opts?.projectId;
     if (!this.store) {
       logger.warn("[ScriptStore] No script-recipes metadata store injected \u2014 script reuse disabled this run.");
@@ -11852,7 +11929,7 @@ var ScriptStore = class {
       if (version === row.version) {
         return this.rowToRecipe(row, this.readBody(row.fileBase));
       }
-      const archivePath = path6.join(this.archiveDir, `${row.fileBase}.v${version}.ts`);
+      const archivePath = path7.join(this.archiveDir, `${row.fileBase}.v${version}.ts`);
       if (!fs6.existsSync(archivePath)) {
         logger.warn(`[ScriptStore] getVersion(${id}, v${version}) \u2014 archived body not found, recipe is now at v${row.version}`);
         return null;
@@ -11876,10 +11953,10 @@ var ScriptStore = class {
       }
       if (recipe.scriptBody) {
         const normalized = normalizeScriptBody(recipe.scriptBody);
-        const hash = this.hash(normalized);
-        if (hash !== recipe.bodyHash) {
+        const hash2 = this.hash(normalized);
+        if (hash2 !== recipe.bodyHash) {
           this.writeBody(recipe.fileBase, normalized);
-          recipe.bodyHash = hash;
+          recipe.bodyHash = hash2;
         }
       }
       recipe.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -12167,7 +12244,7 @@ ${carried.trim()}
   /** Absolute path to the .ts body for a recipe (used by the runner/MainAgent). */
   getScriptPath(recipe) {
     const base = recipe.fileBase || this.toSlug(recipe.name);
-    return path6.join(this.storeDir, `${base}.ts`);
+    return path7.join(this.storeDir, `${base}.ts`);
   }
   // ============================================
   // Internals
@@ -12353,7 +12430,7 @@ ${analysisBody.trim()}
     return true;
   }
   bodyPath(fileBase) {
-    return path6.join(this.storeDir, `${fileBase}.ts`);
+    return path7.join(this.storeDir, `${fileBase}.ts`);
   }
   readBody(fileBase) {
     try {
@@ -12365,7 +12442,7 @@ ${analysisBody.trim()}
   }
   /** Directory holding superseded bodies. Dot-prefixed so IDEs/`ls` hide it. */
   get archiveDir() {
-    return path6.join(this.storeDir, ".versions");
+    return path7.join(this.storeDir, ".versions");
   }
   /**
    * Archive a superseded body as `.versions/<fileBase>.v<n>.ts`.
@@ -12375,7 +12452,7 @@ ${analysisBody.trim()}
    */
   writeArchive(fileBase, version, body) {
     if (!fs6.existsSync(this.archiveDir)) fs6.mkdirSync(this.archiveDir, { recursive: true });
-    const finalPath = path6.join(this.archiveDir, `${fileBase}.v${version}.ts`);
+    const finalPath = path7.join(this.archiveDir, `${fileBase}.v${version}.ts`);
     const tmpPath = `${finalPath}.tmp-${randomBytes2(4).toString("hex")}`;
     fs6.writeFileSync(tmpPath, body);
     fs6.renameSync(tmpPath, finalPath);
@@ -12393,7 +12470,7 @@ ${analysisBody.trim()}
       for (const f of fs6.readdirSync(this.archiveDir)) {
         if (!f.startsWith(prefix) || !f.endsWith(".ts")) continue;
         const suffix = f.slice(oldBase.length);
-        fs6.renameSync(path6.join(this.archiveDir, f), path6.join(this.archiveDir, `${newBase}${suffix}`));
+        fs6.renameSync(path7.join(this.archiveDir, f), path7.join(this.archiveDir, `${newBase}${suffix}`));
       }
     } catch (err) {
       logger.warn(`[ScriptStore] failed to move archives ${oldBase} \u2192 ${newBase}: ${err}`);
@@ -12419,7 +12496,7 @@ ${analysisBody.trim()}
       const prefix = `${fileBase}.v`;
       for (const f of fs6.readdirSync(this.archiveDir)) {
         if (f.startsWith(prefix) && f.endsWith(".ts")) {
-          fs6.unlinkSync(path6.join(this.archiveDir, f));
+          fs6.unlinkSync(path7.join(this.archiveDir, f));
         }
       }
     } catch (err) {
@@ -12704,7 +12781,7 @@ var WRITE_SCRIPT_TOOL_DEF = {
 };
 var RESOLVE_ENTITIES_TOOL_DEF = {
   name: "resolve_entities",
-  description: 'ALWAYS call this FIRST, before any source query, on every question. It resolves BOTH halves of what the question refers to: the things the user NAMED become exact database ids, and the things the question asks you to COMPUTE come back as the project\'s own formulas. Pass `concepts` for anything the question asks you to compute, total, forecast, rank or classify \u2014 named from the CONCEPT CATALOG in your system prompt, and including concepts not named literally in the question ("how much did we bill" is a revenue question). A definition returned here OVERRIDES the knowledge base, the schema, and your own reasoning: use its body as written, and treat every filter it states as required. Pass `mentions` for any proper noun or identifier the user referred to \u2014 customer/company/project names, people, places, invoice or document numbers. Pass the user\'s wording VERBATIM; do not clean it up, expand abbreviations, or correct a spelling. Misspellings and partial names are matched for you. Set a mention\'s `entityType` ONLY when the question itself says what the value is ("project 314023", "customer Acme Ltd", "invoice CHL/895/26-27"). DO NOT GUESS IT. A wrong guess is worse than none: the lookup is confined to that type, and if anything there matches even weakly you silently get the wrong record instead of the right one from another type. Leaving it off searches every type and returns the best candidate from each, labelled \u2014 so you can choose from what actually exists rather than from a guess. NEVER write a WHERE clause on a name you have not resolved here, and NEVER invent an id. Reading the result: use the top pick when it is an exact or high-scoring match. When it is flagged `ambiguous`, OR when the top score is low, READ `alternatives` before choosing \u2014 each is labelled with its `entityType`, and the right record is often there under a type you would not have guessed. `entityMap` comes back automatically for every type your mentions resolved to: it gives the id column to filter on and the table/column the name lives in. Filter on the id, never on the name. A mention in `recognized` is NOT indexed but IS locatable \u2014 values like invoice or GCN numbers change daily, so only where they live is registered. If it carries `searchSql`, RUN THAT QUERY AS GIVEN; otherwise use its `field` with the ready-made `match` predicate. Do not rewrite either comparison as `=`, because the stored data is irregular. A mention in `unresolved` is not in the index: say so for that item and still answer the rest, rather than dropping it or inventing an id. Call it again later in the turn if query results reveal another name you need an id for.',
+  description: 'ALWAYS call this FIRST, before any source query, on every question. It resolves ONLY the things the user NAMED into exact database ids \u2014 proper nouns, identifiers, searchable values. It has no notion of formulas, computation, totals, or business logic \u2014 for anything the question asks you to compute, forecast, rank, or classify, use the separate concept-resolution tool instead, if one is available; never pass that kind of thing here. Pass `mentions` for any proper noun or identifier the user referred to \u2014 customer/company/project names, people, places, invoice or document numbers. Pass the user\'s wording VERBATIM; do not clean it up, expand abbreviations, or correct a spelling. Misspellings and partial names are matched for you. Set a mention\'s `entityType` ONLY when the question itself says what the value is ("project 314023", "customer Acme Ltd", "invoice CHL/895/26-27"). DO NOT GUESS IT. A wrong guess is worse than none: the lookup is confined to that type, and if anything there matches even weakly you silently get the wrong record instead of the right one from another type. Leaving it off searches every type and returns the best candidate from each, labelled \u2014 so you can choose from what actually exists rather than from a guess. NEVER write a WHERE clause on a name you have not resolved here, and NEVER invent an id. Reading the result: use the top pick when it is an exact or high-scoring match. When it is flagged `ambiguous`, OR when the top score is low, READ `alternatives` before choosing \u2014 each is labelled with its `entityType`, and the right record is often there under a type you would not have guessed. `entityMap` comes back automatically for every type your mentions resolved to: it gives the id column to filter on and the table/column the name lives in. Filter on the id, never on the name. A mention in `recognized` is NOT indexed but IS locatable \u2014 values like invoice or GCN numbers change daily, so only where they live is registered. If it carries `searchSql`, RUN THAT QUERY AS GIVEN; otherwise use its `field` with the ready-made `match` predicate. Do not rewrite either comparison as `=`, because the stored data is irregular. A mention in `unresolved` is not in the index: say so for that item and still answer the rest, rather than dropping it or inventing an id. Call it again later in the turn if query results reveal another name you need an id for.',
   input_schema: {
     type: "object",
     properties: {
@@ -12722,30 +12799,10 @@ var RESOLVE_ENTITIES_TOOL_DEF = {
           },
           required: ["text"]
         }
-      },
-      concepts: {
-        type: "array",
-        items: { type: "string" },
-        description: "Names from the CONCEPT CATALOG for anything the question asks you to compute, total, forecast, rank or classify \u2014 including when the concept is not named literally. Empty only when the question asks for no computation at all. Prerequisites come back automatically."
       }
     }
   }
 };
-var RESOLVE_CONCEPTS_TOOL_DEF = {
-  name: "resolve_concepts",
-  description: 'Fetch the project\'s OWN definition of a business concept \u2014 the formula, filters and joins that define it \u2014 BEFORE computing that concept yourself. Call this whenever the question asks you to compute, calculate, total, forecast, or classify something, even when the concept is not named literally in the question. Pass names from the CONCEPT CATALOG in your system prompt; ask for the SPECIFIC name that fits, since a vague single word matches whichever entry is closest by string. Anything a concept depends on is returned automatically alongside it \u2014 you do not need to work out or request its prerequisites. A clear misspelling is corrected for you and reported in `corrected`. But when a name is too vague or too close to several catalog entries ("project", when the catalog holds project name / project budget / project type), NOTHING is resolved: you get `didYouMean` candidates instead. Those are candidates, NOT an answer \u2014 choose the one the question means and call again with that exact name, never assume the first. When a concept comes back, USE ITS BODY AS WRITTEN: it overrides whatever the schema, column names or your own reasoning suggest, and every filter it states is REQUIRED, not optional. Honour its `returns` contract too \u2014 if it declares a unit or grain (e.g. "per-currency, unconverted"), do not collapse across that unit without saying so. A name that comes back in `unmatched` has no definition here: derive it yourself and say plainly in your answer that you did.',
-  input_schema: {
-    type: "object",
-    properties: {
-      names: {
-        type: "array",
-        items: { type: "string" },
-        description: "Concept names from the CONCEPT CATALOG. Ask only for what this question needs \u2014 dependencies come back on their own."
-      }
-    },
-    required: ["names"]
-  }
-};
 var EXECUTE_SCRIPT_TOOL_DEF = {
   name: "execute_script",
   description: "Run the current draft script in a subprocess and return { ok, sampleRows, executedQueries, error?, errorPhase? }. Call this after write_script. If ok is false, fix the draft with a fresh write_script (max 3 attempts per turn). If ok is true AND the sample rows answer the user question, proceed to your final analysis.",
@@ -12801,9 +12858,11 @@ var MainAgent = class {
      */
     this.resolvedEntities = [];
     /**
-     * Concept bodies resolved this turn (via resolve_entities' embedded concept
-     * lookup or a standalone resolve_concepts call) — retained the same way as
-     * resolvedEntities above, so they can be attached to the SourceAgent dispatch.
+     * Concept bodies resolved this turn (currently: invariants only, via
+     * loadConceptInvariants — concept resolution is no longer part of
+     * resolve_entities or any other MainAgent-owned tool) — retained the same
+     * way as resolvedEntities above, so they can be attached to the SourceAgent
+     * dispatch.
      *
      * Without this, a concept resolved HERE (MainAgent's own tool loop) never
      * reaches SourceAgent at all: SourceAgent only gets the natural-language
@@ -12879,7 +12938,6 @@ var MainAgent = class {
     const entitySearchActive = this.entitySearchEnabled && entityCatalog.count > 0;
     if (entityCatalog.count) logger.info(`[MainAgent] Entity catalog: ${entityCatalog.count} type(s) \u2014 resolve_entities pinned to iteration 1`);
     const conceptCatalog = this.conceptsEnabled ? await this.loadConceptCatalog() : { text: "", count: 0 };
-    const conceptsActive = this.conceptsEnabled && conceptCatalog.count > 0;
     const conceptInvariants = this.conceptsEnabled ? await this.loadConceptInvariants() : { text: "", count: 0 };
     if (conceptCatalog.count) {
       logger.info(
@@ -12920,7 +12978,6 @@ var MainAgent = class {
       ...directToolDefs,
       ...workflowToolDefs,
       ...entitySearchActive ? [RESOLVE_ENTITIES_TOOL_DEF] : [],
-      ...conceptsActive ? [RESOLVE_CONCEPTS_TOOL_DEF] : [],
       ...this.scriptingEnabled ? [WRITE_SCRIPT_TOOL_DEF, EXECUTE_SCRIPT_TOOL_DEF, WRITE_ANALYSIS_TOOL_DEF] : [],
       // Only offered when there is a catalog to choose from; without one the
       // flow falls back to generateScriptComponents exactly as before.
@@ -12936,7 +12993,7 @@ var MainAgent = class {
     let sourceCallCounter = 0;
     const toolIdCallCounts = {};
     let selectedWorkflow;
-    const toolHandler = async (toolName, toolInput) => {
+    const toolHandlerInner = async (toolName, toolInput) => {
       const workflow = this.workflows.find((w) => w.id === toolName);
       if (workflow) {
         return this.handleWorkflow(workflow, toolInput, (w) => {
@@ -12944,10 +13001,7 @@ var MainAgent = class {
         });
       }
       if (toolName === "resolve_entities") {
-        return this.handleResolveEntities(toolInput, userPrompt);
-      }
-      if (toolName === "resolve_concepts") {
-        return this.handleResolveConcepts(toolInput);
+        return this.handleResolveEntities(toolInput);
       }
       if (toolName === "write_components") {
         if (!this.scriptingEnabled) return "Component authoring is not enabled for this request.";
@@ -12975,7 +13029,8 @@ var MainAgent = class {
       }
       const sourceInput = {
         intent: toolInput.intent || toolInput.query || JSON.stringify(toolInput),
-        aggregation: toolInput.aggregation || "raw"
+        aggregation: toolInput.aggregation || "raw",
+        concepts: Array.isArray(toolInput.concepts) ? toolInput.concepts.filter((c) => typeof c === "string") : void 0
       };
       logger.info(`[MainAgent] Dispatching SourceAgent for "${externalTool.name}" | intent: "${sourceInput.intent}"`);
       const preResolved = await this.preResolveSchema(externalTool, sourceInput.intent);
@@ -13004,10 +13059,20 @@ var MainAgent = class {
       if (entityBlock) {
         logger.info(`[MainAgent] Attached ${this.resolvedEntities.length} resolved entity id(s) to the dispatch: ${this.resolvedEntities.map((e) => `${e.entityType}=${e.instanceId}`).join(", ")}`);
       }
-      const conceptBlock = this.buildResolvedConceptsBlock();
+      const conceptBlock = this.buildResolvedConceptsBlock(sourceInput.concepts);
+      const wantedConcepts = new Set(sourceInput.concepts ?? []);
+      const attachedConcepts = this.resolvedConcepts.filter((c) => c.alwaysInclude || wantedConcepts.has(c.name));
       if (conceptBlock) {
-        logger.info(`[MainAgent] Attached ${this.resolvedConcepts.length} resolved concept(s) to the dispatch: ${this.resolvedConcepts.map((c) => c.name).join(", ")}`);
-      }
+        logger.info(`[MainAgent] Attached ${attachedConcepts.length} resolved concept(s) to the dispatch: ${attachedConcepts.map((c) => c.name).join(", ")}`);
+      }
+      logger.file(
+        `[DISPATCH] ${externalTool.name} | sourceInput.concepts requested:`,
+        JSON.stringify(sourceInput.concepts ?? []),
+        "\n  entityBlock:",
+        entityBlock || "(none)",
+        "\n  conceptBlock:",
+        conceptBlock || "(none)"
+      );
       const result = await sourceAgent.execute({
         ...sourceInput,
         intent: sourceInput.intent + entityBlock + conceptBlock
@@ -13036,7 +13101,7 @@ var MainAgent = class {
         const entry = sourceAgent.getTraceEntry();
         if (entry) {
           entry.result = formatted;
-          if (this.resolvedConcepts.length) entry.resolvedConcepts = [...this.resolvedConcepts];
+          if (attachedConcepts.length) entry.resolvedConcepts = [...attachedConcepts];
           entry.aggregation = sourceInput.aggregation;
         }
       } catch (traceErr) {
@@ -13044,8 +13109,21 @@ var MainAgent = class {
       }
       return formatted;
     };
+    const toolHandler = async (toolName, toolInput) => {
+      logger.file(`[TOOL CALL] ${toolName} | input:`, JSON.stringify(toolInput));
+      try {
+        const result = await toolHandlerInner(toolName, toolInput);
+        logger.file(`[TOOL RESULT] ${toolName} | result:`, typeof result === "string" ? result.slice(0, 4e3) : JSON.stringify(result).slice(0, 4e3));
+        return result;
+      } catch (err) {
+        logger.file(`[TOOL ERROR] ${toolName} | error:`, err instanceof Error ? err.message : String(err));
+        throw err;
+      }
+    };
     let text = "";
     const firstIterationToolChoice = entitySearchActive ? { type: "tool", name: "resolve_entities" } : (this.forkMode || this.editMode) && this.scriptingEnabled ? { type: "any" } : void 0;
+    const conceptToolRegistered = this.externalTools.some((t) => t.id === "concept");
+    const secondIterationToolChoice = conceptToolRegistered ? { type: "tool", name: "concept" } : void 0;
     try {
       text = await LLM.streamWithTools(
         {
@@ -13064,7 +13142,8 @@ var MainAgent = class {
           apiKey: apiKey || this.config.apiKey,
           partial: streamCallback,
           signal,
-          ...firstIterationToolChoice ? { firstIterationToolChoice } : {}
+          ...firstIterationToolChoice ? { firstIterationToolChoice } : {},
+          ...secondIterationToolChoice ? { secondIterationToolChoice } : {}
         },
         this.config.maxIterations
       );
@@ -13235,24 +13314,6 @@ ${catalog}`,
     const hardcodedComponentText = findHardcodedComponentText(body);
     const hardcodedEntityNames = findHardcodedEntityNames(body, this.resolvedEntities.map((e) => e.displayName));
     const componentViolations = [...hardcodedAggregates, ...hardcodedComponentText, ...hardcodedEntityNames];
-    if (componentViolations.length > 0) {
-      const named = componentViolations.map((v) => `"${v.text}"`).join(", ");
-      const repeatedTexts = componentViolations.map((v) => v.text).filter((t) => this.lastComponentsViolationTexts.includes(t));
-      this.lastComponentsViolationTexts = componentViolations.map((v) => v.text);
-      logger.warn(`[MainAgent] write_components rejected \u2014 ${componentViolations.length} hardcoded value(s): ${named}`);
-      const lines2 = componentViolations.map((v) => `  \u2022 "${v.text}" \u2014 ${v.reason}`).join("\n");
-      let message = `write_components rejected: getComponents hardcodes ${componentViolations.length} value(s) that belong to this run's data, not fixed text:
-${lines2}
-
-FIX: derive every such value from \`data\`/\`datasets\` at render time via \`fmt\` (e.g. \`Total: \${fmt.money(datasets.summary[0].total)}\`), never a number typed directly into the string.`;
-      if (repeatedTexts.length > 0) {
-        const repeatedList = repeatedTexts.map((t) => `"${t}"`).join(", ");
-        message += `
-
-STILL UNCHANGED FROM THE LAST ATTEMPT: ${repeatedList}. Restating the same reason won't help a second time \u2014 this is almost certainly a parameter or an already-resolved value: if it's an id, use \`params.<name>\` directly; if it's a name or a period, read it from \`data\`/\`datasets\`/\`fmt.range\`. Replace the literal itself, not the wording around it.`;
-      }
-      return message;
-    }
     const recipeId = this.scriptState.recipeId;
     const draft = recipeId ? await this.scriptStore.get(recipeId) : null;
     if (!recipeId || !draft) return "Draft was lost from the store. Call write_script again.";
@@ -13713,12 +13774,19 @@ The verified script is intact. You can still call write_analysis and write_compo
 RESOLVED ENTITIES \u2014 these were looked up already. Filter on the ids; do NOT search for them by name. Where a name must appear in output or a comparison, use the "name in DB" spelling EXACTLY as given. Where a READY-MADE SCOPE is given, paste it into the query as-is instead of writing your own join/city-match/lookup for the same thing:
 ${lines.join("\n")}`;
   }
-  /** Dedupe-and-retain helper shared by resolveConceptsForTurn and handleResolveConcepts. */
-  retainResolvedConcepts(resolved) {
+  /**
+   * Dedupe-and-retain helper shared by loadConceptInvariants and the generic
+   * direct-tool `resolvedConcepts` opt-in hook. `alwaysInclude` marks entries
+   * that buildResolvedConceptsBlock must attach to EVERY dispatch regardless
+   * of that dispatch's `concepts` param — true only for invariants, which are
+   * meant to apply everywhere by definition. Concepts retained without it
+   * (e.g. via the `concept` tool's `get`) are scoped per-dispatch instead.
+   */
+  retainResolvedConcepts(resolved, opts) {
     for (const c of resolved) {
       if (!c?.name || !c?.body) continue;
       if (this.resolvedConcepts.some((existing) => existing.name === c.name)) continue;
-      this.resolvedConcepts.push({ name: String(c.name), kind: String(c.kind ?? ""), body: String(c.body) });
+      this.resolvedConcepts.push({ name: String(c.name), kind: String(c.kind ?? ""), body: String(c.body), alwaysInclude: !!opts?.alwaysInclude });
     }
   }
   /**
@@ -13726,10 +13794,29 @@ ${lines.join("\n")}`;
    * entity ids — appended to the dispatch intent so SourceAgent's own,
    * independent LLM call receives the resolved definitions verbatim rather
    * than only MainAgent's paraphrased intent text.
+   *
+   * Unlike buildResolvedEntitiesBlock, non-invariant entries here are SCOPED
+   * to `names` (this dispatch's SourceToolInput.concepts) rather than
+   * dumping the whole-turn `this.resolvedConcepts` accumulator into every
+   * dispatch. A concept body is phrased as an authoritative override
+   * ("overrides the schema... your own reasoning") — fetching several via
+   * `get` to compare/discard, or a turn needing different concepts for
+   * different sub-questions, must not leak an irrelevant concept's filters
+   * into an unrelated dispatch. An entry not named in `names` and not
+   * `alwaysInclude` is left out — a concept the model forgot to name is a
+   * visible, fixable miss; one that leaks in uninvited is not.
+   *
+   * `alwaysInclude` entries (invariants — see loadConceptInvariants) bypass
+   * `names` entirely and attach to every dispatch regardless, same as before
+   * this method took a `names` param — they are meant to apply everywhere,
+   * not just when the model happens to ask for them.
    */
-  buildResolvedConceptsBlock() {
+  buildResolvedConceptsBlock(names) {
     if (!this.resolvedConcepts.length) return "";
-    const lines = this.resolvedConcepts.map((c) => `- ${c.name}${c.kind ? ` (${c.kind})` : ""}: ${c.body}`);
+    const wanted = new Set(names ?? []);
+    const scoped = this.resolvedConcepts.filter((c) => c.alwaysInclude || wanted.has(c.name));
+    if (!scoped.length) return "";
+    const lines = scoped.map((c) => `- ${c.name}${c.kind ? ` (${c.kind})` : ""}: ${c.body}`);
     return `
 
 RESOLVED CONCEPTS \u2014 authoritative definitions for this turn. Use each body EXACTLY as written; it overrides the schema, the knowledge base, and your own reasoning:
@@ -13744,11 +13831,21 @@ ${lines.join("\n")}`;
     return !!this.config.collections?.["concepts"]?.["resolve"];
   }
   /**
-   * Concept names for the system prompt. Names ONLY — the body comes back from
+   * The concept catalog for the system prompt: one line per concept — name,
+   * aliases, and what it is for. No bodies — the body comes back from
    * resolve_concepts once the LLM has named one, exactly as with the entity
    * catalog. Putting bodies here would rebuild the always-on context problem
    * concepts exist to solve.
    *
+   * The description is what makes the list usable. It used to be names only,
+   * which asked the model to judge from a name alone whether `ref-data null
+   * sentinel` bears on the question in front of it — and a wrong judgement is
+   * silent, since it simply does not fetch. A line of prose per concept costs
+   * a few tokens and is read rather than matched.
+   *
+   * Aliases stay, because they are how a user is likely to phrase it, and
+   * showing them is what stops the LLM inventing a near-miss name.
+   *
    * Not cached, for the same reason loadEntityCatalog isn't: unchanged rows
    * render byte-identical text so the prompt-cache prefix still hits, and a
    * process cache would only buy a window where a new concept is invisible.
@@ -13761,7 +13858,8 @@ ${lines.join("\n")}`;
       const rows = res?.data || [];
       const text = rows.map((r) => {
         const aka = r.aliases?.length ? ` (also: ${r.aliases.join(", ")})` : "";
-        return `- ${r.name}${aka}`;
+        const what = r.description?.trim() ? ` \u2014 ${r.description.trim()}` : "";
+        return `- ${r.name}${aka}${what}`;
       }).join("\n");
       return { text, count: rows.length };
     } catch (err) {
@@ -13779,10 +13877,14 @@ ${lines.join("\n")}`;
    * Bodies ARE included here — unlike the catalog — because there is nothing to
    * request: being unrequestable is what makes them invariants.
    *
-   * Also retained into resolvedConcepts (same as an explicit resolve_concepts
-   * call) so these bodies reach SourceAgent's dispatch too — an invariant is
-   * meant to apply everywhere, not just wherever the model happens to ask for
-   * something whose `requires` chain reaches it.
+   * Also retained into resolvedConcepts so these bodies reach SourceAgent's
+   * dispatch too — an invariant is meant to apply everywhere, not just
+   * wherever the model happens to ask for something whose `requires` chain
+   * reaches it. This is now the ONLY way a concept body reaches
+   * resolvedConcepts/SourceAgent's dispatch automatically — a non-invariant
+   * concept fetched through a project's own concept-lookup tool (if any) is
+   * NOT retained here, and will not reach a later SourceAgent dispatch unless
+   * the model itself restates it in the intent it writes.
    */
   async loadConceptInvariants() {
     const fn = this.config.collections?.["concepts"]?.["invariants"];
@@ -13790,7 +13892,7 @@ ${lines.join("\n")}`;
     try {
       const res = await fn({});
       const rows = res?.data || [];
-      this.retainResolvedConcepts(rows);
+      this.retainResolvedConcepts(rows, { alwaysInclude: true });
       const text = rows.map((r) => `### ${r.name}
 ${r.body}`).join("\n\n");
       return { text, count: rows.length };
@@ -13799,161 +13901,11 @@ ${r.body}`).join("\n\n");
       return { text: "", count: 0 };
     }
   }
-  /**
-   * Resolve the concepts for a turn, with a SERVER-SIDE FLOOR.
-   *
-   * Pinning a tool guarantees it is called; it does not guarantee the model
-   * fills in the arguments. Observed: a question containing the exact words
-   * "revenue forecast" produced a call with no concepts at all, and the agent
-   * then used an incomplete copy of the formula from the knowledge base — the
-   * resulting query filtered a customer id against a project column and
-   * returned zero rows on every attempt.
-   *
-   * So when the model names nothing, scan the question itself for catalog names
-   * and aliases on word boundaries. Precise (a literal name is evidence, not a
-   * guess) and asymmetric in the safe direction: an unneeded definition costs a
-   * few hundred ignorable tokens, a missing one costs a wrong answer.
-   */
-  /**
-   * Returns the tool-facing fields to spread into the resolve_entities JSON
-   * response, PLUS a `_trace` field with everything the trace needs that the
-   * model does not (asked/viaFloor/unmatched). Callers must pull `_trace` out
-   * before spreading the rest into what the model sees — see handleResolveEntities.
-   */
-  async resolveConceptsForTurn(asked, userPrompt) {
-    const resolveFn = this.config.collections?.["concepts"]?.["resolve"];
-    if (!resolveFn) return {};
-    let names = [...asked];
-    let viaFloor = [];
-    if (!names.length && userPrompt) {
-      try {
-        const catFn = this.config.collections?.["concepts"]?.["catalog"];
-        const cat = catFn ? await catFn({}) : null;
-        const haystack = ` ${userPrompt.toLowerCase().replace(/\s+/g, " ")} `;
-        for (const row of cat?.data || []) {
-          const labels = [row.name, ...row.aliases || []].filter(Boolean).sort((a, b) => b.length - a.length);
-          for (const label of labels) {
-            const l = String(label).toLowerCase().trim();
-            if (l.length < 4) continue;
-            if (haystack.includes(` ${l} `) || haystack.includes(` ${l},`) || haystack.includes(` ${l}?`) || haystack.includes(` ${l}.`)) {
-              names.push(row.name);
-              viaFloor.push(row.name);
-              break;
-            }
-          }
-        }
-      } catch (err) {
-        logger.warn(`[MainAgent] concept floor scan failed (non-blocking): ${err instanceof Error ? err.message : String(err)}`);
-      }
-    }
-    if (!names.length) return {};
-    try {
-      const res = await resolveFn({ names });
-      const resolved = res?.resolved || [];
-      const impliedKeys = new Set((res?.implied || []).map((s) => s.toLowerCase()));
-      this.retainResolvedConcepts(resolved);
-      logger.info(
-        `[MainAgent] concepts (in resolve_entities): asked ${asked.length}` + (viaFloor.length ? `, ${viaFloor.length} found in the question text (${viaFloor.join(", ")})` : "") + ` \u2192 ${resolved.length} returned` + (res?.implied?.length ? `, ${res.implied.length} via requires` : "") + (res?.corrected?.length ? `, corrected: ${res.corrected.map((c) => `${c.asked}\u2192${c.matched}`).join(", ")}` : "") + (res?.suggestions?.length ? `, ambiguous: ${res.suggestions.map((s) => s.asked).join(", ")}` : "")
-      );
-      const _trace = {
-        asked,
-        viaFloor,
-        returned: resolved.map((c) => ({
-          name: c.name,
-          kind: c.kind,
-          definition: c.body,
-          ...c.returns && Object.keys(c.returns).length ? { returns: c.returns } : {},
-          ...impliedKeys.has(String(c.name).toLowerCase()) ? { viaRequires: true } : {}
-        })),
-        implied: res?.implied || [],
-        unmatched: res?.unmatched || [],
-        corrected: res?.corrected || [],
-        suggestions: res?.suggestions || []
-      };
-      if (!resolved.length) return { _trace };
-      return {
-        concepts: resolved.map((c) => ({
-          name: c.name,
-          kind: c.kind,
-          definition: c.body,
-          ...c.returns && Object.keys(c.returns).length ? { returns: c.returns } : {},
-          ...impliedKeys.has(String(c.name).toLowerCase()) ? { viaRequires: true } : {}
-        })),
-        ...res?.corrected?.length ? { conceptsCorrected: res.corrected } : {},
-        ...res?.suggestions?.length ? { conceptsDidYouMean: res.suggestions } : {},
-        conceptNote: "These definitions are AUTHORITATIVE. Use each body as written \u2014 it overrides the knowledge base, the column names in the schema, and your own reasoning, and every filter it states is required. Entries marked viaRequires are prerequisites returned automatically; they apply just as much as the ones asked for." + (viaFloor.length ? ` Included because the question mentions them: ${viaFloor.join(", ")}.` : ""),
-        _trace
-      };
-    } catch (err) {
-      logger.warn(`[MainAgent] concept resolution inside resolve_entities failed (non-blocking): ${err instanceof Error ? err.message : String(err)}`);
-      return { _trace: { asked, viaFloor, error: err instanceof Error ? err.message : String(err) } };
-    }
-  }
   /**
    * Never throws: a concept-store outage must degrade to "no definition found"
    * and leave the agent deriving the formula as it does today, not take the
    * whole answer down.
    */
-  async handleResolveConcepts(toolInput) {
-    const fn = this.config.collections?.["concepts"]?.["resolve"];
-    const names = Array.isArray(toolInput?.names) ? toolInput.names.filter(Boolean) : [];
-    if (!fn) {
-      return JSON.stringify({ concepts: [], unmatched: names, note: "Concept definitions are not available; derive from the schema and say so." });
-    }
-    if (!names.length) {
-      return JSON.stringify({ concepts: [], unmatched: [], note: "No concept names given \u2014 continue." });
-    }
-    try {
-      const res = await fn({ names });
-      const resolved = res?.resolved || [];
-      const impliedKeys = new Set((res?.implied || []).map((s) => s.toLowerCase()));
-      this.retainResolvedConcepts(resolved);
-      logger.info(
-        `[MainAgent] resolve_concepts: asked ${names.length} \u2192 ${resolved.length} returned` + (res?.implied?.length ? `, ${res.implied.length} pulled in as dependencies` : "") + (res?.corrected?.length ? `, corrected: ${res.corrected.map((c) => `${c.asked}\u2192${c.matched}`).join(", ")}` : "") + (res?.suggestions?.length ? `, ambiguous: ${res.suggestions.map((s) => s.asked).join(", ")}` : "") + (res?.unmatched?.length ? `, unmatched: ${res.unmatched.join(", ")}` : "")
-      );
-      const suggestions = res?.suggestions || [];
-      const corrected = res?.corrected || [];
-      const notes = [];
-      if (resolved.length) notes.push("Use these definitions VERBATIM \u2014 every filter stated is required. Entries marked viaRequires are prerequisites returned automatically; they apply just as much as the ones you asked for.");
-      if (corrected.length) notes.push(`Read as a corrected spelling: ${corrected.map((c) => `"${c.asked}" \u2192 "${c.matched}"`).join(", ")}. If that is not what you meant, ask again with the exact catalog name.`);
-      if (suggestions.length) notes.push(`No confident match for ${suggestions.map((s) => `"${s.asked}"`).join(", ")} \u2014 these are CANDIDATES, not answers. Pick the one the question actually means and call resolve_concepts again with that exact name; do NOT assume the first.`);
-      if (!resolved.length && !suggestions.length) notes.push("No definition on file \u2014 derive it yourself and say so in your answer.");
-      const seenByLLM = {
-        concepts: resolved.map((c) => ({
-          name: c.name,
-          kind: c.kind,
-          definition: c.body,
-          ...c.returns && Object.keys(c.returns).length ? { returns: c.returns } : {},
-          ...impliedKeys.has(String(c.name).toLowerCase()) ? { viaRequires: true } : {}
-        })),
-        ...corrected.length ? { corrected } : {},
-        ...suggestions.length ? { didYouMean: suggestions } : {},
-        unmatched: res?.unmatched || [],
-        note: notes.join(" ")
-      };
-      try {
-        if (this.config.trace) {
-          this.config.trace.concepts.calls.push({
-            via: "resolve_concepts",
-            asked: names,
-            implied: res?.implied || [],
-            returned: seenByLLM.concepts,
-            ...corrected.length ? { corrected } : {},
-            ...suggestions.length ? { suggestions } : {},
-            unmatched: res?.unmatched || [],
-            note: notes.join(" ")
-          });
-        }
-      } catch (traceErr) {
-        logger.warn(`[MainAgent] Trace capture failed for resolve_concepts (non-blocking): ${traceErr}`);
-      }
-      return JSON.stringify(seenByLLM);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      logger.warn(`[MainAgent] resolve_concepts failed (non-blocking): ${msg}`);
-      return JSON.stringify({ concepts: [], unmatched: names, note: "Concept lookup failed; derive from the schema and say so." });
-    }
-  }
   /**
    * Compact catalog (type + gloss) for the system prompt. This is what lets the
    * LLM NAME a concept instead of guessing at our vocabulary — it can infer
@@ -13984,20 +13936,18 @@ ${r.body}`).join("\n\n");
    * Never throws: a resolver outage must degrade to "nothing resolved" and
    * leave the agent exactly as it was, not take the whole answer down.
    */
-  async handleResolveEntities(toolInput, userPrompt) {
+  async handleResolveEntities(toolInput) {
     const fn = this.config.collections?.["entity-search"]?.["resolveEntities"];
     const mentions = Array.isArray(toolInput?.mentions) ? toolInput.mentions.filter((m) => m?.text) : [];
     const entityTypes = Array.isArray(toolInput?.entityTypes) ? toolInput.entityTypes.filter(Boolean) : [];
-    const askedConcepts = Array.isArray(toolInput?.concepts) ? toolInput.concepts.filter(Boolean) : [];
-    const { _trace: conceptTrace, ...conceptBlock } = await this.resolveConceptsForTurn(askedConcepts, userPrompt);
-    if (conceptTrace) {
-      try {
-        if (this.config.trace) {
-          this.config.trace.concepts.calls.push({ via: "resolve_entities", ...conceptTrace });
-        }
-      } catch (traceErr) {
-        logger.warn(`[MainAgent] Trace capture failed for concepts-in-resolve_entities (non-blocking): ${traceErr}`);
-      }
+    if (this.streamBuffer.hasCallback()) {
+      const named = mentions.map((m) => `"${m.text}"`).join(", ");
+      this.streamBuffer.write(`
+
+\u{1F50D} **Resolving entities${named ? `: ${named}` : ""}...**
+
+`);
+      await streamDelay();
     }
     const traceEarlyReturn = (note) => {
       try {
@@ -14010,23 +13960,48 @@ ${r.body}`).join("\n\n");
     };
     if (!fn) {
       traceEarlyReturn("Entity search unavailable");
-      return JSON.stringify({ resolved: [], unresolved: [], entityMap: {}, ...conceptBlock, note: "Entity search is not available; proceed using the schema." });
+      if (this.streamBuffer.hasCallback()) {
+        this.streamBuffer.write(`\u26A0\uFE0F **Entity search unavailable** \u2014 proceeding on schema alone.
+
+`);
+      }
+      return JSON.stringify({ resolved: [], unresolved: [], entityMap: {}, note: "Entity search is not available; proceed using the schema." });
     }
     if (!mentions.length && !entityTypes.length) {
       traceEarlyReturn("Nothing named in the question to resolve");
+      if (this.streamBuffer.hasCallback()) {
+        this.streamBuffer.write(`\u2705 **Entity search:** nothing to resolve for this question.
+
+`);
+      }
       return JSON.stringify({
         resolved: [],
         unresolved: [],
         entityMap: {},
-        ...conceptBlock,
-        note: conceptBlock.concepts?.length ? "The question named nothing to look up, but the definitions below apply \u2014 use them as written." : "Nothing to resolve for this question \u2014 continue."
+        note: "Nothing to resolve for this question \u2014 continue."
       });
     }
     try {
       const res = await fn({ mentions, entityTypes });
       logger.info(
-        `[MainAgent] resolve_entities: ${res?.resolved?.length ?? 0} resolved, ${res?.unresolved?.length ?? 0} unresolved, ${Object.keys(res?.entityMap || {}).length} concept(s)`
+        `[MainAgent] resolve_entities: ${res?.resolved?.length ?? 0} resolved, ${res?.unresolved?.length ?? 0} unresolved, ${Object.keys(res?.entityMap || {}).length} type(s)`
       );
+      if (this.streamBuffer.hasCallback()) {
+        const resolvedCount = res?.resolved?.length ?? 0;
+        const unresolvedCount = res?.unresolved?.length ?? 0;
+        const names = (Array.isArray(res?.resolved) ? res.resolved : []).map((r) => {
+          const label = r?.displayName || r?.mention;
+          if (!label) return null;
+          return r?.entityType ? `${label} (${r.entityType})` : label;
+        }).filter(Boolean).join(", ");
+        const unresolvedNames = (Array.isArray(res?.unresolved) ? res.unresolved : []).map((u) => typeof u === "string" ? u : u?.text).filter(Boolean).join(", ");
+        let line = `\u2705 **Entity search:** ${resolvedCount} resolved`;
+        if (names) line += ` (${names})`;
+        if (unresolvedCount) line += `, ${unresolvedCount} unresolved${unresolvedNames ? ` (${unresolvedNames})` : ""}`;
+        this.streamBuffer.write(`${line}
+
+`);
+      }
       const TIE_EPSILON = 0.05;
       const key = (e) => `${e.entityType}::${e.instanceId}`;
       const add = (mention, c) => {
@@ -14062,7 +14037,7 @@ ${r.body}`).join("\n\n");
           attrs: r.attrs && typeof r.attrs === "object" ? r.attrs : void 0
         });
       }
-      const seenByLLM = { ...res, ...conceptBlock };
+      const seenByLLM = { ...res };
       try {
         if (this.config.trace) {
           this.config.trace.entityResolution.calls.push({ mentions, entityTypes, ...seenByLLM });
@@ -14074,6 +14049,13 @@ ${r.body}`).join("\n\n");
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       logger.warn(`[MainAgent] resolve_entities failed (non-blocking): ${msg}`);
+      if (this.streamBuffer.hasCallback()) {
+        this.streamBuffer.write(`
+
+\u274C **Entity search failed:** ${msg}
+
+`);
+      }
       try {
         if (this.config.trace) {
           this.config.trace.entityResolution.calls.push({
@@ -14092,8 +14074,7 @@ ${r.body}`).join("\n\n");
         resolved: [],
         entityMap: {},
         error: msg,
-        unresolved: mentions.map((m) => m.text),
-        ...conceptBlock
+        unresolved: mentions.map((m) => m.text)
       });
     }
   }
@@ -14186,7 +14167,7 @@ ${lines.join("\n")}`;
     if (this.streamBuffer.hasCallback()) {
       this.streamBuffer.write(`
 
-\u{1F527} **Running ${tool.name}...**
+\u{1F527} **Running ${describeDirectToolCall(tool, toolInput)}...**
 
 `);
       await streamDelay();
@@ -14197,19 +14178,24 @@ ${lines.join("\n")}`;
       if (result && result.error) {
         const errorMsg = typeof result.error === "string" ? result.error : JSON.stringify(result.error);
         logger.warn(`[MainAgent] Direct tool "${tool.name}" returned error: ${errorMsg}`);
+        this.config.trace?.directTools.calls.push({ toolId: tool.id, input: toolInput, error: errorMsg, durationMs: executionTimeMs });
         return `\u274C Tool "${tool.name}" error: ${errorMsg}`;
       }
+      if (Array.isArray(result?.resolvedConcepts)) {
+        this.retainResolvedConcepts(result.resolvedConcepts, { alwaysInclude: true });
+      }
       const resultData = result.data || result;
       const rowCount = Array.isArray(resultData) ? resultData.length : 1;
       if (this.streamBuffer.hasCallback()) {
-        this.streamBuffer.write(`\u2705 **${tool.name}** completed (${rowCount} results, ${executionTimeMs}ms)
+        this.streamBuffer.write(`\u2705 **${describeDirectToolCall(tool, toolInput)}** completed (${rowCount} results, ${executionTimeMs}ms)
 
 `);
       }
+      const isConceptTool = tool.id === "concept";
       const formattedResult = formatToolResultForLLM(result, {
         toolName: tool.name,
-        maxRows: 5,
-        maxCharsPerField: 200
+        maxRows: isConceptTool ? 25 : 5,
+        maxCharsPerField: isConceptTool ? 4e3 : 200
       });
       const sampleData = Array.isArray(resultData) ? resultData.slice(0, TOOL_TRACKING_SAMPLE_ROWS) : Array.isArray(formattedResult.data) ? formattedResult.data.slice(0, TOOL_TRACKING_SAMPLE_ROWS) : [];
       executedTools.push({
@@ -14225,6 +14211,7 @@ ${lines.join("\n")}`;
         outputSchema: tool.outputSchema
       });
       const formatted = typeof formattedResult === "string" ? formattedResult : JSON.stringify(formattedResult);
+      this.config.trace?.directTools.calls.push({ toolId: tool.id, input: toolInput, output: result, durationMs: executionTimeMs });
       return `\u2705 Tool "${tool.name}" executed successfully. ${rowCount} results returned.
 
 ${formatted}`;
@@ -14235,10 +14222,11 @@ ${formatted}`;
       if (this.streamBuffer.hasCallback()) {
         this.streamBuffer.write(`
 
-\u274C **${tool.name} failed:** ${errorMsg}
+\u274C **${describeDirectToolCall(tool, toolInput)} failed:** ${errorMsg}
 
 `);
       }
+      this.config.trace?.directTools.calls.push({ toolId: tool.id, input: toolInput, error: errorMsg, durationMs: executionTimeMs });
       return `\u274C Tool "${tool.name}" failed: ${errorMsg}`;
     }
   }
@@ -14391,6 +14379,11 @@ ${propLines}` : ""
               type: "string",
               enum: ["raw", "pre-aggregate", "summary"],
               description: 'How to return data. "pre-aggregate": use GROUP BY/SUM/COUNT for totals. "summary": high-level metrics. "raw": individual records.'
+            },
+            concepts: {
+              type: "array",
+              items: { type: "string" },
+              description: `Exact concept name(s), already fetched this turn via the concept tool's "get" method, that THIS query needs. Only names given here get attached as authoritative definitions to this dispatch \u2014 omit a concept you looked at but are not using for this specific query. Leave empty/omit entirely when this query needs none.`
             }
           },
           required: ["intent"]
@@ -14614,6 +14607,22 @@ ${scopeWarning} The script re-runs them, so you can include more than one \`ctx.
     return buildSourceSummaries(this.externalTools);
   }
 };
+function describeDirectToolCall(tool, toolInput) {
+  const method = toolInput?.method;
+  if (typeof method !== "string") return tool.name;
+  switch (method) {
+    case "find":
+      return typeof toolInput.query === "string" ? `${tool.name} (find: "${toolInput.query}")` : `${tool.name} (find)`;
+    case "get": {
+      const names = Array.isArray(toolInput.names) ? toolInput.names.join(", ") : void 0;
+      return names ? `${tool.name} (get: ${names})` : `${tool.name} (get)`;
+    }
+    case "run":
+      return typeof toolInput.name === "string" ? `${tool.name} (run: ${toolInput.name})` : `${tool.name} (run)`;
+    default:
+      return `${tool.name} (${method})`;
+  }
+}
 function extractTablesFromSQL(sqls) {
   const tables = /* @__PURE__ */ new Set();
   const pattern = /(?:FROM|JOIN)\s+"?([a-zA-Z_][\w.]*)"?/gi;
@@ -14637,6 +14646,7 @@ function createRunTrace() {
     scriptMatcher: null,
     entityResolution: { calls: [] },
     concepts: { calls: [] },
+    directTools: { calls: [] },
     componentGen: []
   };
 }
@@ -15931,12 +15941,12 @@ function answerCatalogForBinding(components) {
 import dotenv from "dotenv";
 
 // src/userResponse/schema.ts
-import path7 from "path";
+import path8 from "path";
 import fs7 from "fs";
 var Schema = class {
   constructor(schemaFilePath) {
     this.cachedSchema = null;
-    this.schemaFilePath = schemaFilePath || path7.join(process.cwd(), "../analysis/data/schema.json");
+    this.schemaFilePath = schemaFilePath || path8.join(process.cwd(), "../analysis/data/schema.json");
   }
   /**
    * Gets the database schema from the schema file
@@ -15944,7 +15954,7 @@ var Schema = class {
    */
   getDatabaseSchema() {
     try {
-      const dir = path7.dirname(this.schemaFilePath);
+      const dir = path8.dirname(this.schemaFilePath);
       if (!fs7.existsSync(dir)) {
         logger.info(`Creating directory structure: ${dir}`);
         fs7.mkdirSync(dir, { recursive: true });
@@ -17548,7 +17558,7 @@ ${executedToolsText}`);
    */
   async handleUserRequest(userPrompt, components, apiKey, conversationHistory, responseMode = "text", streamCallback, collections, externalTools, userId) {
     const startTime = Date.now();
-    logger.clearFile();
+    logger.clearFile(`legacy-${userPrompt}`);
     logger.logLLMPrompt("handleUserRequest", "user", `User Prompt: ${userPrompt}`);
     try {
       const conversationMatch = await conversation_search_default.searchConversationsWithReranking({
@@ -18081,13 +18091,28 @@ var get_agent_user_response = async (prompt, components, anthropicApiKey, groqAp
   let runTrace;
   const answerComps = answerComponents(components);
   const bindingComps = projectForDatasetBinding(answerComps);
-  logger.clearFile();
+  logger.clearFile(`chat-${prompt}`);
   logger.logLLMPrompt("agentUserResponse", "user", `User Prompt: ${prompt}`);
   logger.info(`[AgentFlow] Starting | provider: ${provider} | prompt: "${prompt.substring(0, 50)}..."`);
   try {
     const cached = await replayExactMatch({ prompt, collections, userId, streamCallback, method: `${provider}-agent-exact-match`, startTime });
     if (cached?.response) return cached.response;
-    const directReplay = cached?.directReplay;
+    let directReplay = cached?.directReplay;
+    if (!cached) {
+      const supersededMatch = await conversation_search_default.findExactMatch({
+        userPrompt: prompt,
+        collections,
+        userId,
+        statuses: ["superseded"]
+      });
+      const boundBinding = supersededMatch?.uiBlock?.scriptBinding;
+      if (boundBinding?.recipeId) {
+        directReplay = { recipeId: boundBinding.recipeId, params: boundBinding.params || {} };
+        logger.info(
+          `[AgentFlow] Exact match found a SUPERSEDED row (recipe edited since) \u2014 will re-run current recipe ${directReplay.recipeId} directly (skip matcher LLM)`
+        );
+      }
+    }
     logger.info(`[AgentFlow] No exact match \u2014 proceeding with agent`);
     runTrace = createRunTrace();
     const apiKey = (() => {
@@ -18172,7 +18197,7 @@ var get_agent_user_response = async (prompt, components, anthropicApiKey, groqAp
         const boundRecipe = await scriptStore.get(directReplay.recipeId);
         if (boundRecipe) {
           scriptMatch = { tier: "high", recipe: boundRecipe, extractedParams: directReplay.params };
-          logger.info(`[AgentFlow] TTL-expired exact match \u2014 replaying bound recipe "${boundRecipe.name}" directly (skipped ScriptMatcher LLM)`);
+          logger.info(`[AgentFlow] Direct replay \u2014 running current recipe "${boundRecipe.name}" directly (skipped ScriptMatcher LLM)`);
         } else {
           logger.info(`[AgentFlow] Bound recipe ${directReplay.recipeId} no longer in store \u2014 falling back to ScriptMatcher LLM`);
         }
@@ -18524,6 +18549,19 @@ RENDERING REQUIREMENT (overrides the default choice of component): ${scriptMatch
                 }
               };
             }
+            if (isDisplayEdit) {
+              try {
+                const invalidate = collections?.["conversation-history"]?.["invalidateByScriptRecipe"];
+                if (invalidate) {
+                  const n = await invalidate({ recipeId: scriptMatch.recipe.id, userId });
+                  logger.info(`[AgentFlow] Superseded ${n?.count ?? n ?? 0} cached answer(s) bound to display-edited recipe ${scriptMatch.recipe.id}`);
+                } else {
+                  logger.warn(`[AgentFlow] conversation-history.invalidateByScriptRecipe not wired \u2014 cached answers for recipe ${scriptMatch.recipe.id} will replay the PRE-EDIT component set`);
+                }
+              } catch (invErr) {
+                logger.warn(`[AgentFlow] Conversation invalidation failed (non-blocking): ${invErr}`);
+              }
+            }
             const elapsedTime2 = Date.now() - startTime;
             logger.info(`[AgentFlow] Script flow complete | ${scriptResult.executedQueries.length} queries | ${matchedComponents2.length} components | ${elapsedTime2}ms`);
             return {
@@ -18679,6 +18717,67 @@ BEGIN NOW. Your VERY FIRST action MUST be a \`write_script\` tool call containin
     const textResponse = rawText.replace(/_?_?SB_END_?_?/g, "").replace(/__SB_\w+_(?:START|MSG)_?_?/g, "").replace(/__QUERY_TIMER_START_[^_]*__/g, "").replace(/__QUERY_TIMER_DONE_[\d.]+__/g, "").replace(/__TEXT_COMPLETE__COMPONENT_GENERATION_START__/g, "").replace(/\[COMPLEXITY:\s*(?:simple|medium|complex)\]/gi, "");
     streamBuffer.flush();
     if (signal?.aborted) throw new RequestAbortedError();
+    if (agentResponse.savedScript && editContext) {
+      try {
+        const authored = agentResponse.savedScript;
+        if (runTrace) {
+          try {
+            runTrace.script = {
+              reused: false,
+              recipeId: authored.recipeId,
+              body: authored.scriptBody,
+              reasoning: editContext.instruction ?? null,
+              executionResult: authored.executionResult ?? null,
+              failedAttempts: agentResponse.failedScriptAttempts
+            };
+          } catch (traceErr) {
+            logger.warn(`[AgentFlow] Trace capture failed for edited script (non-blocking): ${traceErr}`);
+          }
+        }
+        const summaryLine = (agentResponse.text || "").split("\n").map((l) => l.trim()).find((l) => l.startsWith("\u270F\uFE0F"));
+        const changeSummary = (summaryLine || editContext.instruction).replace(/^✏️\s*/, "").replace(/^\**\s*Updated the script:\s*/i, "").replace(/\*\*/g, "").replace(/\s+/g, " ").trim().slice(0, 300);
+        const committed = await scriptStore.commitEdit(
+          editContext.recipeId,
+          {
+            recipeId: authored.recipeId,
+            name: authored.name,
+            intentDescription: authored.intentDescription,
+            tags: authored.tags,
+            parameters: authored.parameters,
+            scriptBody: authored.scriptBody,
+            sourceIds: authored.sourceIds,
+            tables: authored.tables
+          },
+          { instruction: editContext.instruction, changeSummary, editedBy: userId }
+        );
+        if (committed) {
+          agentResponse.savedScript.recipeId = committed.id;
+          scriptBinding = {
+            recipeId: committed.id,
+            version: committed.version,
+            params: {},
+            name: committed.name,
+            columns: authored.executedQueries?.[0]?.data?.[0] ? Object.keys(authored.executedQueries[0].data[0]) : void 0
+          };
+          try {
+            const invalidate = collections?.["conversation-history"]?.["invalidateByScriptRecipe"];
+            if (invalidate) {
+              const n = await invalidate({ recipeId: committed.id, userId });
+              logger.info(`[AgentFlow] Superseded ${n?.count ?? n ?? 0} cached answer(s) bound to edited recipe ${committed.id}`);
+            } else {
+              logger.warn(`[AgentFlow] conversation-history.invalidateByScriptRecipe not wired \u2014 cached answers for recipe ${committed.id} will replay the PRE-EDIT result`);
+            }
+          } catch (invErr) {
+            logger.warn(`[AgentFlow] Conversation invalidation failed (non-blocking): ${invErr}`);
+          }
+        } else {
+          logger.warn(`[AgentFlow] commitEdit failed for "${editedRecipeName}" \u2014 original recipe left unchanged`);
+        }
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logger.warn(`[AgentFlow] Failed to commit script edit (non-blocking): ${msg}`);
+      }
+    }
     if (agentResponse.executedTools.length === 0 && agentResponse.savedScript?.executedQueries && agentResponse.savedScript.executedQueries.length > 0) {
       for (const q of agentResponse.savedScript.executedQueries) {
         agentResponse.executedTools.push({
@@ -18952,66 +19051,7 @@ RENDERING REQUIREMENT (overrides the default choice of component): ${carriedRequ
         }
       };
     }
-    if (agentResponse.savedScript && editContext) {
-      try {
-        const authored = agentResponse.savedScript;
-        if (runTrace) {
-          try {
-            runTrace.script = {
-              reused: false,
-              recipeId: authored.recipeId,
-              body: authored.scriptBody,
-              reasoning: editContext.instruction ?? null,
-              executionResult: authored.executionResult ?? null,
-              failedAttempts: agentResponse.failedScriptAttempts
-            };
-          } catch (traceErr) {
-            logger.warn(`[AgentFlow] Trace capture failed for edited script (non-blocking): ${traceErr}`);
-          }
-        }
-        const summaryLine = (agentResponse.text || "").split("\n").map((l) => l.trim()).find((l) => l.startsWith("\u270F\uFE0F"));
-        const changeSummary = (summaryLine || editContext.instruction).replace(/^✏️\s*/, "").replace(/^\**\s*Updated the script:\s*/i, "").replace(/\*\*/g, "").replace(/\s+/g, " ").trim().slice(0, 300);
-        const committed = await scriptStore.commitEdit(
-          editContext.recipeId,
-          {
-            recipeId: authored.recipeId,
-            name: authored.name,
-            intentDescription: authored.intentDescription,
-            tags: authored.tags,
-            parameters: authored.parameters,
-            scriptBody: authored.scriptBody,
-            sourceIds: authored.sourceIds,
-            tables: authored.tables
-          },
-          { instruction: editContext.instruction, changeSummary, editedBy: userId }
-        );
-        if (committed) {
-          scriptBinding = {
-            recipeId: committed.id,
-            version: committed.version,
-            params: {},
-            name: committed.name,
-            columns: authored.executedQueries?.[0]?.data?.[0] ? Object.keys(authored.executedQueries[0].data[0]) : void 0
-          };
-          try {
-            const invalidate = collections?.["conversation-history"]?.["invalidateByScriptRecipe"];
-            if (invalidate) {
-              const n = await invalidate({ recipeId: committed.id, userId });
-              logger.info(`[AgentFlow] Superseded ${n?.count ?? n ?? 0} cached answer(s) bound to edited recipe ${committed.id}`);
-            } else {
-              logger.warn(`[AgentFlow] conversation-history.invalidateByScriptRecipe not wired \u2014 cached answers for recipe ${committed.id} will replay the PRE-EDIT result`);
-            }
-          } catch (invErr) {
-            logger.warn(`[AgentFlow] Conversation invalidation failed (non-blocking): ${invErr}`);
-          }
-        } else {
-          logger.warn(`[AgentFlow] commitEdit failed for "${editedRecipeName}" \u2014 original recipe left unchanged`);
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        logger.warn(`[AgentFlow] Failed to commit script edit (non-blocking): ${msg}`);
-      }
-    } else if (agentResponse.savedScript) {
+    if (agentResponse.savedScript && !editContext) {
       try {
         const authored = agentResponse.savedScript;
         if (runTrace) {
@@ -19240,7 +19280,8 @@ function transformUIBlockForDB(uiblock, userPrompt, uiBlockId) {
   };
 }
 function hasTraceContent(trace) {
-  return trace.kbNodes.global.length > 0 || trace.kbNodes.query.length > 0 || trace.schemaNodes.routing.length > 0 || trace.schemaNodes.preResolve.length > 0 || !!trace.schemaNodes.mainAgentCatalog || trace.schemaNodes.sourceAgentSchemas.length > 0 || trace.script != null || trace.scriptMatcher != null || !!trace.entityResolution.catalogText || trace.entityResolution.calls.length > 0 || !!trace.conversationHistory || !!trace.userAccessContext || !!trace.userKbContext || !!trace.concepts?.catalogText || !!trace.concepts?.invariantsText || (trace.concepts?.calls?.length ?? 0) > 0 || (trace.componentGen?.length ?? 0) > 0;
+  if (!trace || typeof trace !== "object") return false;
+  return (trace.kbNodes?.global?.length ?? 0) > 0 || (trace.kbNodes?.query?.length ?? 0) > 0 || (trace.schemaNodes?.routing?.length ?? 0) > 0 || (trace.schemaNodes?.preResolve?.length ?? 0) > 0 || !!trace.schemaNodes?.mainAgentCatalog || (trace.schemaNodes?.sourceAgentSchemas?.length ?? 0) > 0 || trace.script != null || trace.scriptMatcher != null || !!trace.entityResolution?.catalogText || (trace.entityResolution?.calls?.length ?? 0) > 0 || !!trace.conversationHistory || !!trace.userAccessContext || !!trace.userKbContext || !!trace.concepts?.catalogText || !!trace.concepts?.invariantsText || (trace.concepts?.calls?.length ?? 0) > 0 || (trace.directTools?.calls?.length ?? 0) > 0 || (trace.componentGen?.length ?? 0) > 0;
 }
 async function saveConversation(params) {
   const { userId, userPrompt, uiblock, uiBlockId, threadId, collections, status = "success", error: turnError, trace } = params;
@@ -19386,6 +19427,18 @@ var CONTEXT_CONFIG = {
 function stripStreamMarkers(text) {
   return text.replace(/__TEXT_COMPLETE__[\s\S]*/g, "").replace(/__ANSWER_COMPONENT_START__[\s\S]*?__ANSWER_COMPONENT_END__/g, "").replace(/__COMPONENT_GENERATION_START__/g, "").trim();
 }
+function promptContextFrom(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const source = raw;
+  const context = {};
+  if (typeof source.dashboardId === "string" && source.dashboardId.trim()) {
+    context.dashboardId = source.dashboardId.trim();
+  }
+  if (source.filters && typeof source.filters === "object" && !Array.isArray(source.filters)) {
+    context.filters = source.filters;
+  }
+  return Object.keys(context).length ? context : void 0;
+}
 var inFlightAborts = /* @__PURE__ */ new Map();
 var recentlyAborted = /* @__PURE__ */ new Map();
 var ABORT_TOMBSTONE_TTL_MS = 3e4;
@@ -19449,6 +19502,10 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
   const userConfig = payload.config;
   const SA_RUNTIME = payload.SA_RUNTIME;
   const wsId = userPromptRequest.from.id || "unknown";
+  const reported = (response) => ({
+    model: response?.data?.model,
+    usage: response?.data?.usage
+  });
   const promptContext = `User Prompt: ${prompt?.substring(0, 50)}${(prompt?.length || 0) > 50 ? "..." : ""}`;
   llmUsageLogger.resetLogFile(promptContext);
   userPromptErrorLogger.resetLogFile(promptContext);
@@ -19572,7 +19629,8 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
       conversationHistory,
       onStream: streamCallback,
       onNarration: narrationCallback,
-      signal: abortController.signal
+      signal: abortController.signal,
+      context: promptContextFrom(payload.context)
     }) : await get_agent_user_response(
       prompt,
       components,
@@ -19629,7 +19687,8 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
     }
     if (userId) {
       const latencyMs = Date.now() - requestStartTime;
-      const model = mainAgentModel || "unknown";
+      const turn = reported(userResponse);
+      const model = turn.model || mainAgentModel || "unknown";
       const event = analyticsClient.buildEvent({
         type: "chat_agent",
         userId,
@@ -19642,7 +19701,8 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
         model,
         errorMessage: "aborted",
         conversationId: savedConversationId2,
-        response: savedResponse2
+        response: savedResponse2,
+        usage: turn.usage
       });
       analyticsClient.track(event).catch(() => {
       });
@@ -19696,7 +19756,8 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
     }
     if (userId) {
       const latencyMs = Date.now() - requestStartTime;
-      const model = mainAgentModel || "unknown";
+      const turn = reported(userResponse);
+      const model = turn.model || mainAgentModel || "unknown";
       const event = analyticsClient.buildEvent({
         type: "chat_agent",
         userId,
@@ -19709,7 +19770,8 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
         model,
         errorMessage,
         conversationId: savedConversationId2,
-        response: savedResponse2
+        response: savedResponse2,
+        usage: turn.usage
       });
       analyticsClient.track(event).catch(() => {
       });
@@ -19793,7 +19855,8 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
   llmUsageLogger.logSessionSummary(prompt?.substring(0, 50));
   if (userId) {
     const latencyMs = Date.now() - requestStartTime;
-    const model = mainAgentModel || "unknown";
+    const turn = reported(userResponse);
+    const model = turn.model || mainAgentModel || "unknown";
     const componentConfig = userResponse.data?.component?.props?.config;
     const queryMap = componentConfig?._queryMap || {};
     const sqlStatements = Object.values(queryMap).filter((v) => typeof v === "string");
@@ -19825,7 +19888,8 @@ var get_user_request = async (data, components, sendMessage, anthropicApiKey, gr
       sourcesUsed: sourcesUsed.length > 0 ? sourcesUsed : void 0,
       sqlGenerated: sqlStatements.length > 0 ? sqlStatements.join(";\n") : void 0,
       conversationId: savedConversationId,
-      response: savedResponse
+      response: savedResponse,
+      usage: turn.usage
     });
     analyticsClient.track(event).catch(() => {
     });
@@ -19848,7 +19912,7 @@ async function handleUserPromptRequest(data, components, sendMessage, anthropicA
       id: `comp_${Math.random().toString(36).substring(2, 8)}`
     }));
   }
-  const { trace: _trace, ...dataWithoutTrace } = response.data ?? {};
+  const { trace: _trace, usage: _usage, model: _model, ...dataWithoutTrace } = response.data ?? {};
   sendDataResponse4(
     response.id || data.id,
     {
@@ -23938,7 +24002,7 @@ var processDashCompRequest = async (data, components, _sendMessage, anthropicApi
   const conversationHistory = dashboardId ? dashboardConversationHistory.getHistory(dashboardId, userId) : void 0;
   const promptContext = `DASH_COMP[${reqType}]: ${prompt?.substring(0, 50)}${(prompt?.length || 0) > 50 ? "..." : ""}`;
   llmUsageLogger.resetLogFile(promptContext);
-  logger.clearFile();
+  logger.clearFile(promptContext);
   if (!prompt) {
     errors.push("Prompt is required");
   }
@@ -24469,6 +24533,9 @@ ${marker}
 }
 
 // src/codingAgent/drivers/pi.ts
+import * as crypto3 from "crypto";
+import * as fs8 from "fs";
+import * as path9 from "path";
 var dynamicImport2 = new Function("specifier", "return import(specifier)");
 var piModulePromise = null;
 function loadPi() {
@@ -24480,46 +24547,111 @@ function loadPi() {
   }
   return piModulePromise;
 }
-var authAndRegistry = null;
-function getAuthAndRegistry() {
-  if (!authAndRegistry) {
-    authAndRegistry = loadPi().then(({ AuthStorage, ModelRegistry }) => {
-      const authStorage = AuthStorage.create();
-      return { authStorage, modelRegistry: ModelRegistry.create(authStorage) };
+var runtimePromise = null;
+function modelRuntime(pi) {
+  if (!runtimePromise) {
+    const agentDir = pi.getAgentDir();
+    runtimePromise = pi.ModelRuntime.create({
+      authPath: `${agentDir}/auth.json`,
+      modelsStorePath: `${agentDir}/models-store.json`,
+      allowModelNetwork: true
+    }).catch((err) => {
+      runtimePromise = null;
+      throw err;
     });
   }
-  return authAndRegistry;
+  return runtimePromise;
 }
-var DEFAULT_PROVIDER = "openai-codex";
-var DEFAULT_MODEL_ID = process.env.PI_AGENT_MODEL || "gpt-5.5";
+var DEFAULT_PROVIDER = process.env.PI_PROVIDER || "openai-codex";
+var DEFAULT_MODEL_ID = process.env.PI_MODEL || process.env.PI_AGENT_MODEL || "gpt-5.6-luna";
 var KNOWN_UNUSABLE_MODEL_IDS = /* @__PURE__ */ new Set(["gpt-5.3-codex-spark"]);
-async function resolveModel(modelRegistry, spec) {
-  const [provider, modelId] = spec?.includes("/") ? [spec.slice(0, spec.indexOf("/")), spec.slice(spec.indexOf("/") + 1)] : [spec || DEFAULT_PROVIDER, void 0];
-  const available = modelRegistry.getAvailable().filter((m) => m.provider === provider);
-  const wanted = modelId ?? (spec ? void 0 : DEFAULT_MODEL_ID);
-  const exact = wanted && (modelRegistry.find(provider, wanted) ?? available.find((m) => m.id === wanted));
-  if (exact && modelRegistry.hasConfiguredAuth(exact)) return exact;
-  const usable = available.filter((m) => !KNOWN_UNUSABLE_MODEL_IDS.has(m.id));
-  if (usable.length) return usable[0];
-  if (available.length) return available[0];
-  throw new Error(
-    `No model available from "${provider}". Authorise it in a terminal on this machine: run \`pi\`, then \`/login\`.`
-  );
+async function resolveModel(runtime, spec) {
+  const slash = spec?.indexOf("/") ?? -1;
+  const provider = slash > 0 ? spec.slice(0, slash) : DEFAULT_PROVIDER;
+  const wanted = slash > 0 ? spec.slice(slash + 1) : spec || DEFAULT_MODEL_ID;
+  const available = await runtime.getAvailable(provider);
+  const exact = available.find((m) => m.id === wanted);
+  if (exact) return exact;
+  const fallback = available.find((m) => !KNOWN_UNUSABLE_MODEL_IDS.has(m.id)) ?? available[0];
+  if (fallback) {
+    console.warn(`[pi] model ${provider}/${wanted} unavailable \u2014 using ${fallback.provider}/${fallback.id}`);
+    return fallback;
+  }
+  throw new Error(`No model available from "${provider}". Authorise it in a terminal on this machine: run \`pi\`, then \`/login\`.`);
+}
+var SHELL_ENV_ALLOWLIST = [
+  "PATH",
+  "Path",
+  "HOME",
+  "USER",
+  "USERNAME",
+  "LOGNAME",
+  "SHELL",
+  "LANG",
+  "LC_ALL",
+  "TERM",
+  "TMPDIR",
+  "TEMP",
+  "TMP",
+  "NODE_EXTRA_CA_CERTS",
+  // Windows: without these a shell cannot start programs.
+  "SystemRoot",
+  "SYSTEMROOT",
+  "windir",
+  "ComSpec",
+  "COMSPEC",
+  "PATHEXT",
+  "USERPROFILE",
+  "APPDATA",
+  "LOCALAPPDATA",
+  "HOMEDRIVE",
+  "HOMEPATH",
+  "ProgramFiles",
+  "ProgramData",
+  "MSYSTEM"
+];
+function shellEnv(run, inherit) {
+  if (inherit) return { ...process.env, ...run };
+  const env = {};
+  for (const key of SHELL_ENV_ALLOWLIST) {
+    if (process.env[key] !== void 0) env[key] = process.env[key];
+  }
+  return { ...env, ...run };
+}
+function bashTool(pi, cwd, env) {
+  const local = pi.createLocalBashOperations();
+  const definition = pi.createBashToolDefinition(cwd, {
+    operations: {
+      exec: (command, dir, options) => local.exec(command, dir, { ...options, timeout: void 0, env: env() })
+    }
+  });
+  const parameters = definition.parameters;
+  return {
+    ...definition,
+    description: definition.description.replace(/\s*Optionally provide a timeout in seconds\./, ""),
+    parameters: { ...parameters, properties: { command: parameters.properties.command }, required: ["command"] }
+  };
 }
 function emptyUsage2() {
   return { inputTokens: 0, outputTokens: 0, reasoningTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0, toolCalls: 0 };
 }
 var BUFFER_CAP2 = 64e3;
 var EVENT_CAP2 = 600;
-function normEvent2(ev) {
-  switch (ev.type) {
-    case "tool_execution_start":
-      return { kind: "command", id: ev.toolCallId, command: ev.toolName ? `${ev.toolName} ${jsonPreview(ev.args)}` : void 0, status: "in_progress" };
-    case "tool_execution_end":
-      return { kind: "command", id: ev.toolCallId, status: ev.isError ? "failed" : "completed", done: true, output: textOf(ev.result) };
-    default:
-      return null;
+function textOf(content) {
+  const blocks = content?.content ?? content;
+  if (!Array.isArray(blocks)) return typeof content === "string" ? content : "";
+  return blocks.filter((b) => b?.type === "text").map((b) => String(b.text ?? "")).join("").trim();
+}
+function assistantParts(message) {
+  const record = message;
+  if (record?.role !== "assistant" || !Array.isArray(record.content)) return { text: "", thinking: "" };
+  let text = "";
+  let thinking = "";
+  for (const block of record.content) {
+    if (block?.type === "text") text += String(block.text ?? "");
+    else if (block?.type === "thinking" && !block.redacted) thinking += String(block.thinking ?? "");
   }
+  return { text, thinking };
 }
 function jsonPreview(v) {
   if (v == null) return "";
@@ -24529,10 +24661,10 @@ function jsonPreview(v) {
     return "";
   }
 }
-function textOf(content) {
-  const blocks = content?.content ?? content;
-  if (!Array.isArray(blocks)) return typeof content === "string" ? content : "";
-  return blocks.filter((b) => b?.type === "text").map((b) => String(b.text ?? "")).join("").trim();
+function toolEvent(name, id, args) {
+  if (name === "bash") return { kind: "command", id, command: String(args?.command ?? "") };
+  if (name === "write" || name === "edit") return { kind: "file", id, text: String(args?.path ?? args?.file_path ?? "") };
+  return { kind: "tool", id, tool: { name: name ?? "tool", args } };
 }
 var TRANSCRIPT_CAP = 400;
 var sessionListeners = /* @__PURE__ */ new Set();
@@ -24550,9 +24682,6 @@ function publish(sessionKey, live, entry) {
   for (const listener of sessionListeners) listener(sessionKey, entry);
 }
 var liveSessions = /* @__PURE__ */ new Map();
-function newSessionId() {
-  return `pi_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
-}
 var IDLE_TIMEOUT_MS = Number(process.env.PI_AGENT_IDLE_MS ?? 30 * 60 * 1e3);
 var sweeper = null;
 function startSweeper() {
@@ -24571,29 +24700,76 @@ function startSweeper() {
   }, 6e4);
   sweeper.unref?.();
 }
+function readInstructions(opts) {
+  if (!opts.instructionsFile) return void 0;
+  const file = path9.resolve(opts.cwd, opts.instructionsFile);
+  try {
+    return { file, content: fs8.readFileSync(file, "utf-8") };
+  } catch {
+    return void 0;
+  }
+}
+var hash = (s) => crypto3.createHash("sha256").update(s).digest("hex");
 function createPiSession(opts) {
   let running = false;
-  let sessionKey = opts.resumeId && liveSessions.has(opts.resumeId) ? opts.resumeId : void 0;
-  async function ensureSession() {
-    const existing = sessionKey ? liveSessions.get(sessionKey) : void 0;
-    if (existing) return existing;
-    const { createAgentSession, SessionManager } = await loadPi();
-    const { authStorage, modelRegistry } = await getAuthAndRegistry();
-    const model = await resolveModel(modelRegistry, opts.model);
-    const { session } = await createAgentSession({
+  let sessionKey = opts.resumeId;
+  async function open(resumeFile) {
+    const pi = await loadPi();
+    const runtime = await modelRuntime(pi);
+    const model = await resolveModel(runtime, opts.model);
+    const agentDir = pi.getAgentDir();
+    const instructions = readInstructions(opts);
+    const resourceLoader = new pi.DefaultResourceLoader({
+      cwd: opts.cwd,
+      agentDir,
+      // The workspace's own instructions, and only them — not whatever
+      // AGENTS.md files the machine's user keeps in ~/.pi or a parent folder.
+      agentsFilesOverride: (base) => instructions ? { agentsFiles: [{ path: instructions.file, content: instructions.content }] } : base
+    });
+    await resourceLoader.reload();
+    const sessionManager = resumeFile && fs8.existsSync(resumeFile) ? pi.SessionManager.open(resumeFile) : pi.SessionManager.create(opts.cwd);
+    const live = {
+      running: false,
+      transcript: [],
+      lastActive: Date.now(),
+      eventLog: [],
+      buf: "",
+      env: opts.env,
+      inheritEnv: opts.inheritEnv,
+      instructions: hash(instructions?.content ?? "")
+    };
+    const { session } = await pi.createAgentSession({
       cwd: opts.cwd,
-      sessionManager: SessionManager.inMemory(),
-      authStorage,
-      modelRegistry,
+      agentDir,
+      modelRuntime: runtime,
       model,
-      tools: opts.tools ?? ["bash"]
+      ...opts.tools ? { tools: opts.tools } : {},
+      customTools: [bashTool(pi, opts.cwd, () => shellEnv(live.env, live.inheritEnv))],
+      resourceLoader,
+      sessionManager
     });
-    sessionKey = newSessionId();
-    const live = { session, running: false, transcript: [], lastActive: Date.now(), eventLog: [], buf: "" };
-    liveSessions.set(sessionKey, live);
+    live.session = session;
+    const file = sessionManager.getSessionFile();
+    if (!file) throw new Error("pi did not give this session a file, so it could not be resumed later.");
+    sessionKey = file;
+    liveSessions.set(file, live);
     startSweeper();
     return live;
   }
+  async function ensureSession() {
+    const existing = sessionKey ? liveSessions.get(sessionKey) : void 0;
+    if (existing) {
+      if (existing.instructions !== hash(readInstructions(opts)?.content ?? "") && !existing.running) {
+        existing.session.dispose();
+        liveSessions.delete(sessionKey);
+        return open(sessionKey);
+      }
+      existing.env = opts.env;
+      existing.inheritEnv = opts.inheritEnv;
+      return existing;
+    }
+    return open(sessionKey);
+  }
   async function runTurn(prompt, handlers, signal) {
     const startedAt = Date.now();
     const usage = emptyUsage2();
@@ -24625,29 +24801,70 @@ function createPiSession(opts) {
       live.buf = (live.buf + chunk).slice(-BUFFER_CAP2);
       handlers?.onOutput?.(chunk);
     };
+    const send = (event) => {
+      live.eventLog.push(event);
+      if (live.eventLog.length > EVENT_CAP2) live.eventLog.shift();
+      handlers?.onEvent?.(event);
+      publish(key, live, { at: Date.now(), kind: "activity", event });
+    };
+    let streamed = 0;
+    let messageSeq = 0;
+    const started = /* @__PURE__ */ new Map();
     const unsubscribe = live.session.subscribe((ev) => {
-      if (ev.type === "message_update" && ev.assistantMessageEvent?.type === "text_delta") {
-        const delta = ev.assistantMessageEvent.delta;
-        if (delta) {
-          emit(delta);
-          handlers?.onNarration?.(delta);
+      switch (ev.type) {
+        case "turn_start":
+          send({ kind: "turn" });
+          return;
+        case "message_start":
+          streamed = 0;
+          return;
+        case "message_update": {
+          const { text } = assistantParts(ev.message);
+          if (text.length > streamed) {
+            const delta = text.slice(streamed);
+            streamed = text.length;
+            emit(delta);
+            handlers?.onNarration?.(delta);
+          }
+          return;
         }
-        return;
-      }
-      if (ev.type === "tool_execution_start" || ev.type === "tool_execution_end") {
-        if (ev.type === "tool_execution_end") usage.toolCalls++;
-        const event = normEvent2(ev);
-        if (!event) return;
-        live.eventLog.push(event);
-        if (live.eventLog.length > EVENT_CAP2) live.eventLog.shift();
-        handlers?.onEvent?.(event);
-        publish(key, live, { at: Date.now(), kind: "activity", event });
-        if (ev.type === "tool_execution_start") emit(`
+        case "message_end": {
+          const { text, thinking } = assistantParts(ev.message);
+          const id = `msg_${++messageSeq}`;
+          if (thinking.trim()) send({ kind: "reasoning", id: `${id}_r`, text: thinking.trim(), status: "completed", done: true });
+          if (text.trim()) send({ kind: "message", id, text: text.trim(), status: "completed", done: true });
+          streamed = 0;
+          return;
+        }
+        case "tool_execution_start": {
+          const event = { ...toolEvent(ev.toolName, ev.toolCallId, ev.args), status: "in_progress" };
+          if (ev.toolCallId) started.set(ev.toolCallId, event);
+          send(event);
+          emit(`
 \u2192 ${ev.toolName ?? "tool"} ${jsonPreview(ev.args)}
 `);
-        return;
+          return;
+        }
+        case "tool_execution_end": {
+          usage.toolCalls++;
+          const start = ev.toolCallId && started.get(ev.toolCallId) || toolEvent(ev.toolName, ev.toolCallId, void 0);
+          send({ ...start, status: ev.isError ? "failed" : "completed", done: true, output: textOf(ev.result) });
+          return;
+        }
+        default:
+          return;
       }
     });
+    let early = false;
+    const poll = handlers?.doneWhen ? setInterval(async () => {
+      try {
+        if (!early && await handlers.doneWhen()) {
+          early = true;
+          void live.session.abort();
+        }
+      } catch {
+      }
+    }, 1e3) : null;
     try {
       if (signal?.aborted) {
         status = "aborted";
@@ -24655,16 +24872,20 @@ function createPiSession(opts) {
       }
       await live.session.prompt(prompt);
       const err = live.session.agent.state.errorMessage;
-      if (err) {
-        status = signal?.aborted ? "aborted" : "error";
+      if (early) status = "early";
+      else if (signal?.aborted) status = "aborted";
+      else if (err) {
+        status = "error";
         error = err;
-      } else if (signal?.aborted) {
-        status = "aborted";
       }
     } catch (err) {
-      status = signal?.aborted ? "aborted" : "error";
-      error = err?.message ?? String(err);
+      if (early) status = "early";
+      else {
+        status = signal?.aborted ? "aborted" : "error";
+        error = err?.message ?? String(err);
+      }
     } finally {
+      if (poll) clearInterval(poll);
       unsubscribe();
       signal?.removeEventListener("abort", onAbort);
       live.running = false;
@@ -24705,8 +24926,8 @@ function createPiSession(opts) {
       }
       sessionKey = void 0;
     },
-    // Local-only, same as the codex driver: the live session stays in the
-    // module map so a later run with this sessionId can still resume it.
+    // Local-only, same as the codex driver: the live session stays in the map
+    // so a later run with this sessionId resumes it.
     dispose: () => {
     }
   };
@@ -24725,11 +24946,11 @@ function createCodingAgentSession(harness, opts) {
 }
 
 // src/codingAgent/registry.ts
-import * as path8 from "path";
+import * as path10 from "path";
 var agents = /* @__PURE__ */ new Map();
 var config = {
-  promptRoot: path8.join(process.cwd(), ".prompts", "coding-agents"),
-  runtimeDir: path8.join(process.cwd(), ".coding-agent-runtime"),
+  promptRoot: path10.join(process.cwd(), ".prompts", "coding-agents"),
+  runtimeDir: path10.join(process.cwd(), ".coding-agent-runtime"),
   harness: "codex",
   keepRuns: 20,
   keepThreads: 200
@@ -24768,13 +24989,13 @@ function getCodingAgentsConfig() {
   return config;
 }
 function resolvePromptDir(def) {
-  return def.promptDir || path8.join(config.promptRoot, def.id);
+  return def.promptDir || path10.join(config.promptRoot, def.id);
 }
 
 // src/codingAgent/runner.ts
-import * as fs8 from "fs";
+import * as fs9 from "fs";
 import * as fsp from "fs/promises";
-import * as path9 from "path";
+import * as path11 from "path";
 var DEFAULT_TIMEOUT_MS = 15 * 60 * 1e3;
 var inFlight = /* @__PURE__ */ new Set();
 function slug(v) {
@@ -24784,11 +25005,11 @@ function resolveScope(def, opts) {
   const scope = def.scope ?? (def.mode === "chat" ? "thread" : "project");
   if (scope === "thread") {
     const id = slug(opts.threadId || "default");
-    return { key: `thread:${id}`, dirName: path9.join("threads", id) };
+    return { key: `thread:${id}`, dirName: path11.join("threads", id) };
   }
   if (scope === "user") {
     const id = slug(opts.userId || "anonymous");
-    return { key: `user:${id}`, dirName: path9.join("users", id) };
+    return { key: `user:${id}`, dirName: path11.join("users", id) };
   }
   return { key: "project", dirName: "_project" };
 }
@@ -24797,30 +25018,30 @@ function makeRunId() {
   return `${t}-${Math.random().toString(36).slice(2, 8)}`;
 }
 function statePath(scopeDir) {
-  return path9.join(scopeDir, "_state.json");
+  return path11.join(scopeDir, "_state.json");
 }
 function loadState(scopeDir) {
   try {
-    return JSON.parse(fs8.readFileSync(statePath(scopeDir), "utf-8"));
+    return JSON.parse(fs9.readFileSync(statePath(scopeDir), "utf-8"));
   } catch {
     return { turns: 0, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
   }
 }
 function saveState(scopeDir, state) {
   try {
-    fs8.mkdirSync(scopeDir, { recursive: true });
-    fs8.writeFileSync(statePath(scopeDir), JSON.stringify({ ...state, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
+    fs9.mkdirSync(scopeDir, { recursive: true });
+    fs9.writeFileSync(statePath(scopeDir), JSON.stringify({ ...state, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
   } catch (err) {
     logger.warn(`[CodingAgent] failed to persist session state: ${err?.message ?? err}`);
   }
 }
 async function clearTransient(dir) {
-  await fsp.rm(path9.join(dir, "input"), { recursive: true, force: true });
+  await fsp.rm(path11.join(dir, "input"), { recursive: true, force: true });
 }
 function createWorkspace(dir, runId) {
-  const abs = (rel) => path9.join(dir, rel);
+  const abs = (rel) => path11.join(dir, rel);
   const ensureDir = async (rel) => {
-    await fsp.mkdir(path9.dirname(abs(rel)), { recursive: true });
+    await fsp.mkdir(path11.dirname(abs(rel)), { recursive: true });
   };
   return {
     dir,
@@ -24849,7 +25070,7 @@ function createWorkspace(dir, runId) {
 }
 var INSTRUCTIONS_FILE = "system.md";
 async function installInstructions(def, ws) {
-  const src = path9.join(resolvePromptDir(def), "system.md");
+  const src = path11.join(resolvePromptDir(def), "system.md");
   try {
     await ws.write(INSTRUCTIONS_FILE, await fsp.readFile(src, "utf-8"));
   } catch {
@@ -24863,7 +25084,7 @@ async function pruneThreads(agentId, threadsDir, keep) {
     const dirs = (await fsp.readdir(threadsDir, { withFileTypes: true })).filter((e) => e.isDirectory());
     if (dirs.length <= keep) return;
     const aged = await Promise.all(dirs.map(async (e) => {
-      const dir = path9.join(threadsDir, e.name);
+      const dir = path11.join(threadsDir, e.name);
       const stat2 = await fsp.stat(statePath(dir)).catch(() => fsp.stat(dir));
       return { name: e.name, dir, used: stat2.mtimeMs };
     }));
@@ -24883,7 +25104,7 @@ async function pruneRuns(agentDir, keep) {
   try {
     const entries = (await fsp.readdir(agentDir, { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name).sort();
     for (const name of entries.slice(0, Math.max(0, entries.length - keep))) {
-      await fsp.rm(path9.join(agentDir, name), { recursive: true, force: true });
+      await fsp.rm(path11.join(agentDir, name), { recursive: true, force: true });
     }
   } catch {
   }
@@ -24898,17 +25119,17 @@ async function runCodingAgent(agentId, options = {}) {
   }
   const cfg = getCodingAgentsConfig();
   const runId = makeRunId();
-  const agentDir = path9.join(cfg.runtimeDir, def.id);
+  const agentDir = path11.join(cfg.runtimeDir, def.id);
   const policy = def.session ?? {};
   const persistentWorkspace = policy.workspace === "persistent";
   const persistentSession = policy.scope === "persistent";
   const runAsJob = !(options.chat === true && def.mode === "task");
   const { key: scopeKey, dirName } = resolveScope(def, { userId: options.userId, threadId: options.threadId });
-  const scopeDir = path9.join(agentDir, dirName);
-  const dir = options.workspaceDir || (persistentWorkspace ? scopeDir : path9.join(scopeDir, "runs", runId));
-  fs8.mkdirSync(dir, { recursive: true });
+  const scopeDir = path11.join(agentDir, dirName);
+  const dir = options.workspaceDir || (persistentWorkspace ? scopeDir : path11.join(scopeDir, "runs", runId));
+  fs9.mkdirSync(dir, { recursive: true });
   if (persistentWorkspace && !options.workspaceDir) {
-    fs8.mkdirSync(path9.join(dir, "memory"), { recursive: true });
+    fs9.mkdirSync(path11.join(dir, "memory"), { recursive: true });
     if (runAsJob) await clearTransient(dir);
   }
   const lockKey = persistentWorkspace || persistentSession ? `${def.id}:${scopeKey}` : `dir:${dir}`;
@@ -25009,7 +25230,7 @@ async function runCodingAgent(agentId, options = {}) {
           onUsage: ctx.onUsage,
           // Opt-in only: see stopOnDeliverable. Letting the turn end naturally
           // is what makes usage reporting work at all.
-          ...outputPath && def.stopOnDeliverable ? { doneWhen: () => fs8.existsSync(outputPath) } : {}
+          ...outputPath && def.stopOnDeliverable ? { doneWhen: () => fs9.existsSync(outputPath) } : {}
         },
         timeout.signal
       );
@@ -25113,9 +25334,9 @@ Fix ONLY that, and rewrite the same file at the same path. Do not re-run any que
     logger.info(
       `[CodingAgent:${def.id}] ${runAsJob ? "run" : "chat"}=${runId} status=${record.status} ms=${record.ms} tokens=${record.usage.inputTokens}/${record.usage.outputTokens} tools=${record.usage.toolCalls}` + (record.applied ? ` applied="${record.applied.summary}"` : "") + (record.error ? ` error="${record.error}"` : "")
     );
-    if (!options.workspaceDir && !persistentWorkspace) await pruneRuns(path9.join(scopeDir, "runs"), cfg.keepRuns);
-    if (!options.workspaceDir && dirName.startsWith(`threads${path9.sep}`)) {
-      await pruneThreads(def.id, path9.join(agentDir, "threads"), cfg.keepThreads);
+    if (!options.workspaceDir && !persistentWorkspace) await pruneRuns(path11.join(scopeDir, "runs"), cfg.keepRuns);
+    if (!options.workspaceDir && dirName.startsWith(`threads${path11.sep}`)) {
+      await pruneThreads(def.id, path11.join(agentDir, "threads"), cfg.keepThreads);
     }
   }
 }
@@ -25175,14 +25396,14 @@ ${assertReadOnlySql.toString().replace("export function", "function")}
 `;
 
 // src/codingAgent/tools/shims.ts
-import * as fs9 from "fs";
-import * as path10 from "path";
-var resolve2 = (target, name) => typeof target === "string" ? path10.join(target, name) : target.pathTo(name);
+import * as fs10 from "fs";
+import * as path12 from "path";
+var resolve3 = (target, name) => typeof target === "string" ? path12.join(target, name) : target.pathTo(name);
 function writeShims(defs, target) {
   for (const def of defs) {
-    const file = resolve2(target, def.name);
-    fs9.writeFileSync(file, def.body, "utf-8");
-    fs9.chmodSync(file, 493);
+    const file = resolve3(target, def.name);
+    fs10.writeFileSync(file, def.body, "utf-8");
+    fs10.chmodSync(file, 493);
   }
   return defs.map((def) => ({ name: `./${def.name}`, summary: def.summary }));
 }
@@ -25441,17 +25662,17 @@ console.log(${JSON.stringify(
 }
 
 // src/codingAgent/triggers.ts
-import * as fs10 from "fs";
-import * as path11 from "path";
+import * as fs11 from "fs";
+import * as path13 from "path";
 var EVENT_BURST_CAP = 200;
 var capEvents = (events) => events.length > EVENT_BURST_CAP ? events.slice(-EVENT_BURST_CAP) : events;
 function statePath2(agentId) {
-  return path11.join(getCodingAgentsConfig().runtimeDir, agentId, "_triggers.json");
+  return path13.join(getCodingAgentsConfig().runtimeDir, agentId, "_triggers.json");
 }
 function loadTriggerState(agentId) {
   let raw;
   try {
-    raw = JSON.parse(fs10.readFileSync(statePath2(agentId), "utf-8"));
+    raw = JSON.parse(fs11.readFileSync(statePath2(agentId), "utf-8"));
   } catch {
     return { counts: {}, pending: {} };
   }
@@ -25471,8 +25692,8 @@ function loadTriggerState(agentId) {
 function saveTriggerState(agentId, state) {
   try {
     const p = statePath2(agentId);
-    fs10.mkdirSync(path11.dirname(p), { recursive: true });
-    fs10.writeFileSync(p, JSON.stringify(state, null, 2));
+    fs11.mkdirSync(path13.dirname(p), { recursive: true });
+    fs11.writeFileSync(p, JSON.stringify(state, null, 2));
   } catch (err) {
     logger.warn(`[CodingAgent:${agentId}] failed to persist trigger state: ${err?.message ?? err}`);
   }
@@ -25608,13 +25829,13 @@ function describeTriggers() {
 }
 
 // src/codingAgent/collection.ts
-import * as fs11 from "fs";
-import * as path12 from "path";
+import * as fs12 from "fs";
+import * as path14 from "path";
 function isChattable(agent) {
   return agent.mode !== "task";
 }
 function registerCodingAgentCollection(sdk, config2 = {}) {
-  const runtimeDir = config2.runtimeDir || process.env.CODING_AGENT_RUNTIME_DIR || path12.join(process.cwd(), ".coding-agent-runtime");
+  const runtimeDir = config2.runtimeDir || process.env.CODING_AGENT_RUNTIME_DIR || path14.join(process.cwd(), ".coding-agent-runtime");
   const defaultHarness = config2.harness || process.env.CODING_AGENT_HARNESS || "codex";
   const sessions = /* @__PURE__ */ new Map();
   const running = /* @__PURE__ */ new Set();
@@ -25674,8 +25895,8 @@ function registerCodingAgentCollection(sdk, config2 = {}) {
           ...record.status === "skipped" ? { error: `${def.title} is in the middle of a run \u2014 try again in a moment.` } : record.error ? { error: record.error } : {}
         };
       }
-      const cwd = path12.join(runtimeDir, "threads", threadId);
-      fs11.mkdirSync(cwd, { recursive: true });
+      const cwd = path14.join(runtimeDir, "threads", threadId);
+      fs12.mkdirSync(cwd, { recursive: true });
       let session = sessions.get(threadId);
       if (!session) {
         session = createCodingAgentSession(harness || defaultHarness, {
@@ -26954,8 +27175,8 @@ function getLLMProviders() {
 }
 
 // src/auth/user-manager.ts
-import fs12 from "fs";
-import path13 from "path";
+import fs13 from "fs";
+import path15 from "path";
 import os2 from "os";
 var UserManager = class {
   /**
@@ -26968,7 +27189,7 @@ var UserManager = class {
     this.hasChanged = false;
     this.syncInterval = null;
     this.isInitialized = false;
-    this.filePath = path13.join(os2.homedir(), ".superatom", "projects", projectId, "users.json");
+    this.filePath = path15.join(os2.homedir(), ".superatom", "projects", projectId, "users.json");
     this.syncIntervalMs = syncIntervalMs;
   }
   /**
@@ -26993,20 +27214,20 @@ var UserManager = class {
    */
   async loadUsersFromFile() {
     try {
-      const dir = path13.dirname(this.filePath);
-      if (!fs12.existsSync(dir)) {
+      const dir = path15.dirname(this.filePath);
+      if (!fs13.existsSync(dir)) {
         logger.info(`Creating directory structure: ${dir}`);
-        fs12.mkdirSync(dir, { recursive: true });
+        fs13.mkdirSync(dir, { recursive: true });
       }
-      if (!fs12.existsSync(this.filePath)) {
+      if (!fs13.existsSync(this.filePath)) {
         logger.info(`Users file does not exist at ${this.filePath}, creating with empty users`);
         const initialData = { users: [] };
-        fs12.writeFileSync(this.filePath, JSON.stringify(initialData, null, 4));
+        fs13.writeFileSync(this.filePath, JSON.stringify(initialData, null, 4));
         this.users = [];
         this.hasChanged = false;
         return;
       }
-      const fileContent = fs12.readFileSync(this.filePath, "utf-8");
+      const fileContent = fs13.readFileSync(this.filePath, "utf-8");
       const rawData = JSON.parse(fileContent);
       const validatedData = UsersDataSchema.parse(rawData);
       this.users = validatedData.users;
@@ -27025,16 +27246,16 @@ var UserManager = class {
       return;
     }
     try {
-      const dir = path13.dirname(this.filePath);
-      if (!fs12.existsSync(dir)) {
-        fs12.mkdirSync(dir, { recursive: true });
+      const dir = path15.dirname(this.filePath);
+      if (!fs13.existsSync(dir)) {
+        fs13.mkdirSync(dir, { recursive: true });
       }
       const usersToSave = this.users.map((user) => {
         const { wsIds, ...userWithoutWsIds } = user;
         return userWithoutWsIds;
       });
       const data = { users: usersToSave };
-      fs12.writeFileSync(this.filePath, JSON.stringify(data, null, 4));
+      fs13.writeFileSync(this.filePath, JSON.stringify(data, null, 4));
       this.hasChanged = false;
       logger.debug(`Synced ${this.users.length} users to file (wsIds excluded)`);
     } catch (error) {
@@ -27252,8 +27473,8 @@ var UserManager = class {
 };
 
 // src/dashboards/dashboard-manager.ts
-import fs13 from "fs";
-import path14 from "path";
+import fs14 from "fs";
+import path16 from "path";
 import os3 from "os";
 var DashboardManager = class {
   /**
@@ -27262,7 +27483,7 @@ var DashboardManager = class {
    */
   constructor(projectId = "snowflake-dataset") {
     this.projectId = projectId;
-    this.dashboardsBasePath = path14.join(
+    this.dashboardsBasePath = path16.join(
       os3.homedir(),
       ".superatom",
       "projects",
@@ -27276,7 +27497,7 @@ var DashboardManager = class {
    * @returns Full path to dashboard data.json file
    */
   getDashboardPath(dashboardId) {
-    return path14.join(this.dashboardsBasePath, dashboardId, "data.json");
+    return path16.join(this.dashboardsBasePath, dashboardId, "data.json");
   }
   /**
    * Create a new dashboard
@@ -27286,13 +27507,13 @@ var DashboardManager = class {
    */
   createDashboard(dashboardId, dashboard) {
     const dashboardPath = this.getDashboardPath(dashboardId);
-    const dashboardDir = path14.dirname(dashboardPath);
-    if (fs13.existsSync(dashboardPath)) {
+    const dashboardDir = path16.dirname(dashboardPath);
+    if (fs14.existsSync(dashboardPath)) {
       throw new Error(`Dashboard '${dashboardId}' already exists`);
     }
     const validated = DSLRendererPropsSchema.parse(dashboard);
-    fs13.mkdirSync(dashboardDir, { recursive: true });
-    fs13.writeFileSync(dashboardPath, JSON.stringify(validated, null, 4));
+    fs14.mkdirSync(dashboardDir, { recursive: true });
+    fs14.writeFileSync(dashboardPath, JSON.stringify(validated, null, 4));
     logger.info(`Dashboard created: ${dashboardId}`);
     return validated;
   }
@@ -27303,12 +27524,12 @@ var DashboardManager = class {
    */
   getDashboard(dashboardId) {
     const dashboardPath = this.getDashboardPath(dashboardId);
-    if (!fs13.existsSync(dashboardPath)) {
+    if (!fs14.existsSync(dashboardPath)) {
       logger.warn(`Dashboard not found: ${dashboardId}`);
       return null;
     }
     try {
-      const fileContent = fs13.readFileSync(dashboardPath, "utf-8");
+      const fileContent = fs14.readFileSync(dashboardPath, "utf-8");
       const dashboard = JSON.parse(fileContent);
       const validated = DSLRendererPropsSchema.parse(dashboard);
       return validated;
@@ -27322,16 +27543,16 @@ var DashboardManager = class {
    * @returns Array of dashboard objects with their IDs
    */
   getAllDashboards() {
-    if (!fs13.existsSync(this.dashboardsBasePath)) {
-      fs13.mkdirSync(this.dashboardsBasePath, { recursive: true });
+    if (!fs14.existsSync(this.dashboardsBasePath)) {
+      fs14.mkdirSync(this.dashboardsBasePath, { recursive: true });
       return [];
     }
     const dashboards = [];
     try {
-      const dashboardDirs = fs13.readdirSync(this.dashboardsBasePath);
+      const dashboardDirs = fs14.readdirSync(this.dashboardsBasePath);
       for (const dashboardId of dashboardDirs) {
         const dashboardPath = this.getDashboardPath(dashboardId);
-        if (fs13.existsSync(dashboardPath)) {
+        if (fs14.existsSync(dashboardPath)) {
           const dashboard = this.getDashboard(dashboardId);
           if (dashboard) {
             dashboards.push({ dashboardId, dashboard });
@@ -27353,13 +27574,13 @@ var DashboardManager = class {
    */
   updateDashboard(dashboardId, dashboard) {
     const dashboardPath = this.getDashboardPath(dashboardId);
-    if (!fs13.existsSync(dashboardPath)) {
+    if (!fs14.existsSync(dashboardPath)) {
       logger.warn(`Dashboard not found for update: ${dashboardId}`);
       return null;
     }
     try {
       const validated = DSLRendererPropsSchema.parse(dashboard);
-      fs13.writeFileSync(dashboardPath, JSON.stringify(validated, null, 4));
+      fs14.writeFileSync(dashboardPath, JSON.stringify(validated, null, 4));
       logger.info(`Dashboard updated: ${dashboardId}`);
       return validated;
     } catch (error) {
@@ -27374,13 +27595,13 @@ var DashboardManager = class {
    */
   deleteDashboard(dashboardId) {
     const dashboardPath = this.getDashboardPath(dashboardId);
-    const dashboardDir = path14.dirname(dashboardPath);
-    if (!fs13.existsSync(dashboardPath)) {
+    const dashboardDir = path16.dirname(dashboardPath);
+    if (!fs14.existsSync(dashboardPath)) {
       logger.warn(`Dashboard not found for deletion: ${dashboardId}`);
       return false;
     }
     try {
-      fs13.rmSync(dashboardDir, { recursive: true, force: true });
+      fs14.rmSync(dashboardDir, { recursive: true, force: true });
       logger.info(`Dashboard deleted: ${dashboardId}`);
       return true;
     } catch (error) {
@@ -27395,21 +27616,21 @@ var DashboardManager = class {
    */
   dashboardExists(dashboardId) {
     const dashboardPath = this.getDashboardPath(dashboardId);
-    return fs13.existsSync(dashboardPath);
+    return fs14.existsSync(dashboardPath);
   }
   /**
    * Get dashboard count
    * @returns Number of dashboards
    */
   getDashboardCount() {
-    if (!fs13.existsSync(this.dashboardsBasePath)) {
+    if (!fs14.existsSync(this.dashboardsBasePath)) {
       return 0;
     }
     try {
-      const dashboardDirs = fs13.readdirSync(this.dashboardsBasePath);
+      const dashboardDirs = fs14.readdirSync(this.dashboardsBasePath);
       return dashboardDirs.filter((dir) => {
         const dashboardPath = this.getDashboardPath(dir);
-        return fs13.existsSync(dashboardPath);
+        return fs14.existsSync(dashboardPath);
       }).length;
     } catch (error) {
       logger.error("Failed to get dashboard count:", error);
@@ -27419,8 +27640,8 @@ var DashboardManager = class {
 };
 
 // src/reports/report-manager.ts
-import fs14 from "fs";
-import path15 from "path";
+import fs15 from "fs";
+import path17 from "path";
 import os4 from "os";
 var ReportManager = class {
   /**
@@ -27429,7 +27650,7 @@ var ReportManager = class {
    */
   constructor(projectId = "snowflake-dataset") {
     this.projectId = projectId;
-    this.reportsBasePath = path15.join(
+    this.reportsBasePath = path17.join(
       os4.homedir(),
       ".superatom",
       "projects",
@@ -27443,7 +27664,7 @@ var ReportManager = class {
    * @returns Full path to report data.json file
    */
   getReportPath(reportId) {
-    return path15.join(this.reportsBasePath, reportId, "data.json");
+    return path17.join(this.reportsBasePath, reportId, "data.json");
   }
   /**
    * Create a new report
@@ -27453,13 +27674,13 @@ var ReportManager = class {
    */
   createReport(reportId, report) {
     const reportPath = this.getReportPath(reportId);
-    const reportDir = path15.dirname(reportPath);
-    if (fs14.existsSync(reportPath)) {
+    const reportDir = path17.dirname(reportPath);
+    if (fs15.existsSync(reportPath)) {
       throw new Error(`Report '${reportId}' already exists`);
     }
     const validated = DSLRendererPropsSchema2.parse(report);
-    fs14.mkdirSync(reportDir, { recursive: true });
-    fs14.writeFileSync(reportPath, JSON.stringify(validated, null, 4));
+    fs15.mkdirSync(reportDir, { recursive: true });
+    fs15.writeFileSync(reportPath, JSON.stringify(validated, null, 4));
     logger.info(`Report created: ${reportId}`);
     return validated;
   }
@@ -27470,12 +27691,12 @@ var ReportManager = class {
    */
   getReport(reportId) {
     const reportPath = this.getReportPath(reportId);
-    if (!fs14.existsSync(reportPath)) {
+    if (!fs15.existsSync(reportPath)) {
       logger.warn(`Report not found: ${reportId}`);
       return null;
     }
     try {
-      const fileContent = fs14.readFileSync(reportPath, "utf-8");
+      const fileContent = fs15.readFileSync(reportPath, "utf-8");
       const report = JSON.parse(fileContent);
       const validated = DSLRendererPropsSchema2.parse(report);
       return validated;
@@ -27489,16 +27710,16 @@ var ReportManager = class {
    * @returns Array of report objects with their IDs
    */
   getAllReports() {
-    if (!fs14.existsSync(this.reportsBasePath)) {
-      fs14.mkdirSync(this.reportsBasePath, { recursive: true });
+    if (!fs15.existsSync(this.reportsBasePath)) {
+      fs15.mkdirSync(this.reportsBasePath, { recursive: true });
       return [];
     }
     const reports = [];
     try {
-      const reportDirs = fs14.readdirSync(this.reportsBasePath);
+      const reportDirs = fs15.readdirSync(this.reportsBasePath);
       for (const reportId of reportDirs) {
         const reportPath = this.getReportPath(reportId);
-        if (fs14.existsSync(reportPath)) {
+        if (fs15.existsSync(reportPath)) {
           const report = this.getReport(reportId);
           if (report) {
             reports.push({ reportId, report });
@@ -27520,13 +27741,13 @@ var ReportManager = class {
    */
   updateReport(reportId, report) {
     const reportPath = this.getReportPath(reportId);
-    if (!fs14.existsSync(reportPath)) {
+    if (!fs15.existsSync(reportPath)) {
       logger.warn(`Report not found for update: ${reportId}`);
       return null;
     }
     try {
       const validated = DSLRendererPropsSchema2.parse(report);
-      fs14.writeFileSync(reportPath, JSON.stringify(validated, null, 4));
+      fs15.writeFileSync(reportPath, JSON.stringify(validated, null, 4));
       logger.info(`Report updated: ${reportId}`);
       return validated;
     } catch (error) {
@@ -27541,13 +27762,13 @@ var ReportManager = class {
    */
   deleteReport(reportId) {
     const reportPath = this.getReportPath(reportId);
-    const reportDir = path15.dirname(reportPath);
-    if (!fs14.existsSync(reportPath)) {
+    const reportDir = path17.dirname(reportPath);
+    if (!fs15.existsSync(reportPath)) {
       logger.warn(`Report not found for deletion: ${reportId}`);
       return false;
     }
     try {
-      fs14.rmSync(reportDir, { recursive: true, force: true });
+      fs15.rmSync(reportDir, { recursive: true, force: true });
       logger.info(`Report deleted: ${reportId}`);
       return true;
     } catch (error) {
@@ -27562,21 +27783,21 @@ var ReportManager = class {
    */
   reportExists(reportId) {
     const reportPath = this.getReportPath(reportId);
-    return fs14.existsSync(reportPath);
+    return fs15.existsSync(reportPath);
   }
   /**
    * Get report count
    * @returns Number of reports
    */
   getReportCount() {
-    if (!fs14.existsSync(this.reportsBasePath)) {
+    if (!fs15.existsSync(this.reportsBasePath)) {
       return 0;
     }
     try {
-      const reportDirs = fs14.readdirSync(this.reportsBasePath);
+      const reportDirs = fs15.readdirSync(this.reportsBasePath);
       return reportDirs.filter((dir) => {
         const reportPath = this.getReportPath(dir);
-        return fs14.existsSync(reportPath);
+        return fs15.existsSync(reportPath);
       }).length;
     } catch (error) {
       logger.error("Failed to get report count:", error);
@@ -28070,8 +28291,8 @@ var CleanupService = class _CleanupService {
 };
 
 // src/dashboardAgent/collection.ts
-import path16 from "path";
-import fs15 from "fs";
+import path18 from "path";
+import fs16 from "fs";
 
 // src/dashboardAgent/tools.ts
 import { Type } from "typebox";
@@ -28283,12 +28504,16 @@ function loadPi2() {
   if (!piModulePromise2) piModulePromise2 = dynamicImport3("@earendil-works/pi-coding-agent");
   return piModulePromise2;
 }
-var authAndRegistry2 = null;
-function getAuthAndRegistry2() {
-  if (!authAndRegistry2) {
-    authAndRegistry2 = loadPi2().then(({ AuthStorage, ModelRegistry }) => {
-      const authStorage = AuthStorage.create();
-      const modelRegistry = ModelRegistry.create(authStorage);
+var authAndRegistry = null;
+function getAuthAndRegistry() {
+  if (!authAndRegistry) {
+    authAndRegistry = loadPi2().then(async ({ ModelRuntime, getAgentDir }) => {
+      const agentDir = getAgentDir();
+      const modelRegistry = await ModelRuntime.create({
+        authPath: `${agentDir}/auth.json`,
+        modelsStorePath: `${agentDir}/models-store.json`,
+        allowModelNetwork: true
+      });
       const proxyRoot = process.env.SUPERATOM_LLM_PROXY_URL;
       if (proxyRoot) {
         modelRegistry.registerProvider("openrouter", {
@@ -28300,10 +28525,10 @@ function getAuthAndRegistry2() {
           '[DashboardAgent] OPENROUTER_API_KEY is a proxy key (sk-prox-\u2026) but SUPERATOM_LLM_PROXY_URL is not set \u2014 requests would be sent directly to openrouter.ai, which will 401 ("Missing Authentication header"). Set SUPERATOM_LLM_PROXY_URL (e.g. https://ai.superatom.ai) in backend/.env.'
         );
       }
-      return { authStorage, modelRegistry };
+      return { modelRuntime: modelRegistry };
     });
   }
-  return authAndRegistry2;
+  return authAndRegistry;
 }
 async function preResolveSchema(sdk, tool, intent, projectId) {
   const tier = tool.schemaTier;
@@ -28399,16 +28624,16 @@ function textDelta(event) {
 }
 var runningDashboards = /* @__PURE__ */ new Set();
 function registerDashboardAgentCollection(sdk, config2 = {}) {
-  const piCwd = config2.cwd || process.env.PI_AGENT_DIR || path16.join(process.cwd(), ".prompts", "dashboard-agent");
-  const runtimeDir = config2.runtimeDir || process.env.PI_AGENT_RUNTIME_DIR || path16.join(process.cwd(), ".pi-dashboard-agent-runtime");
+  const piCwd = config2.cwd || process.env.PI_AGENT_DIR || path18.join(process.cwd(), ".prompts", "dashboard-agent");
+  const runtimeDir = config2.runtimeDir || process.env.PI_AGENT_RUNTIME_DIR || path18.join(process.cwd(), ".pi-dashboard-agent-runtime");
   const freshSession = config2.freshSession ?? process.env.PI_AGENT_FRESH_SESSION !== "false";
-  const SESSIONS_FILE = path16.join(runtimeDir, ".pi-dashboard-sessions.json");
-  const DRAFTS_DIR = path16.join(runtimeDir, "drafts");
-  const DASHBOARD_LOG_FILE = path16.join(runtimeDir, "dashboard.log");
+  const SESSIONS_FILE = path18.join(runtimeDir, ".pi-dashboard-sessions.json");
+  const DRAFTS_DIR = path18.join(runtimeDir, "drafts");
+  const DASHBOARD_LOG_FILE = path18.join(runtimeDir, "dashboard.log");
   function appendLog(text) {
     try {
-      fs15.mkdirSync(runtimeDir, { recursive: true });
-      fs15.appendFileSync(DASHBOARD_LOG_FILE, text);
+      fs16.mkdirSync(runtimeDir, { recursive: true });
+      fs16.appendFileSync(DASHBOARD_LOG_FILE, text);
     } catch (err) {
       console.warn(`[DashboardAgent] Failed to write dashboard.log: ${err?.message ?? err}`);
     }
@@ -28420,15 +28645,15 @@ ${fullPrompt}
 --- Response ---
 `;
     try {
-      fs15.mkdirSync(runtimeDir, { recursive: true });
-      fs15.writeFileSync(DASHBOARD_LOG_FILE, header);
+      fs16.mkdirSync(runtimeDir, { recursive: true });
+      fs16.writeFileSync(DASHBOARD_LOG_FILE, header);
     } catch (err) {
       console.warn(`[DashboardAgent] Failed to write dashboard.log: ${err?.message ?? err}`);
     }
   }
   function readDraft(dashboardId) {
     try {
-      const raw = fs15.readFileSync(path16.join(DRAFTS_DIR, `${dashboardId}.json`), "utf-8");
+      const raw = fs16.readFileSync(path18.join(DRAFTS_DIR, `${dashboardId}.json`), "utf-8");
       return JSON.parse(raw);
     } catch (err) {
       console.warn(`[DashboardAgent] Failed to read draft for ${dashboardId}: ${err?.message ?? err}`);
@@ -28437,7 +28662,7 @@ ${fullPrompt}
   }
   function loadSessionMap() {
     try {
-      return JSON.parse(fs15.readFileSync(SESSIONS_FILE, "utf-8"));
+      return JSON.parse(fs16.readFileSync(SESSIONS_FILE, "utf-8"));
     } catch {
       return {};
     }
@@ -28446,8 +28671,8 @@ ${fullPrompt}
     const map = loadSessionMap();
     map[dashboardId] = sessionFile;
     try {
-      fs15.mkdirSync(piCwd, { recursive: true });
-      fs15.writeFileSync(SESSIONS_FILE, JSON.stringify(map, null, 2));
+      fs16.mkdirSync(piCwd, { recursive: true });
+      fs16.writeFileSync(SESSIONS_FILE, JSON.stringify(map, null, 2));
     } catch (err) {
       console.warn(`[DashboardAgent] Failed to persist session file for ${dashboardId}: ${err?.message ?? err}`);
     }
@@ -28517,14 +28742,14 @@ ${fullPrompt}
     }
     try {
       const { createAgentSession, SessionManager } = await loadPi2();
-      const { authStorage, modelRegistry } = await getAuthAndRegistry2();
+      const { modelRuntime: modelRuntime2 } = await getAuthAndRegistry();
       let model;
       const explicitProvider = config2.provider || process.env.PI_AGENT_PROVIDER;
       const explicitModel = config2.model || process.env.PI_AGENT_MODEL;
       if (explicitProvider || explicitModel) {
         const providerName = explicitProvider || "openrouter";
         const modelId = explicitModel || "anthropic/claude-sonnet-4.5";
-        model = modelRegistry.find(providerName, modelId);
+        model = modelRuntime2.getModel(providerName, modelId);
         if (!model) {
           return { success: false, error: `Model not found: ${providerName}/${modelId}. Check the configured provider/model and that its API key is configured.` };
         }
@@ -28537,8 +28762,8 @@ ${fullPrompt}
           { provider: "groq", modelId: "llama-3.3-70b-versatile" }
         ];
         for (const candidate of FALLBACK_MODELS) {
-          const found = modelRegistry.find(candidate.provider, candidate.modelId);
-          if (found && modelRegistry.hasConfiguredAuth(found)) {
+          const found = modelRuntime2.getModel(candidate.provider, candidate.modelId);
+          if (found && modelRuntime2.hasConfiguredAuth(found.provider)) {
             model = found;
             break;
           }
@@ -28623,7 +28848,7 @@ ${turn.responseText ?? ""}`).join("\n\n");
           console.warn(`[DashboardAgent] Failed to fetch previous responses for ${dashboardId}: ${err?.message ?? err}`);
         }
       }
-      const draftPath = path16.join(DRAFTS_DIR, `${dashboardId}.json`);
+      const draftPath = path18.join(DRAFTS_DIR, `${dashboardId}.json`);
       const fullPrompt = [
         `Dashboard ID: ${dashboardId}.`,
         projectId ? `Project ID: ${projectId}.` : null,
@@ -28655,7 +28880,7 @@ ${previousResponseText}` : null,
       let sessionManager;
       if (!freshSession) {
         const existingSessionFile = loadSessionMap()[dashboardId];
-        if (existingSessionFile && fs15.existsSync(existingSessionFile)) {
+        if (existingSessionFile && fs16.existsSync(existingSessionFile)) {
           sessionManager = SessionManager.open(existingSessionFile, runtimeDir);
           console.log(`[DashboardAgent] Resuming session file ${existingSessionFile} for dashboard ${dashboardId}`);
         } else {
@@ -28672,8 +28897,7 @@ ${previousResponseText}` : null,
         const created = await createAgentSession({
           cwd: piCwd,
           sessionManager,
-          authStorage,
-          modelRegistry,
+          modelRuntime: modelRuntime2,
           model,
           customTools
         });
@@ -28683,8 +28907,7 @@ ${previousResponseText}` : null,
         const created = await createAgentSession({
           cwd: piCwd,
           sessionManager: SessionManager.create(piCwd, runtimeDir),
-          authStorage,
-          modelRegistry,
+          modelRuntime: modelRuntime2,
           model,
           customTools
         });
@@ -28736,7 +28959,7 @@ ${description}
       };
       signal?.addEventListener("abort", onAbort, { once: true });
       try {
-        fs15.unlinkSync(draftPath);
+        fs16.unlinkSync(draftPath);
       } catch {
       }
       let result;
@@ -28756,7 +28979,7 @@ ${description}
         signal?.removeEventListener("abort", onAbort);
         if (freshSession && session.sessionFile) {
           try {
-            fs15.unlinkSync(session.sessionFile);
+            fs16.unlinkSync(session.sessionFile);
           } catch (err) {
             console.warn(`[DashboardAgent] Failed to delete fresh-session file ${session.sessionFile}: ${err?.message ?? err}`);
           }
@@ -28956,6 +29179,9 @@ var SuperatomSDK = class {
     if (config2.queryCacheTTL !== void 0) {
       queryCache.setTTL(config2.queryCacheTTL);
     }
+    if (config2.queryResultCache === false) {
+      queryCache.disableResultCache();
+    }
     if (config2.dashboardHistoryTTL !== void 0) {
       dashboardConversationHistory.setTTL(config2.dashboardHistoryTTL);
     }
@@ -29040,7 +29266,7 @@ var SuperatomSDK = class {
       logger.info("Already connected to WebSocket");
       return Promise.resolve();
     }
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       try {
         const url = new URL(this.url);
         if (this.apiKey) {
@@ -29056,7 +29282,7 @@ var SuperatomSDK = class {
           logger.info("WebSocket connected successfully");
           this.startHeartbeat();
           this.flushPendingOutbox();
-          resolve3();
+          resolve4();
         });
         this.ws.addEventListener("message", (event) => {
           this.handleMessage(event.data);