pi-better-harness 0.3.16 → 0.3.17

package/node_modules/pi-better-background-tasks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-background-tasks",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "description": "Pi extension for durable background shell tasks, watchers, logs, and status inspection.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-background-tasks/src/shared-navigator.ts

@@ -1,4 +1,5 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth as piTruncateToWidth, visibleWidth as piVisibleWidth } from "@earendil-works/pi-tui";
 import type { Component } from "@earendil-works/pi-tui";
 import { createRenderScheduler, type RenderScheduler } from "./shared-render-scheduler.ts";
 
@@ -280,10 +281,10 @@ function refreshMainListWidget(): void {
   }) : undefined;
   const changed = nextSignature !== s.lastMainListSignature;
   s.lastMainListSignature = nextSignature;
-  s.lastMainListLines = rows.length ? buildMainListLines(rows, MAIN_LIST_FALLBACK_WIDTH, deps.truncate, themeFg(ctx), {
+  s.lastMainListLines = rows.length ? ["", ...buildMainListLines(rows, MAIN_LIST_FALLBACK_WIDTH, deps.truncate, themeFg(ctx), {
     selectedId: s.mainListFocused ? s.mainListSelectedId : undefined,
     focused: s.mainListFocused === true,
-  }) : undefined;
+  })] : undefined;
   if (!rows.length) {
     if (!s.mainListWidgetInstalled) return;
     try { (ctx.ui as any).setWidget?.(MAIN_LIST_WIDGET_KEY, undefined); } catch { /* ignore */ }
@@ -323,10 +324,10 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
         state().lastMainListLines = undefined;
         return [];
       }
-      const lines = buildMainListLines(rows, renderWidth(width), deps.truncate, themeFgFromTheme(theme), {
+      const lines = ["", ...buildMainListLines(rows, renderWidth(width), deps.truncate, themeFgFromTheme(theme), {
         selectedId: state().mainListFocused ? state().mainListSelectedId : undefined,
         focused: state().mainListFocused === true,
-      });
+      })];
       state().lastMainListLines = lines;
       return lines;
     },
@@ -1269,7 +1270,8 @@ export function wrapLogText(text: string, width: number): string[] {
       continue;
     }
     const sourceIndent = source.match(/^[ \t]*/)?.[0] ?? "";
-    const indent = sourceIndent.replace(/\t/g, "  ");
+    // Leave room for a full-width grapheme even on deeply indented log lines.
+    const indent = sourceIndent.replace(/\t/g, "  ").slice(0, max - 2);
     let remaining = source.slice(sourceIndent.length);
     const contentWidth = Math.max(1, max - visibleWidth(indent));
     if (!remaining) {
@@ -1302,33 +1304,25 @@ function lastDelimiterBreak(value: string): number {
   return last;
 }
 
+const GRAPHEME_SEGMENTER = new Intl.Segmenter(undefined, { granularity: "grapheme" });
+
 function splitVisiblePrefix(value: string, width: number): [string, string] {
   const max = Math.max(0, Math.floor(width));
   let visible = 0;
-  let index = 0;
-  while (index < value.length && visible < max) {
-    if (value[index] === "\u001b" || value[index] === "\u009b") {
-      const match = value.slice(index).match(ANSI_RE);
-      if (match?.index === 0) {
-        index += match[0].length;
-        continue;
-      }
-    }
-    if (value[index] === "<") {
-      const close = value.indexOf(">", index);
-      if (close !== -1) {
-        const tag = value.slice(index, close + 1);
-        if (/^<\/?[a-zA-Z][\w-]*>$/.test(tag) || tag === "</>") {
-          index = close + 1;
-          continue;
-        }
-      }
+  let end = 0;
+  for (const { segment, index } of GRAPHEME_SEGMENTER.segment(value)) {
+    if (index < end) continue;
+    const formatting = value.slice(index).match(FORMATTING_PREFIX_RE);
+    if (formatting) {
+      end = index + formatting[0].length;
+      continue;
     }
-    const codePoint = value.codePointAt(index)!;
-    index += codePoint > 0xFFFF ? 2 : 1;
-    visible += 1;
+    const cells = piVisibleWidth(segment);
+    if (visible + cells > max) break;
+    visible += cells;
+    end = index + segment.length;
   }
-  return [value.slice(0, index), value.slice(index)];
+  return [value.slice(0, end), value.slice(end)];
 }
 
 function cycleLogTailRows(current: number): number {
@@ -1387,44 +1381,19 @@ function safeTruncate(line: string, width: number, truncate: (s: string, width:
 
 const ANSI_RE = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))", "g");
 
+const FORMATTING_PREFIX_RE = new RegExp(`^(?:${ANSI_RE.source}|<\\/?[a-zA-Z][\\w-]*>|</>)`);
+
 function visibleWidth(value: string): number {
-  return String(value ?? "")
+  const cleaned = String(value ?? "")
     .replace(ANSI_RE, "")
     .replace(/<\/?[a-zA-Z][\w-]*>/g, "")
-    .replace(/<\/>/g, "")
-    .length;
+    .replace(/<\/>/g, "");
+  return piVisibleWidth(cleaned);
 }
 
 function truncateVisible(value: string, width: number): string {
   const str = String(value ?? "");
   const max = Math.max(0, Math.floor(width || 0));
   if (visibleWidth(str) <= max) return str;
-  let out = "";
-  let vis = 0;
-  let i = 0;
-  while (i < str.length && vis < max) {
-    if (str[i] === "\u001b" || str[i] === "\u009b") {
-      const match = str.slice(i).match(ANSI_RE);
-      if (match && match.index === 0) {
-        out += match[0];
-        i += match[0].length;
-        continue;
-      }
-    }
-    if (str[i] === "<") {
-      const close = str.indexOf(">", i);
-      if (close !== -1) {
-        const tag = str.slice(i, close + 1);
-        if (/^<\/?[a-zA-Z][\w-]*>$/.test(tag) || tag === "</>") {
-          out += tag;
-          i = close + 1;
-          continue;
-        }
-      }
-    }
-    out += str[i];
-    vis += 1;
-    i += 1;
-  }
-  return out;
+  return piTruncateToWidth(str, max);
 }

package/node_modules/pi-better-plan/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-plan",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Structured execution plans with persistent progress for Pi.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-plan/src/index.ts

@@ -162,10 +162,13 @@ export default function planExtension(pi: ExtensionAPI): void {
             if (displayMode === "hidden") return [];
             if (displayedWorkflowOwner) {
               if (displayedWorkflowOwner !== "rush-issues") return [];
-              return rushPlan ? renderRushPlan(rushPlan, width) : [];
+              const fg = typeof theme?.fg === "function"
+                ? (color: string, value: string) => theme.fg(color as never, value)
+                : undefined;
+              return rushPlan ? ["", ...renderRushPlan(rushPlan, width, false, fg)] : [];
             }
             if (!currentPlan) return [];
-            return renderCompactPlan(currentPlan, width, theme as never);
+            return ["", ...renderCompactPlan(currentPlan, width, theme as never)];
           },
           invalidate() {},
           dispose() {
@@ -189,8 +192,11 @@ export default function planExtension(pi: ExtensionAPI): void {
         ctx.ui.notify(renderRushPlan(plan, 160, true).join("\n"), "info");
         return;
       }
-      await ctx.ui.custom<void>((tui, _theme, _keys, done) => {
-        const component = createRushPlanComponent(plan, () => done());
+      await ctx.ui.custom<void>((tui, theme, _keys, done) => {
+        const fg = typeof theme?.fg === "function"
+          ? (color: string, value: string) => theme.fg(color as never, value)
+          : undefined;
+        const component = createRushPlanComponent(plan, () => done(), fg);
         return { render: (width) => component.render(width), handleInput(data) {
           component.handleInput?.(data);
           tui.requestRender();

package/node_modules/pi-better-plan/src/workflow-plan.ts

@@ -98,9 +98,15 @@ export function workflowBinding(entries: Iterable<{ type: string; customType?: s
   return binding;
 }
 
-export function renderRushPlan(plan: RushPlan, width: number, full = false): string[] {
+export function renderRushPlan(
+  plan: RushPlan,
+  width: number,
+  full = false,
+  fg?: (color: string, value: string) => string,
+): string[] {
   const completed = plan.issues.filter((unit) => unit.status === "succeeded").length;
-  const lines = [`rush-issues  rev ${plan.planRevision}  ${completed}/${plan.issues.length} units${plan.spec?.title ? `  ${plan.spec.title}` : ""}`];
+  const summary = `rev ${plan.planRevision}  ${completed}/${plan.issues.length} units${plan.spec?.title ? `  ${plan.spec.title}` : ""}`;
+  const lines = [fg ? `${fg("warning", "rush-issues")}  ${fg("dim", summary)}` : `rush-issues  ${summary}`];
   const fleet = ["explore", "combine", "canary", "review", "cicd"]
     .map((stage) => `${stage}: ${stage === "canary" && !plan.warehouseCanaryRequired ? "n/a" : plan.fleet[stage]?.status ?? "pending"}`);
   lines.push(`fleet  ${fleet.join("  ")}`);
@@ -115,9 +121,13 @@ export function renderRushPlan(plan: RushPlan, width: number, full = false): str
   return lines.map((line) => truncateToWidth(line, Math.max(1, width)));
 }
 
-export function createRushPlanComponent(plan: RushPlan, onClose: () => void): Component {
+export function createRushPlanComponent(
+  plan: RushPlan,
+  onClose: () => void,
+  fg?: (color: string, value: string) => string,
+): Component {
   return {
-    render: (width) => renderRushPlan(plan, width, true),
+    render: (width) => renderRushPlan(plan, width, true, fg),
     handleInput(data) {
       if (matchesKey(data, "escape") || matchesKey(data, "left") || matchesKey(data, "ctrl+c")) onClose();
     },

package/node_modules/pi-better-subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-subagents",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "Pi extension for detached, sandboxed subagent runs that keep the foreground session free.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-subagents/shared-navigator.ts

@@ -1,4 +1,5 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth as piTruncateToWidth, visibleWidth as piVisibleWidth } from "@earendil-works/pi-tui";
 import type { Component } from "@earendil-works/pi-tui";
 import { createRenderScheduler, type RenderScheduler } from "./shared-render-scheduler.ts";
 
@@ -280,10 +281,10 @@ function refreshMainListWidget(): void {
   }) : undefined;
   const changed = nextSignature !== s.lastMainListSignature;
   s.lastMainListSignature = nextSignature;
-  s.lastMainListLines = rows.length ? buildMainListLines(rows, MAIN_LIST_FALLBACK_WIDTH, deps.truncate, themeFg(ctx), {
+  s.lastMainListLines = rows.length ? ["", ...buildMainListLines(rows, MAIN_LIST_FALLBACK_WIDTH, deps.truncate, themeFg(ctx), {
     selectedId: s.mainListFocused ? s.mainListSelectedId : undefined,
     focused: s.mainListFocused === true,
-  }) : undefined;
+  })] : undefined;
   if (!rows.length) {
     if (!s.mainListWidgetInstalled) return;
     try { (ctx.ui as any).setWidget?.(MAIN_LIST_WIDGET_KEY, undefined); } catch { /* ignore */ }
@@ -323,10 +324,10 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
         state().lastMainListLines = undefined;
         return [];
       }
-      const lines = buildMainListLines(rows, renderWidth(width), deps.truncate, themeFgFromTheme(theme), {
+      const lines = ["", ...buildMainListLines(rows, renderWidth(width), deps.truncate, themeFgFromTheme(theme), {
         selectedId: state().mainListFocused ? state().mainListSelectedId : undefined,
         focused: state().mainListFocused === true,
-      });
+      })];
       state().lastMainListLines = lines;
       return lines;
     },
@@ -1269,7 +1270,8 @@ export function wrapLogText(text: string, width: number): string[] {
       continue;
     }
     const sourceIndent = source.match(/^[ \t]*/)?.[0] ?? "";
-    const indent = sourceIndent.replace(/\t/g, "  ");
+    // Leave room for a full-width grapheme even on deeply indented log lines.
+    const indent = sourceIndent.replace(/\t/g, "  ").slice(0, max - 2);
     let remaining = source.slice(sourceIndent.length);
     const contentWidth = Math.max(1, max - visibleWidth(indent));
     if (!remaining) {
@@ -1302,33 +1304,25 @@ function lastDelimiterBreak(value: string): number {
   return last;
 }
 
+const GRAPHEME_SEGMENTER = new Intl.Segmenter(undefined, { granularity: "grapheme" });
+
 function splitVisiblePrefix(value: string, width: number): [string, string] {
   const max = Math.max(0, Math.floor(width));
   let visible = 0;
-  let index = 0;
-  while (index < value.length && visible < max) {
-    if (value[index] === "\u001b" || value[index] === "\u009b") {
-      const match = value.slice(index).match(ANSI_RE);
-      if (match?.index === 0) {
-        index += match[0].length;
-        continue;
-      }
-    }
-    if (value[index] === "<") {
-      const close = value.indexOf(">", index);
-      if (close !== -1) {
-        const tag = value.slice(index, close + 1);
-        if (/^<\/?[a-zA-Z][\w-]*>$/.test(tag) || tag === "</>") {
-          index = close + 1;
-          continue;
-        }
-      }
+  let end = 0;
+  for (const { segment, index } of GRAPHEME_SEGMENTER.segment(value)) {
+    if (index < end) continue;
+    const formatting = value.slice(index).match(FORMATTING_PREFIX_RE);
+    if (formatting) {
+      end = index + formatting[0].length;
+      continue;
     }
-    const codePoint = value.codePointAt(index)!;
-    index += codePoint > 0xFFFF ? 2 : 1;
-    visible += 1;
+    const cells = piVisibleWidth(segment);
+    if (visible + cells > max) break;
+    visible += cells;
+    end = index + segment.length;
   }
-  return [value.slice(0, index), value.slice(index)];
+  return [value.slice(0, end), value.slice(end)];
 }
 
 function cycleLogTailRows(current: number): number {
@@ -1387,44 +1381,19 @@ function safeTruncate(line: string, width: number, truncate: (s: string, width:
 
 const ANSI_RE = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))", "g");
 
+const FORMATTING_PREFIX_RE = new RegExp(`^(?:${ANSI_RE.source}|<\\/?[a-zA-Z][\\w-]*>|</>)`);
+
 function visibleWidth(value: string): number {
-  return String(value ?? "")
+  const cleaned = String(value ?? "")
     .replace(ANSI_RE, "")
     .replace(/<\/?[a-zA-Z][\w-]*>/g, "")
-    .replace(/<\/>/g, "")
-    .length;
+    .replace(/<\/>/g, "");
+  return piVisibleWidth(cleaned);
 }
 
 function truncateVisible(value: string, width: number): string {
   const str = String(value ?? "");
   const max = Math.max(0, Math.floor(width || 0));
   if (visibleWidth(str) <= max) return str;
-  let out = "";
-  let vis = 0;
-  let i = 0;
-  while (i < str.length && vis < max) {
-    if (str[i] === "\u001b" || str[i] === "\u009b") {
-      const match = str.slice(i).match(ANSI_RE);
-      if (match && match.index === 0) {
-        out += match[0];
-        i += match[0].length;
-        continue;
-      }
-    }
-    if (str[i] === "<") {
-      const close = str.indexOf(">", i);
-      if (close !== -1) {
-        const tag = str.slice(i, close + 1);
-        if (/^<\/?[a-zA-Z][\w-]*>$/.test(tag) || tag === "</>") {
-          out += tag;
-          i = close + 1;
-          continue;
-        }
-      }
-    }
-    out += str[i];
-    vis += 1;
-    i += 1;
-  }
-  return out;
+  return piTruncateToWidth(str, max);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-harness",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "Pi extension bundle for a write sandbox, subagents, background tasks, SSH, goals, and structured plans.",
   "license": "MIT",
   "type": "module",
@@ -50,12 +50,12 @@
     "test": "node --test test/*.test.mjs"
   },
   "dependencies": {
-    "pi-better-background-tasks": "0.2.14",
+    "pi-better-background-tasks": "0.2.15",
     "pi-better-goal": "0.4.0",
-    "pi-better-plan": "0.3.2",
+    "pi-better-plan": "0.3.3",
     "pi-better-sandbox": "0.3.0",
     "pi-better-ssh": "0.1.1",
-    "pi-better-subagents": "0.1.30",
+    "pi-better-subagents": "0.1.31",
     "yaml": "^2.9.1"
   },
   "bundledDependencies": [