agent.libx.js 0.89.3 → 0.89.4

package/dist/cli.js

@@ -4639,6 +4639,137 @@ function completePath(listDir, ref) {
 
 // cli/lineEditor.ts
 import { emitKeypressEvents } from "readline";
+
+// cli/bidi.ts
+var RTL_RE = /[֐-׿؀-ۿ܀-ݏݐ-ݿࢠ-ࣿיִ-﷿ﹰ-]/;
+var needsBidi = (s) => RTL_RE.test(s);
+function classify(c) {
+  if (c >= 1425 && c <= 1469) return "NSM";
+  if (c === 1471 || c === 1473 || c === 1474 || c === 1476 || c === 1477 || c === 1479) return "NSM";
+  if (c >= 1424 && c <= 1535 || c >= 64285 && c <= 64335) return "R";
+  if (c >= 1632 && c <= 1641 || c >= 1776 && c <= 1785) return "AN";
+  if (c >= 1536 && c <= 1791 || c >= 1872 && c <= 1919 || c >= 2208 && c <= 2303 || c >= 64336 && c <= 65023 || c >= 65136 && c <= 65279) return "AL";
+  if (c >= 48 && c <= 57) return "EN";
+  if (c === 43 || c === 45) return "ES";
+  if (c === 35 || c === 36 || c === 37 || c >= 162 && c <= 165) return "ET";
+  if (c === 44 || c === 46 || c === 58 || c === 47 || c === 160) return "CS";
+  if (c === 32 || c === 9 || c === 11 || c === 12) return "WS";
+  if (c >= 33 && c <= 47 || c >= 58 && c <= 64 || c >= 91 && c <= 96 || c >= 123 && c <= 126) return "ON";
+  return "L";
+}
+function baseLevel(types) {
+  for (const t of types) {
+    if (t === "L") return 0;
+    if (t === "R" || t === "AL") return 1;
+  }
+  return 0;
+}
+function resolveWeak(t, baseDir) {
+  const n = t.length;
+  for (let i = 0; i < n; i++) if (t[i] === "NSM") t[i] = i > 0 ? t[i - 1] : baseDir;
+  for (let i = 0; i < n; i++) if (t[i] === "EN") {
+    for (let j = i - 1; j >= 0; j--) if (t[j] === "L" || t[j] === "R" || t[j] === "AL") {
+      if (t[j] === "AL") t[i] = "AN";
+      break;
+    }
+  }
+  for (let i = 0; i < n; i++) if (t[i] === "AL") t[i] = "R";
+  for (let i = 1; i < n - 1; i++) {
+    if (t[i] === "ES" && t[i - 1] === "EN" && t[i + 1] === "EN") t[i] = "EN";
+    else if (t[i] === "CS" && t[i - 1] === "EN" && t[i + 1] === "EN") t[i] = "EN";
+    else if (t[i] === "CS" && t[i - 1] === "AN" && t[i + 1] === "AN") t[i] = "AN";
+  }
+  for (let i = 0; i < n; i++) if (t[i] === "ET") {
+    let j = i;
+    while (j < n && t[j] === "ET") j++;
+    if (i > 0 && t[i - 1] === "EN" || j < n && t[j] === "EN") for (let k = i; k < j; k++) t[k] = "EN";
+    i = j - 1;
+  }
+  for (let i = 0; i < n; i++) if (t[i] === "ES" || t[i] === "ET" || t[i] === "CS") t[i] = "ON";
+  for (let i = 0; i < n; i++) if (t[i] === "EN") {
+    let strong = baseDir;
+    for (let j = i - 1; j >= 0; j--) if (t[j] === "L" || t[j] === "R") {
+      strong = t[j];
+      break;
+    }
+    if (strong === "L") t[i] = "L";
+  }
+  return t;
+}
+function resolveNeutral(t, baseDir) {
+  const n = t.length;
+  const strong = (x) => x === "L" ? "L" : x === "R" || x === "EN" || x === "AN" ? "R" : void 0;
+  for (let i = 0; i < n; i++) if (t[i] === "ON" || t[i] === "WS") {
+    let j = i;
+    while (j < n && (t[j] === "ON" || t[j] === "WS")) j++;
+    const prev = i > 0 ? strong(t[i - 1]) : baseDir;
+    const next = j < n ? strong(t[j]) : baseDir;
+    const dir = prev && next && prev === next ? prev : baseDir;
+    for (let k = i; k < j; k++) t[k] = dir;
+    i = j - 1;
+  }
+  return t;
+}
+function implicitLevels(t, e) {
+  return t.map((x) => e % 2 === 0 ? x === "R" ? e + 1 : x === "EN" || x === "AN" ? e + 2 : e : x === "L" || x === "EN" || x === "AN" ? e + 1 : e);
+}
+function reorder(levels) {
+  const n = levels.length;
+  const order = Array.from({ length: n }, (_, i) => i);
+  let highest = 0, lowestOdd = Infinity;
+  for (const l of levels) {
+    if (l > highest) highest = l;
+    if (l % 2 && l < lowestOdd) lowestOdd = l;
+  }
+  for (let lvl = highest; lvl >= lowestOdd; lvl--) {
+    let i = 0;
+    while (i < n) {
+      if (levels[i] >= lvl) {
+        let j = i;
+        while (j < n && levels[j] >= lvl) j++;
+        for (let a = i, b = j - 1; a < b; a++, b--) {
+          const tmp = order[a];
+          order[a] = order[b];
+          order[b] = tmp;
+        }
+        i = j;
+      } else i++;
+    }
+  }
+  return order;
+}
+function bidiLine(line) {
+  const n = line.length;
+  if (n === 0) return { visual: "", caret: [0] };
+  const types = Array.from({ length: n }, (_, i) => classify(line.charCodeAt(i)));
+  const e = baseLevel(types);
+  const baseDir = e % 2 ? "R" : "L";
+  const levels = implicitLevels(resolveNeutral(resolveWeak(types, baseDir), baseDir), e);
+  const order = reorder(levels);
+  const logToVis = new Array(n);
+  for (let v = 0; v < n; v++) logToVis[order[v]] = v;
+  const caret = new Array(n + 1);
+  for (let c = 0; c < n; c++) caret[c] = levels[c] % 2 === 0 ? logToVis[c] : logToVis[c] + 1;
+  caret[n] = levels[n - 1] % 2 === 0 ? logToVis[n - 1] + 1 : logToVis[n - 1];
+  const visual = order.map((li) => line[li]).join("");
+  return { visual, caret };
+}
+function applyBidi(buf, cursor) {
+  if (!needsBidi(buf)) return { text: buf, cursor };
+  const lines = buf.split("\n");
+  const out = [];
+  let visCursor = cursor, logBase = 0, visBase = 0;
+  for (const line of lines) {
+    const { visual, caret } = bidiLine(line);
+    out.push(visual);
+    if (cursor >= logBase && cursor <= logBase + line.length) visCursor = visBase + caret[cursor - logBase];
+    logBase += line.length + 1;
+    visBase += visual.length + 1;
+  }
+  return { text: out.join("\n"), cursor: visCursor };
+}
+
+// cli/lineEditor.ts
 var visibleWidth = (s) => s.replace(/\x1b\[[0-9;]*m/g, "").length;
 var isPrintable = (str) => !!str && !/[\x00-\x1f\x7f]/.test(str);
 var EditorState = class _EditorState {
@@ -5210,8 +5341,9 @@ function createLineEditor(out) {
     const prompt = s.searching ? dim2(`(${s.searchMiss ? "failing " : ""}reverse-i-search)\`${s.searchQuery}': `) : mode ? COLOR[mode.name](`${mode.pfx} ${mode.name} \u203A `) : vimTag + promptArg;
     if (curRow > 0) out.write(`\x1B[${curRow}A`);
     out.write("\r\x1B[J");
-    const viewBuf = mode ? s.buf.slice(mode.pfx.length) : s.buf;
-    const viewCursor = mode ? Math.max(0, s.cursor - mode.pfx.length) : s.cursor;
+    const rawBuf = mode ? s.buf.slice(mode.pfx.length) : s.buf;
+    const rawCursor = mode ? Math.max(0, s.cursor - mode.pfx.length) : s.cursor;
+    const { text: viewBuf, cursor: viewCursor } = applyBidi(rawBuf, rawCursor);
     const { rows, cursorRow, cursorCol } = wrapLayout(visibleWidth(prompt), viewBuf, viewCursor, cols);
     const ghost = !mode && !s.searching ? s.ghost() : "";
     const ghostFits = ghost && rows.length === 1 && visibleWidth(prompt) + viewBuf.length + ghost.length < cols;