mixdog 0.7.8 → 0.7.12

package/setup/tui.mjs

@@ -1,9 +1,8 @@
 /**
- * Zero-dependency clack-style terminal UI helpers for the mixdog setup wizard.
- * Node built-ins only; assumes an interactive TTY (wizard guarantees this).
+ * Zero-dependency clack-style terminal UI helpers for mixdog setup/install.
+ * Node built-ins only; assumes an interactive TTY when prompts are used.
  */
 import { emitKeypressEvents } from 'node:readline';
-import { fileURLToPath } from 'node:url';
 
 const stdin = process.stdin;
 const stdout = process.stdout;
@@ -16,12 +15,14 @@ const ansi = {
   green: '\x1b[32m',
   red: '\x1b[31m',
   dim: '\x1b[2m',
+  bold: '\x1b[1m',
   inverse: '\x1b[7m',
 };
 
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
 const STRIP_ANSI_RE = /\x1b\[[0-9;]*m/g;
+const STRIP_OSC_RE = /\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g;
 const GRAPHEME_SEGMENTER = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
 
 function assertInteractiveTTY() {
@@ -30,13 +31,23 @@ function assertInteractiveTTY() {
   }
 }
 
-function rail(active = true) {
-  return active ? `${ansi.dim}│${ansi.reset}` : `${ansi.dim}◇${ansi.reset}`;
+function gutter() {
+  return `${ansi.dim}│${ansi.reset}`;
+}
+
+function railEnd() {
+  return gutter();
+}
+
+/** Global key legend pinned at the bottom of every prompt (outside the rail). */
+const NAV_LEGEND = 'Enter confirm · Ctrl+C quit';
+function navLegendRow() {
+  return `  ${ansi.dim}${NAV_LEGEND}${ansi.reset}`;
 }
 
 function prefixGlyph(done) {
   return done
-    ? `${ansi.green}✔${ansi.reset}`
+    ? `${ansi.green}✓${ansi.reset}`
     : `${ansi.cyan}◆${ansi.reset}`;
 }
 
@@ -97,7 +108,7 @@ function graphemeClusterWidth(segment) {
 }
 
 function cellWidth(str) {
-  const plain = str.replace(STRIP_ANSI_RE, '');
+  const plain = str.replace(STRIP_OSC_RE, '').replace(STRIP_ANSI_RE, '');
   let width = 0;
   for (const { segment } of GRAPHEME_SEGMENTER.segment(plain)) {
     width += graphemeClusterWidth(segment);
@@ -129,7 +140,8 @@ function redrawUp(lines) {
 
 function finishPrompt(lines, finalLine) {
   redrawUp(lines);
-  stdout.write(`${ansi.green}✔${ansi.reset} ${finalLine}\n`);
+  stdout.write(`${ansi.green}✓${ansi.reset} ${finalLine}\n`);
+  stdout.write(`${gutter()}\n`);
 }
 
 /**
@@ -211,158 +223,6 @@ async function withRawPrompt(run) {
   }
 }
 
-/**
- * @param {string} message
- * @param {{ value: string, label: string, hint?: string }[]} options
- * @param {{ initial?: string }} [opts]
- */
-export async function select(message, options, { initial } = {}) {
-  if (!options?.length) {
-    throw new Error('select: options must be a non-empty array');
-  }
-  let index = 0;
-  if (initial !== undefined) {
-    const i = options.findIndex((o) => o.value === initial);
-    if (i >= 0) index = i;
-  }
-
-  return withRawPrompt(async ({ rerender, onKey, promptReject }) => {
-    const draw = () => {
-      const rows = [
-        `${prefixGlyph(false)} ${message}`,
-        rail(),
-      ];
-      for (let i = 0; i < options.length; i += 1) {
-        const opt = options[i];
-        const active = i === index;
-        const cursor = active ? `${ansi.cyan}❯ ${ansi.reset}` : '  ';
-        const label = active
-          ? `${ansi.cyan}${ansi.inverse} ${opt.label} ${ansi.reset}`
-          : opt.label;
-        const hint = opt.hint ? ` ${ansi.dim}${opt.hint}${ansi.reset}` : '';
-        rows.push(`${rail()} ${cursor}${label}${hint}`);
-      }
-      return rows.join('\n');
-    };
-
-    rerender(draw);
-
-    return new Promise((resolve, reject) => {
-      promptReject(reject);
-      onKey((_str, key) => {
-        const name = key.name;
-        if (name === 'up' || name === 'k') {
-          index = (index - 1 + options.length) % options.length;
-          rerender(draw);
-          return;
-        }
-        if (name === 'down' || name === 'j') {
-          index = (index + 1) % options.length;
-          rerender(draw);
-          return;
-        }
-        if (name === 'return') {
-          const chosen = options[index];
-          finishPrompt(
-            lineCount(draw()),
-            `${message} ${ansi.dim}·${ansi.reset} ${ansi.cyan}${chosen.label}${ansi.reset}`,
-          );
-          resolve(chosen.value);
-        }
-      });
-    });
-  });
-}
-
-/**
- * @param {string} message
- * @param {{ value: string, label: string, hint?: string }[]} options
- * @param {{ initial?: string[], min?: number }} [opts]
- */
-export async function multiselect(message, options, { initial = [], min = 0 } = {}) {
-  if (!options?.length) {
-    throw new Error('multiselect: options must be a non-empty array');
-  }
-  const selected = new Set(
-    Array.isArray(initial) ? initial.filter((v) => options.some((o) => o.value === v)) : [],
-  );
-  let index = 0;
-  let error = '';
-
-  return withRawPrompt(async ({ rerender, onKey, promptReject }) => {
-    const draw = () => {
-      const rows = [
-        `${prefixGlyph(false)} ${message}`,
-        rail(),
-      ];
-      for (let i = 0; i < options.length; i += 1) {
-        const opt = options[i];
-        const active = i === index;
-        const checked = selected.has(opt.value);
-        const box = checked ? '◉' : '◯';
-        const cursor = active ? `${ansi.cyan}❯ ${ansi.reset}` : '  ';
-        const label = active
-          ? `${ansi.cyan}${ansi.inverse} ${opt.label} ${ansi.reset}`
-          : opt.label;
-        const hint = opt.hint ? ` ${ansi.dim}${opt.hint}${ansi.reset}` : '';
-        rows.push(`${rail()} ${cursor}${box} ${label}${hint}`);
-      }
-      if (error) {
-        rows.push(`${rail()} ${ansi.red}${error}${ansi.reset}`);
-      }
-      return rows.join('\n');
-    };
-
-    rerender(draw);
-
-    return new Promise((resolve, reject) => {
-      promptReject(reject);
-      onKey((_str, key) => {
-        const name = key.name;
-        if (name === 'up' || name === 'k') {
-          index = (index - 1 + options.length) % options.length;
-          error = '';
-          rerender(draw);
-          return;
-        }
-        if (name === 'down' || name === 'j') {
-          index = (index + 1) % options.length;
-          error = '';
-          rerender(draw);
-          return;
-        }
-        if (name === 'space') {
-          const val = options[index].value;
-          if (selected.has(val)) selected.delete(val);
-          else selected.add(val);
-          error = '';
-          rerender(draw);
-          return;
-        }
-        if (name === 'return') {
-          if (selected.size < min) {
-            error = `Select at least ${min} option${min === 1 ? '' : 's'} (${selected.size}/${min})`;
-            rerender(draw);
-            return;
-          }
-          const values = options
-            .filter((o) => selected.has(o.value))
-            .map((o) => o.value);
-          const labels = options
-            .filter((o) => selected.has(o.value))
-            .map((o) => o.label)
-            .join(', ');
-          finishPrompt(
-            lineCount(draw()),
-            `${message} ${ansi.dim}·${ansi.reset} ${ansi.cyan}${labels || '(none)'}${ansi.reset}`,
-          );
-          resolve(values);
-        }
-      });
-    });
-  });
-}
-
 /**
  * @param {string} message
  * @param {{ initial?: boolean }} [opts]
@@ -380,9 +240,10 @@ export async function confirm(message, { initial = false } = {}) {
         : `${ansi.dim}No${ansi.reset}`;
       return [
         `${prefixGlyph(false)} ${message}`,
-        rail(),
-        `${rail()} ${yes} / ${no}`,
-        `${rail()} ${ansi.dim}←/→ or y/n, Enter${ansi.reset}`,
+        gutter(),
+        `${gutter()} ${yes} / ${no}`,
+        railEnd(),
+        navLegendRow(),
       ].join('\n');
     };
 
@@ -392,12 +253,12 @@ export async function confirm(message, { initial = false } = {}) {
       promptReject(reject);
       onKey((str, key) => {
         const name = key.name;
-        if (name === 'left' || name === 'y') {
+        if (name === 'y') {
           value = true;
           rerender(draw);
           return;
         }
-        if (name === 'right' || name === 'n') {
+        if (name === 'n') {
           value = false;
           rerender(draw);
           return;
@@ -406,18 +267,10 @@ export async function confirm(message, { initial = false } = {}) {
           const label = value ? 'Yes' : 'No';
           finishPrompt(
             lineCount(draw()),
-            `${message} ${ansi.dim}·${ansi.reset} ${ansi.cyan}${label}${ansi.reset}`,
+            `${message} ${ansi.dim}· ${label}${ansi.reset}`,
           );
           resolve(value);
         }
-        if (str === 'y' || str === 'Y') {
-          value = true;
-          rerender(draw);
-        }
-        if (str === 'n' || str === 'N') {
-          value = false;
-          rerender(draw);
-        }
       });
     });
   });
@@ -425,128 +278,10 @@ export async function confirm(message, { initial = false } = {}) {
 
 /**
  * @param {string} message
- * @param {{ initial?: string, placeholder?: string }} [opts]
  */
-export async function text(message, { initial = '', placeholder = '' } = {}) {
-  let value = String(initial ?? '');
-
-  return withRawPrompt(async ({ rerender, onKey, promptReject }) => {
-    const draw = () => {
-      const shown = value.length > 0
-        ? value
-        : (placeholder ? `${ansi.dim}${placeholder}${ansi.reset}` : '');
-      return [
-        `${prefixGlyph(false)} ${message}`,
-        rail(),
-        `${rail()} ${shown}${ansi.dim}▌${ansi.reset}`,
-      ].join('\n');
-    };
-
-    rerender(draw);
-
-    return new Promise((resolve, reject) => {
-      promptReject(reject);
-      onKey((str, key) => {
-        const name = key.name;
-        if (name === 'return') {
-          const out = value.length > 0 ? value : String(initial ?? '');
-          finishPrompt(
-            lineCount(draw()),
-            `${message} ${ansi.dim}·${ansi.reset} ${ansi.cyan}${out || '(empty)'}${ansi.reset}`,
-          );
-          resolve(out);
-          return;
-        }
-        if (name === 'backspace') {
-          value = value.slice(0, -1);
-          rerender(draw);
-          return;
-        }
-        if (str && !key.ctrl && !key.meta && str >= ' ') {
-          value += str;
-          rerender(draw);
-        }
-      });
-    });
-  });
-}
-
-/**
- * @param {string} message
- */
-export async function password(message) {
-  let value = '';
-
-  return withRawPrompt(async ({ rerender, onKey, promptReject }) => {
-    const draw = () => {
-      const masked = value.length > 0 ? '•'.repeat(value.length) : '';
-      return [
-        `${prefixGlyph(false)} ${message}`,
-        rail(),
-        `${rail()} ${masked}${ansi.dim}▌${ansi.reset}`,
-      ].join('\n');
-    };
-
-    rerender(draw);
-
-    return new Promise((resolve, reject) => {
-      promptReject(reject);
-      onKey((str, key) => {
-        const name = key.name;
-        if (name === 'return') {
-          finishPrompt(
-            lineCount(draw()),
-            `${message} ${ansi.dim}·${ansi.reset} ${ansi.cyan}${'•'.repeat(value.length)}${ansi.reset}`,
-          );
-          resolve(value);
-          return;
-        }
-        if (name === 'backspace') {
-          value = value.slice(0, -1);
-          rerender(draw);
-          return;
-        }
-        if (str && !key.ctrl && !key.meta && str >= ' ') {
-          value += str;
-          rerender(draw);
-        }
-      });
-    });
-  });
-}
-
-/**
- * @param {string} message
- * @param {{ total?: number, width?: number }} [opts]
- */
-export function createProgressBar(message, { total = 100, width = 24 } = {}) {
-  const safeTotal = total > 0 ? total : 100;
-  let lastDone = 0;
-  let closed = false;
-
-  const render = (done, tot) => {
-    const clamped = Math.max(0, Math.min(tot, done));
-    const pct = Math.min(100, Math.floor((clamped / tot) * 100));
-    const filled = Math.min(width, Math.round((clamped / tot) * width));
-    const bar = `${'█'.repeat(filled)}${'░'.repeat(width - filled)}`;
-    stdout.write(`\r${message} [${bar}] ${pct}%`);
-    lastDone = clamped;
-  };
-
-  return {
-    update(done, totalOverride) {
-      if (closed) return;
-      const tot = totalOverride !== undefined && totalOverride > 0 ? totalOverride : safeTotal;
-      render(done, tot);
-    },
-    done(finalMsg) {
-      if (closed) return;
-      closed = true;
-      const tail = finalMsg ? ` ${finalMsg}` : '';
-      stdout.write('\r\x1b[2K');
-      stdout.write(`${ansi.green}✔${ansi.reset} ${message}${tail}\n`);
-    },
-  };
+export function outro(message) {
+  writeBlock(gutter());
+  writeBlock(`${ansi.green}└${ansi.reset}  ${message}`);
 }
 
 /**
@@ -578,29 +313,13 @@ export function createSpinner(message) {
       stopped = true;
       if (timer) clearInterval(timer);
       stdout.write('\r\x1b[2K');
-      const mark = ok ? `${ansi.green}✔${ansi.reset}` : `${ansi.red}✖${ansi.reset}`;
       const tail = finalMsg ? ` ${finalMsg}` : '';
+      if (ok) {
+        stdout.write(`${ansi.green}✓${ansi.reset} ${current}${tail}\n`);
+        return;
+      }
+      const mark = `${ansi.red}✖${ansi.reset}`;
       stdout.write(`${mark} ${current}${tail}\n`);
     },
   };
-}
-
-if (process.argv[1] === fileURLToPath(import.meta.url) && process.env.TUI_SMOKE) {
-  const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-  (async () => {
-    const bar = createProgressBar('TUI smoke progress', { total: 100, width: 20 });
-    for (let i = 0; i <= 100; i += 10) {
-      bar.update(i);
-      await sleep(40);
-    }
-    bar.done('complete');
-    const spin = createSpinner('TUI smoke spinner');
-    await sleep(400);
-    spin.update('TUI smoke spinner (tick)');
-    await sleep(400);
-    spin.stop('stopped', true);
-  })().catch((err) => {
-    console.error(err);
-    process.exit(1);
-  });
 }

package/src/agent/orchestrator/config.mjs

@@ -15,7 +15,6 @@ const ENV_KEY_MAP = {
     gemini: 'GEMINI_API_KEY',
     deepseek: 'DEEPSEEK_API_KEY',
     xai: 'XAI_API_KEY',
-    nvidia: 'NVIDIA_API_KEY',
 };
 // Canonical maintenance defaults. Single source of truth — imported by
 // llm/index.mjs and setup-server.mjs so UI/runtime cannot drift from config.

package/src/agent/orchestrator/providers/anthropic-oauth.mjs

@@ -1790,11 +1790,8 @@ export async function loginOAuth() {
     url.searchParams.set('code_challenge_method', 'S256');
     url.searchParams.set('state', state);
     process.stderr.write(`\n[anthropic-oauth] Open this URL to log in with Claude:\n${url.toString()}\n\n`);
-    try {
-        const { exec } = await import('child_process');
-        const opener = process.platform === 'win32' ? 'start' : process.platform === 'darwin' ? 'open' : 'xdg-open';
-        exec(`${opener} "${url.toString()}"`, { windowsHide: true });
-    } catch { /* user opens manually */ }
+    const { openInBrowser } = await import('../../../shared/open-url.mjs');
+    openInBrowser(url.toString());
 
     return new Promise((resolve) => {
         const timeout = setTimeout(() => { server.close(); resolve(null); }, OAUTH_LOGIN_TIMEOUT_MS);