sandal-db 1.0.2 → 1.0.3

package/dist/cli.js

@@ -5,7 +5,7 @@ import fs4 from "node:fs";
 import { Command } from "commander";
 import chalk4 from "chalk";
 import ora2 from "ora";
-import { input as input2, select, confirm as confirm2 } from "@inquirer/prompts";
+import { input, select, confirm } from "@inquirer/prompts";
 
 // src/config/index.ts
 import fs from "node:fs";
@@ -965,7 +965,7 @@ function createChatModel(options) {
 }
 
 // src/repl.ts
-import readline from "node:readline";
+import readline2 from "node:readline";
 import fs3 from "node:fs";
 import chalk3 from "chalk";
 import boxen2 from "boxen";
@@ -1382,10 +1382,42 @@ function classifyMongoQuery(rawText, query, rowThreshold, options) {
 }
 
 // src/safety/confirm.ts
+import readline from "node:readline";
 import chalk from "chalk";
 import boxen from "boxen";
-import { confirm, input } from "@inquirer/prompts";
-async function requestUserConfirmation(query, safety, affectedRows) {
+async function defaultAsk(promptText) {
+  process.stdin.resume();
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    rl.question(promptText, (answer) => {
+      rl.close();
+      process.stdin.resume();
+      resolve(answer);
+    });
+  });
+}
+async function promptConfirm(message, defaultValue, ask = defaultAsk) {
+  const suffix = defaultValue ? chalk.gray(" (Y/n): ") : chalk.gray(" (y/N): ");
+  const response = (await ask(`${message}${suffix}`)).trim().toLowerCase();
+  if (!response) {
+    return defaultValue;
+  }
+  if (["y", "yes", "true", "1"].includes(response)) {
+    return true;
+  }
+  if (["n", "no", "false", "0"].includes(response)) {
+    return false;
+  }
+  return defaultValue;
+}
+async function promptInput(message, ask = defaultAsk) {
+  const response = await ask(message);
+  return response.trim();
+}
+async function requestUserConfirmation(query, safety, affectedRows, ask = defaultAsk) {
   const queryDisplay = (query.sql || query.rawDisplay || "").trim();
   if (safety.isFullWipe) {
     const boxContent = [
@@ -1404,9 +1436,10 @@ async function requestUserConfirmation(query, safety, affectedRows) {
         margin: { top: 1, bottom: 1 }
       })
     );
-    const typed = await input({
-      message: chalk.red.bold(`Type "${safety.literalWord || "DROP DATABASE"}" to confirm full wipe:`)
-    });
+    const typed = await promptInput(
+      chalk.red.bold(`Type "${safety.literalWord || "DROP DATABASE"}" to confirm full wipe: `),
+      ask
+    );
     if (typed.trim() === safety.literalWord) {
       return { confirmed: true };
     }
@@ -1443,11 +1476,12 @@ async function requestUserConfirmation(query, safety, affectedRows) {
       })
     );
     if (safety.requiresLiteralWord && safety.literalWord) {
-      const typed = await input({
-        message: chalk.hex("#FFA500").bold(
-          `Destructive operation with no filter. Type "${safety.literalWord}" to confirm:`
-        )
-      });
+      const typed = await promptInput(
+        chalk.hex("#FFA500").bold(
+          `Destructive operation with no filter. Type "${safety.literalWord}" to confirm: `
+        ),
+        ask
+      );
       if (typed.trim() === safety.literalWord) {
         return { confirmed: true };
       }
@@ -1456,10 +1490,11 @@ async function requestUserConfirmation(query, safety, affectedRows) {
         reason: `Confirmation word mismatch (expected "${safety.literalWord}"). Operation cancelled.`
       };
     }
-    const answer2 = await confirm({
-      message: chalk.hex("#FFA500").bold("Proceed with dangerous operation?"),
-      default: false
-    });
+    const answer2 = await promptConfirm(
+      chalk.hex("#FFA500").bold("Proceed with dangerous operation?"),
+      false,
+      ask
+    );
     return { confirmed: answer2 };
   }
   if (safety.isStructural) {
@@ -1491,10 +1526,11 @@ async function requestUserConfirmation(query, safety, affectedRows) {
         margin: { top: 1, bottom: 1 }
       })
     );
-    const answer2 = await confirm({
-      message: chalk.cyan.bold("Apply this structural change?"),
-      default: true
-    });
+    const answer2 = await promptConfirm(
+      chalk.cyan.bold("Apply this structural change?"),
+      true,
+      ask
+    );
     return { confirmed: answer2 };
   }
   if (safety.category === "write") {
@@ -1514,10 +1550,11 @@ async function requestUserConfirmation(query, safety, affectedRows) {
         margin: { top: 1, bottom: 1 }
       })
     );
-    const answer2 = await confirm({
-      message: chalk.magenta.bold("Execute write query?"),
-      default: false
-    });
+    const answer2 = await promptConfirm(
+      chalk.magenta.bold("Execute write query?"),
+      false,
+      ask
+    );
     return { confirmed: answer2 };
   }
   const lines = [
@@ -1533,10 +1570,11 @@ async function requestUserConfirmation(query, safety, affectedRows) {
       margin: { top: 1, bottom: 1 }
     })
   );
-  const answer = await confirm({
-    message: chalk.green.bold("Execute read query?"),
-    default: true
-  });
+  const answer = await promptConfirm(
+    chalk.green.bold("Execute read query?"),
+    true,
+    ask
+  );
   return { confirmed: answer };
 }
 
@@ -1668,8 +1706,8 @@ var OBVIOUS_DATABASE_PATTERNS = [
   /\b(?:how many (?:users|rows|records|orders|items|products|documents))\b/i,
   /\b(?:database|postgres|mongodb|mongo|pg_)\b/i
 ];
-async function classifyIntent(input3, model, historyContext) {
-  const trimmed = input3.trim();
+async function classifyIntent(input2, model, historyContext) {
+  const trimmed = input2.trim();
   for (const pattern of OBVIOUS_OUT_OF_SCOPE_PATTERNS) {
     if (pattern.test(trimmed)) {
       return {
@@ -1922,7 +1960,8 @@ Do not wrap with markdown or code fences.`;
     if (!state.generatedQuery || !state.safety) {
       return { confirmed: false, cancelReason: "Missing query or safety classification." };
     }
-    const result = await requestUserConfirmation(
+    const confirmHandler = config.confirmFn || requestUserConfirmation;
+    const result = await confirmHandler(
       state.generatedQuery,
       state.safety,
       state.affectedRowCount ?? null
@@ -2058,9 +2097,9 @@ function createMarkdownRenderer(options = {}) {
     codespan: chalk2.yellow,
     code: chalk2.yellow,
     blockquote: chalk2.gray.italic,
-    hr: (input3) => {
+    hr: (input2) => {
       const w = Math.min(options.width ?? (process.stdout.columns || 80), 80);
-      return chalk2.gray(input3 && input3.trim() ? input3 : "\u2500".repeat(w));
+      return chalk2.gray(input2 && input2.trim() ? input2 : "\u2500".repeat(w));
     },
     table: chalk2.reset,
     tableOptions: {
@@ -2312,6 +2351,8 @@ var ReplSession = class {
   agent;
   memoryManager;
   classifierOptions;
+  rl;
+  currentSpinner;
   constructor(options) {
     this.adapter = options.adapter;
     this.model = options.model;
@@ -2327,11 +2368,7 @@ var ReplSession = class {
       allowFullWipe: this.allowFullWipe,
       rowThresholdForDangerousUpdate: this.rowThreshold
     };
-    this.agent = createDatabaseAgent({
-      adapter: this.adapter,
-      model: this.model,
-      classifierOptions: this.classifierOptions
-    });
+    this.initAgent();
     this.memoryManager = new ChatMemoryManager();
     const initialSession = this.memoryManager.createSession("New Chat", this.adapter.connectionUrl);
     this.sessionId = initialSession.id;
@@ -2339,23 +2376,57 @@ var ReplSession = class {
       addSavedConnection(this.adapter.connectionUrl);
     }
   }
+  initAgent() {
+    this.agent = createDatabaseAgent({
+      adapter: this.adapter,
+      model: this.model,
+      classifierOptions: this.classifierOptions,
+      confirmFn: async (query, safety, affectedRows) => {
+        if (this.currentSpinner && this.currentSpinner.isSpinning) {
+          this.currentSpinner.stop();
+        }
+        const confirmResult = await requestUserConfirmation(
+          query,
+          safety,
+          affectedRows,
+          this.askQuestion.bind(this)
+        );
+        if (confirmResult.confirmed && this.currentSpinner) {
+          this.currentSpinner.text = chalk3.cyan("Executing query and analyzing...");
+          this.currentSpinner.start();
+        }
+        return confirmResult;
+      }
+    });
+  }
+  askQuestion(query) {
+    process.stdin.resume();
+    if (!this.rl || this.rl.closed) {
+      this.rl = readline2.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+        terminal: true
+      });
+    }
+    return new Promise((resolve) => this.rl.question(query, resolve));
+  }
   getPromptText() {
     return chalk3.cyan(`sandal [${this.adapter.type}]> `);
   }
   async start() {
     this.setupSignalHandlers();
     this.printWelcomeBanner();
-    const rl = readline.createInterface({
+    process.stdin.resume();
+    this.rl = readline2.createInterface({
       input: process.stdin,
       output: process.stdout,
       terminal: true
     });
-    const askQuestion = (query) => {
-      return new Promise((resolve) => rl.question(query, resolve));
-    };
+    const askQuestion = this.askQuestion.bind(this);
     while (this.isRunning) {
-      const input3 = await askQuestion(this.getPromptText());
-      const trimmed = input3.trim();
+      process.stdin.resume();
+      const input2 = await askQuestion(this.getPromptText());
+      const trimmed = input2.trim();
       if (!trimmed) continue;
       if (["exit", "quit", ".exit", ".quit"].includes(trimmed.toLowerCase())) {
         break;
@@ -2462,6 +2533,7 @@ ${chalk3.gray(
         continue;
       }
       const agentSpinner = ora(chalk3.cyan("Agent planning query...")).start();
+      this.currentSpinner = agentSpinner;
       try {
         const historyMessages = this.memoryManager.toLangChainMessages(this.sessionId, 6);
         const result = await this.agent.invoke(
@@ -2475,7 +2547,9 @@ ${chalk3.gray(
             }
           }
         );
-        agentSpinner.stop();
+        if (agentSpinner.isSpinning) {
+          agentSpinner.stop();
+        }
         if (result.queryResult && result.queryResult.success && result.queryResult.rows) {
           this.renderRowsTable(result.queryResult);
         }
@@ -2506,10 +2580,24 @@ ${chalk3.gray(
           );
         }
       } catch (err) {
-        agentSpinner.fail(chalk3.red(`Execution failed: ${err.message}`));
+        if (agentSpinner.isSpinning) {
+          agentSpinner.fail(chalk3.red(`Execution failed: ${err.message}`));
+        } else {
+          console.error(chalk3.red(`
+Execution failed: ${err.message}
+`));
+        }
+      } finally {
+        if (agentSpinner.isSpinning) {
+          agentSpinner.stop();
+        }
+        this.currentSpinner = void 0;
+        process.stdin.resume();
       }
     }
-    rl.close();
+    if (this.rl && !this.rl.closed) {
+      this.rl.close();
+    }
     await this.shutdown();
   }
   async handleSwitchConnection(targetUrl, ask) {
@@ -2566,11 +2654,7 @@ ${chalk3.gray(
       } catch {
       }
       this.adapter = newAdapter;
-      this.agent = createDatabaseAgent({
-        adapter: this.adapter,
-        model: this.model,
-        classifierOptions: this.classifierOptions
-      });
+      this.initAgent();
       addSavedConnection(urlToConnect);
       spinner.succeed(
         chalk3.green(
@@ -2611,17 +2695,17 @@ Current Model: `) + chalk3.white(this.modelName) + chalk3.gray(` (${this.provide
       });
       console.log(chalk3.gray("  [O] Other (type custom model name)"));
       console.log(chalk3.gray("  [C] Cancel\n"));
-      const input3 = (await ask(chalk3.cyan("Select model [number, name, C]: "))).trim();
-      if (!input3 || input3.toLowerCase() === "c") return;
-      const num = parseInt(input3, 10);
+      const input2 = (await ask(chalk3.cyan("Select model [number, name, C]: "))).trim();
+      if (!input2 || input2.toLowerCase() === "c") return;
+      const num = parseInt(input2, 10);
       if (!isNaN(num) && num >= 1 && num <= list.length) {
         targetModel = list[num - 1];
-      } else if (input3.toLowerCase() === "o") {
+      } else if (input2.toLowerCase() === "o") {
         const custom = (await ask(chalk3.cyan("Enter model name: "))).trim();
         if (!custom) return;
         targetModel = custom;
       } else {
-        targetModel = input3;
+        targetModel = input2;
       }
     }
     if (!this.apiKey) {
@@ -2645,11 +2729,7 @@ No API key found for ${this.provider.toUpperCase()}.`));
         apiKey: this.apiKey
       });
       this.modelName = targetModel;
-      this.agent = createDatabaseAgent({
-        adapter: this.adapter,
-        model: this.model,
-        classifierOptions: this.classifierOptions
-      });
+      this.initAgent();
       console.log(chalk3.green(`
 Updated active model to: ${targetModel} [${this.provider}]
 `));
@@ -2706,11 +2786,7 @@ No API key found for ${p.toUpperCase()}.`));
       this.provider = p;
       this.modelName = defaultModel;
       this.apiKey = key;
-      this.agent = createDatabaseAgent({
-        adapter: this.adapter,
-        model: this.model,
-        classifierOptions: this.classifierOptions
-      });
+      this.initAgent();
       console.log(
         chalk3.green(`
 Switched provider to ${p.toUpperCase()} with model ${defaultModel}.
@@ -2753,11 +2829,7 @@ Removed stored API key for "${this.provider}" from ~/.sandal/config.json.`));
         model: this.modelName,
         apiKey: newKey
       });
-      this.agent = createDatabaseAgent({
-        adapter: this.adapter,
-        model: this.model,
-        classifierOptions: this.classifierOptions
-      });
+      this.initAgent();
       console.log(chalk3.green(`
 Updated API key for "${this.provider}" and refreshed model.
 `));
@@ -2794,11 +2866,7 @@ Updated API key for "${this.provider}" and refreshed model.
   handleNewChat() {
     const newSession = this.memoryManager.createSession("New Chat", this.adapter.connectionUrl);
     this.sessionId = newSession.id;
-    this.agent = createDatabaseAgent({
-      adapter: this.adapter,
-      model: this.model,
-      classifierOptions: this.classifierOptions
-    });
+    this.initAgent();
     console.log(chalk3.green(`
 Started fresh chat session: ${this.sessionId}`));
     console.log(chalk3.gray("Chat memory is clean for this new session.\n"));
@@ -2829,11 +2897,7 @@ Could not load chat session "${targetId}".
       return;
     }
     this.sessionId = session.id;
-    this.agent = createDatabaseAgent({
-      adapter: this.adapter,
-      model: this.model,
-      classifierOptions: this.classifierOptions
-    });
+    this.initAgent();
     console.log(
       chalk3.green(
         `
@@ -2871,11 +2935,7 @@ Chat History: "${session.title}" [${this.sessionId}]:`));
   }
   handleClearChat() {
     this.memoryManager.clearSession(this.sessionId);
-    this.agent = createDatabaseAgent({
-      adapter: this.adapter,
-      model: this.model,
-      classifierOptions: this.classifierOptions
-    });
+    this.initAgent();
     console.log(chalk3.green(`
 Chat memory for session [${this.sessionId}] has been cleared.
 `));
@@ -3102,6 +3162,9 @@ Schema for collection: ${collection.name}`));
     process.on("SIGTERM", handleExit);
   }
   async shutdown() {
+    if (this.rl && !this.rl.closed) {
+      this.rl.close();
+    }
     if (this.adapter.isConnected()) {
       try {
         await this.adapter.disconnect();
@@ -3351,7 +3414,7 @@ async function runCli(opts) {
         "\nNo database connection URL found in CLI flags, environment, or config."
       )
     );
-    dbUrl = await input2({
+    dbUrl = await input({
       message: "Enter your database URL (postgres://... or mongodb://...):",
       validate: (val) => {
         try {
@@ -3362,7 +3425,7 @@ async function runCli(opts) {
         }
       }
     });
-    const saveDb = await confirm2({
+    const saveDb = await confirm({
       message: "Save this database URL to ~/.sandal/config.json for future runs?",
       default: true
     });
@@ -3387,11 +3450,11 @@ async function runCli(opts) {
         { name: "Anthropic (ANTHROPIC_API_KEY)", value: "anthropic" }
       ]
     });
-    apiKey = await input2({
+    apiKey = await input({
       message: `Enter your ${provider.toUpperCase()} API key:`,
       validate: (val) => val.trim().length > 0 ? true : "API key cannot be empty."
     });
-    const saveKey = await confirm2({
+    const saveKey = await confirm({
       message: "Save this API key to ~/.sandal/config.json?",
       default: true
     });
@@ -3426,6 +3489,7 @@ async function runCli(opts) {
     model: modelName,
     apiKey
   });
+  process.stdin.resume();
   const repl = new ReplSession({
     adapter,
     model,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandal-db",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "SANDAL - Safe Agentic Natural-language Database Access Layer. Production-grade agentic database assistant CLI using LangGraph and LLMs (Google Gemini, OpenAI, Anthropic)",
   "type": "module",
   "bin": {