solrouter 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solrouter",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Local privacy router for coding tools: pseudonymises every request before it leaves your machine, and sends work a frontier model would refuse to an uncensored open-weight model you control.",
   "type": "module",
   "bin": {

package/src/banner.js

@@ -1,8 +1,7 @@
-// banner.js — pixel art for the terminal, rendered with truecolor half-blocks (▀).
-// Exports the cat (wearing the real wave mark on its hoodie) and the mark alone,
-// plus helpers the interactive setup uses to compose the full-width screen.
+// banner.js — the wave mark + wordmark for the terminal, rendered with truecolor
+// half-blocks. The mark is decoded from the real logo (see mark.js).
 
-import { MARK_LG, MARK_SM } from "./mark.js";
+import { MARK_LG } from "./mark.js";
 
 export const PAL = {
   bg: "#0a0908", raised: "#161412", accent: "#F5E6D3", ink: "#e8e0d4",
@@ -16,46 +15,6 @@ export const bgc = (h) => { const [r, g, b] = rgb(h); return `\x1b[48;2;${r};${g
 export const RESET = "\x1b[0m";
 export const paint = (h, t, bold = false) => fg(h) + (bold ? "\x1b[1m" : "") + t + RESET;
 
-// Base cat, clean hoodie. .=transparent o=outline b=body e=eye n=nose p=ear H=hoodie
-const CAT = [
-  "...oo................oo....",
-  "..obbo..............obbo..",
-  "..obpbo............obpbo..",
-  "..obbbbo..........obbbbo..",
-  "...obbbboooooooooobbbbo...",
-  "....obbbbbbbbbbbbbbbbo....",
-  "...obbbbbbbbbbbbbbbbbbo...",
-  "..obbbbbbbbbbbbbbbbbbbbo..",
-  "..obbbeebbbbbbbbeebbbbbo..",
-  "..obbbeebbbbbbbbeebbbbbo..",
-  "..obbbbbbbbbnnbbbbbbbbbo..",
-  "..obbbbbbbbbnnbbbbbbbbbo..",
-  "...obbbbbbbbbbbbbbbbbbo...",
-  "....obbbbbbbbbbbbbbbbo....",
-  "...oHHHHHHHHHHHHHHHHHHo...",
-  "..oHHHHHHHHHHHHHHHHHHHHo..",
-  "..oHHHHHHHHHHHHHHHHHHHHo..",
-  "..oHHHHHHHHHHHHHHHHHHHHo..",
-  "..oHHHHHHHHHHHHHHHHHHHHo..",
-  "..oHHHHHHHHHHHHHHHHHHHHo..",
-  "..oHHHHHHHHHHHHHHHHHHHHo..",
-  "..obbHHHHHHHHHHHHHHHHbbo..",
-  "..obbboHHHHHHHHHHHHobbbo..",
-  "...oooo.oooooooooo.oooo...",
-];
-
-// Overlay the real mark (SM) onto the hoodie, centred.
-function catWithMark() {
-  const g = CAT.map(r => r.split(""));
-  const mw = MARK_SM[0].length, mh = MARK_SM.length;
-  const c0 = Math.round((CAT[0].length - mw) / 2);  // centre horizontally
-  const r0 = 16;                                     // centred on the black hoodie
-  for (let y = 0; y < mh; y++) for (let x = 0; x < mw; x++) {
-    if (MARK_SM[y][x] === "v" && g[r0 + y] && g[r0 + y][c0 + x] === "H") g[r0 + y][c0 + x] = "v";
-  }
-  return g.map(r => r.join(""));
-}
-
 const CMAP = { o: PAL.out, b: PAL.cream, e: PAL.eye, n: PAL.nose, p: PAL.nose, H: PAL.hood, v: PAL.cream };
 
 /** Render a pixel grid to ANSI half-block lines. Display width = grid width in chars. */
@@ -76,16 +35,16 @@ export function renderGrid(grid, cmap = CMAP) {
   return lines;
 }
 
-export const catLines = () => renderGrid(catWithMark());
-export const catWidth = () => CAT[0].length;
 export const markLines = () => renderGrid(MARK_LG, { v: PAL.cream });
 
-/** Legacy one-shot splash (used by the `banner` command). */
+/** One-shot splash: the wave mark + wordmark. */
 export function banner() {
-  const L = ["", "  " + paint(PAL.accent, "≈≈", true) + "  " + paint(PAL.accent, "SOLROUTER", true),
-    "  " + paint(PAL.muted, "private routing for your coding agent"), ""];
-  catLines().forEach(l => L.push("    " + l));
-  L.push(""); return L.join("\n");
+  const L = [""];
+  markLines().forEach(m => L.push("  " + m));
+  L.push("  " + paint(PAL.accent, "SOLROUTER", true));
+  L.push("  " + paint(PAL.muted, "private routing for your coding agent"));
+  L.push("");
+  return L.join("\n");
 }
 
-export default { banner, catLines, markLines, catWidth, renderGrid, PAL, paint, fg, bgc, RESET };
+export default { banner, markLines, renderGrid, PAL, paint, fg, bgc, RESET };

package/src/setup.js

@@ -1,5 +1,5 @@
-// setup.js — the interactive first-run wizard. Full-width TUI: selectable option
-// cards on the left, the cat + a speech bubble on the right that changes per step.
+// setup.js — the interactive first-run wizard. A clean single-column TUI: the wave
+// mark, the step question as a heading, and selectable option cards.
 // Arrow keys move, enter selects, esc/ctrl-c quits.
 //
 // Steps (v1 — API-key only for the frontier leg; no subscription relay):
@@ -9,7 +9,7 @@
 //   4. done — save config, offer to launch
 
 import readline from "node:readline";
-import { catLines, markLines, catWidth, PAL, paint, fg, RESET } from "./banner.js";
+import { markLines, PAL, paint, fg, RESET } from "./banner.js";
 import { loadConfig, saveAuth, loadAuth, isLoggedIn, HOME_DIR } from "./config.js";
 import { browserLogin } from "./auth.js";
 import { writeFileSync, readFileSync, mkdirSync, existsSync } from "node:fs";
@@ -21,67 +21,30 @@ const clear = () => process.stdout.write("\x1b[2J\x1b[H");
 const hideCur = () => process.stdout.write("\x1b[?25l");
 const showCur = () => process.stdout.write("\x1b[?25h");
 
-// A rounded speech bubble in accent with a consistent width, tail pointing to the cat.
-function bubble(lines) {
-  const iw = Math.max(...lines.map(l => l.length));   // inner text width
-  const A = PAL.accent;
-  const out = [];
-  out.push(fg(A) + "╭" + "─".repeat(iw + 2) + "╮" + RESET);
-  for (const l of lines) out.push(fg(A) + "│ " + RESET + paint(PAL.ink, l.padEnd(iw)) + fg(A) + " │" + RESET);
-  out.push(fg(A) + "╰" + "─".repeat(iw + 2) + "╯" + RESET);
-  out.push("      " + fg(A) + "╲" + RESET);           // tail toward the cat below
-  return out;
-}
-
-// Right block = bubble (with the step's question) stacked above the cat, cat indented.
-function rightBlock(question) {
-  const cat = catLines().map(l => "   " + l);
-  const b = bubble(question);
-  return [...b, "", ...cat, "", "   " + paint(PAL.faint, "the router")];
-}
-
-// Left block = header (stacked, no long inline rows) + step + body lines.
-function leftBlock(step, bodyLines) {
-  const L = [];
-  markLines().forEach(m => L.push(m));                 // real wave mark
-  L.push(paint(PAL.accent, "SOLROUTER", true));
-  L.push(paint(PAL.muted, "private routing for your coding agent"));
-  L.push("");
-  L.push(paint(PAL.faint, `STEP ${step} / 3`));
-  L.push("");
-  bodyLines.forEach(l => L.push(l));
-  return L;
-}
-
 // One option card (two lines): selected gets an accent bar + bright text.
 function card(name, desc, selected) {
   const bar = selected ? fg(PAL.accent) + "▐ " + RESET : "  ";
   const nm = selected ? paint(PAL.accent, "▸ " + name, true) : paint(PAL.ink, "  " + name);
-  const ds = paint(selected ? PAL.muted : PAL.faint, "    " + desc);
-  return [bar + nm, bar + ds, ""];
+  const ds = desc ? paint(selected ? PAL.muted : PAL.faint, "    " + desc) : "";
+  return desc ? [bar + nm, bar + ds, ""] : [bar + nm, ""];
 }
 
+// Clean single-column frame: header (wave mark + wordmark), step, the question as a
+// heading, then the option cards. No cat.
 function compose(step, question, bodyLines) {
-  const left = leftBlock(step, bodyLines);
-  const right = rightBlock(question);
-  const termW = W();
-  const leftMax = Math.max(...left.map(visLen));
-  const rightW = Math.max(...right.map(visLen));
-  // Pin the right block to a FIXED column near the right edge, so nothing shoves it
-  // around and the bubble stays aligned. Push the cat as far right as fits.
-  const rightCol = Math.max(leftMax + 8, termW - rightW - 3);
-  const rows = Math.max(left.length, right.length);
-  const out = [""];
-  for (let i = 0; i < rows; i++) {
-    let l = left[i] || "";
-    const r = right[i] || "";
-    if (visLen(l) > rightCol - 2) l = l.slice(0, rightCol - 2); // safety clamp
-    const pad = Math.max(2, rightCol - visLen(l));
-    out.push("  " + l + " ".repeat(pad) + r);
-  }
-  out.push("");
-  out.push("  " + paint(PAL.faint, "↑↓ move   ↵ select   esc quit"));
-  return out.join("\n");
+  const L = [""];
+  markLines().forEach(m => L.push("  " + m));           // the real wave mark
+  L.push("  " + paint(PAL.accent, "SOLROUTER", true));
+  L.push("  " + paint(PAL.muted, "private routing for your coding agent"));
+  L.push("");
+  L.push("  " + paint(PAL.faint, `STEP ${step} / 3`));
+  L.push("");
+  L.push("  " + paint(PAL.ink, question.join(" "), true));
+  L.push("");
+  bodyLines.forEach(l => L.push("  " + l));
+  L.push("");
+  L.push("  " + paint(PAL.faint, "↑↓ move   ↵ select   esc quit"));
+  return L.join("\n");
 }
 
 function render(step, question, bodyLines) { clear(); process.stdout.write(compose(step, question, bodyLines)); }