march-cli 0.1.21 → 0.1.22

package/src/cli/tui/output/scroll-state.mjs

@@ -1,79 +1,79 @@
-export class OutputScrollState {
-  constructor() {
-    this.offset = 0;
-    this.anchorStart = null;
-    this.viewportHeight = null;
-    this.totalLines = 0;
-  }
-
-  clear() {
-    this.offset = 0;
-    this.anchorStart = null;
-    this.viewportHeight = null;
-    this.totalLines = 0;
-  }
-
-  setTotalLines(total) {
-    this.totalLines = Math.max(0, Math.trunc(total));
-  }
-
-  scroll(delta, { step = this.getStep() } = {}) {
-    const total = this.totalLines;
-    const win = this._windowHeight();
-    const maxOffset = this.getMaxOffset();
-    step = Math.max(1, Math.trunc(step));
-    const currentStart = this.anchorStart ?? Math.max(0, total - this.offset - win);
-    const maxStart = Math.max(0, total - win);
-    const nextStart = clamp(currentStart + (delta < 0 ? -step : step), 0, maxStart);
-    const nextEnd = Math.min(total, nextStart + win);
-    this.offset = clamp(total - nextEnd, 0, maxOffset);
-    this.anchorStart = this.offset > 0 ? nextStart : null;
-    return { offset: this.offset, maxOffset, atTail: this.offset === 0 };
-  }
-
-  getStep() {
-    return Math.max(1, Math.floor(this._windowHeight() / 3));
-  }
-
-  getMaxOffset() {
-    return Math.max(0, this.totalLines - this._windowHeight());
-  }
-
-  setViewportHeight(height) {
-    this.viewportHeight = Math.max(1, Math.trunc(height));
-    this.offset = clamp(this.offset, 0, this.getMaxOffset());
-    if (this.offset === 0) this.anchorStart = null;
-  }
-
-  reset() {
-    this.offset = 0;
-    this.anchorStart = null;
-  }
-
-  sliceRange() {
-    const win = this.viewportHeight;
-    if (win === null) return null;
-    const maxOffset = this.getMaxOffset();
-    if (this.anchorStart !== null && this.offset > 0) {
-      const start = clamp(this.anchorStart, 0, Math.max(0, this.totalLines - win));
-      const end = Math.min(this.totalLines, start + win);
-      this.offset = clamp(this.totalLines - end, 0, maxOffset);
-      if (this.offset === 0) this.anchorStart = null;
-      else this.anchorStart = start;
-      return { start, end };
-    }
-
-    this.offset = clamp(this.offset, 0, maxOffset);
-    if (this.offset === 0) this.anchorStart = null;
-    const end = Math.max(0, this.totalLines - this.offset);
-    return { start: Math.max(0, end - win), end };
-  }
-
-  _windowHeight() {
-    return this.viewportHeight || (process.stdout.rows || 30) - 2;
-  }
-}
-
-function clamp(value, min, max) {
-  return Math.min(max, Math.max(min, value));
-}
+export class OutputScrollState {
+  constructor() {
+    this.offset = 0;
+    this.anchorStart = null;
+    this.viewportHeight = null;
+    this.totalLines = 0;
+  }
+
+  clear() {
+    this.offset = 0;
+    this.anchorStart = null;
+    this.viewportHeight = null;
+    this.totalLines = 0;
+  }
+
+  setTotalLines(total) {
+    this.totalLines = Math.max(0, Math.trunc(total));
+  }
+
+  scroll(delta, { step = this.getStep() } = {}) {
+    const total = this.totalLines;
+    const win = this._windowHeight();
+    const maxOffset = this.getMaxOffset();
+    step = Math.max(1, Math.trunc(step));
+    const currentStart = this.anchorStart ?? Math.max(0, total - this.offset - win);
+    const maxStart = Math.max(0, total - win);
+    const nextStart = clamp(currentStart + (delta < 0 ? -step : step), 0, maxStart);
+    const nextEnd = Math.min(total, nextStart + win);
+    this.offset = clamp(total - nextEnd, 0, maxOffset);
+    this.anchorStart = this.offset > 0 ? nextStart : null;
+    return { offset: this.offset, maxOffset, atTail: this.offset === 0 };
+  }
+
+  getStep() {
+    return Math.max(1, Math.floor(this._windowHeight() / 3));
+  }
+
+  getMaxOffset() {
+    return Math.max(0, this.totalLines - this._windowHeight());
+  }
+
+  setViewportHeight(height) {
+    this.viewportHeight = Math.max(1, Math.trunc(height));
+    this.offset = clamp(this.offset, 0, this.getMaxOffset());
+    if (this.offset === 0) this.anchorStart = null;
+  }
+
+  reset() {
+    this.offset = 0;
+    this.anchorStart = null;
+  }
+
+  sliceRange() {
+    const win = this.viewportHeight;
+    if (win === null) return null;
+    const maxOffset = this.getMaxOffset();
+    if (this.anchorStart !== null && this.offset > 0) {
+      const start = clamp(this.anchorStart, 0, Math.max(0, this.totalLines - win));
+      const end = Math.min(this.totalLines, start + win);
+      this.offset = clamp(this.totalLines - end, 0, maxOffset);
+      if (this.offset === 0) this.anchorStart = null;
+      else this.anchorStart = start;
+      return { start, end };
+    }
+
+    this.offset = clamp(this.offset, 0, maxOffset);
+    if (this.offset === 0) this.anchorStart = null;
+    const end = Math.max(0, this.totalLines - this.offset);
+    return { start: Math.max(0, end - win), end };
+  }
+
+  _windowHeight() {
+    return this.viewportHeight || (process.stdout.rows || 30) - 2;
+  }
+}
+
+function clamp(value, min, max) {
+  return Math.min(max, Math.max(min, value));
+}

package/src/cli/tui/output/text-line-renderer.mjs

@@ -1,50 +1,50 @@
-import { visibleWidth } from "@earendil-works/pi-tui";
-import { R } from "../ui-theme.mjs";
-
-export function appendTextLines(lines, textLines, width) {
-  for (const line of textLines) {
-    for (const part of String(line ?? "").split(/\r?\n/)) {
-      for (const wrapped of wrapLine(part, width)) lines.push(wrapped);
-    }
-  }
-}
-
-export function wrapLine(text, maxWidth) {
-  if (maxWidth <= 0) return [""];
-  const result = [];
-  let cur = "";
-  let curW = 0;
-  let activeSgr = "";
-  for (let i = 0; i < text.length;) {
-    if (text[i] === "\x1b") {
-      const match = text.slice(i).match(/^\x1b\[[0-?]*[ -/]*[@-~]/);
-      if (match) {
-        const seq = match[0];
-        cur += seq;
-        activeSgr = updateActiveSgr(activeSgr, seq);
-        i += seq.length;
-        continue;
-      }
-    }
-    const ch = text[i];
-    const w = visibleWidth(ch);
-    if (curW + w > maxWidth) {
-      result.push(activeSgr ? `${cur}${R}` : cur);
-      cur = activeSgr + ch;
-      curW = w;
-    } else {
-      cur += ch;
-      curW += w;
-    }
-    i += 1;
-  }
-  if (cur) result.push(cur);
-  return result.length > 0 ? result : [""];
-}
-
-function updateActiveSgr(activeSgr, seq) {
-  if (!seq.endsWith("m")) return activeSgr;
-  const body = seq.slice(2, -1);
-  if (body === "" || body.split(";").includes("0")) return "";
-  return seq;
-}
+import { visibleWidth } from "@earendil-works/pi-tui";
+import { R } from "../ui-theme.mjs";
+
+export function appendTextLines(lines, textLines, width) {
+  for (const line of textLines) {
+    for (const part of String(line ?? "").split(/\r?\n/)) {
+      for (const wrapped of wrapLine(part, width)) lines.push(wrapped);
+    }
+  }
+}
+
+export function wrapLine(text, maxWidth) {
+  if (maxWidth <= 0) return [""];
+  const result = [];
+  let cur = "";
+  let curW = 0;
+  let activeSgr = "";
+  for (let i = 0; i < text.length;) {
+    if (text[i] === "\x1b") {
+      const match = text.slice(i).match(/^\x1b\[[0-?]*[ -/]*[@-~]/);
+      if (match) {
+        const seq = match[0];
+        cur += seq;
+        activeSgr = updateActiveSgr(activeSgr, seq);
+        i += seq.length;
+        continue;
+      }
+    }
+    const ch = text[i];
+    const w = visibleWidth(ch);
+    if (curW + w > maxWidth) {
+      result.push(activeSgr ? `${cur}${R}` : cur);
+      cur = activeSgr + ch;
+      curW = w;
+    } else {
+      cur += ch;
+      curW += w;
+    }
+    i += 1;
+  }
+  if (cur) result.push(cur);
+  return result.length > 0 ? result : [""];
+}
+
+function updateActiveSgr(activeSgr, seq) {
+  if (!seq.endsWith("m")) return activeSgr;
+  const body = seq.slice(2, -1);
+  if (body === "" || body.split(";").includes("0")) return "";
+  return seq;
+}

package/src/cli/tui/output/tool-card-renderer.mjs

@@ -1,59 +1,59 @@
-import { visibleWidth } from "@earendil-works/pi-tui";
-import { R, brightBlack, dim, red } from "../ui-theme.mjs";
-
-export function renderToolCardBlock(block, width) {
-  const lines = [];
-  const border = brightBlack("┃");
-  const marker = block.state === "running" ? "▶" : block.expanded ? "▾" : "▸";
-  const summary = block.summary ? ` · ${block.summary}` : "";
-  const head = `${marker} ${block.title}${summary}`;
-  appendCardWrapped(lines, border, (block.isError ? red : dim)(head), width);
-
-  if (block.expanded && block.bodyLines?.length) {
-    lines.push(border);
-    for (const line of block.bodyLines) appendCardWrapped(lines, border, dim(line), width, "  ");
-  }
-  return lines;
-}
-
-function appendCardWrapped(lines, border, text, width, indent = "") {
-  const prefix = `${border} ${indent}`;
-  const contentWidth = Math.max(8, width - visibleWidth(prefix));
-  for (const part of wrapLine(text, contentWidth)) lines.push(`${prefix}${part}`);
-}
-
-function wrapLine(text, maxWidth) {
-  if (maxWidth <= 0) return [""];
-  const result = [];
-  let cur = "", curW = 0, activeSgr = "";
-  for (let i = 0; i < text.length;) {
-    if (text[i] === "\x1b") {
-      const match = text.slice(i).match(/^\x1b\[[0-?]*[ -/]*[@-~]/);
-      if (match) {
-        cur += match[0];
-        activeSgr = updateActiveSgr(activeSgr, match[0]);
-        i += match[0].length;
-        continue;
-      }
-    }
-    const ch = text[i], w = visibleWidth(ch);
-    if (curW + w > maxWidth) {
-      result.push(activeSgr ? `${cur}${R}` : cur);
-      cur = activeSgr + ch;
-      curW = w;
-    } else {
-      cur += ch;
-      curW += w;
-    }
-    i += 1;
-  }
-  if (cur) result.push(cur);
-  return result.length > 0 ? result : [""];
-}
-
-function updateActiveSgr(activeSgr, seq) {
-  if (!seq.endsWith("m")) return activeSgr;
-  const body = seq.slice(2, -1);
-  if (body === "" || body.split(";").includes("0")) return "";
-  return seq;
-}
+import { visibleWidth } from "@earendil-works/pi-tui";
+import { R, brightBlack, dim, red } from "../ui-theme.mjs";
+
+export function renderToolCardBlock(block, width) {
+  const lines = [];
+  const border = brightBlack("┃");
+  const marker = block.state === "running" ? "▶" : block.expanded ? "▾" : "▸";
+  const summary = block.summary ? ` · ${block.summary}` : "";
+  const head = `${marker} ${block.title}${summary}`;
+  appendCardWrapped(lines, border, (block.isError ? red : dim)(head), width);
+
+  if (block.expanded && block.bodyLines?.length) {
+    lines.push(border);
+    for (const line of block.bodyLines) appendCardWrapped(lines, border, dim(line), width, "  ");
+  }
+  return lines;
+}
+
+function appendCardWrapped(lines, border, text, width, indent = "") {
+  const prefix = `${border} ${indent}`;
+  const contentWidth = Math.max(8, width - visibleWidth(prefix));
+  for (const part of wrapLine(text, contentWidth)) lines.push(`${prefix}${part}`);
+}
+
+function wrapLine(text, maxWidth) {
+  if (maxWidth <= 0) return [""];
+  const result = [];
+  let cur = "", curW = 0, activeSgr = "";
+  for (let i = 0; i < text.length;) {
+    if (text[i] === "\x1b") {
+      const match = text.slice(i).match(/^\x1b\[[0-?]*[ -/]*[@-~]/);
+      if (match) {
+        cur += match[0];
+        activeSgr = updateActiveSgr(activeSgr, match[0]);
+        i += match[0].length;
+        continue;
+      }
+    }
+    const ch = text[i], w = visibleWidth(ch);
+    if (curW + w > maxWidth) {
+      result.push(activeSgr ? `${cur}${R}` : cur);
+      cur = activeSgr + ch;
+      curW = w;
+    } else {
+      cur += ch;
+      curW += w;
+    }
+    i += 1;
+  }
+  if (cur) result.push(cur);
+  return result.length > 0 ? result : [""];
+}
+
+function updateActiveSgr(activeSgr, seq) {
+  if (!seq.endsWith("m")) return activeSgr;
+  const body = seq.slice(2, -1);
+  if (body === "" || body.split(";").includes("0")) return "";
+  return seq;
+}

package/src/cli/tui/output/visible-lines.mjs

@@ -1,8 +1,8 @@
-export function sliceLinesWithTail(baseLines, tailLine, range) {
-  if (!range) return tailLine == null ? baseLines : [...baseLines, tailLine];
-
-  const { start, end } = range;
-  const visible = baseLines.slice(start, Math.min(end, baseLines.length));
-  if (tailLine != null && end > baseLines.length) visible.push(tailLine);
-  return visible;
-}
+export function sliceLinesWithTail(baseLines, tailLine, range) {
+  if (!range) return tailLine == null ? baseLines : [...baseLines, tailLine];
+
+  const { start, end } = range;
+  const visible = baseLines.slice(start, Math.min(end, baseLines.length));
+  if (tailLine != null && end > baseLines.length) visible.push(tailLine);
+  return visible;
+}