@deepagents/text2sql 0.17.1 → 0.19.0

package/dist/lib/agents/result-tools.d.ts

@@ -1,6 +1,11 @@
 import { type IFileSystem } from 'just-bash';
 import type { SkillPathMapping } from '@deepagents/context';
 import type { Adapter } from '../adapters/adapter.ts';
+interface CommandResult {
+    stdout: string;
+    stderr: string;
+    exitCode: number;
+}
 /**
  * Options for creating result tools.
  */
@@ -19,17 +24,16 @@ export interface ResultToolsOptions {
  * SQL is executed via: sql run "SELECT ..."
  */
 export declare function createResultTools(options: ResultToolsOptions): Promise<{
-    sandbox: import("bash-tool").Sandbox;
+    sandbox: {
+        executeCommand: (command: string) => Promise<CommandResult>;
+        readFile(path: string): Promise<string>;
+        writeFiles(files: Array<{
+            path: string;
+            content: string | Buffer;
+        }>): Promise<void>;
+    };
     tools: {
-        bash: import("ai").Tool<unknown, import("bash-tool").CommandResult | AsyncIterable<import("bash-tool").CommandResult> | {
-            meta: Record<string, unknown>;
-            stdout: string;
-            stderr: string;
-            exitCode: number;
-        } | {
-            meta: Record<string, unknown>;
-            [Symbol.asyncIterator](): AsyncIterator<import("bash-tool").CommandResult, any, any>;
-        }>;
+        bash: import("ai").Tool<unknown, CommandResult | AsyncIterable<import("bash-tool").CommandResult>>;
         readFile: import("ai").Tool<{
             path: string;
         }, {
@@ -43,4 +47,5 @@ export declare function createResultTools(options: ResultToolsOptions): Promise<
         }>;
     };
 }>;
+export {};
 //# sourceMappingURL=result-tools.d.ts.map

package/dist/lib/agents/result-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,WAAW,EAIjB,MAAM,WAAW,CAAC;AAMnB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AA2LtD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,6BAA6B;IAC7B,UAAU,EAAE,WAAW,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;GA4ElE"}
+{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,WAAW,EAOjB,MAAM,WAAW,CAAC;AAMnB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AA+kBD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,6BAA6B;IAC7B,UAAU,EAAE,WAAW,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;;kCA4C/B,MAAM;;;;;;;;;;;;;;;;;;;;;GAoDzC"}

package/dist/lib/agents/sql.agent.d.ts

@@ -6,10 +6,8 @@ export interface ToSqlOptions {
     input: string;
     /** Database adapter for validation */
     adapter: Adapter;
-    /** Schema fragments from adapter introspection */
-    schemaFragments: ContextFragment[];
-    /** Instructions/teachings to include */
-    instructions: ContextFragment[];
+    /** Context fragments (schema + instructions/teachings) */
+    fragments: ContextFragment[];
     /** Optional model override */
     model: AgentModel;
     /** Maximum retry attempts on validation failure (default: 3) */

package/dist/lib/agents/sql.agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql.agent.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/sql.agent.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,kDAAkD;IAClD,eAAe,EAAE,eAAe,EAAE,CAAC;IACnC,wCAAwC;IACxC,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,8BAA8B;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,eAA+B,CAAC;AAC5C;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC;gBACH,OAAO,EAAE,MAAM;IAK3B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB;CAG/D;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,OAAO,EAAE,MAAM;IAI3B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB;CAGjE;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAsFvE"}
+{"version":3,"file":"sql.agent.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/sql.agent.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,8BAA8B;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,eAA+B,CAAC;AAC5C;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC;gBACH,OAAO,EAAE,MAAM;IAK3B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB;CAG/D;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,OAAO,EAAE,MAAM;IAI3B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB;CAGjE;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAwFvE"}

package/dist/lib/sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/lib/sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,IAAI,EAET,KAAK,OAAO,EACZ,KAAK,SAAS,EAGf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKrD,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAElE,qBAAa,QAAQ;;gBAYP,MAAM,EAAE;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,CAAC,GAAG,SAAS,EAAE,eAAe,EAAE,KAAK,aAAa,CAAC;QAC5D,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,cAAc,CAAC;QACvB,KAAK,EAAE,UAAU,CAAC;QAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1E,4BAA4B;QAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,UAAU,EAAE,WAAW,CAAC;KACzB;IAeY,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlD;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAUhD;;;;;;;;;;;;;;;;;;OAkBG;IACU,OAAO,CAAC,CAAC,SAAS,YAAY,EACzC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAC/B,OAAO,CAAC,aAAa,EAAE,CAAC;IAKd,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE;CAoHxC"}
+{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/lib/sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,IAAI,EAET,KAAK,OAAO,EACZ,KAAK,SAAS,EAGf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKrD,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAElE,qBAAa,QAAQ;;gBAYP,MAAM,EAAE;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,CAAC,GAAG,SAAS,EAAE,eAAe,EAAE,KAAK,aAAa,CAAC;QAC5D,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,cAAc,CAAC;QACvB,KAAK,EAAE,UAAU,CAAC;QAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1E,4BAA4B;QAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,UAAU,EAAE,WAAW,CAAC;KACzB;IAeY,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWlD;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAUhD;;;;;;;;;;;;;;;;;;OAkBG;IACU,OAAO,CAAC,CAAC,SAAS,YAAY,EACzC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAC/B,OAAO,CAAC,aAAa,EAAE,CAAC;IAKd,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE;CAoHxC"}

package/dist/lib/synthesis/index.js

@@ -889,8 +889,7 @@ async function toSql(options) {
           role: "You are an expert SQL query generator. You translate natural language questions into precise, efficient SQL queries based on the provided database schema.",
           objective: "Translate natural language questions into precise, efficient SQL queries"
         }),
-        ...options.instructions,
-        ...options.schemaFragments
+        ...options.fragments
       );
       if (errors.length) {
         context.set(
@@ -911,19 +910,21 @@ async function toSql(options) {
       const sqlOutput = structuredOutput5({
         model,
         context,
-        schema: z5.union([
-          z5.object({
-            sql: z5.string().describe("The SQL query that answers the question"),
-            reasoning: z5.string().optional().describe("The reasoning steps taken to generate the SQL")
-          }),
-          z5.object({
-            error: z5.string().describe(
-              "Error message explaining why the question cannot be answered with the given schema"
-            )
-          })
-        ])
+        schema: z5.object({
+          result: z5.union([
+            z5.object({
+              sql: z5.string().describe("The SQL query that answers the question"),
+              reasoning: z5.string().describe("The reasoning steps taken to generate the SQL")
+            }),
+            z5.object({
+              error: z5.string().describe(
+                "Error message explaining why the question cannot be answered with the given schema"
+              )
+            })
+          ])
+        })
       });
-      const output = await sqlOutput.generate();
+      const { result: output } = await sqlOutput.generate();
       if ("error" in output) {
         throw new UnanswerableSQLError(output.error);
       }
@@ -953,6 +954,16 @@ function formatErrorMessage(error) {
   }
   return error.message;
 }
+function isModelUnavailableError(error) {
+  if (!APICallError.isInstance(error)) {
+    return false;
+  }
+  const message = error.message.toLowerCase();
+  const responseBody = (error.responseBody ?? "").toLowerCase();
+  const is404ModelError = error.statusCode === 404 && (message.includes("model") || responseBody.includes("model_not_found"));
+  const errorCode = typeof error.data === "object" && error.data !== null && "error" in error.data && typeof error.data.error === "object" && error.data.error !== null && "code" in error.data.error && typeof error.data.error.code === "string" ? error.data.error.code.toLowerCase() : void 0;
+  return is404ModelError || errorCode === "model_not_found" || responseBody.includes('"code":"model_not_found"') || message.includes("model") && message.includes("does not exist or you do not have access to it");
+}
 async function withRetry(computation, options = { retries: 3 }) {
   const errors = [];
   let attempts = 0;
@@ -966,6 +977,9 @@ async function withRetry(computation, options = { retries: 3 }) {
         if (UnanswerableSQLError.isInstance(context.error)) {
           return false;
         }
+        if (isModelUnavailableError(context.error)) {
+          return false;
+        }
         if (SQLValidationError.isInstance(context.error)) {
           return true;
         }
@@ -1061,9 +1075,7 @@ Generate ${this.options.count} questions at ${complexity} complexity.` : void 0;
             return await toSql({
               input: question,
               adapter: this.adapter,
-              schemaFragments: [],
-              // Placeholder - needs to pass actual fragments
-              instructions: this.options.teachings ?? [],
+              fragments: this.options.teachings ?? [],
               model: this.options.model
             });
           } catch (error) {
@@ -1440,9 +1452,7 @@ var DepthEvolver = class extends PairProducer {
       const sqlResult = await toSql({
         input: evolvedQuestion,
         adapter: this.adapter,
-        schemaFragments: [],
-        // Placeholder - needs to pass actual fragments
-        instructions: [],
+        fragments: [],
         model: this.options?.model
       });
       return {