@deepagents/text2sql 0.12.0 → 0.12.1

package/dist/index.js

@@ -603,7 +603,7 @@ function message(content) {
   } : content;
   return {
     id: message2.id,
-    name: "message",
+    name: message2.role,
     data: "content",
     type: "message",
     persist: true,
@@ -625,6 +625,22 @@ function assistantText(content, options) {
     parts: [{ type: "text", text: content }]
   });
 }
+var LAZY_ID = Symbol("lazy-id");
+function isLazyFragment(fragment2) {
+  return LAZY_ID in fragment2;
+}
+function lastAssistantMessage(content) {
+  return {
+    name: "assistant",
+    type: "message",
+    persist: true,
+    data: "content",
+    [LAZY_ID]: {
+      type: "last-assistant",
+      content
+    }
+  };
+}
 var ContextRenderer = class {
   options;
   constructor(options = {}) {
@@ -1121,6 +1137,12 @@ var ContextEngine = class {
     if (this.#pendingMessages.length === 0) {
       return;
     }
+    for (let i = 0; i < this.#pendingMessages.length; i++) {
+      const fragment2 = this.#pendingMessages[i];
+      if (isLazyFragment(fragment2)) {
+        this.#pendingMessages[i] = await this.#resolveLazyFragment(fragment2);
+      }
+    }
     let parentId = this.#branch.headMessageId;
     const now = Date.now();
     for (const fragment2 of this.#pendingMessages) {
@@ -1140,6 +1162,39 @@ var ContextEngine = class {
     this.#branch.headMessageId = parentId;
     this.#pendingMessages = [];
   }
+  /**
+   * Resolve a lazy fragment by finding the appropriate ID.
+   */
+  async #resolveLazyFragment(fragment2) {
+    const lazy = fragment2[LAZY_ID];
+    if (lazy.type === "last-assistant") {
+      const lastId = await this.#getLastAssistantId();
+      return assistantText(lazy.content, { id: lastId ?? crypto.randomUUID() });
+    }
+    throw new Error(`Unknown lazy fragment type: ${lazy.type}`);
+  }
+  /**
+   * Find the most recent assistant message ID (pending or persisted).
+   */
+  async #getLastAssistantId() {
+    for (let i = this.#pendingMessages.length - 1; i >= 0; i--) {
+      const msg = this.#pendingMessages[i];
+      if (msg.name === "assistant" && !isLazyFragment(msg)) {
+        return msg.id;
+      }
+    }
+    if (this.#branch?.headMessageId) {
+      const chain = await this.#store.getMessageChain(
+        this.#branch.headMessageId
+      );
+      for (let i = chain.length - 1; i >= 0; i--) {
+        if (chain[i].name === "assistant") {
+          return chain[i].id;
+        }
+      }
+    }
+    return void 0;
+  }
   /**
    * Estimate token count and cost for the full context.
    *
@@ -1419,6 +1474,35 @@ var ContextEngine = class {
   consolidate() {
     return void 0;
   }
+  /**
+   * Extract skill path mappings from available_skills fragments.
+   * Returns array of { host, sandbox } for mounting in sandbox filesystem.
+   *
+   * Reads the original `paths` configuration stored in fragment metadata
+   * by the skills() fragment helper.
+   *
+   * @example
+   * ```ts
+   * const context = new ContextEngine({ store, chatId, userId })
+   *   .set(skills({ paths: [{ host: './skills', sandbox: '/skills' }] }));
+   *
+   * const mounts = context.getSkillMounts();
+   * // [{ host: './skills', sandbox: '/skills' }]
+   * ```
+   */
+  getSkillMounts() {
+    const mounts = [];
+    for (const fragment2 of this.#fragments) {
+      if (fragment2.name === "available_skills" && fragment2.metadata && Array.isArray(fragment2.metadata.paths)) {
+        for (const mapping of fragment2.metadata.paths) {
+          if (typeof mapping === "object" && mapping !== null && typeof mapping.host === "string" && typeof mapping.sandbox === "string") {
+            mounts.push({ host: mapping.host, sandbox: mapping.sandbox });
+          }
+        }
+      }
+    }
+    return mounts;
+  }
   /**
    * Inspect the full context state for debugging.
    * Returns a JSON-serializable object with context information.
@@ -1660,7 +1744,7 @@ var errorRecoveryGuardrail = {
     }
     return logAndFail(
       "Unknown error",
-      `An error occurred: ${errorText.slice(0, 100)}. Let me try a different approach.`
+      `An error occurred: ${errorText}. Let me try a different approach.`
     );
   }
 };
@@ -1908,18 +1992,19 @@ var SqliteContextStore = class extends ContextStore {
   // Message Operations (Graph Nodes)
   // ==========================================================================
   async addMessage(message2) {
+    const existingParent = message2.parentId === message2.id ? this.#db.prepare("SELECT parentId FROM messages WHERE id = ?").get(message2.id) : void 0;
+    const parentId = message2.parentId === message2.id ? existingParent?.parentId ?? null : message2.parentId;
     this.#db.prepare(
       `INSERT INTO messages (id, chatId, parentId, name, type, data, createdAt)
          VALUES (?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT(id) DO UPDATE SET
-           parentId = excluded.parentId,
            name = excluded.name,
            type = excluded.type,
            data = excluded.data`
     ).run(
       message2.id,
       message2.chatId,
-      message2.parentId,
+      parentId,
       message2.name,
       message2.type ?? null,
       JSON.stringify(message2.data),
@@ -2387,13 +2472,9 @@ var Agent = class _Agent {
               writer.write({ type: "finish" });
               return;
             }
-            writer.write({
-              type: "text-delta",
-              id: generateId2(),
-              delta: ` ${failureFeedback}`
-            });
+            writeText(writer, failureFeedback);
             const selfCorrectionText = accumulatedText + " " + failureFeedback;
-            context.set(assistantText(selfCorrectionText));
+            context.set(lastAssistantMessage(selfCorrectionText));
             await context.save();
             currentResult = await this.#createRawStream(
               contextVariables,
@@ -2498,6 +2579,22 @@ var repairToolCall = async ({
   });
   return { ...toolCall, input: JSON.stringify(output) };
 };
+function writeText(writer, text) {
+  const feedbackPartId = generateId2();
+  writer.write({
+    id: feedbackPartId,
+    type: "text-start"
+  });
+  writer.write({
+    id: feedbackPartId,
+    type: "text-delta",
+    delta: ` ${text}`
+  });
+  writer.write({
+    id: feedbackPartId,
+    type: "text-end"
+  });
+}
 
 // packages/text2sql/src/lib/agents/explainer.agent.ts
 import { groq as groq2 } from "@ai-sdk/groq";
@@ -2606,6 +2703,7 @@ import { createBashTool as createBashTool2 } from "bash-tool";
 import chalk3 from "chalk";
 import {
   Bash,
+  InMemoryFs,
   MountableFs,
   OverlayFs,
   ReadWriteFs,
@@ -2613,6 +2711,7 @@ import {
 } from "just-bash";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { v7 } from "uuid";
 function createCommand(name, subcommands) {
   const usageLines = Object.entries(subcommands).map(([, def]) => `  ${name} ${def.usage.padEnd(30)} ${def.description}`).join("\n");
   return defineCommand2(name, async (args, ctx) => {
@@ -2663,7 +2762,7 @@ function createSqlCommand(adapter) {
         try {
           const rows = await adapter.execute(query);
           const rowsArray = Array.isArray(rows) ? rows : [];
-          const filePath = `/results/${crypto.randomUUID()}.json`;
+          const filePath = `/results/${v7()}.json`;
           await ctx.fs.writeFile(filePath, JSON.stringify(rowsArray, null, 2));
           const columns = rowsArray.length > 0 ? Object.keys(rowsArray[0]) : [];
           return {
@@ -2714,14 +2813,24 @@ function createSqlCommand(adapter) {
   });
 }
 async function createResultTools(options) {
-  const { adapter, chatId, messageId } = options;
+  const { adapter, chatId, messageId, skillMounts = [] } = options;
   const sqlCommand = createSqlCommand(adapter);
-  const chatDir = path.join(process.cwd(), "artifacts", chatId);
+  const root = process.env.TEXT2SQL_FS_ROOT || process.cwd();
+  const chatDir = path.join(root, "artifacts", chatId);
   const resultsDir = path.join(chatDir, messageId, "results");
   await fs.mkdir(resultsDir, { recursive: true });
+  const fsMounts = skillMounts.map(({ host, sandbox: sandbox2 }) => ({
+    mountPoint: sandbox2,
+    filesystem: new OverlayFs({
+      root: host,
+      mountPoint: "/",
+      readOnly: true
+    })
+  }));
   const filesystem = new MountableFs({
-    base: new OverlayFs({ root: process.cwd() }),
+    base: new InMemoryFs(),
     mounts: [
+      ...fsMounts,
       {
         mountPoint: "/results",
         filesystem: new ReadWriteFs({ root: resultsDir })
@@ -2739,10 +2848,6 @@ async function createResultTools(options) {
   const { bash, sandbox } = await createBashTool2({
     sandbox: bashInstance,
     destination: "/",
-    uploadDirectory: {
-      source: process.cwd(),
-      include: "packages/text2sql/src/skills/**/*.md"
-    },
     onBeforeBashCall: ({ command }) => {
       console.log(chalk3.cyan(`[onBeforeBashCall]: ${command}`));
       return { command };
@@ -2765,7 +2870,9 @@ import {
   NoContentGeneratedError,
   NoObjectGeneratedError,
   NoOutputGeneratedError,
-  TypeValidationError
+  TypeValidationError,
+  defaultSettingsMiddleware,
+  wrapLanguageModel
 } from "ai";
 import { Console } from "node:console";
 import { createWriteStream } from "node:fs";
@@ -2777,6 +2884,7 @@ var logger = new Console({
   stderr: createWriteStream("./sql-agent-error.log", { flags: "a" }),
   inspectOptions: { depth: null }
 });
+var RETRY_TEMPERATURES = [0, 0.2, 0.3];
 function extractSql(output) {
   const match = output.match(/```sql\n?([\s\S]*?)```/);
   return match ? match[1].trim() : output.trim();
@@ -2830,8 +2938,14 @@ async function toSql(options) {
       } else {
         context.set(user(options.input));
       }
+      const temperature = RETRY_TEMPERATURES[attemptNumber - 1] ?? RETRY_TEMPERATURES[RETRY_TEMPERATURES.length - 1];
+      const baseModel = options.model ?? groq3("openai/gpt-oss-20b");
+      const model = wrapLanguageModel({
+        model: baseModel,
+        middleware: defaultSettingsMiddleware({ settings: { temperature } })
+      });
       const sqlOutput = structuredOutput({
-        model: options.model ?? groq3("openai/gpt-oss-20b"),
+        model,
         context,
         schema: z3.union([
           z3.object({
@@ -3672,9 +3786,15 @@ var Text2Sql = class {
             "For large results, slice first: cat <path> | jq '.[:10]'"
           ]
         }),
+        hint(
+          `You cannot access sql through a tool, it'll fail so the proper way to access it is through the bash tool using "sql run" and "sql validate" commands.`
+        ),
         hint(
           "The sql command outputs: file path, column names (comma-separated), and row count. Use column names to construct precise jq queries."
         ),
+        hint(
+          'This is virtual bash environment and "sql" commands proxy to the database hence you cannot access sql files directly.'
+        ),
         hint(
           "If a query fails, the sql command returns an error message in stderr."
         )
@@ -3683,14 +3803,16 @@ var Text2Sql = class {
     );
     const userMsg = messages.at(-1);
     if (userMsg) {
-      context.set(user(userMsg));
+      context.set(message(userMsg));
       await context.save();
     }
     const messageId = userMsg?.id ?? generateId3();
+    const skillMounts = context.getSkillMounts();
     const { bash } = await createResultTools({
       adapter: this.#config.adapter,
       chatId: params.chatId,
-      messageId
+      messageId,
+      skillMounts
     });
     const chatAgent = agent({
       name: "text2sql",
@@ -3710,6 +3832,7 @@ var Text2Sql = class {
       sendFinish: true,
       sendReasoning: true,
       sendSources: true,
+      originalMessages: messages,
       generateMessageId: generateId3,
       onFinish: async ({ responseMessage }) => {
         context.set(assistant(responseMessage));
@@ -3734,7 +3857,7 @@ var Text2Sql = class {
     );
     const userMsg = messages.at(-1);
     if (userMsg) {
-      context.set(user(userMsg));
+      context.set(message(userMsg));
       await context.save();
     }
     const developerAgent = agent({