@deaquinodev/querky 0.4.4 → 0.4.6

package/dist/index.js

@@ -39,10 +39,11 @@ var PgDbClient = class {
   }
   pg;
   async query(sql) {
-    const result = await this.pg.query(sql);
+    const raw = await this.pg.query(sql);
+    const result = Array.isArray(raw) ? raw[raw.length - 1] : raw;
     return {
-      fields: result.fields.map((f) => f.name),
-      rows: result.rows,
+      fields: (result.fields ?? []).map((f) => f.name),
+      rows: result.rows ?? [],
       rowCount: result.rowCount ?? 0
     };
   }
@@ -625,8 +626,12 @@ var COMMANDS = {
     description: "Save last query as a named alias",
     category: "Aliases",
     usage: "/save <name>",
-    detail: "Saves the last executed SQL query as a named alias scoped to the current database. Run it later with /<name>. Supports positional ($1, $2) and named (:param) substitution.",
-    example: "/save active-orders",
+    detail: "Saves the last executed SQL query as a named alias scoped to the current database. Run it later with /<name>. If the query contains $1, $2 placeholders or :param placeholders, values are substituted at run time.",
+    examples: [
+      "/save active-orders                 (no params \u2014 run with /active-orders)",
+      "/save user-by-id                    (query had WHERE id = $1 \u2014 run with /user-by-id 42)",
+      "/save by-status                     (query had WHERE status = :status \u2014 run with /by-status :status=active)"
+    ],
     run: (ctx) => {
       const name = ctx.args.trim();
       if (!name) return { ok: false, message: "Usage: /save <name>" };
@@ -640,8 +645,14 @@ var COMMANDS = {
     description: "Define an alias inline",
     category: "Aliases",
     usage: "/alias <name> <SQL>",
-    detail: "Defines a named alias without running a query first. Equivalent to /save but lets you specify the SQL directly.",
-    example: "/alias recent SELECT * FROM events ORDER BY created_at DESC LIMIT 20",
+    detail: "Defines a named alias without running a query first. Use $1, $2 for positional args or :param for named args \u2014 values are substituted when the alias is invoked.",
+    examples: [
+      "/alias recent SELECT * FROM events ORDER BY created_at DESC LIMIT 20",
+      "/alias user SELECT * FROM users WHERE id = $1",
+      "/alias by-email SELECT * FROM users WHERE email = :email",
+      "/user 42                             (positional)",
+      "/by-email :email=alice@example.com   (named)"
+    ],
     run: (ctx) => {
       const [name, ...rest] = ctx.args.trim().split(/\s+/);
       if (!name || rest.length === 0) return { ok: false, message: "Usage: /alias <name> <SQL>" };
@@ -706,7 +717,8 @@ var COMMANDS = {
           description: cmd.description,
           psqlAlias: PSQL_REVERSE[name],
           detail: cmd.detail,
-          example: cmd.example
+          example: cmd.example,
+          examples: cmd.examples
         };
         return { ok: true, message: "", helpData: { mode: "detail", entry } };
       }
@@ -1177,7 +1189,7 @@ function useVimInput(onSubmit, isActive, vimEnabled = true, onTab, history = [],
           }
           if (key.leftArrow) return { ...s, cursor: Math.max(0, s.cursor - 1) };
           if (key.rightArrow) return { ...s, cursor: Math.min(s.value.length, s.cursor + 1) };
-          if (key.tab) {
+          if (key.tab && !key.shift) {
             const sugs = getSuggestions?.(s.value, s.cursor) ?? [];
             if (sugs.length > 0) {
               const next = s.suggestionIndex < sugs.length - 1 ? s.suggestionIndex + 1 : 0;
@@ -1187,6 +1199,14 @@ function useVimInput(onSubmit, isActive, vimEnabled = true, onTab, history = [],
             if (completed != null) return { ...s, value: completed, cursor: completed.length };
             return s;
           }
+          if (key.tab && key.shift) {
+            const sugs = getSuggestions?.(s.value, s.cursor) ?? [];
+            if (sugs.length > 0) {
+              const next = s.suggestionIndex <= 0 ? sugs.length - 1 : s.suggestionIndex - 1;
+              return { ...s, suggestionIndex: next };
+            }
+            return s;
+          }
           if (key.ctrl && input === "e") {
             return { ...s, pendingEditor: s.value };
           }
@@ -1484,9 +1504,10 @@ function FuzzyHighlight({ text, token, selected }) {
     (seg, i) => seg.hit ? /* @__PURE__ */ jsx(Text, { color: ACCENT, bold: true, children: seg.chars }, i) : /* @__PURE__ */ jsx(Text, { dimColor: !selected, children: seg.chars }, i)
   ) });
 }
-var BG = "#1e1b4b";
+var BG = "#1e1e1e";
 var ACCENT = "#818cf8";
-var PLACEHOLDER = "#6366f1";
+var PROMPT_MUTED = "#6b7280";
+var PLACEHOLDER = "#4b5563";
 var KW_COLOR = "#a5b4fc";
 var STR_COLOR = "#fb923c";
 var NUM_COLOR = "#86efac";
@@ -1498,9 +1519,9 @@ function sqlTokenColor(type) {
   if (type === "comment") return CMT_COLOR;
   return void 0;
 }
-function SqlLine({ text }) {
+function SqlLine({ text, bg }) {
   const tokens = tokenizeSql(text);
-  return /* @__PURE__ */ jsx(Fragment, { children: tokens.map((tok, i) => /* @__PURE__ */ jsx(Text, { color: sqlTokenColor(tok.type), children: tok.text }, i)) });
+  return /* @__PURE__ */ jsx(Fragment, { children: tokens.map((tok, i) => /* @__PURE__ */ jsx(Text, { backgroundColor: bg, color: sqlTokenColor(tok.type), children: tok.text }, i)) });
 }
 function SqlHighlightedInput({ text, cursorAt, mode, pad: pad2 }) {
   const tokens = tokenizeSql(text);
@@ -1518,7 +1539,7 @@ function SqlHighlightedInput({ text, cursorAt, mode, pad: pad2 }) {
       const after = tok.text.slice(rel + 1);
       if (before) parts.push(/* @__PURE__ */ jsx(Text, { backgroundColor: BG, color, children: before }, `${i}b`));
       if (mode === "INSERT") {
-        parts.push(/* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: ACCENT, bold: true, children: "\u258C" }, `${i}c`));
+        parts.push(/* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: PROMPT_MUTED, bold: true, children: "\u258C" }, `${i}c`));
       } else {
         parts.push(/* @__PURE__ */ jsx(Text, { backgroundColor: ACCENT, color: BG, bold: true, children: ch || " " }, `${i}c`));
       }
@@ -1531,7 +1552,7 @@ function SqlHighlightedInput({ text, cursorAt, mode, pad: pad2 }) {
   }
   if (!cursorDone) {
     if (mode === "INSERT") {
-      parts.push(/* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: ACCENT, bold: true, children: "\u258C" }, "c"));
+      parts.push(/* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: PROMPT_MUTED, bold: true, children: "\u258C" }, "c"));
     } else {
       parts.push(/* @__PURE__ */ jsx(Text, { backgroundColor: ACCENT, color: BG, bold: true, children: " " }, "c"));
     }
@@ -1623,16 +1644,19 @@ function QueryInput({ onSubmit, isLoading, onModeChange, onShellModeChange, vimE
   const isMultiLine = !isEmpty && !isShellMode && !isCommand && value.includes("\n");
   const dOff = isShellMode ? 2 : 0;
   const placeholder = "Type a SQL query\u2026";
+  const previewResult = !isMultiLine && suggestionIndex >= 0 && suggestions.length > 0 ? handleSuggestionAccept(value, cursorPos, suggestions[suggestionIndex]) : null;
+  const renderValue = previewResult?.value ?? value;
+  const renderCursor = previewResult?.cursor ?? cursorPos;
   const lineWidth = innerWidth - 4;
-  const displayValue = value.slice(dOff);
-  const displayCursor = Math.max(0, cursorPos - dOff);
+  const displayValue = renderValue.slice(dOff);
+  const displayCursor = Math.max(0, renderCursor - dOff);
   const scrollStart = displayCursor > lineWidth - 1 ? displayCursor - lineWidth + 1 : 0;
   const visibleBefore = displayValue.slice(scrollStart, displayCursor);
-  const cursorChar = cursorPos < dOff ? " " : displayValue[displayCursor] ?? " ";
+  const cursorChar = renderCursor < dOff ? " " : displayValue[displayCursor] ?? " ";
   const visibleAfter = displayValue.slice(displayCursor + 1, scrollStart + lineWidth);
   const textPad = " ".repeat(Math.max(0, lineWidth - visibleBefore.length - 1 - visibleAfter.length));
-  const visibleSql = value.slice(scrollStart, scrollStart + lineWidth);
-  const relativeSqlCursor = cursorPos - scrollStart;
+  const visibleSql = renderValue.slice(scrollStart, scrollStart + lineWidth);
+  const relativeSqlCursor = renderCursor - scrollStart;
   const sqlCursorAtEnd = relativeSqlCursor >= visibleSql.length;
   const sqlPad = " ".repeat(Math.max(0, lineWidth - visibleSql.length - (sqlCursorAtEnd ? 1 : 0)));
   const emptyPad = " ".repeat(Math.max(0, lineWidth - placeholder.length - 1));
@@ -1644,31 +1668,37 @@ function QueryInput({ onSubmit, isLoading, onModeChange, onShellModeChange, vimE
   );
   const hintsInline = totalHintsWidth <= termWidth;
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    isMultiLine ? /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: ACCENT, paddingX: 1, children: value.split("\n").map((line, i, arr) => {
+    isMultiLine ? /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(Text, { backgroundColor: BG, children: emptyLine }),
+      value.split("\n").map((line, i, arr) => {
         const numW = String(arr.length).length;
+        const prefixWidth = 2 + numW + 3;
+        const contentWidth = innerWidth - prefixWidth;
         const isLast = i === arr.length - 1;
+        const linePad = " ".repeat(Math.max(0, contentWidth - line.length - (isLast ? 1 : 0)));
         return /* @__PURE__ */ jsxs(Box, { children: [
-          /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+          /* @__PURE__ */ jsxs(Text, { backgroundColor: BG, dimColor: true, children: [
+            "  ",
             String(i + 1).padStart(numW),
             " \u2502 "
           ] }),
-          /* @__PURE__ */ jsx(SqlLine, { text: line }),
-          isLast && (mode === "INSERT" ? /* @__PURE__ */ jsx(Text, { color: ACCENT, bold: true, children: "\u258C" }) : /* @__PURE__ */ jsx(Text, { backgroundColor: ACCENT, color: BG, bold: true, children: " " }))
+          /* @__PURE__ */ jsx(SqlLine, { text: line, bg: BG }),
+          isLast && (mode === "INSERT" ? /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: PROMPT_MUTED, bold: true, children: "\u258C" }) : /* @__PURE__ */ jsx(Text, { backgroundColor: ACCENT, color: BG, bold: true, children: " " })),
+          /* @__PURE__ */ jsx(Text, { backgroundColor: BG, children: linePad })
         ] }, i);
-      }) }),
-      /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Enter: run  \xB7  Ctrl+E / e: re-edit" }) })
+      }),
+      /* @__PURE__ */ jsx(Text, { backgroundColor: BG, children: emptyLine })
     ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(Text, { backgroundColor: BG, children: emptyLine }),
       /* @__PURE__ */ jsxs(Box, { children: [
-        /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: isShellMode ? theme.shellMode : ACCENT, bold: true, children: isShellMode ? "  $ " : "  > " }),
+        /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: isShellMode ? theme.shellMode : PROMPT_MUTED, bold: true, children: isShellMode ? "  $ " : "  > " }),
         isEmpty ? /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: PLACEHOLDER, children: placeholder }),
-          /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: ACCENT, bold: true, children: "\u258C" }),
+          /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: PROMPT_MUTED, bold: true, children: "\u258C" }),
           /* @__PURE__ */ jsx(Text, { backgroundColor: BG, children: emptyPad })
         ] }) : isShellMode || isCommand ? /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx(Text, { backgroundColor: BG, children: visibleBefore }),
-          mode === "INSERT" ? /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: ACCENT, bold: true, children: "\u258C" }) : /* @__PURE__ */ jsx(Text, { backgroundColor: ACCENT, color: BG, bold: true, children: cursorChar }),
+          mode === "INSERT" ? /* @__PURE__ */ jsx(Text, { backgroundColor: BG, color: PROMPT_MUTED, bold: true, children: "\u258C" }) : /* @__PURE__ */ jsx(Text, { backgroundColor: ACCENT, color: BG, bold: true, children: cursorChar }),
           /* @__PURE__ */ jsxs(Text, { backgroundColor: BG, children: [
             visibleAfter,
             textPad
@@ -1713,7 +1743,7 @@ import { Box as Box2, Text as Text2 } from "ink";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var COL_PAD = 1;
 var INDIGO = "#818cf8";
-var BORDER = "white";
+var BORDER2 = "white";
 var NULL_COLOR = "#6366f1";
 var NULL_MARKER = "\u2205";
 function isNull(val) {
@@ -1744,10 +1774,10 @@ function hline(widths, left, mid, right) {
 function ExpandedTable({ columns, rows }) {
   const keyWidth = columns.reduce((max, col) => Math.max(max, col.length), 0);
   return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: rows.map((row, i) => /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: i < rows.length - 1 ? 1 : 0, children: [
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: `\u2500[ Record ${i + 1} ]${"\u2500".repeat(Math.max(0, keyWidth + 14 - String(i + 1).length))}` }),
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: `\u2500[ Record ${i + 1} ]${"\u2500".repeat(Math.max(0, keyWidth + 14 - String(i + 1).length))}` }),
     columns.map((col) => /* @__PURE__ */ jsxs2(Box2, { children: [
       /* @__PURE__ */ jsx2(Text2, { color: INDIGO, bold: true, children: col.padEnd(keyWidth) }),
-      /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: " \u2502 " }),
+      /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: " \u2502 " }),
       isNull(row[col]) ? /* @__PURE__ */ jsx2(Text2, { color: NULL_COLOR, dimColor: true, children: NULL_MARKER }) : /* @__PURE__ */ jsx2(Text2, { children: cellValue(row[col]) })
     ] }, col))
   ] }, i)) });
@@ -1760,51 +1790,43 @@ function Table({ columns, rows, expanded = false }) {
   const botLine = hline(widths, "\u2570", "\u2534", "\u256F");
   function renderHeaderRow(cols) {
     return /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" }),
+      /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" }),
       cols.map((v, i) => /* @__PURE__ */ jsxs2(Box2, { children: [
         /* @__PURE__ */ jsx2(Text2, { color: INDIGO, bold: true, children: " ".repeat(COL_PAD) + pad(v, widths[i]) + " ".repeat(COL_PAD) }),
-        /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" })
+        /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" })
       ] }, i))
     ] });
   }
   function renderDataRow(row) {
     return /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" }),
+      /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" }),
       columns.map((col, i) => /* @__PURE__ */ jsxs2(Box2, { children: [
         isNull(row[col]) ? /* @__PURE__ */ jsx2(Text2, { color: NULL_COLOR, dimColor: true, children: " ".repeat(COL_PAD) + pad(NULL_MARKER, widths[i]) + " ".repeat(COL_PAD) }) : /* @__PURE__ */ jsx2(Text2, { children: " ".repeat(COL_PAD) + pad(cellValue(row[col]), widths[i]) + " ".repeat(COL_PAD) }),
-        /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" })
+        /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" })
       ] }, i))
     ] });
   }
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: topLine }),
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: topLine }),
     renderHeaderRow(columns),
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: midLine }),
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: midLine }),
     rows.map((row, i) => /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
       renderDataRow(row),
-      i < rows.length - 1 && /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: midLine })
+      i < rows.length - 1 && /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: midLine })
     ] }, i)),
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: botLine })
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: botLine })
   ] });
 }
 
 // src/ui/components/QueryResult.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
-var ERROR_BG = "#3b0f0f";
 var ERROR_FG = "#ff4444";
 function ErrorBox({ message }) {
-  const cols = Math.max(0, (process.stdout.columns ?? 80) - 2);
-  const blank = " ".repeat(cols);
   const lines = message.split("\n");
-  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsx3(Text3, { backgroundColor: ERROR_BG, children: blank }),
-    lines.map((line, i) => {
-      const content = (i === 0 ? "  \u2717  " : "     ") + line;
-      const padded = content.length < cols ? content + " ".repeat(cols - content.length) : content;
-      return /* @__PURE__ */ jsx3(Text3, { backgroundColor: ERROR_BG, color: ERROR_FG, bold: true, children: padded }, i);
-    }),
-    /* @__PURE__ */ jsx3(Text3, { backgroundColor: ERROR_BG, children: blank })
-  ] });
+  return /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", marginTop: 1, children: lines.map((line, i) => /* @__PURE__ */ jsxs3(Text3, { color: ERROR_FG, bold: true, children: [
+    i === 0 ? "\u2717  " : "   ",
+    line
+  ] }, i)) });
 }
 function formatDuration(ms) {
   if (ms < 1e3) return `${ms}ms`;
@@ -1944,7 +1966,7 @@ import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 var USAGE_WIDTH = 28;
 function HelpView({ data }) {
   if (data.mode === "detail" && data.entry) {
-    const { usage, description, psqlAlias, detail, example } = data.entry;
+    const { usage, description, psqlAlias, detail, example, examples } = data.entry;
     return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ jsxs5(Text5, { bold: true, color: "white", children: [
         usage,
@@ -1952,10 +1974,13 @@ function HelpView({ data }) {
       ] }),
       /* @__PURE__ */ jsx5(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx5(Text5, { children: description }) }),
       detail && /* @__PURE__ */ jsx5(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: detail }) }),
-      example && /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, children: [
+      examples && examples.length > 0 ? /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "Examples:" }),
+        examples.map((ex, i) => /* @__PURE__ */ jsx5(Box5, { marginLeft: 2, children: /* @__PURE__ */ jsx5(Text5, { color: theme.accent, children: ex }) }, i))
+      ] }) : example ? /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, children: [
         /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "Example: " }),
         /* @__PURE__ */ jsx5(Text5, { color: theme.accent, children: example })
-      ] })
+      ] }) : null
     ] });
   }
   if (data.mode === "list" && data.groups) {
@@ -1994,7 +2019,6 @@ var TABLE_COLORS = [
   "#fbbf24",
   "#2dd4bf"
 ];
-var BORDER2 = "white";
 var PAD = 1;
 var GAP = 2;
 var FK_PREFIX = "FK \u2192 ";
@@ -2042,31 +2066,31 @@ function TableBox({ table, m, color, colorMap }) {
   const bot = "\u2570" + "\u2500".repeat(nameW + PAD * 2) + "\u2534" + "\u2500".repeat(typeW + PAD * 2) + "\u2534" + "\u2500".repeat(keyW + PAD * 2) + "\u256F";
   const headerW = totalW - 4;
   return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: top }),
+    /* @__PURE__ */ jsx6(Text6, { color, children: top }),
     /* @__PURE__ */ jsxs6(Box6, { children: [
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       /* @__PURE__ */ jsxs6(Text6, { color, bold: true, children: [
         sp,
         p(table.name, headerW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" })
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" })
     ] }),
-    /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: sep }),
+    /* @__PURE__ */ jsx6(Text6, { color, children: sep }),
     table.columns.map((col, i) => /* @__PURE__ */ jsxs6(Box6, { children: [
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       /* @__PURE__ */ jsxs6(Text6, { children: [
         sp,
         p(col.name, nameW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
         sp,
         p(col.type, typeW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       col.isPk ? /* @__PURE__ */ jsxs6(Text6, { bold: true, children: [
         sp,
         p("PK", keyW),
@@ -2076,7 +2100,7 @@ function TableBox({ table, m, color, colorMap }) {
           sp,
           FK_PREFIX
         ] }),
-        /* @__PURE__ */ jsxs6(Text6, { color: colorMap.get(col.fkTable) ?? BORDER2, children: [
+        /* @__PURE__ */ jsxs6(Text6, { color: colorMap.get(col.fkTable) ?? color, children: [
           p(col.fkTable, keyW - FK_PREFIX.length),
           sp
         ] })
@@ -2085,9 +2109,9 @@ function TableBox({ table, m, color, colorMap }) {
         " ".repeat(keyW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" })
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" })
     ] }, i)),
-    /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: bot })
+    /* @__PURE__ */ jsx6(Text6, { color, children: bot })
   ] });
 }
 function ErdView({ data }) {
@@ -2105,7 +2129,7 @@ function ErdView({ data }) {
     {
       table: data.tables[ti],
       m: metrics[ti],
-      color: colorMap.get(data.tables[ti].name) ?? BORDER2,
+      color: colorMap.get(data.tables[ti].name) ?? BORDER,
       colorMap
     }
   ) }, ti)) }, ri)) });
@@ -2124,6 +2148,12 @@ function limitLines(s, n) {
   return lines.slice(0, n).join("\n") + `
 \u2026 +${lines.length - n} more lines (scroll up after next submit)`;
 }
+function displayQuery(query) {
+  const cols = process.stdout.columns ?? 80;
+  const max = Math.max(20, cols - 16);
+  const flat = query.replace(/\n/g, " ").replace(/\s+/g, " ").trim();
+  return flat.length > max ? flat.slice(0, max) + "\u2026" : flat;
+}
 function EntryView({ entry }) {
   const showAi = entry.aiResponse !== "" || entry.aiError !== null;
   const showErd = entry.erdData !== null;
@@ -2136,7 +2166,7 @@ function EntryView({ entry }) {
         label,
         " "
       ] }),
-      /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: entry.query })
+      /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: displayQuery(entry.query) })
     ] }),
     /* @__PURE__ */ jsx7(Box7, { marginTop: 1, flexDirection: "column", children: isShell ? entry.shellOutput !== null && /* @__PURE__ */ jsx7(Text7, { children: entry.shellOutput || "(no output)" }) : /* @__PURE__ */ jsxs7(Fragment4, { children: [
       entry.commandMessage && (entry.commandMessage.helpData ? /* @__PURE__ */ jsx7(HelpView, { data: entry.commandMessage.helpData }) : entry.commandMessage.ok ? /* @__PURE__ */ jsxs7(Text7, { color: theme.accent, children: [
@@ -2419,7 +2449,7 @@ function App({ connectionState, aiUrl: aiUrl2, aiModel: aiModel2, aiKey: aiKey2,
             activeLabel,
             " "
           ] }),
-          /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: lastQuery })
+          /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: displayQuery(lastQuery) })
         ] }),
         /* @__PURE__ */ jsx7(Box7, { marginTop: 1, flexDirection: "column", children: isShellEntry ? isShellRunning ? /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "running\u2026" }) : /* @__PURE__ */ jsx7(Text7, { children: limitLines(shellOutput ?? "", activePageSize()) }) : /* @__PURE__ */ jsxs7(Fragment4, { children: [
           commandMessage && (commandMessage.helpData ? /* @__PURE__ */ jsx7(HelpView, { data: commandMessage.helpData }) : commandMessage.ok ? /* @__PURE__ */ jsxs7(Text7, { color: theme.accent, children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deaquinodev/querky",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "A quirky terminal SQL client with vim mode, AI features, and schema-aware autocomplete",
   "main": "dist/index.js",
   "files": [