toiljs 0.0.55 → 0.0.57

package/build/cli/index.js

@@ -609,8 +609,8 @@ function block({
       return;
     }
     if (!o2) return;
-    const i2 = a3 === "return" ? 0 : -1, m = a3 === "return" ? -1 : 0;
-    l.moveCursor(r2, i2, m, () => {
+    const i2 = a3 === "return" ? 0 : -1, m2 = a3 === "return" ? -1 : 0;
+    l.moveCursor(r2, i2, m2, () => {
       l.clearLine(r2, 1, () => {
         e.once("keypress", n2);
       });
@@ -628,9 +628,9 @@ function wrapTextWithPrefix(e, r2, o2, t2 = o2, s = o2, n2) {
     hard: true,
     trim: false
   }).split(`
-`).map((c2, i2, m) => {
-    const d2 = n2 ? n2(c2, i2) : c2;
-    return i2 === 0 ? `${t2}${d2}` : i2 === m.length - 1 ? `${s}${d2}` : `${o2}${d2}`;
+`).map((c2, i2, m2) => {
+    const d = n2 ? n2(c2, i2) : c2;
+    return i2 === 0 ? `${t2}${d}` : i2 === m2.length - 1 ? `${s}${d}` : `${o2}${d}`;
   }).join(`
 `);
 }
@@ -941,7 +941,7 @@ function isUnicodeSupported() {
 }
 var unicode = isUnicodeSupported();
 var isCI = () => process.env.CI === "true";
-var unicodeOr = (e, o2) => unicode ? e : o2;
+var unicodeOr = (o2, e) => unicode ? o2 : e;
 var S_STEP_ACTIVE = unicodeOr("\u25C6", "*");
 var S_STEP_CANCEL = unicodeOr("\u25A0", "x");
 var S_STEP_ERROR = unicodeOr("\u25B2", "x");
@@ -967,8 +967,8 @@ var S_INFO = unicodeOr("\u25CF", "\u2022");
 var S_SUCCESS = unicodeOr("\u25C6", "*");
 var S_WARN = unicodeOr("\u25B2", "!");
 var S_ERROR = unicodeOr("\u25A0", "x");
-var symbol = (e) => {
-  switch (e) {
+var symbol = (o2) => {
+  switch (o2) {
     case "initial":
     case "active":
       return styleText2("cyan", S_STEP_ACTIVE);
@@ -980,8 +980,8 @@ var symbol = (e) => {
       return styleText2("green", S_STEP_SUBMIT);
   }
 };
-var symbolBar = (e) => {
-  switch (e) {
+var symbolBar = (o2) => {
+  switch (o2) {
     case "initial":
     case "active":
       return styleText2("cyan", S_BAR);
@@ -993,6 +993,10 @@ var symbolBar = (e) => {
       return styleText2("green", S_BAR);
   }
 };
+function formatInstructionFooter(o2, e) {
+  const r2 = [`${e ? `${styleText2("cyan", S_BAR)}  ` : ""}${o2.join(" \u2022 ")}`];
+  return e && r2.push(styleText2("cyan", S_BAR_END)), r2;
+}
 var E$1 = (l2, o2, g, c2, h2, O = false) => {
   let r2 = o2, w = 0;
   if (O)
@@ -1012,19 +1016,19 @@ var limitOptions = ({
   columnPadding: O = 0,
   rowPadding: r2 = 4
 }) => {
-  const i2 = getColumns(c2) - O, I = getRows(c2), C2 = styleText2("dim", "..."), x = Math.max(I - r2, 0), m = Math.max(Math.min(h2, x), 5);
+  const i2 = getColumns(c2) - O, I = getRows(c2), C2 = styleText2("dim", "..."), x = Math.max(I - r2, 0), m2 = Math.max(Math.min(h2, x), 5);
   let p = 0;
-  l2 >= m - 3 && (p = Math.max(
-    Math.min(l2 - m + 3, o2.length - m),
+  l2 >= m2 - 3 && (p = Math.max(
+    Math.min(l2 - m2 + 3, o2.length - m2),
     0
   ));
-  let f = m < o2.length && p > 0, u3 = m < o2.length && p + m < o2.length;
+  let f = m2 < o2.length && p > 0, u3 = m2 < o2.length && p + m2 < o2.length;
   const W2 = Math.min(
-    p + m,
+    p + m2,
     o2.length
   ), e = [];
-  let d2 = 0;
-  f && d2++, u3 && d2++;
+  let d = 0;
+  f && d++, u3 && d++;
   const v = p + (f ? 1 : 0), P = W2 - (u3 ? 1 : 0);
   for (let t2 = v; t2 < P; t2++) {
     const n2 = wrapAnsi(g(o2[t2], t2 === l2), i2, {
@@ -1032,10 +1036,10 @@ var limitOptions = ({
       trim: false
     }).split(`
 `);
-    e.push(n2), d2 += n2.length;
+    e.push(n2), d += n2.length;
   }
-  if (d2 > x) {
-    let t2 = 0, n2 = 0, s = d2;
+  if (d > x) {
+    let t2 = 0, n2 = 0, s = d;
     const M = l2 - v;
     let a3 = x;
     const T = () => E$1(e, s, 0, M, a3), L = () => E$1(
@@ -1095,42 +1099,29 @@ ${g}
     }
   }).prompt();
 };
-var cancel = (o2 = "", t2) => {
-  const i2 = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_END)}  ` : "";
-  i2.write(`${e}${styleText2("red", o2)}
-
-`);
-};
-var intro = (o2 = "", t2) => {
-  const i2 = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_START)}  ` : "";
-  i2.write(`${e}${o2}
-`);
-};
-var outro = (o2 = "", t2) => {
-  const i2 = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR)}
-${styleText2("gray", S_BAR_END)}  ` : "";
-  i2.write(`${e}${o2}
-
-`);
-};
-var d = (n2, a3) => n2.split(`
-`).map((m) => a3(m)).join(`
+var MULTISELECT_INSTRUCTIONS = [
+  `${styleText2("dim", "\u2191/\u2193")} to navigate`,
+  `${styleText2("dim", "Space:")} select`,
+  `${styleText2("dim", "Enter:")} confirm`
+];
+var m = (n2, o2) => n2.split(`
+`).map((d) => o2(d)).join(`
 `);
 var multiselect = (n2) => {
-  const a3 = (t2, o2) => {
+  const o2 = (t2, a3) => {
     const r2 = t2.label ?? String(t2.value);
-    return o2 === "disabled" ? `${styleText2("gray", S_CHECKBOX_INACTIVE)} ${d(r2, (l2) => styleText2(["strikethrough", "gray"], l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint ?? "disabled"})`)}` : ""}` : o2 === "active" ? `${styleText2("cyan", S_CHECKBOX_ACTIVE)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : o2 === "selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${d(r2, (l2) => styleText2("dim", l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : o2 === "cancelled" ? `${d(r2, (l2) => styleText2(["strikethrough", "dim"], l2))}` : o2 === "active-selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : o2 === "submitted" ? `${d(r2, (l2) => styleText2("dim", l2))}` : `${styleText2("dim", S_CHECKBOX_INACTIVE)} ${d(r2, (l2) => styleText2("dim", l2))}`;
-  }, m = n2.required ?? true;
+    return a3 === "disabled" ? `${styleText2("gray", S_CHECKBOX_INACTIVE)} ${m(r2, (l2) => styleText2(["strikethrough", "gray"], l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint ?? "disabled"})`)}` : ""}` : a3 === "active" ? `${styleText2("cyan", S_CHECKBOX_ACTIVE)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : a3 === "selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${m(r2, (l2) => styleText2("dim", l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : a3 === "cancelled" ? `${m(r2, (l2) => styleText2(["strikethrough", "dim"], l2))}` : a3 === "active-selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : a3 === "submitted" ? `${m(r2, (l2) => styleText2("dim", l2))}` : `${styleText2("dim", S_CHECKBOX_INACTIVE)} ${m(r2, (l2) => styleText2("dim", l2))}`;
+  }, d = n2.required ?? true;
   return new a$1({
     options: n2.options,
     signal: n2.signal,
     input: n2.input,
     output: n2.output,
     initialValues: n2.initialValues,
-    required: m,
+    required: d,
     cursorAt: n2.cursorAt,
     validate(t2) {
-      if (m && (t2 === void 0 || t2.length === 0))
+      if (d && (t2 === void 0 || t2.length === 0))
         return `Please select at least one option.
 ${styleText2(
           "reset",
@@ -1144,22 +1135,22 @@ ${styleText2(
         )}`;
     },
     render() {
-      const t2 = n2.withGuide ?? settings.withGuide, o2 = wrapTextWithPrefix(
+      const t2 = n2.withGuide ?? settings.withGuide, a3 = wrapTextWithPrefix(
         n2.output,
         n2.message,
         t2 ? `${symbolBar(this.state)}  ` : "",
         `${symbol(this.state)}  `
       ), r2 = `${t2 ? `${styleText2("gray", S_BAR)}
-` : ""}${o2}
-`, l2 = this.value ?? [], g = (i2, u3) => {
+` : ""}${a3}
+`, l2 = this.value ?? [], p = (i2, u3) => {
         if (i2.disabled)
-          return a3(i2, "disabled");
+          return o2(i2, "disabled");
         const s = l2.includes(i2.value);
-        return u3 && s ? a3(i2, "active-selected") : s ? a3(i2, "selected") : a3(i2, u3 ? "active" : "inactive");
+        return u3 && s ? o2(i2, "active-selected") : s ? o2(i2, "selected") : o2(i2, u3 ? "active" : "inactive");
       };
       switch (this.state) {
         case "submit": {
-          const i2 = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => a3(s, "submitted")).join(styleText2("dim", ", ")) || styleText2("dim", "none"), u3 = wrapTextWithPrefix(
+          const i2 = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => o2(s, "submitted")).join(styleText2("dim", ", ")) || styleText2("dim", "none"), u3 = wrapTextWithPrefix(
             n2.output,
             i2,
             t2 ? `${styleText2("gray", S_BAR)}  ` : ""
@@ -1167,7 +1158,7 @@ ${styleText2(
           return `${r2}${u3}`;
         }
         case "cancel": {
-          const i2 = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => a3(s, "cancelled")).join(styleText2("dim", ", "));
+          const i2 = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => o2(s, "cancelled")).join(styleText2("dim", ", "));
           if (i2.trim() === "")
             return `${r2}${styleText2("gray", S_BAR)}`;
           const u3 = wrapTextWithPrefix(
@@ -1181,10 +1172,10 @@ ${styleText2("gray", S_BAR)}` : ""}`;
         case "error": {
           const i2 = t2 ? `${styleText2("yellow", S_BAR)}  ` : "", u3 = this.error.split(`
 `).map(
-            (h2, x) => x === 0 ? `${t2 ? `${styleText2("yellow", S_BAR_END)}  ` : ""}${styleText2("yellow", h2)}` : `   ${h2}`
+            ($, x) => x === 0 ? `${t2 ? `${styleText2("yellow", S_BAR_END)}  ` : ""}${styleText2("yellow", $)}` : `   ${$}`
           ).join(`
 `), s = r2.split(`
-`).length, v = u3.split(`
+`).length, g = u3.split(`
 `).length + 1;
           return `${r2}${i2}${limitOptions({
             output: n2.output,
@@ -1192,8 +1183,8 @@ ${styleText2("gray", S_BAR)}` : ""}`;
             cursor: this.cursor,
             maxItems: n2.maxItems,
             columnPadding: i2.length,
-            rowPadding: s + v,
-            style: g
+            rowPadding: s + g,
+            style: p
           }).join(`
 ${i2}`)}
 ${u3}
@@ -1201,53 +1192,72 @@ ${u3}
         }
         default: {
           const i2 = t2 ? `${styleText2("cyan", S_BAR)}  ` : "", u3 = r2.split(`
-`).length, s = t2 ? 2 : 1;
+`).length, s = formatInstructionFooter(MULTISELECT_INSTRUCTIONS, t2), g = s.join(`
+`), $ = s.length + 1;
           return `${r2}${i2}${limitOptions({
             output: n2.output,
             options: this.options,
             cursor: this.cursor,
             maxItems: n2.maxItems,
             columnPadding: i2.length,
-            rowPadding: u3 + s,
-            style: g
+            rowPadding: u3 + $,
+            style: p
           }).join(`
 ${i2}`)}
-${t2 ? styleText2("cyan", S_BAR_END) : ""}
+${g}
 `;
         }
       }
     }
   }).prompt();
 };
-var W$1 = (o2) => styleText2("dim", o2);
+var cancel = (o2 = "", t2) => {
+  const i2 = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_END)}  ` : "";
+  i2.write(`${e}${styleText2("red", o2)}
+
+`);
+};
+var intro = (o2 = "", t2) => {
+  const i2 = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_START)}  ` : "";
+  i2.write(`${e}${o2}
+`);
+};
+var outro = (o2 = "", t2) => {
+  const i2 = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR)}
+${styleText2("gray", S_BAR_END)}  ` : "";
+  i2.write(`${e}${o2}
+
+`);
+};
+var W$1 = (o2) => o2;
 var C = (o2, e, s) => {
   const a3 = {
     hard: true,
     trim: false
   }, i2 = wrapAnsi(o2, e, a3).split(`
-`), c2 = i2.reduce((n2, r2) => Math.max(dist_default2(r2), n2), 0), u3 = i2.map(s).reduce((n2, r2) => Math.max(dist_default2(r2), n2), 0), g = e - (u3 - c2);
+`), c2 = i2.reduce((n2, t2) => Math.max(dist_default2(t2), n2), 0), u3 = i2.map(s).reduce((n2, t2) => Math.max(dist_default2(t2), n2), 0), g = e - (u3 - c2);
   return wrapAnsi(o2, g, a3);
 };
 var note = (o2 = "", e = "", s) => {
   const a3 = s?.output ?? process$1.stdout, i2 = s?.withGuide ?? settings.withGuide, c2 = s?.format ?? W$1, g = ["", ...C(o2, getColumns(a3) - 6, c2).split(`
-`).map(c2), ""], n2 = dist_default2(e), r2 = Math.max(
-    g.reduce((m, F) => {
+`).map(c2), ""], n2 = dist_default2(e), t2 = Math.max(
+    g.reduce((m2, F) => {
       const O = dist_default2(F);
-      return O > m ? O : m;
+      return O > m2 ? O : m2;
     }, 0),
     n2
   ) + 2, h2 = g.map(
-    (m) => `${styleText2("gray", S_BAR)}  ${m}${" ".repeat(r2 - dist_default2(m))}${styleText2("gray", S_BAR)}`
+    (m2) => `${styleText2("gray", S_BAR)}  ${m2}${" ".repeat(t2 - dist_default2(m2))}${styleText2("gray", S_BAR)}`
   ).join(`
 `), T = i2 ? `${styleText2("gray", S_BAR)}
 ` : "", l$1 = i2 ? S_CONNECT_LEFT : S_CORNER_BOTTOM_LEFT;
   a3.write(
     `${T}${styleText2("green", S_STEP_SUBMIT)}  ${styleText2("reset", e)} ${styleText2(
       "gray",
-      S_BAR_H.repeat(Math.max(r2 - n2 - 1, 1)) + S_CORNER_TOP_RIGHT
+      S_BAR_H.repeat(Math.max(t2 - n2 - 1, 1)) + S_CORNER_TOP_RIGHT
     )}
 ${h2}
-${styleText2("gray", l$1 + S_BAR_H.repeat(r2 + 2) + S_CORNER_BOTTOM_RIGHT)}
+${styleText2("gray", l$1 + S_BAR_H.repeat(t2 + 2) + S_CORNER_BOTTOM_RIGHT)}
 `
   );
 };
@@ -1260,18 +1270,18 @@ var spinner = ({
   errorMessage: O,
   frames: E = unicode ? ["\u25D2", "\u25D0", "\u25D3", "\u25D1"] : ["\u2022", "o", "O", "0"],
   delay: F = unicode ? 80 : 120,
-  signal: m,
+  signal: m2,
   ...I
 } = {}) => {
   const u3 = isCI();
-  let M, T, d2 = false, S = false, s = "", p, w = performance.now();
+  let M, T, d = false, S = false, s = "", p, w = performance.now();
   const x = getColumns(n2), k = I?.styleFrame ?? W, g = (e) => {
     const r2 = e > 1 ? O ?? settings.messages.error : G ?? settings.messages.cancel;
-    S = e === 1, d2 && (a3(r2, e), S && typeof h2 == "function" && h2());
+    S = e === 1, d && (a3(r2, e), S && typeof h2 == "function" && h2());
   }, f = () => g(2), i2 = () => g(1), A = () => {
-    process.on("uncaughtExceptionMonitor", f), process.on("unhandledRejection", f), process.on("SIGINT", i2), process.on("SIGTERM", i2), process.on("exit", g), m && m.addEventListener("abort", i2);
+    process.on("uncaughtExceptionMonitor", f), process.on("unhandledRejection", f), process.on("SIGINT", i2), process.on("SIGTERM", i2), process.on("exit", g), m2 && m2.addEventListener("abort", i2);
   }, H = () => {
-    process.removeListener("uncaughtExceptionMonitor", f), process.removeListener("unhandledRejection", f), process.removeListener("SIGINT", i2), process.removeListener("SIGTERM", i2), process.removeListener("exit", g), m && m.removeEventListener("abort", i2);
+    process.removeListener("uncaughtExceptionMonitor", f), process.removeListener("unhandledRejection", f), process.removeListener("SIGINT", i2), process.removeListener("SIGTERM", i2), process.removeListener("exit", g), m2 && m2.removeEventListener("abort", i2);
   }, y = () => {
     if (p === void 0) return;
     u3 && n2.write(`
@@ -1286,7 +1296,7 @@ var spinner = ({
     const r2 = (performance.now() - e) / 1e3, t2 = Math.floor(r2 / 60), o2 = Math.floor(r2 % 60);
     return t2 > 0 ? `[${t2}m ${o2}s]` : `[${o2}s]`;
   }, N = I.withGuide ?? settings.withGuide, P = (e = "") => {
-    d2 = true, M = block({ output: n2 }), s = C2(e), w = performance.now(), N && n2.write(`${styleText2("gray", S_BAR)}
+    d = true, M = block({ output: n2 }), s = C2(e), w = performance.now(), N && n2.write(`${styleText2("gray", S_BAR)}
 `);
     let r2 = 0, t2 = 0;
     A(), T = setInterval(() => {
@@ -1310,8 +1320,8 @@ var spinner = ({
       n2.write(j), r2 = r2 + 1 < E.length ? r2 + 1 : 0, t2 = t2 < 4 ? t2 + 0.125 : 0;
     }, F);
   }, a3 = (e = "", r2 = 0, t2 = false) => {
-    if (!d2) return;
-    d2 = false, clearInterval(T), y();
+    if (!d) return;
+    d = false, clearInterval(T), y();
     const o2 = r2 === 0 ? styleText2("green", S_STEP_SUBMIT) : r2 === 1 ? styleText2("red", S_STEP_CANCEL) : styleText2("red", S_STEP_ERROR);
     s = e ?? s, t2 || (l2 === "timer" ? n2.write(`${o2}  ${s} ${_(w)}
 `) : n2.write(`${o2}  ${s}
@@ -1336,20 +1346,24 @@ var u2 = {
   heavy: unicodeOr("\u2501", "="),
   block: unicodeOr("\u2588", "#")
 };
-var c = (e, a3) => e.includes(`
-`) ? e.split(`
-`).map((t2) => a3(t2)).join(`
-`) : a3(e);
-var select = (e) => {
-  const a3 = (t2, d2) => {
-    const s = t2.label ?? String(t2.value);
-    switch (d2) {
+var SELECT_INSTRUCTIONS = [
+  `${styleText2("dim", "\u2191/\u2193")} to navigate`,
+  `${styleText2("dim", "Enter:")} confirm`
+];
+var c = (t2, a3) => t2.includes(`
+`) ? t2.split(`
+`).map((i2) => a3(i2)).join(`
+`) : a3(t2);
+var select = (t2) => {
+  const a3 = (i2, m2) => {
+    const s = i2.label ?? String(i2.value);
+    switch (m2) {
       case "disabled":
-        return `${styleText2("gray", S_RADIO_INACTIVE)} ${c(s, (n2) => styleText2("gray", n2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint ?? "disabled"})`)}` : ""}`;
+        return `${styleText2("gray", S_RADIO_INACTIVE)} ${c(s, (n2) => styleText2("gray", n2))}${i2.hint ? ` ${styleText2("dim", `(${i2.hint ?? "disabled"})`)}` : ""}`;
       case "selected":
         return `${c(s, (n2) => styleText2("dim", n2))}`;
       case "active":
-        return `${styleText2("green", S_RADIO_ACTIVE)} ${s}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}`;
+        return `${styleText2("green", S_RADIO_ACTIVE)} ${s}${i2.hint ? ` ${styleText2("dim", `(${i2.hint})`)}` : ""}`;
       case "cancelled":
         return `${c(s, (n2) => styleText2(["strikethrough", "dim"], n2))}`;
       default:
@@ -1357,52 +1371,53 @@ var select = (e) => {
     }
   };
   return new a2({
-    options: e.options,
-    signal: e.signal,
-    input: e.input,
-    output: e.output,
-    initialValue: e.initialValue,
+    options: t2.options,
+    signal: t2.signal,
+    input: t2.input,
+    output: t2.output,
+    initialValue: t2.initialValue,
     render() {
-      const t2 = e.withGuide ?? settings.withGuide, d2 = `${symbol(this.state)}  `, s = `${symbolBar(this.state)}  `, n2 = wrapTextWithPrefix(
-        e.output,
-        e.message,
+      const i2 = t2.withGuide ?? settings.withGuide, m2 = `${symbol(this.state)}  `, s = `${symbolBar(this.state)}  `, n2 = wrapTextWithPrefix(
+        t2.output,
+        t2.message,
         s,
-        d2
-      ), u3 = `${t2 ? `${styleText2("gray", S_BAR)}
+        m2
+      ), u3 = `${i2 ? `${styleText2("gray", S_BAR)}
 ` : ""}${n2}
 `;
       switch (this.state) {
         case "submit": {
-          const r2 = t2 ? `${styleText2("gray", S_BAR)}  ` : "", l2 = wrapTextWithPrefix(
-            e.output,
+          const r2 = i2 ? `${styleText2("gray", S_BAR)}  ` : "", o2 = wrapTextWithPrefix(
+            t2.output,
             a3(this.options[this.cursor], "selected"),
             r2
           );
-          return `${u3}${l2}`;
+          return `${u3}${o2}`;
         }
         case "cancel": {
-          const r2 = t2 ? `${styleText2("gray", S_BAR)}  ` : "", l2 = wrapTextWithPrefix(
-            e.output,
+          const r2 = i2 ? `${styleText2("gray", S_BAR)}  ` : "", o2 = wrapTextWithPrefix(
+            t2.output,
             a3(this.options[this.cursor], "cancelled"),
             r2
           );
-          return `${u3}${l2}${t2 ? `
+          return `${u3}${o2}${i2 ? `
 ${styleText2("gray", S_BAR)}` : ""}`;
         }
         default: {
-          const r2 = t2 ? `${styleText2("cyan", S_BAR)}  ` : "", l2 = t2 ? styleText2("cyan", S_BAR_END) : "", g = u3.split(`
-`).length, h2 = t2 ? 2 : 1;
+          const r2 = i2 ? `${styleText2("cyan", S_BAR)}  ` : "", o2 = u3.split(`
+`).length, $ = formatInstructionFooter(SELECT_INSTRUCTIONS, i2), h2 = $.join(`
+`), b = $.length + 1;
           return `${u3}${r2}${limitOptions({
-            output: e.output,
+            output: t2.output,
             cursor: this.cursor,
             options: this.options,
-            maxItems: e.maxItems,
+            maxItems: t2.maxItems,
             columnPadding: r2.length,
-            rowPadding: g + h2,
-            style: (p, b) => a3(p, p.disabled ? "disabled" : b ? "active" : "inactive")
+            rowPadding: o2 + b,
+            style: (p, x) => a3(p, p.disabled ? "disabled" : x ? "active" : "inactive")
           }).join(`
 ${r2}`)}
-${l2}
+${h2}
 `;
         }
       }
@@ -1424,10 +1439,10 @@ var text = (t2) => new n({
 `, c2 = t2.placeholder ? styleText2("inverse", t2.placeholder[0]) + styleText2("dim", t2.placeholder.slice(1)) : styleText2(["inverse", "hidden"], "_"), o2 = this.userInput ? this.userInputWithCursor : c2, a3 = this.value ?? "";
     switch (this.state) {
       case "error": {
-        const n2 = this.error ? `  ${styleText2("yellow", this.error)}` : "", r2 = i2 ? `${styleText2("yellow", S_BAR)}  ` : "", d2 = i2 ? styleText2("yellow", S_BAR_END) : "";
+        const n2 = this.error ? `  ${styleText2("yellow", this.error)}` : "", r2 = i2 ? `${styleText2("yellow", S_BAR)}  ` : "", d = i2 ? styleText2("yellow", S_BAR_END) : "";
         return `${s.trim()}
 ${r2}${o2}
-${d2}${n2}
+${d}${n2}
 `;
       }
       case "submit": {
@@ -1588,11 +1603,11 @@ function capture(cmd, args, cwd) {
     const child = onWindows ? spawn([cmd, ...args].join(" "), { cwd, shell: true }) : spawn(cmd, args, { cwd });
     let stdout2 = "";
     let stderr = "";
-    child.stdout?.on("data", (d2) => {
-      stdout2 += d2.toString();
+    child.stdout?.on("data", (d) => {
+      stdout2 += d.toString();
     });
-    child.stderr?.on("data", (d2) => {
-      stderr += d2.toString();
+    child.stderr?.on("data", (d) => {
+      stderr += d.toString();
     });
     child.on("error", reject);
     child.on("close", (code) => {
@@ -1680,9 +1695,7 @@ function visibleWidth(s) {
 function box(lines, paint = (s) => s) {
   const width = lines.reduce((w, l2) => Math.max(w, visibleWidth(l2)), 0);
   const side = paint("\u2502");
-  const body = lines.map(
-    (l2) => `  ${side}  ${l2}${" ".repeat(width - visibleWidth(l2))}  ${side}`
-  );
+  const body = lines.map((l2) => `  ${side}  ${l2}${" ".repeat(width - visibleWidth(l2))}  ${side}`);
   return [
     "  " + paint(`\u256D${"\u2500".repeat(width + 4)}\u256E`),
     ...body,
@@ -2025,7 +2038,7 @@ function scaffold(name, template, features, aiTools, images) {
     "@types/react-dom": "^19.2.3",
     eslint: "^10.2.0",
     prettier: "^3.8.1",
-    toilscript: "^0.1.27",
+    toilscript: "^0.1.35",
     typescript: "^6.0.3"
   };
   for (const dep of requiredPackages(features).sort()) {
@@ -2067,9 +2080,18 @@ export default defineConfig({
     // Generated files don't need formatting. (toilscript server decorators like @main /
     // @remote-on-functions are handled by the toiljs/prettier-plugin, so server/ is not ignored.)
     ".prettierignore": "node_modules\nbuild\n.toil\nshared/server.ts\ntoil-env.d.ts\ntoil-routes.d.ts\nserver/_emails.ts\nserver/toil-server-env.d.ts\n",
-    ".gitignore": "node_modules\nbuild\n.toil\nshared/server.ts\ntoil-env.d.ts\ntoil-routes.d.ts\n# Local dev env vars/secrets (never commit)\n.env\n.env.secrets\n",
-    // Use the project's pinned TypeScript (node_modules) instead of VS Code's bundled version.
-    ".vscode/settings.json": JSON.stringify({ "typescript.tsdk": "node_modules/typescript/lib" }, null, 4) + "\n",
+    ".gitignore": "node_modules\nbuild\n.toil\nshared/server.ts\ntoil-env.d.ts\ntoil-routes.d.ts\nhosts/*/_tmpl/\n# Local dev env vars/secrets (never commit)\n.env\n.env.secrets\n",
+    // Use the project's pinned TypeScript (node_modules) instead of VS Code's bundled
+    // version, and prompt to switch, so the editor loads the toilscript LS plugin wired
+    // in server/tsconfig.json (which clears the @database / @data editor false positives).
+    ".vscode/settings.json": JSON.stringify(
+      {
+        "typescript.tsdk": "node_modules/typescript/lib",
+        "typescript.enablePromptUseWorkspaceTsdk": true
+      },
+      null,
+      4
+    ) + "\n",
     "toil-env.d.ts": TOIL_ENV_DTS,
     // Stub typed-routes augmentation (RoutePath = string until the first dev/build regenerates it).
     "toil-routes.d.ts": "// AUTO-GENERATED by toil, do not edit.\nexport {};\n",
@@ -2120,9 +2142,15 @@ export default defineConfig({
       null,
       4
     ) + "\n",
+    // The toilscript LS plugin teaches the editor about compiler-injected members
+    // (`@database` static collections like `Db.users`, the `@data` codec, `@user`), so
+    // stock TypeScript stops false-flagging them as TS2339. Editor-only; ignored by tsc.
     "server/tsconfig.json": JSON.stringify(
       {
         extends: "toilscript/std/assembly.json",
+        compilerOptions: {
+          plugins: [{ name: "toilscript/std/ts-plugin.cjs" }]
+        },
         include: ["./**/*.ts"]
       },
       null,
@@ -2505,13 +2533,17 @@ import fs4 from "node:fs";
 import { createRequire } from "node:module";
 import path5 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { loadConfig as loadConfig2, scanRoutes, TOIL_SERVER_ENV_DTS as TOIL_SERVER_ENV_DTS2 } from "toiljs/compiler";
+import {
+  loadConfig as loadConfig2,
+  scanRoutes,
+  TOIL_SERVER_ENV_DTS as TOIL_SERVER_ENV_DTS2
+} from "toiljs/compiler";
 
 // src/cli/diagnostics.ts
 function parseVersion(v) {
-  const m = /(\d+)(?:\.(\d+))?(?:\.(\d+))?/.exec(v);
-  if (!m) return [0, 0, 0];
-  return [Number(m[1]), Number(m[2] ?? 0), Number(m[3] ?? 0)];
+  const m2 = /(\d+)(?:\.(\d+))?(?:\.(\d+))?/.exec(v);
+  if (!m2) return [0, 0, 0];
+  return [Number(m2[1]), Number(m2[2] ?? 0), Number(m2[3] ?? 0)];
 }
 function satisfiesMin(version2, range) {
   const [a3, b, c2] = parseVersion(version2);
@@ -2682,9 +2714,9 @@ function findRelativeAssets(files) {
     const lines = file.source.split("\n");
     for (let i2 = 0; i2 < lines.length; i2++) {
       attr.lastIndex = 0;
-      let m;
-      while ((m = attr.exec(lines[i2])) !== null) {
-        const value = m[1] ?? m[2] ?? "";
+      let m2;
+      while ((m2 = attr.exec(lines[i2])) !== null) {
+        const value = m2[1] ?? m2[2] ?? "";
         if (isBrokenRelativeAsset(value)) {
           issues.push({ file: file.path, line: i2 + 1, value });
         }
@@ -2838,6 +2870,27 @@ function checkRestDispatch(f) {
     fix: "In your handler add `const hit = Rest.dispatch(req); if (hit != null) return hit;`, or set `Server.handler = () => new RestHandler()`."
   };
 }
+function checkServerTsPlugin(present) {
+  return present ? { id: "server-ts-plugin", label: "toilscript editor plugin", status: "pass" } : {
+    id: "server-ts-plugin",
+    label: "toilscript editor plugin",
+    status: "warn",
+    detail: "server tsconfig is missing the toilscript LS plugin, so the editor wrongly flags @database static collections (e.g. GuestbookDb.totals) and @data members as TS2339",
+    fix: 'Run `toiljs doctor --fix` to add { "plugins": [{ "name": "toilscript/std/ts-plugin.cjs" }] } to your server tsconfig, then pick the workspace TypeScript version and restart the TS server.'
+  };
+}
+function checkAuthSecrets(f) {
+  if (!f.usesAuth || f.sessionSecretSet) {
+    return { id: "auth-secrets", label: "Session secret", status: "pass" };
+  }
+  return {
+    id: "auth-secrets",
+    label: "Session secret",
+    status: "warn",
+    detail: "auth is used but AUTH_SESSION_SECRET is unset: sessions fall back to a PUBLISHED key, so anyone can forge a session cookie and skip login",
+    fix: `Set AUTH_SESSION_SECRET to a long random value in .env.secrets (local) and on your deploy target (also AUTH_OPRF_SEED / AUTH_KEM_SK if you use password login). Generate one: node -e "console.log(require('crypto').randomBytes(32).toString('hex'))".`
+  };
+}
 function summarize(groups) {
   let pass = 0;
   let warn2 = 0;
@@ -2969,6 +3022,41 @@ function gatherRestFacts(root, toilconfig) {
   }
   return { hasControllers, dispatched };
 }
+function secretDefined(root, key) {
+  const raw = readFile(path5.join(root, ".env.secrets"));
+  if (raw === null) return false;
+  return new RegExp(`^\\s*(?:export\\s+)?${key}\\s*=\\s*\\S`, "m").test(raw);
+}
+function gatherAuthFacts(root, toilconfig) {
+  let usesAuth = false;
+  for (const src of serverSources(root, toilconfig)) {
+    if (/\bAuthService\b/.test(src) || /@user\b/.test(src) || /@auth\b/.test(src)) {
+      usesAuth = true;
+      break;
+    }
+  }
+  return { usesAuth, sessionSecretSet: secretDefined(root, "AUTH_SESSION_SECRET") };
+}
+var TS_PLUGIN_NAME = "toilscript/std/ts-plugin.cjs";
+function serverTsconfigPath(root, toilconfig) {
+  const dirs = /* @__PURE__ */ new Set();
+  const entries = Array.isArray(toilconfig?.entries) ? toilconfig.entries.filter((e) => typeof e === "string") : [];
+  for (const e of entries) dirs.add(path5.dirname(path5.resolve(root, e)));
+  if (dirs.size === 0) dirs.add(path5.join(root, "server"));
+  for (const dir of dirs) {
+    const p = path5.join(dir, "tsconfig.json");
+    if (fs4.existsSync(p)) return p;
+  }
+  return null;
+}
+function tsconfigHasToilPlugin(tsconfig) {
+  const plugins = asRecord(tsconfig?.compilerOptions)?.plugins;
+  if (!Array.isArray(plugins)) return false;
+  return plugins.some((p) => {
+    const name = asRecord(p)?.name;
+    return typeof name === "string" && name.includes("ts-plugin");
+  });
+}
 function applyRpcFix(root) {
   const changed = [];
   const skipped = [];
@@ -3064,7 +3152,9 @@ function applyRpcFix(root) {
   }
   const serverToilconfig = readJsonObject(path5.join(root, "toilconfig.json"));
   if (serverToilconfig !== null) {
-    const entries = Array.isArray(serverToilconfig.entries) ? serverToilconfig.entries.filter((e) => typeof e === "string") : [];
+    const entries = Array.isArray(serverToilconfig.entries) ? serverToilconfig.entries.filter(
+      (e) => typeof e === "string"
+    ) : [];
     const dirs = /* @__PURE__ */ new Set();
     for (const e of entries) dirs.add(path5.dirname(path5.resolve(root, e)));
     if (dirs.size === 0) dirs.add(path5.join(root, "server"));
@@ -3154,6 +3244,50 @@ function applyPrettierFix(root, pkg) {
   changed.push(".prettierrc.json");
   return { changed, skipped };
 }
+function applyServerEditorFix(root, toilconfig) {
+  const changed = [];
+  const skipped = [];
+  const tsPath = serverTsconfigPath(root, toilconfig);
+  if (tsPath === null) {
+    skipped.push("server/tsconfig.json (not found; add the toilscript ts-plugin by hand)");
+  } else {
+    const rel = path5.relative(root, tsPath);
+    const raw = readFile(tsPath);
+    const parsed = raw !== null ? readJsonObject(tsPath) : null;
+    if (parsed === null) {
+      skipped.push(`${rel} (JSON with comments; add the "${TS_PLUGIN_NAME}" plugin by hand)`);
+    } else if (!tsconfigHasToilPlugin(parsed)) {
+      const co = asRecord(parsed.compilerOptions) ?? {};
+      const existingPlugins = Array.isArray(co.plugins) ? co.plugins : [];
+      co.plugins = [...existingPlugins, { name: TS_PLUGIN_NAME }];
+      parsed.compilerOptions = co;
+      writeFile(tsPath, JSON.stringify(parsed, null, 4) + "\n");
+      changed.push(rel);
+    }
+  }
+  const vsPath = path5.join(root, ".vscode", "settings.json");
+  const vsRaw = readFile(vsPath);
+  const vs = vsRaw !== null ? readJsonObject(vsPath) : {};
+  if (vs === null) {
+    skipped.push(".vscode/settings.json (unparseable; set typescript.tsdk by hand)");
+  } else {
+    let touched = false;
+    if (vs["typescript.tsdk"] !== "node_modules/typescript/lib") {
+      vs["typescript.tsdk"] = "node_modules/typescript/lib";
+      touched = true;
+    }
+    if (vs["typescript.enablePromptUseWorkspaceTsdk"] !== true) {
+      vs["typescript.enablePromptUseWorkspaceTsdk"] = true;
+      touched = true;
+    }
+    if (touched) {
+      fs4.mkdirSync(path5.dirname(vsPath), { recursive: true });
+      writeFile(vsPath, JSON.stringify(vs, null, 4) + "\n");
+      changed.push(".vscode/settings.json");
+    }
+  }
+  return { changed, skipped };
+}
 function frameworkMeta() {
   const pkgPath = path5.resolve(
     path5.dirname(fileURLToPath3(import.meta.url)),
@@ -3288,15 +3422,28 @@ async function runDoctor(opts) {
   const peerChecks = Object.keys(meta.peers).map(peerName);
   const rpcFix = serverPresent && opts.fix ? applyRpcFix(root) : null;
   const prettierFix = serverPresent && opts.fix ? applyPrettierFix(root, projectPkg) : null;
+  const editorFix = serverPresent && opts.fix ? applyServerEditorFix(root, toilconfig) : null;
   const rpcFacts = gatherRpcFacts(root);
   const restFacts = gatherRestFacts(root, toilconfig);
+  const authFacts = gatherAuthFacts(root, toilconfig);
   const prettierPresent = prettierPluginPresent(
     root,
     readJsonObject(path5.join(root, "package.json"))
   );
-  const serverFix = rpcFix || prettierFix ? {
-    changed: [...rpcFix?.changed ?? [], ...prettierFix?.changed ?? []],
-    skipped: [...rpcFix?.skipped ?? [], ...prettierFix?.skipped ?? []]
+  const serverTsPath = serverPresent ? serverTsconfigPath(root, toilconfig) : null;
+  const serverTsParsed = serverTsPath ? readJsonObject(serverTsPath) : null;
+  const serverTsPluginPresent = serverTsPath === null || serverTsParsed === null ? true : tsconfigHasToilPlugin(serverTsParsed);
+  const serverFix = rpcFix || prettierFix || editorFix ? {
+    changed: [
+      ...rpcFix?.changed ?? [],
+      ...prettierFix?.changed ?? [],
+      ...editorFix?.changed ?? []
+    ],
+    skipped: [
+      ...rpcFix?.skipped ?? [],
+      ...prettierFix?.skipped ?? [],
+      ...editorFix?.skipped ?? []
+    ]
   } : null;
   const groups = [
     {
@@ -3354,10 +3501,14 @@ async function runDoctor(opts) {
         checkWasmBuilt(wasmExists),
         checkRpcWiring(rpcFacts),
         checkRestDispatch(restFacts),
-        checkPrettierPlugin(prettierPresent)
+        checkPrettierPlugin(prettierPresent),
+        checkServerTsPlugin(serverTsPluginPresent)
       ] : [checkToilconfig(false)]
     }
   ];
+  if (serverPresent) {
+    groups.push({ title: "Security", checks: [checkAuthSecrets(authFacts)] });
+  }
   const summary = summarize(groups);
   if (opts.json) {
     process.stdout.write(JSON.stringify({ groups, summary, fixed: serverFix }, null, 2) + "\n");
@@ -3376,14 +3527,14 @@ async function runDoctor(opts) {
 function renderRpcFix(result) {
   const out = [];
   if (result.changed.length > 0) {
-    out.push("  " + success("fixed RPC wiring") + dim(`  ${result.changed.join(", ")}`));
+    out.push("  " + success("fixed server wiring") + dim(`  ${result.changed.join(", ")}`));
     if (result.changed.includes("package.json")) {
       out.push(
         "  " + dim("run your installer (npm/pnpm/yarn) if the toilscript version changed.")
       );
     }
   } else {
-    out.push("  " + dim("RPC wiring already in place, nothing to fix."));
+    out.push("  " + dim("server wiring already in place, nothing to fix."));
   }
   for (const item of result.skipped) out.push("  " + warn("skipped") + dim(`  ${item}`));
   process.stdout.write(out.join("\n") + "\n\n");
@@ -3401,9 +3552,9 @@ import path6 from "node:path";
 
 // src/cli/updates.ts
 function parseVersion2(v) {
-  const m = /(\d+)(?:\.(\d+))?(?:\.(\d+))?/.exec(v);
-  if (!m) return [0, 0, 0];
-  return [Number(m[1]), Number(m[2] ?? 0), Number(m[3] ?? 0)];
+  const m2 = /(\d+)(?:\.(\d+))?(?:\.(\d+))?/.exec(v);
+  if (!m2) return [0, 0, 0];
+  return [Number(m2[1]), Number(m2[2] ?? 0), Number(m2[3] ?? 0)];
 }
 function classifyBump(from, to) {
   const [fa, fb, fc] = parseVersion2(from);
@@ -3569,9 +3720,9 @@ function isCacheFresh(cache, now, ttlMs = CHECK_TTL_MS) {
   return cache.checkedAt <= now && now - cache.checkedAt < ttlMs;
 }
 function parseSemver(v) {
-  const m = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?/.exec(v.trim());
-  if (!m) return { nums: [0, 0, 0], pre: null };
-  return { nums: [Number(m[1]), Number(m[2]), Number(m[3])], pre: m[4] ?? null };
+  const m2 = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?/.exec(v.trim());
+  if (!m2) return { nums: [0, 0, 0], pre: null };
+  return { nums: [Number(m2[1]), Number(m2[2]), Number(m2[3])], pre: m2[4] ?? null };
 }
 function compareSemver(a3, b) {
   const pa = parseSemver(a3);