mixdog 0.9.0 → 0.9.2

package/src/tui/display-width.mjs

@@ -0,0 +1,69 @@
+/**
+ * display-width.mjs — shared visible display-width helper for the assistant
+ * render path.
+ *
+ * Why this exists: string-width@8 defaults East-Asian-Width "Ambiguous" glyphs
+ * to NARROW (1 cell). A specific, common problem set renders 2 cells wide in
+ * Windows Terminal — circled digits / enclosed alphanumerics (U+2460–U+24FF)
+ * and arrows (U+2190–U+21FF). When our width math counts them as 1 but the
+ * terminal draws 2, following text overlaps.
+ *
+ * Policy (narrow + gated + consistent):
+ *   - Widen ONLY the two problem ranges below. NEVER widen box-drawing
+ *     (U+2500–U+257F └ │ ⎿ ─), block elements, or the figures.mjs glyphs —
+ *     those are also EAW-ambiguous but must stay 1 cell.
+ *   - Enabled by default ONLY under Windows Terminal (WT_SESSION set).
+ *   - MIXDOG_TUI_AMBIGUOUS_WIDE overrides the default: '1' forces on, '0'
+ *     forces off; the override always wins.
+ *   - When OFF, behaviour is byte-for-byte identical to plain string-width.
+ *
+ * IMPORTANT: vendor/ink/build/display-width.js replicates this exact policy so
+ * ink's MEASUREMENT agrees with OUR wrap/row math. If you change the ranges or
+ * the gate here, change them THERE too (see the sync note in that file).
+ */
+import stringWidth from 'string-width';
+
+/**
+ * True for code points we treat as wide (2 cells) when the policy is ON:
+ *   - U+2460–U+24FF Enclosed Alphanumerics (① ② ③ …)
+ *   - U+2190–U+21FF Arrows (→ ← ↑ ↓ …)
+ * Deliberately excludes box-drawing / blocks / figures.
+ */
+export function isProblemCodePoint(cp) {
+  return (cp >= 0x2460 && cp <= 0x24ff) || (cp >= 0x2190 && cp <= 0x21ff);
+}
+
+/** Resolve the wide policy from env. Override wins over the WT_SESSION default. */
+export function resolveAmbiguousWidePolicy(env = process.env) {
+  const override = env?.MIXDOG_TUI_AMBIGUOUS_WIDE;
+  if (override === '1') return true;
+  if (override === '0') return false;
+  return Boolean(env?.WT_SESSION);
+}
+
+/** Resolved once at module load (matches the "computed once" requirement). */
+export const AMBIGUOUS_WIDE = resolveAmbiguousWidePolicy();
+
+/**
+ * Pure width with an explicit policy flag (used by tests and by `displayWidth`).
+ * base = string-width (ANSI-aware). When `wide` is on, add +1 for each problem
+ * code point that string-width counted as a single cell, turning it into 2.
+ * ANSI escape bytes are all ASCII and never fall in the problem ranges, so the
+ * raw code-point scan adds nothing for them.
+ */
+export function displayWidthWith(str, wide) {
+  const s = String(str ?? '');
+  const base = stringWidth(s);
+  if (!wide) return base;
+  let extra = 0;
+  for (const ch of s) {
+    const cp = ch.codePointAt(0);
+    if (isProblemCodePoint(cp) && stringWidth(ch) === 1) extra += 1;
+  }
+  return base + extra;
+}
+
+/** Visible display width under the resolved policy. */
+export function displayWidth(str) {
+  return displayWidthWith(str, AMBIGUOUS_WIDE);
+}

package/src/tui/display-width.test.mjs

@@ -0,0 +1,35 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import stringWidth from 'string-width';
+import { displayWidthWith, isProblemCodePoint } from './display-width.mjs';
+
+// Policy ON: the two problem ranges become 2 cells; everything else unchanged.
+test('policy ON widens circled digits and arrows only', () => {
+  assert.equal(displayWidthWith('\u2460', true), 2); // ① circled digit
+  assert.equal(displayWidthWith('\u2192', true), 2); // → rightwards arrow
+  assert.equal(displayWidthWith('a', true), 1); // ASCII unchanged
+  // Box-drawing / figures must NOT be widened by the policy.
+  assert.equal(displayWidthWith('\u2514', true), stringWidth('\u2514')); // └
+  assert.equal(displayWidthWith('\u2502', true), stringWidth('\u2502')); // │
+  assert.equal(displayWidthWith('\u2500', true), stringWidth('\u2500')); // ─
+  assert.equal(displayWidthWith('\u25cf', true), stringWidth('\u25cf')); // ●
+  // Mixed string: base + one +1 per problem code point.
+  assert.equal(displayWidthWith('a\u2460b\u2192', true), stringWidth('a\u2460b\u2192') + 2);
+});
+
+// Policy OFF: byte-for-byte identical to plain string-width.
+test('policy OFF equals string-width', () => {
+  for (const s of ['\u2460', '\u2192', 'a', '\u2514', 'hello \u2192 world', '']) {
+    assert.equal(displayWidthWith(s, false), stringWidth(s));
+  }
+});
+
+test('problem range membership', () => {
+  assert.equal(isProblemCodePoint(0x2460), true);
+  assert.equal(isProblemCodePoint(0x24ff), true);
+  assert.equal(isProblemCodePoint(0x2190), true);
+  assert.equal(isProblemCodePoint(0x21ff), true);
+  assert.equal(isProblemCodePoint(0x2500), false); // box-drawing
+  assert.equal(isProblemCodePoint(0x245f), false); // just below range
+  assert.equal(isProblemCodePoint(0x2200), false); // just above arrows
+});