@deepagents/text2sql 0.15.1 → 0.16.0

package/dist/index.js

@@ -1,3 +1,6 @@
+// packages/text2sql/src/lib/adapters/adapter.ts
+import { format as formatSql } from "sql-formatter";
+
 // packages/text2sql/src/lib/fragments/schema.ts
 function dialectInfo(input) {
   return {
@@ -265,6 +268,13 @@ var Adapter = class {
       cardinality
     });
   }
+  format(sql) {
+    try {
+      return formatSql(sql, { language: this.formatterLanguage });
+    } catch {
+      return sql;
+    }
+  }
   /**
    * Convert unknown database value to number.
    * Handles number, bigint, and string types.
@@ -546,15 +556,15 @@ function createSqlCommand(adapter) {
       usage: 'run "SELECT ..."',
       description: "Execute query and store results",
       handler: async (args, ctx) => {
-        const query = args.join(" ").trim();
-        if (!query) {
+        const rawQuery = args.join(" ").trim();
+        if (!rawQuery) {
           return {
             stdout: "",
             stderr: "sql run: no query provided",
             exitCode: 1
           };
         }
-        const validation = validateReadOnly(query);
+        const validation = validateReadOnly(rawQuery);
         if (!validation.valid) {
           return {
             stdout: "",
@@ -562,6 +572,7 @@ function createSqlCommand(adapter) {
             exitCode: 1
           };
         }
+        const query = adapter.format(rawQuery);
         const syntaxError = await adapter.validate(query);
         if (syntaxError) {
           return {
@@ -601,15 +612,15 @@ function createSqlCommand(adapter) {
       usage: 'validate "SELECT ..."',
       description: "Validate query syntax",
       handler: async (args) => {
-        const query = args.join(" ").trim();
-        if (!query) {
+        const rawQuery = args.join(" ").trim();
+        if (!rawQuery) {
           return {
             stdout: "",
             stderr: "sql validate: no query provided",
             exitCode: 1
           };
         }
-        const validation = validateReadOnly(query);
+        const validation = validateReadOnly(rawQuery);
         if (!validation.valid) {
           return {
             stdout: "",
@@ -617,6 +628,7 @@ function createSqlCommand(adapter) {
             exitCode: 1
           };
         }
+        const query = adapter.format(rawQuery);
         const syntaxError = await adapter.validate(query);
         if (syntaxError) {
           return {
@@ -798,7 +810,7 @@ async function toSql(options) {
       if ("error" in output) {
         throw new UnanswerableSQLError(output.error);
       }
-      const sql = extractSql(output.sql);
+      const sql = options.adapter.format(extractSql(output.sql));
       const validationError = await options.adapter.validate(sql);
       if (validationError) {
         throw new SQLValidationError(validationError);
@@ -1856,7 +1868,7 @@ var MssqlFs = class _MssqlFs {
   #root;
   #schema;
   #ownsPool;
-  #initialized;
+  #isInitialized = false;
   constructor(options) {
     this.#chunkSize = options.chunkSize ?? 1024 * 1024;
     const schema = options.schema ?? "dbo";
@@ -1874,7 +1886,6 @@ var MssqlFs = class _MssqlFs {
       this.#pool = new mssql.ConnectionPool(options.pool);
       this.#ownsPool = true;
     }
-    this.#initialized = this.#initialize();
   }
   static #requireMssql() {
     try {
@@ -1889,7 +1900,7 @@ var MssqlFs = class _MssqlFs {
   #t(name) {
     return `[${this.#schema}].[${name}]`;
   }
-  async #initialize() {
+  async initialize() {
     if (this.#ownsPool) {
       await this.#pool.connect();
     }
@@ -1931,9 +1942,14 @@ var MssqlFs = class _MssqlFs {
         );
       }
     }
+    this.#isInitialized = true;
   }
-  async #ensureInitialized() {
-    await this.#initialized;
+  #ensureInitialized() {
+    if (!this.#isInitialized) {
+      throw new Error(
+        "MssqlFs not initialized. Call await fs.initialize() after construction."
+      );
+    }
   }
   async #createParentDirs(p) {
     const segments = p.split("/").filter(Boolean);
@@ -1969,15 +1985,15 @@ var MssqlFs = class _MssqlFs {
     return result.rowsAffected[0] ?? 0;
   }
   async #query(sql, params) {
-    await this.#ensureInitialized();
+    this.#ensureInitialized();
     return this.#rawQuery(sql, params);
   }
   async #exec(sql, params) {
-    await this.#ensureInitialized();
+    this.#ensureInitialized();
     return this.#rawExec(sql, params);
   }
   async #useTransaction(fn) {
-    await this.#ensureInitialized();
+    this.#ensureInitialized();
     const mssql = _MssqlFs.#requireMssql();
     const transaction = new mssql.Transaction(this.#pool);
     try {
@@ -2109,10 +2125,6 @@ var MssqlFs = class _MssqlFs {
     return new Uint8Array(Buffer.from(content, enc));
   }
   async close() {
-    try {
-      await this.#initialized;
-    } catch {
-    }
     if (this.#ownsPool) {
       await this.#pool.close();
     }
@@ -2242,9 +2254,9 @@ var MssqlFs = class _MssqlFs {
       isFile: entry.type === "file",
       isDirectory: entry.type === "directory",
       isSymbolicLink: false,
-      mode: entry.mode,
-      size: entry.size,
-      mtime: new Date(entry.mtime)
+      mode: Number(entry.mode),
+      size: Number(entry.size),
+      mtime: new Date(Number(entry.mtime))
     };
   }
   async lstat(filePath) {
@@ -2262,9 +2274,9 @@ var MssqlFs = class _MssqlFs {
       isFile: entry.type === "file",
       isDirectory: entry.type === "directory",
       isSymbolicLink: entry.type === "symlink",
-      mode: entry.mode,
-      size: entry.size,
-      mtime: new Date(entry.mtime)
+      mode: Number(entry.mode),
+      size: Number(entry.size),
+      mtime: new Date(Number(entry.mtime))
     };
   }
   async mkdir(dirPath, options) {
@@ -2961,7 +2973,7 @@ function reasoningFramework() {
       "You are a very strong reasoner and planner. Use these critical instructions to structure your plans, thoughts, and responses."
     ),
     fragment2(
-      "Meta-cognitive reasoning framework",
+      "meta-cognitive-reasoning-framework",
       hint2(
         "Before taking any action (either tool calls *or* responses to the user), you must proactively, methodically, and independently plan and reason about:"
       ),
@@ -3078,7 +3090,7 @@ function guidelines(options = {}) {
     ...reasoningFramework(),
     // Prerequisite policies (must do X before Y)
     fragment2(
-      "Prerequisite policies",
+      "prerequisite_policies",
       policy({
         rule: "YOU MUST inspect schema structure and available tables",
         before: "generating ANY SQL query",
@@ -3102,7 +3114,7 @@ function guidelines(options = {}) {
     ),
     // Few-shot: Applying reasoning principles
     fragment2(
-      "Reasoning examples",
+      "reasoning-examples",
       example({
         question: "Show me sales last month",
         answer: `Applying Principle 1 (Logical dependencies):
@@ -3142,7 +3154,7 @@ Action: Ask user: "Top by what metric\u2014total revenue, number of orders, or m
     ),
     // Schema adherence - consolidated into clear rules
     fragment2(
-      "Schema adherence",
+      "schema_adherence",
       hint2(
         "Use only tables and columns from the schema. For unspecified columns, use SELECT *. When showing related items, include IDs and requested details."
       ),
@@ -3346,6 +3358,7 @@ import {
   InvalidToolInputError,
   NoSuchToolError,
   ToolCallRepairError,
+  createUIMessageStream,
   generateId
 } from "ai";
 import "just-bash";
@@ -3436,6 +3449,7 @@ var Text2Sql = class {
       skillMounts,
       filesystem: trackedFs
     });
+    const assistantMsgId = generateId();
     const chatAgent = agent2({
       name: "text2sql",
       model: this.#config.model,
@@ -3451,26 +3465,54 @@ var Text2Sql = class {
       {},
       { transform: this.#config.transform }
     );
-    return result.toUIMessageStream({
+    const uiStream = result.toUIMessageStream({
       onError: (error) => this.#formatError(error),
       sendStart: true,
       sendFinish: true,
       sendReasoning: true,
       sendSources: true,
       originalMessages: messages,
-      generateMessageId: generateId,
+      generateMessageId: () => assistantMsgId,
+      messageMetadata: ({ part }) => {
+        if (part.type === "finish-step") {
+          return {
+            finishReason: part.finishReason,
+            usage: part.usage
+          };
+        }
+        if (part.type === "finish") {
+          return {
+            finishReason: part.finishReason,
+            totalUsage: part.totalUsage
+          };
+        }
+        return void 0;
+      }
+    });
+    return createUIMessageStream({
+      originalMessages: messages,
+      generateId: () => assistantMsgId,
+      onStepFinish: async ({ responseMessage }) => {
+        context.set(assistant({ ...responseMessage, id: assistantMsgId }));
+        await context.save({ branch: false });
+      },
       onFinish: async ({ responseMessage }) => {
         const createdFiles = trackedFs.getCreatedFiles();
-        const messageWithMetadata = {
-          ...responseMessage,
-          metadata: {
-            ...responseMessage.metadata ?? {},
-            createdFiles
-          }
-        };
-        context.set(assistant(messageWithMetadata));
-        await context.save();
+        context.set(
+          assistant({
+            ...responseMessage,
+            id: assistantMsgId,
+            metadata: {
+              ...responseMessage.metadata ?? {},
+              createdFiles
+            }
+          })
+        );
+        await context.save({ branch: false });
         await context.trackUsage(await result.totalUsage);
+      },
+      execute: async ({ writer }) => {
+        writer.merge(uiStream);
       }
     });
   }