@tt-a1i/openpi 0.3.1 → 0.5.0

package/extensions/subagents/src/ui/wait-result.ts

@@ -3,8 +3,12 @@ import {
   keyHint,
   type Theme,
 } from "@earendil-works/pi-coding-agent";
-import { Markdown, Text } from "@earendil-works/pi-tui";
-import { sanitizeText } from "./transcript.ts";
+import {
+  type Component,
+  Markdown,
+  truncateToWidth,
+} from "@earendil-works/pi-tui";
+import { sanitizeText } from "../../../shared/agent-transcript.ts";
 
 const MAX_STATUS_ROWS = 4;
 
@@ -12,40 +16,116 @@ export interface WaitResultItem {
   readonly id: string;
   readonly title?: string;
   readonly status?: string;
+  readonly outcome?: "completed" | "failed" | "interrupted";
+  readonly worktreeBranch?: string;
+  readonly elapsed?: string;
+  readonly artifactSaveFailed?: boolean;
+  readonly fullResultSaved?: boolean;
 }
 
 export interface WaitResultDetails {
   readonly results?: readonly WaitResultItem[];
 }
 
+function singleLine(value: string) {
+  return sanitizeText(value).replace(/\s+/gu, " ").trim();
+}
+
+function fixedRows(rows: readonly string[]): Component {
+  return {
+    render(width) {
+      return rows.map((row) => truncateToWidth(row, Math.max(1, width), "…"));
+    },
+    invalidate() {},
+  };
+}
+
+function selectStatusRows(results: readonly WaitResultItem[]) {
+  const visible = results.slice(0, MAX_STATUS_ROWS);
+  if (visible.some((result) => result.status === "error")) {
+    return visible;
+  }
+
+  const hiddenFailure = results
+    .slice(MAX_STATUS_ROWS)
+    .find((result) => result.status === "error");
+  return hiddenFailure ? [...visible.slice(0, -1), hiddenFailure] : visible;
+}
+
 export function buildWaitResultPreview(
   content: string,
   details: WaitResultDetails | undefined,
   theme: Theme,
 ) {
   const results = details?.results ?? [];
-  const failed = results.filter((result) => result.status === "error").length;
+  const uncertain = results.filter(
+    (result) => result.outcome === "interrupted",
+  ).length;
+  const failed = results.filter(
+    (result) => result.status === "error" && result.outcome !== "interrupted",
+  ).length;
+  const artifactFailures = results.filter(
+    (result) => result.artifactSaveFailed,
+  ).length;
+  const exceptions = [
+    failed > 0 ? theme.fg("error", `${failed} failed`) : "",
+    uncertain > 0 ? theme.fg("warning", `${uncertain} uncertain`) : "",
+  ].filter(Boolean);
   const header =
-    theme.fg(failed > 0 ? "warning" : "success", "■") +
-    ` ${theme.fg("accent", theme.bold(`${results.length} subagent${results.length === 1 ? "" : "s"} settled`))}` +
-    (failed > 0 ? theme.fg("error", ` · ${failed} failed`) : "");
+    theme.fg(
+      failed > 0 || uncertain > 0 ? "warning" : "success",
+      failed > 0 || uncertain > 0 ? "!" : "✓",
+    ) +
+    ` ${exceptions.length > 0 ? `${exceptions.join(" · ")} · ` : ""}` +
+    theme.fg(
+      "accent",
+      theme.bold(
+        `${results.length} subagent${results.length === 1 ? "" : "s"} settled`,
+      ),
+    ) +
+    (artifactFailures > 0
+      ? theme.fg(
+          "warning",
+          ` · ${artifactFailures} artifact${artifactFailures === 1 ? "" : "s"} not saved`,
+        )
+      : "");
   const lines = [header];
+  const statusRows = selectStatusRows(results);
 
-  for (const result of results.slice(0, MAX_STATUS_ROWS)) {
-    const isFailure = result.status === "error";
+  for (const result of statusRows) {
+    const isUncertain = result.outcome === "interrupted";
+    const isFailure = result.status === "error" && !isUncertain;
     const icon = theme.fg(
-      isFailure ? "error" : "success",
-      isFailure ? "x" : "✓",
+      isFailure ? "error" : isUncertain ? "warning" : "success",
+      isFailure ? "x" : isUncertain ? "?" : "✓",
     );
+    const id = singleLine(result.id);
+    const title = result.title ? singleLine(result.title) : "";
+    const status = isUncertain
+      ? "uncertain"
+      : singleLine(result.status ?? "settled");
+    const elapsed = result.elapsed ? singleLine(result.elapsed) : "";
+    const notices = [
+      result.artifactSaveFailed ? "artifact not saved" : "",
+      result.worktreeBranch
+        ? `worktree handoff · ${singleLine(result.worktreeBranch)}`
+        : "",
+      result.fullResultSaved ? "full result saved" : "",
+    ].filter(Boolean);
+    const attention = notices.length
+      ? theme.fg("warning", `${notices.join(" · ")} · `)
+      : "";
     lines.push(
-      `  ${icon} ${theme.fg("accent", result.id)}${result.title ? theme.fg("muted", ` · ${result.title}`) : ""}${theme.fg("dim", ` · ${result.status ?? "settled"}`)}`,
+      `  ${icon} ${attention}${theme.fg("accent", id)}${title ? theme.fg("muted", ` · ${title}`) : ""}${theme.fg("dim", ` · ${status}${elapsed ? ` · ${elapsed}` : ""}`)}`,
     );
   }
-  if (results.length > MAX_STATUS_ROWS) {
-    lines.push(theme.fg("dim", `  … ${results.length - MAX_STATUS_ROWS} more`));
+  if (results.length > statusRows.length) {
+    lines.push(
+      theme.fg("dim", `  … ${results.length - statusRows.length} more`),
+    );
   }
 
-  if (content.trim()) {
+  if (sanitizeText(content).trim()) {
     lines.push(
       theme.fg(
         "dim",
@@ -56,6 +136,14 @@ export function buildWaitResultPreview(
   return lines.join("\n");
 }
 
+export function renderWaitResultPreview(
+  content: string,
+  details: WaitResultDetails | undefined,
+  theme: Theme,
+) {
+  return fixedRows(buildWaitResultPreview(content, details, theme).split("\n"));
+}
+
 export function renderWaitResult(
   content: string,
   details: WaitResultDetails | undefined,
@@ -63,7 +151,7 @@ export function renderWaitResult(
   theme: Theme,
 ) {
   if (!expanded) {
-    return new Text(buildWaitResultPreview(content, details, theme), 0, 0);
+    return renderWaitResultPreview(content, details, theme);
   }
 
   const markdown = new Markdown(

package/extensions/suggestions/src/ui.ts

@@ -13,6 +13,10 @@ import {
 } from "../../shared/below-editor-navigation.ts";
 
 const FAKE_CURSOR_PATTERN = /\u001b\[7m \u001b\[(?:0|27)m/;
+// Conservative idle-row band for terminal-owned CJK IME preedit. Pi's editor
+// contract exposes only committed input, never a composition event, so the
+// reservation cannot shrink to the frames that actually need it. A 1-cell
+// hardware-cursor pad lets long preedit cover or truncate the ghost.
 const IME_PREEDIT_MIN_COLUMNS = 12;
 const IME_PREEDIT_MAX_COLUMNS = 32;
 const GHOST_MIN_COLUMNS = 8;
@@ -96,10 +100,12 @@ function ghostGeometry(lines: readonly string[], width: number) {
     .replaceAll(CURSOR_MARKER, "");
   const prefix = `${beforeCursor}${cursor[0]}`;
   const remaining = Math.max(0, width - visibleWidth(prefix));
-  // One terminal cell must remain after the hidden hardware cursor. At
-  // narrower widths, suppress the ghost rather than placing the cursor at the
-  // terminal's out-of-range column width.
-  if (remaining <= GHOST_MIN_COLUMNS) return undefined;
+  // Keep enough cells for a readable ghost and a conservative IME preedit
+  // band. At narrower widths, suppress the ghost rather than placing the
+  // hidden hardware cursor at the terminal's out-of-range column width.
+  if (remaining < GHOST_MIN_COLUMNS + IME_PREEDIT_MIN_COLUMNS) {
+    return undefined;
+  }
 
   const desiredPreedit = Math.min(
     IME_PREEDIT_MAX_COLUMNS,

package/extensions/tasks/index.ts

@@ -34,7 +34,6 @@ import {
   type TaskToolDetails,
 } from "./ui.ts";
 
-const TOOL_NAMES = ["tasks_add", "tasks_update", "tasks_list"] as const;
 const TASK_WIDGET_KEY = "session-tasks-panel";
 const CONFLICT_NAMES = new Set(["todo", "TodoWrite", "update_plan"]);
 const TOOL_PURPOSE =
@@ -542,8 +541,6 @@ export default function sessionTasks(pi: ExtensionAPI) {
   });
 }
 
-export { TOOL_NAMES as TASK_TOOL_NAMES };
-
 function mutationWillCloseBatch(
   snapshot: TaskSnapshot,
   id: number,

package/extensions/tasks/ui.ts

@@ -4,15 +4,35 @@ import type {
   Theme,
 } from "@earendil-works/pi-coding-agent";
 import {
+  type Component,
   Key,
   matchesKey,
   Text,
-  truncateToWidth,
-  type Component,
   type TUI,
+  truncateToWidth,
+  visibleWidth,
 } from "@earendil-works/pi-tui";
+import { fitNavigationSides } from "../shared/below-editor-navigation.ts";
+import {
+  hintLine,
+  panelFrame,
+  screenTitleLine,
+} from "../shared/screen-chrome.ts";
 import type { TaskItem, TaskSnapshot } from "./tasks.ts";
 
+/**
+ * One colour per status, shared by every surface. The widget used to paint
+ * in-progress amber while the full list painted it accent, so the same item
+ * changed colour depending on where you looked at it.
+ */
+const STATUS_COLOR = {
+  pending: "muted",
+  in_progress: "accent",
+  blocked: "warning",
+  done: "success",
+  dropped: "error",
+} as const satisfies Record<TaskItem["status"], string>;
+
 const STATUS_ICON: Record<TaskItem["status"], string> = {
   pending: "○",
   in_progress: "●",
@@ -86,45 +106,41 @@ export function taskCounts(items: readonly TaskItem[]): TaskCounts {
 }
 
 /**
- * One-line census: `4 tasks (3 done, 1 in progress, 0 open)`.
+ * One-line census: `4 tasks · 3 done · 1 open`.
  *
- * Counts carry the weight and the words recede, so the shape of the batch
- * reads before any individual row does. `done`, `in progress`, and `open` are
- * always listed even at zero — a stable set of three keeps the line from
- * reflowing as work moves between them. `blocked` and `dropped` are
- * exceptional and appear only when they are not zero.
+ * Colour carries the status and the total anchors the line, so nothing needs
+ * bold numbers alternating with dim words — that zebra was the loudest thing
+ * on screen and said the least. Zeros are dropped: "0 in progress" costs a
+ * segment to tell you nothing, and a segment appearing when work starts is a
+ * signal, not a glitch. When one status covers everything the redundant count
+ * collapses to `all`, so a fresh batch reads `8 tasks · all open` rather than
+ * `8 tasks · 8 open`.
  *
  * Takes counts rather than items because a view often shows a bounded subset
  * of rows; the header must describe the whole batch regardless.
  */
 export function renderTaskSummary(counts: TaskCounts, theme: Theme): string {
-  const number = (value: number) => theme.bold(theme.fg("text", String(value)));
-  const dim = (text: string) => theme.fg("dim", text);
   // Coerced, not trusted: these counts can arrive from a tool-result record
   // persisted by an older build, where a missing key would render the literal
   // word "undefined" (or "NaN tasks") into the header.
   const count = (status: TaskItem["status"]) =>
     Number.isFinite(counts[status]) ? counts[status] : 0;
   const total = Number.isFinite(counts.total) ? counts.total : 0;
+  if (total <= 0) return theme.fg("dim", "no tasks");
+  const present = SUMMARY_ORDER.filter((status) => count(status) > 0);
   // Built segment by segment rather than by wrapping the whole line: each
   // styled run emits its own reset, so an outer color would stop applying at
   // the first inner one.
-  const parts = SUMMARY_ORDER.filter(
-    (status) =>
-      status === "done" ||
-      status === "in_progress" ||
-      status === "pending" ||
-      count(status) > 0,
-  ).map((status) => `${number(count(status))} ${dim(SUMMARY_LABEL[status])}`);
+  const chips = present.map((status) =>
+    theme.fg(
+      STATUS_COLOR[status],
+      `${present.length === 1 && count(status) === total ? "all" : count(status)} ${SUMMARY_LABEL[status]}`,
+    ),
+  );
   return [
-    number(total),
-    " ",
-    dim(total === 1 ? "task" : "tasks"),
-    " ",
-    dim("("),
-    parts.join(dim(", ")),
-    dim(")"),
-  ].join("");
+    theme.fg("dim", `${total} ${total === 1 ? "task" : "tasks"}`),
+    ...chips,
+  ].join(theme.fg("dim", " · "));
 }
 
 export interface TaskToolDetails {
@@ -150,16 +166,7 @@ export function renderTaskRows(
   // (all of them) — would otherwise shift every subject sideways by a column.
   const idWidth = Math.max(...items.map((item) => `T${item.id}`.length), 3);
   return items.flatMap((item) => {
-    const color =
-      item.status === "done"
-        ? "success"
-        : item.status === "blocked"
-          ? "warning"
-          : item.status === "dropped"
-            ? "error"
-            : item.status === "in_progress"
-              ? "accent"
-              : "muted";
+    const color = STATUS_COLOR[item.status];
     // No `[status]` text: the icon, its color, and the subject's own weight
     // already say it, and repeating it in words crowded every row.
     const id = `T${item.id}`.padStart(idWidth);
@@ -215,17 +222,23 @@ export function renderTaskWidget(
 
   const hasOverflow = actionable.length > TASK_WIDGET_LIMIT;
   const toggleHint = hasOverflow
-    ? `  ·  ctrl+shift+t ${expanded ? "collapse" : "show all"}`
+    ? ` · ctrl+shift+t ${expanded ? "collapse" : "show all"}`
     : "";
   // Same census as the full list and the /tasks screen. Counted over `tracked`
   // rather than every item, because the widget deliberately hides dropped work
   // and a total that included it would not add up against the rows shown.
+  //
+  // Hints sit on the right edge instead of trailing the census, so the eye lands
+  // on state first and the keystrokes stay out of the way until wanted. They are
+  // dropped rather than truncated when the terminal is too narrow to hold both.
+  const label =
+    theme.fg("accent", "◆ ") + theme.fg("text", theme.bold("Tasks"));
+  const left = `${label}  ${renderTaskSummary(taskCounts(tracked), theme)}`;
+  const hint = theme.fg("dim", `/tasks${toggleHint}`);
   const header =
-    theme.fg("accent", "◆ ") +
-    theme.fg("text", theme.bold("Tasks")) +
-    "  " +
-    renderTaskSummary(taskCounts(tracked), theme) +
-    theme.fg("dim", `  ·  /tasks${toggleHint}`);
+    visibleWidth(left) + visibleWidth(hint) + 3 <= width
+      ? fitNavigationSides(left, hint, width)
+      : left;
   const visible = expanded
     ? actionable
     : actionable.slice(0, TASK_WIDGET_LIMIT);
@@ -235,12 +248,7 @@ export function renderTaskWidget(
   const idWidth = Math.max(...visible.map((i) => `T${i.id}`.length), 3);
   const lines = [truncateToWidth(header, width)];
   for (const [index, item] of visible.entries()) {
-    const color =
-      item.status === "in_progress"
-        ? "warning"
-        : item.status === "blocked"
-          ? "error"
-          : "muted";
+    const color = STATUS_COLOR[item.status];
     const branch = index === visible.length - 1 && hidden === 0 ? "╰─" : "├─";
     lines.push(
       truncateToWidth(
@@ -379,27 +387,36 @@ class TasksScreen implements Component {
   }
 
   render(width: number) {
-    const body = renderTaskRows(this.snapshot.items, this.theme, width - 4);
-    const rows = Math.max(8, (this.tui.terminal.rows || 30) - 8);
+    const theme = this.theme;
+    const counts = taskCounts(this.snapshot.items);
+    const body = renderTaskRows(this.snapshot.items, theme, width - 4);
+    // Title (1) + frame (2) + hint (1): one row more chrome than the old bare
+    // rule, so the body gives one back and the screen keeps its total height.
+    const rows = Math.max(8, (this.tui.terminal.rows || 30) - 9);
     const maxOffset = Math.max(0, body.length - rows);
     this.offset = Math.min(this.offset, maxOffset);
     const visible = body.slice(this.offset, this.offset + rows);
-    const lines = [
-      truncateToWidth(
-        `${this.theme.fg("accent", this.theme.bold("Session tasks"))}  ${renderTaskSummary(taskCounts(this.snapshot.items), this.theme)}`,
+    // Framed like /subagents, /ps, and /workflows rather than a bare rule: a
+    // full-screen view of a list is the same object in each of them, and it
+    // should not look like a different control here.
+    return [
+      screenTitleLine(theme, "Session tasks", "", width),
+      ...panelFrame(theme, {
+        label: renderTaskSummary(counts, theme),
+        rows: visible.map((line) => ` ${line}`),
         width,
-      ),
-      this.theme.fg("border", "─".repeat(Math.max(0, width))),
-      ...visible.map((line) => truncateToWidth(`  ${line}`, width)),
-    ];
-    while (lines.length < rows + 2) lines.push("");
-    lines.push(
-      truncateToWidth(
-        this.theme.fg("dim", "j/k or ↑/↓ scroll · pgup/pgdn page · esc close"),
+        height: rows + 2,
+      }),
+      hintLine(
+        theme,
+        [
+          ["j/k or ↑/↓", "scroll"],
+          ["pgup/pgdn", "page"],
+          ["esc", "close"],
+        ],
         width,
       ),
-    );
-    return lines;
+    ];
   }
 
   invalidate() {}

package/extensions/ui-customization/footer.ts

@@ -28,6 +28,9 @@ const ESCAPE_PATTERN = /\u001b(?:[()][0-2A-Z]|[ -/]*[@-~])/g;
 
 const RESET = "\x1b[0m";
 const POWERLINE_ARROW = "\ue0b0"; //  — decorative; text remains readable without Nerd Font
+const MODEL_ICON = "\uec10"; // Codicon: sparkle
+const CONTEXT_ICON = "\uebe4"; // Codicon: pie-chart
+const DIRECTORY_ICON = "\uea83"; // Codicon: folder
 
 /** Higher = keep longer when the line is too narrow. */
 const PRIORITY: Record<FooterItem, number> = {
@@ -177,11 +180,11 @@ export function buildSegmentCatalog(
     : modelInfo.modelId;
 
   return {
-    cwd: { text: formatDirectory(cwd), tone: "text" },
-    model: { text: modelText, tone: "muted" },
+    cwd: { text: `${DIRECTORY_ICON} ${formatDirectory(cwd)}`, tone: "text" },
+    model: { text: `${MODEL_ICON} ${modelText}`, tone: "muted" },
     thinking: { text: modelInfo.thinking, tone: "muted" },
     context: {
-      text: contextText,
+      text: contextText ? `${CONTEXT_ICON} ${contextText}` : "",
       tone: contextTone(modelInfo.contextPercent),
     },
     cache: {
@@ -199,7 +202,7 @@ export function buildSegmentCatalog(
           : `~${Math.round(modelInfo.tokensPerSecond)} tok/s`,
       tone: "muted",
     },
-    git: { text: gitInfo.branch ?? "", tone: "muted" },
+    git: { text: gitInfo.branch ? `⎇ ${gitInfo.branch}` : "", tone: "muted" },
     pr: {
       text: gitInfo.pullRequest
         ? formatPullRequest(gitInfo.pullRequest.number, gitInfo.pullRequest.url)
@@ -524,43 +527,3 @@ export function renderFooter(options: FooterRenderOptions) {
 
   return lines;
 }
-
-/** Legacy helper retained for tests that assert grouped content. */
-export function buildFooterContent(
-  modelInfo: ModelInfoState,
-  gitInfo: GitInfoState,
-  selectedItems: readonly FooterItem[],
-  formatPullRequest: (number: number, url: string) => string = (number) =>
-    `PR #${number}`,
-) {
-  const items = new Set(selectedItems);
-  const catalog = buildSegmentCatalog(
-    "",
-    modelInfo,
-    gitInfo,
-    formatPullRequest,
-  );
-  return {
-    showCwd: items.has("cwd"),
-    model: [
-      items.has("model") ? catalog.model.text : "",
-      items.has("thinking") ? catalog.thinking.text : "",
-    ]
-      .filter(Boolean)
-      .join(" · "),
-    usage: [
-      items.has("context") ? catalog.context.text : "",
-      items.has("cache") ? catalog.cache.text : "",
-      items.has("cost") ? catalog.cost.text : "",
-      items.has("throughput") ? catalog.throughput.text : "",
-    ]
-      .filter(Boolean)
-      .join(" · "),
-    git: [
-      items.has("git") ? catalog.git.text : "",
-      items.has("pr") ? catalog.pr.text : "",
-    ]
-      .filter(Boolean)
-      .join(" · "),
-  };
-}

package/extensions/ui-customization/index.ts

@@ -21,13 +21,9 @@ import {
   REFRESH_CHANNEL,
   isGitInfoState,
   isModelInfoState,
-  type GitInfoState,
-  type ModelInfoState,
 } from "../shared/dashboard-state.ts";
 import { formatDirectory, renderFooter } from "./footer.ts";
 
-export { buildFooterContent, formatDirectory, renderFooter } from "./footer.ts";
-
 type Rgb = [number, number, number];
 
 const RESET = "\x1b[0m";