mixdog 0.8.1 → 0.9.1

package/src/tui/figures.mjs

@@ -1,50 +1,31 @@
 /**
  * figures.mjs — TUI glyph constants.
  *
- * Claude Code uses Unicode markers heavily. Keep those markers intact so UI
- * styling does not change under environment-dependent ASCII conversion.
+ * Unicode markers are used heavily in the TUI. Each glyph is declared with its
+ * `\uXXXX` escape (encoding-safe across editors/transports) and the literal
+ * glyph + usage is kept in the trailing comment for readability.
  */
 
-export const BLACK_CIRCLE = process.platform === 'darwin' ? '⏺' : '●';
-export const BULLET_OPERATOR = '·';
-export const TEARDROP_ASTERISK = '✻';
-export const UP_ARROW = '↑';
-export const DOWN_ARROW = '↓';
-export const LIGHTNING_BOLT = '↯';
-export const EFFORT_LOW = '○';
-export const EFFORT_MEDIUM = '◐';
-export const EFFORT_HIGH = '●';
-export const EFFORT_MAX = '◉';
+// Turn marker. \u23fa (⏺) aligns better but is poorly supported off macOS, so
+// other platforms use \u25cf (●).
+export const BLACK_CIRCLE = process.platform === 'darwin' ? '\u23fa' : '\u25cf'; // ⏺ / ● - turn marker
+export const BULLET_OPERATOR = '\u00b7'; // · - inline separator
+export const UP_ARROW = '\u2191'; // ↑ - history/scroll up
+export const DOWN_ARROW = '\u2193'; // ↓ - history/scroll down
 
-// Media/trigger status indicators
-export const PLAY_ICON = '▶';
-export const PAUSE_ICON = '⏸';
+// Tool-result tree gutter. \u2514 (└, BOX DRAWINGS LIGHT UP AND RIGHT) renders
+// in virtually every monospace font; the previous \u23bf (bracket extension)
+// had no glyph in common terminal fonts (Cascadia/Consolas) and fell back to a
+// literal "L", breaking the result tree alignment.
+export const RESULT_GUTTER_GLYPH = '\u2514'; // └ - tool-result tree gutter
+export const RESULT_GUTTER_CONT_GLYPH = '\u2502'; // │ - tool-result continuation rail
 
-// Tool-result tree gutter.
-export const RESULT_GUTTER_GLYPH = '⎿';
+export const BLOCKQUOTE_BAR = '\u258e'; // ▎ - blockquote line prefix
 
-// MCP subscription indicators
-export const REFRESH_ARROW = '↻';
-export const CHANNEL_ARROW = '←';
-export const INJECTED_ARROW = '→';
-export const FORK_GLYPH = '⑂';
-
-// Review status indicators
-export const DIAMOND_OPEN = '◇';
-export const DIAMOND_FILLED = '◆';
-export const REFERENCE_MARK = '※';
-
-// Issue flag indicator
-export const FLAG_ICON = '⚑';
-
-// Blockquote indicator
-export const BLOCKQUOTE_BAR = '▎';
-export const HEAVY_HORIZONTAL = '━';
-
-// The "therefore" sign — Claude Code's collapsed-thinking prefix (∴ Thinking).
-export const THEREFORE = '∴';
+export const THEREFORE = '\u2234'; // ∴ - collapsed-thinking prefix (∴ Thinking)
 // Turn-complete marker — kept distinct from live-thinking's therefore sign.
-export const TURN_DONE_MARKER = '◈';
+export const TURN_DONE_MARKER = '\u25c8'; // ◈ - turn-complete marker
 
-// Prompt pointer (CC uses figures.pointer ❯ for the input glyph).
-export const POINTER = '❯';
+// Horizontal rule fill — BOX DRAWINGS LIGHT HORIZONTAL. Repeated to span the
+// available content width for a clean full-width `---` rule.
+export const HR_LINE = '\u2500'; // ─ - markdown horizontal rule

package/src/tui/index.jsx

@@ -1,9 +1,9 @@
-/**
- * src/tui/index.jsx — entry that mounts the React/ink TUI.
- *
- * Creates the engine session (runs OUR agentLoop outside React) and ink-renders
+/**
+ * src/tui/index.jsx — entry that mounts the React/ink TUI.
+ *
+ * Creates the engine session (runs OUR agentLoop outside React) and ink-renders
  * <App store={...}/>. Resolves when the app exits (/exit or /quit).
- */
+ */
 import React from 'react';
 import { render } from 'ink';
 import { createWriteStream, mkdirSync } from 'node:fs';
@@ -13,8 +13,10 @@ import { performance } from 'node:perf_hooks';
 import { App } from './App.jsx';
 import { createEngineSession } from './engine.mjs';
 import { installProcessSignalCleanup } from '../runtime/shared/process-shutdown.mjs';
-
+import { emitTerminalBackground, loadThemeSettingFromConfig, theme } from './theme.mjs';
+
 const TERMINAL_MODE_RESET = '\x1b[?1006l\x1b[?1005l\x1b[?1015l\x1b[?1003l\x1b[?1002l\x1b[?1000l\x1b[?2004l\x1b[?25h';
+const TERMINAL_OSC_RESET_BG = '\x1b]111\x07';
 const TERMINAL_MODE_RESET_HIDDEN_CURSOR = TERMINAL_MODE_RESET.replace('\x1b[?25h', '\x1b[?25l');
 const MOUSE_TRACKING_ON = '\x1b[?1000h\x1b[?1002h\x1b[?1006h';
 const BOOT_PROFILE_ENABLED = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_BOOT_PROFILE || ''));
@@ -23,12 +25,43 @@ const EXIT_WAIT_TIMEOUT_MS = positiveIntEnv('MIXDOG_TUI_EXIT_WAIT_MS', 2500);
 const EXIT_HARD_DELAY_MS = positiveIntEnv('MIXDOG_TUI_HARD_EXIT_DELAY_MS', 500);
 const EXIT_HARD_ENABLED = !/^(0|false|no|off)$/i.test(String(process.env.MIXDOG_TUI_HARD_EXIT || '1'));
 const EXIT_DEBUG_ENABLED = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_TUI_EXIT_DEBUG || ''));
+const PERF_ENABLED = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_TUI_PERF || ''));
 
 function positiveIntEnv(name, fallback) {
   const value = Number(process.env[name]);
   return Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
 
+// Lightweight render-frame profiler. Forked ink calls options.onRender with the
+// per-frame render() wall time (renderNodeToOutput serialization). We aggregate
+// and emit a rolling summary every PERF_REPORT_EVERY frames so typing latency
+// can be measured without flooding output. Entirely no-op unless
+// MIXDOG_TUI_PERF=1, so it costs nothing in normal runs.
+const PERF_REPORT_EVERY = positiveIntEnv('MIXDOG_TUI_PERF_EVERY', 60);
+function makeRenderProfiler() {
+  if (!PERF_ENABLED) return undefined;
+  let count = 0;
+  let sum = 0;
+  let max = 0;
+  let slow = 0;
+  return ({ renderTime } = {}) => {
+    const ms = Number(renderTime) || 0;
+    count += 1;
+    sum += ms;
+    if (ms > max) max = ms;
+    if (ms >= 16) slow += 1;
+    if (count >= PERF_REPORT_EVERY) {
+      const avg = sum / count;
+      try {
+        process.stderr.write(
+          `[mixdog-perf] frames=${count} avg=${avg.toFixed(2)}ms max=${max.toFixed(2)}ms slow16+=${slow}\n`,
+        );
+      } catch { /* ignore */ }
+      count = 0; sum = 0; max = 0; slow = 0;
+    }
+  };
+}
+
 function bootProfile(event, fields = {}) {
   if (!BOOT_PROFILE_ENABLED) return;
   const elapsedMs = performance.now() - BOOT_PROFILE_START;
@@ -92,7 +125,7 @@ function scheduleHardExit(code = 0) {
   if (!EXIT_HARD_ENABLED) return;
   const timer = setTimeout(() => {
     dumpActiveHandles('hard-exit');
-    try { process.stdout.write(TERMINAL_MODE_RESET); } catch { /* ignore */ }
+    try { process.stdout.write(`${TERMINAL_MODE_RESET}${TERMINAL_OSC_RESET_BG}`); } catch { /* ignore */ }
     process.exit(code);
   }, EXIT_HARD_DELAY_MS);
   timer.unref?.();
@@ -158,27 +191,48 @@ export async function runTui({ provider, model, toolMode } = {}) {
   }
 
   const restoreStderr = installTuiStderrGuard();
+  const restorePrimedInput = () => {}; // stdin raw mode is owned by Ink's useInput effects
+  let restored = false;
+  const restoreTerminal = () => {
+    if (restored) return;
+    restored = true;
+    restorePrimedInput();
+    try { process.stdout.write(`${TERMINAL_MODE_RESET}\x1b[0 q\x1b[?1049l${TERMINAL_MODE_RESET}${TERMINAL_OSC_RESET_BG}`); } catch { /* ignore */ }
+  };
+
+  // Enter the alternate screen buffer before session/runtime boot so no stale
+  // shell rows are visible while the statusline/TUI data warms up. The first
+  // real Ink frame may still arrive after createEngineSession(), but the user
+  // sees a clean fullscreen surface immediately instead of the previous terminal
+  // contents bleeding through the bottom status area.
+  process.stdout.write(`${TERMINAL_MODE_RESET_HIDDEN_CURSOR}\x1b[?1049h${TERMINAL_MODE_RESET_HIDDEN_CURSOR}\x1b[2J\x1b[H`);
+
+  // Use a blinking BAR cursor (DECSCUSR 5) — a thin caret behind the text, not a
+  // fat block. PromptInput parks this hardware cursor at the insertion point via
+  // useCursor; the terminal also anchors IME composition to it.
+  process.stdout.write('\x1b[5 q'); // blinking bar
+
+  process.on('exit', restoreTerminal);
+
+  // Apply the persisted UI theme (ui.theme in mixdog-config.json) before the
+  // first React frame so the whole tree paints in the chosen palette. Unknown
+  // or missing values leave the default Mixdog dark palette in place; a failed
+  // config read never blocks boot.
+  try { await loadThemeSettingFromConfig(); } catch { /* default theme stays */ }
+  emitTerminalBackground(theme.background);
+
   let store;
   try {
     store = await createEngineSession({ provider, model, toolMode });
     bootProfile('store:ready', { ms: (performance.now() - startedAt).toFixed(1) });
   } catch (error) {
+    restoreTerminal();
+    try { process.off('exit', restoreTerminal); } catch { /* ignore */ }
     restoreStderr();
     process.stderr.write(`mixdog: ${error?.message || error}\n`);
     return 1;
   }
-
-  // Enter the alternate screen buffer for a true fullscreen UI: the input bar
-  // pins to the physical bottom (App uses height={rows}) and, on exit, the
-  // shell's original screen is restored untouched. \x1b[?1049h enters alt
-  // screen; then clear it and home the cursor so we start from a clean top.
-  process.stdout.write(`${TERMINAL_MODE_RESET_HIDDEN_CURSOR}\x1b[?1049h${TERMINAL_MODE_RESET_HIDDEN_CURSOR}\x1b[2J\x1b[H`);
-
-  // Use a blinking BAR cursor (DECSCUSR 5) — a thin caret behind the text, not a
-  // fat block. PromptInput parks this hardware cursor at the insertion point via
-  // useCursor; the terminal also anchors IME composition to it.
-  process.stdout.write('\x1b[5 q'); // blinking bar
-
+
   // Keep mouse handling app-owned by default: native terminal selections are
   // cleared by the fullscreen redraws that happen while a turn streams. Users
   // who prefer their terminal's native mouse behavior can opt out with
@@ -187,16 +241,6 @@ export async function runTui({ provider, model, toolMode } = {}) {
   if (mouseTracking) {
     process.stdout.write(MOUSE_TRACKING_ON);
   }
-  const restorePrimedInput = () => {}; // stdin raw mode is owned by Ink's useInput effects
-
-  let restored = false;
-  const restoreTerminal = () => {
-    if (restored) return;
-    restored = true;
-    restorePrimedInput();
-    try { process.stdout.write(`${TERMINAL_MODE_RESET}\x1b[0 q\x1b[?1049l${TERMINAL_MODE_RESET}`); } catch { /* ignore */ }
-  };
-  process.on('exit', restoreTerminal);
   let storeDisposed = false;
   const disposeStoreOnce = async (reason = 'cli-react-exit') => {
     if (storeDisposed) return;
@@ -215,12 +259,12 @@ export async function runTui({ provider, model, toolMode } = {}) {
       restoreStderr();
     },
   });
-
+
   // exitOnCtrlC:false — App handles Ctrl+C as an interrupt/line-clear so Ink
   // does not exit abruptly. Explicit exits go through /exit or /quit so teardown
   // still restores the cursor, mouse mode, and alternate screen cleanly.
   try {
-    const instance = render(<App store={store} />, { exitOnCtrlC: false, maxFps: 120 });
+    const instance = render(<App store={store} />, { exitOnCtrlC: false, maxFps: 120, onRender: makeRenderProfiler() });
     bootProfile('render:mounted', { ms: (performance.now() - startedAt).toFixed(1) });
     const { waitUntilExit } = instance;
     // [mixdog fork] Hand the ink renderer's drag-selection setter to the store so

package/src/tui/input-editing.mjs

@@ -154,6 +154,31 @@ export function caretPosition(text, offset, width) {
   return { row, col };
 }
 
+// Inverse of caretPosition: given a visual (row, col) cell inside the wrapped
+// content of `width` columns, return the character offset whose caret sits
+// closest to that cell. Used to map a mouse click/drag cell in the prompt box
+// to an edit offset so mouse selection can drive selectionAnchor + cursor.
+export function offsetAtCell(text, row, col, width) {
+  const w = safeWidth(width);
+  const value = String(text || '');
+  const positions = boundaryPositions(value, w);
+  if (positions.length === 0) return 0;
+  let best = positions[0];
+  let bestScore = Infinity;
+  for (const position of positions) {
+    const rowDist = Math.abs(position.row - row);
+    const colDist = Math.abs(position.col - col);
+    // Row distance dominates so a click never jumps to a different visual line;
+    // within the matched row the nearest column wins.
+    const score = rowDist * 100000 + colDist;
+    if (score < bestScore) {
+      best = position;
+      bestScore = score;
+    }
+  }
+  return best.offset;
+}
+
 function boundaryPositions(text, width) {
   const value = String(text || '');
   const offsets = [0];