@deepagents/text2sql 0.32.0 → 0.33.0

package/dist/index.js

@@ -346,9 +346,6 @@ var Adapter = class {
         this.#relationshipToFragment(rel, sourceTable, targetTable)
       );
     }
-    if (ctx.report) {
-      fragments.push({ name: "businessContext", data: ctx.report });
-    }
     return fragments;
   }
   /**
@@ -677,7 +674,8 @@ import {
   Bash,
   MountableFs,
   OverlayFs,
-  defineCommand
+  defineCommand,
+  parse as parse2
 } from "just-bash";
 import { AsyncLocalStorage } from "node:async_hooks";
 import * as path2 from "node:path";
@@ -1483,6 +1481,37 @@ ${usageLines}`,
     };
   });
 }
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function buildRepair(name, subcommands) {
+  const subNames = Object.keys(subcommands).map(escapeRegExp).join("|");
+  const pattern = new RegExp(
+    `^(\\s*${escapeRegExp(name)}\\s+(?:${subNames}))\\s+([\\s\\S]+)$`
+  );
+  return function repair(raw) {
+    const match = raw.match(pattern);
+    if (!match) return raw;
+    try {
+      parse2(raw);
+      return raw;
+    } catch {
+    }
+    const [, prefix, argsPart] = match;
+    const sub = prefix.trim().split(/\s+/).pop();
+    const repairFn = subcommands[sub]?.repair;
+    if (!repairFn) return raw;
+    const repairedArgs = repairFn(argsPart);
+    if (repairedArgs == null) return raw;
+    const repaired = `${prefix} ${repairedArgs}`;
+    try {
+      parse2(repaired);
+      return repaired;
+    } catch {
+      return raw;
+    }
+  };
+}
 function validateReadOnly(query) {
   const upper = query.toUpperCase().trim();
   if (!upper.startsWith("SELECT") && !upper.startsWith("WITH")) {
@@ -1491,17 +1520,38 @@ function validateReadOnly(query) {
   return { valid: true };
 }
 var SQL_VALIDATE_REMINDER = "Always run `sql validate` before `sql run` to catch syntax errors early.";
+function normalizeShellArtifacts(raw) {
+  return raw.replace(/\\n/g, "\n").replace(/\\t/g, "	").replace(/\\([().*])/g, "$1").replace(/\\(?=$)/gm, "");
+}
+function stripQuoteArtifacts(raw) {
+  let sql = raw.trim();
+  if (sql.startsWith('"')) {
+    sql = sql.slice(1);
+    if (sql.endsWith('"')) sql = sql.slice(0, -1);
+  } else if (sql.startsWith("'")) {
+    sql = sql.slice(1);
+    if (sql.endsWith("'")) sql = sql.slice(0, -1);
+  }
+  return sql.trim();
+}
+function repairSqlArgs(rawArgs) {
+  const sql = stripQuoteArtifacts(rawArgs);
+  if (!sql) return null;
+  const escaped = sql.replace(/'/g, "'\\''");
+  return `'${escaped}'`;
+}
 function createSqlCommand(adapter, metaStore) {
-  return createCommand("sql", {
+  const subcommands = {
     run: {
       usage: 'run "SELECT ..."',
       description: "Execute query and store results",
+      repair: repairSqlArgs,
       handler: async (args, ctx) => {
         const store = metaStore.getStore();
         if (store) {
           store.value = { ...store.value, reminder: SQL_VALIDATE_REMINDER };
         }
-        const rawQuery = args.join(" ").trim().replace(/\\n/g, "\n").replace(/\\t/g, "	");
+        const rawQuery = normalizeShellArtifacts(args.join(" ").trim());
         if (!rawQuery) {
           return {
             stdout: "",
@@ -1559,8 +1609,9 @@ function createSqlCommand(adapter, metaStore) {
     validate: {
       usage: 'validate "SELECT ..."',
       description: "Validate query syntax",
+      repair: repairSqlArgs,
       handler: async (args) => {
-        const rawQuery = args.join(" ").trim().replace(/\\n/g, "\n").replace(/\\t/g, "	");
+        const rawQuery = normalizeShellArtifacts(args.join(" ").trim());
         if (!rawQuery) {
           return {
             stdout: "",
@@ -1594,7 +1645,10 @@ function createSqlCommand(adapter, metaStore) {
         };
       }
     }
-  });
+  };
+  const command = createCommand("sql", subcommands);
+  const repair = buildRepair("sql", subcommands);
+  return { command, repair };
 }
 function toViolationResult(error) {
   if (error instanceof SqlProxyViolationError) {
@@ -1606,7 +1660,10 @@ function toViolationResult(error) {
 async function createResultTools(options) {
   const { adapter, skillMounts, filesystem: baseFs } = options;
   const metaStore = new AsyncLocalStorage();
-  const sqlCommand = createSqlCommand(adapter, metaStore);
+  const { command: sqlCommand, repair: repairCommand } = createSqlCommand(
+    adapter,
+    metaStore
+  );
   const fsMounts = skillMounts.map(({ host, sandbox: sandbox2 }) => ({
     mountPoint: path2.dirname(sandbox2),
     filesystem: new OverlayFs({
@@ -1630,8 +1687,9 @@ async function createResultTools(options) {
     destination: "/",
     extraInstructions: 'Every bash tool call must include a brief non-empty "reasoning" input explaining why the command is needed.',
     onBeforeBashCall: ({ command }) => {
-      console.log(chalk.cyan(`[onBeforeBashCall]: ${command}`));
-      return { command };
+      const repaired = repairCommand(command);
+      console.log(chalk.cyan(`[onBeforeBashCall]: ${repaired}`));
+      return { command: repaired };
     },
     onAfterBashCall: ({ result }) => {
       if (result.exitCode !== 0) {