@tt-a1i/openpi 0.4.0 → 0.5.0

package/extensions/background-terminals/src/output.ts

@@ -13,13 +13,17 @@
  */
 
 import type { OutputView } from "./domain.ts";
+import { TerminalTextSanitizer } from "../../shared/terminal-text.ts";
 
 export class OutputBuffer {
   private chunks: string[] = [];
+  private modelSafeChunks: string[] = [];
   /** Bytes currently retained across `chunks`. */
   private retainedBytes = 0;
+  private modelSafeRetainedBytes = 0;
   /** Cached join of `chunks`; invalidated on push so 1Hz UI ticks are cheap. */
   private cachedText: string | undefined = "";
+  private cachedModelSafeText: string | undefined = "";
   /** Bumped on every push; lets the UI cache derived line layouts. */
   version = 0;
   totalBytes = 0;
@@ -28,6 +32,7 @@ export class OutputBuffer {
 
   private readonly maxRetainedBytes: number;
   private readonly spill?: (chunk: string) => unknown;
+  private readonly modelSanitizer = new TerminalTextSanitizer();
 
   constructor(maxRetainedBytes: number, spill?: (chunk: string) => unknown) {
     this.maxRetainedBytes = maxRetainedBytes;
@@ -36,6 +41,7 @@ export class OutputBuffer {
 
   push(chunk: string) {
     if (chunk.length === 0) return true;
+    this.retainModelSafeText(this.modelSanitizer.push(chunk));
     let bytes = Buffer.byteLength(chunk, "utf8");
     this.totalBytes += bytes;
     const spillAccepted = this.spill?.(chunk) !== false;
@@ -74,11 +80,38 @@ export class OutputBuffer {
 
   view(): OutputView {
     this.cachedText ??= this.chunks.join("");
+    this.cachedModelSafeText ??= this.modelSafeChunks.join("");
     return {
       text: this.cachedText,
+      modelSafeText: this.cachedModelSafeText,
       totalBytes: this.totalBytes,
       truncatedBytes: this.truncatedBytes,
       spillPath: this.spillPath,
     };
   }
+
+  private retainModelSafeText(text: string) {
+    if (text.length === 0) return;
+    let bytes = Buffer.byteLength(text, "utf8");
+    if (bytes > this.maxRetainedBytes) {
+      this.modelSafeChunks = [];
+      this.modelSafeRetainedBytes = 0;
+      const raw = Buffer.from(text, "utf8");
+      let start = raw.length - this.maxRetainedBytes;
+      while (start < raw.length && (raw[start] & 0xc0) === 0x80) start++;
+      text = raw.subarray(start).toString("utf8");
+      bytes = raw.length - start;
+    }
+    this.modelSafeChunks.push(text);
+    this.modelSafeRetainedBytes += bytes;
+    while (
+      this.modelSafeRetainedBytes > this.maxRetainedBytes &&
+      this.modelSafeChunks.length > 1
+    ) {
+      const evicted = this.modelSafeChunks.shift();
+      if (evicted === undefined) break;
+      this.modelSafeRetainedBytes -= Buffer.byteLength(evicted, "utf8");
+    }
+    this.cachedModelSafeText = undefined;
+  }
 }

package/extensions/background-terminals/src/prompt.ts

@@ -6,6 +6,7 @@ import {
   formatSize,
   truncateTail,
 } from "@earendil-works/pi-coding-agent";
+import { sanitizeTerminalText } from "../../shared/terminal-text.ts";
 import {
   formatDuration,
   formatElapsed,
@@ -139,7 +140,7 @@ function outputSection(
   maxLines: number,
 ) {
   if (view.totalBytes === 0) return `${label}: (empty)`;
-  const truncation = truncateTail(view.text, {
+  const truncation = truncateTail(view.modelSafeText, {
     maxBytes: Math.min(maxBytes, DEFAULT_MAX_BYTES),
     maxLines: Math.min(maxLines, DEFAULT_MAX_LINES),
   });
@@ -186,12 +187,15 @@ export function buildTerminalBatchResultMessage(
   messages: readonly string[],
   omitted = 0,
 ) {
-  if (messages.length === 1 && omitted === 0) return messages[0]!;
-  const summaries = messages.map(
+  const sanitizedMessages = messages.map(sanitizeTerminalText);
+  if (sanitizedMessages.length === 1 && omitted === 0) {
+    return sanitizedMessages[0]!;
+  }
+  const summaries = sanitizedMessages.map(
     (message) => message.split("\n", 1)[0] || "Background terminal result",
   );
   const header = [
-    `${messages.length} background terminal result${messages.length === 1 ? "" : "s"}:`,
+    `${sanitizedMessages.length} background terminal result${sanitizedMessages.length === 1 ? "" : "s"}:`,
     ...summaries.map((summary) => `- ${summary}`),
     omitted > 0
       ? `- ${omitted} older result${omitted === 1 ? "" : "s"} omitted from this bounded batch; use bg_list/bg_status for retained details.`
@@ -206,7 +210,7 @@ export function buildTerminalBatchResultMessage(
     `${header}${logsHeader}${truncationMarker}`,
     "utf8",
   );
-  const logs = truncateTail(messages.join("\n\n"), {
+  const logs = truncateTail(sanitizedMessages.join("\n\n"), {
     maxBytes: Math.max(1, RESULT_BATCH_MAX - fixedBytes),
     maxLines: DEFAULT_MAX_LINES,
   });
@@ -220,6 +224,10 @@ export function buildKillReport(results: ReadonlyArray<KillResult>) {
       if (entry.killed) {
         return `Killed ${entry.id} "${entry.title}" (${entry.exit}).`;
       }
+      if (entry.terminationFailed) {
+        const detail = entry.errorText ? ` ${entry.errorText}.` : "";
+        return `Could not confirm process-tree termination for ${entry.id} "${entry.title}" (${entry.exit}).${detail}`;
+      }
       if (entry.wasRunning) {
         // The natural exit won the race with the kill signal.
         return `${entry.id} "${entry.title}" exited on its own before the kill landed (${entry.exit}).`;

package/extensions/background-terminals/src/result-delivery.ts

@@ -1,3 +1,5 @@
+import type { ConsumableResultDeliveryQueue } from "../../shared/result-delivery.ts";
+
 /**
  * Deferred one-shot delivery map (same semantics as subagents'): a settled
  * terminal's result is held here until it is either drained into a follow-up
@@ -8,7 +10,7 @@
 export function createDeferredResultDelivery<T extends { id: string }>() {
   const pending = new Map<string, T>();
 
-  return {
+  const queue = {
     defer(result: T) {
       pending.set(result.id, result);
       return pending.size;
@@ -38,6 +40,7 @@ export function createDeferredResultDelivery<T extends { id: string }>() {
       pending.clear();
     },
   };
+  return queue satisfies ConsumableResultDeliveryQueue<T>;
 }
 
 /**

package/extensions/clear-context/index.ts

@@ -0,0 +1,83 @@
+import {
+  type ExtensionAPI,
+  type ExtensionContext,
+  type KeybindingsManager,
+} from "@earendil-works/pi-coding-agent";
+import { Key, matchesKey, type EditorComponent } from "@earendil-works/pi-tui";
+import {
+  BelowEditorNavigationEditor,
+  BelowEditorStripState,
+} from "../shared/below-editor-navigation.ts";
+import {
+  registerEditorLayer,
+  removeEditorLayer,
+} from "../shared/editor-layers.ts";
+
+export function shouldClearContext(
+  data: string,
+  editorText: string,
+  isIdle: boolean,
+) {
+  return isIdle && editorText.length === 0 && matchesKey(data, Key.ctrl("c"));
+}
+
+export class ClearContextEditor extends BelowEditorNavigationEditor {
+  private readonly isIdle: () => boolean;
+
+  constructor(
+    base: EditorComponent,
+    keybindings: KeybindingsManager,
+    isIdle: () => boolean,
+  ) {
+    super(
+      base,
+      keybindings,
+      new BelowEditorStripState(),
+      () => false,
+      () => undefined,
+      () => undefined,
+    );
+    this.isIdle = isIdle;
+  }
+
+  override handleInput(data: string) {
+    if (shouldClearContext(data, this.getText(), this.isIdle())) {
+      // Route through Pi's built-in /new command so session replacement keeps
+      // Pi's persistence, cleanup, and transcript lifecycle as the source of truth.
+      this.setText("/new");
+      this.onSubmit?.("/new");
+      return;
+    }
+
+    super.handleInput(data);
+  }
+}
+
+function installClearContextShortcut(pi: ExtensionAPI, ctx: ExtensionContext) {
+  if (ctx.mode !== "tui") return () => {};
+
+  registerEditorLayer(pi, ctx, {
+    id: "clear-context",
+    order: 100,
+    wrap: (base, _tui, _theme, keybindings) =>
+      new ClearContextEditor(base, keybindings, () => ctx.isIdle()),
+  });
+
+  return () => removeEditorLayer(pi, "clear-context");
+}
+
+export default function clearContext(pi: ExtensionAPI) {
+  let removeShortcut = () => {};
+
+  pi.on("session_start", (_event, ctx) => {
+    removeShortcut();
+    removeShortcut = installClearContextShortcut(pi, ctx);
+  });
+
+  pi.on("session_shutdown", () => {
+    removeShortcut();
+    removeShortcut = () => {};
+  });
+}
+
+export { installClearContextShortcut };

package/extensions/context-pivot/index.ts

@@ -11,6 +11,9 @@ import {
 
 export const MIN_CONTEXT_PIVOT_TOKENS = 30_000;
 const STATUS_KEY = "context-pivot";
+const NOTHING_TO_COMPACT_ERROR = "Nothing to compact (session too small)";
+const NO_DISCARDABLE_HISTORY_MESSAGE =
+  "Context pivot could not run: this session has no discardable history to compact. Continue in the current session, or use /sessions to choose another session; to begin cleanly, start a new Session in Pi.";
 
 interface PendingPivot {
   brief: string;
@@ -57,6 +60,13 @@ export function buildPivotSummary(brief: string): string {
   ].join("\n");
 }
 
+function formatContextPivotError(error: unknown): string {
+  const message = error instanceof Error ? error.message : String(error);
+  return message === NOTHING_TO_COMPACT_ERROR
+    ? NO_DISCARDABLE_HISTORY_MESSAGE
+    : `Context pivot failed: ${message}`;
+}
+
 function impossibleKeptId(entries: readonly SessionEntry[]) {
   return `${entries.at(-1)?.id ?? "context-pivot"}-context-pivot-cut`;
 }
@@ -73,7 +83,7 @@ function validateBrief(brief: string, ctx: ExtensionContext) {
   }
   if (tokens < MIN_CONTEXT_PIVOT_TOKENS) {
     throw new Error(
-      `Context is only ${Math.round(tokens).toLocaleString()} tokens; use context_pivot once context reaches at least ${MIN_CONTEXT_PIVOT_TOKENS.toLocaleString()} tokens, or /handoff for a genuinely new session.`,
+      `Context is only ${Math.round(tokens).toLocaleString()} tokens; use context_pivot once context reaches at least ${MIN_CONTEXT_PIVOT_TOKENS.toLocaleString()} tokens, or use /sessions to browse or switch an existing session; start a new Session in Pi when a clean session is needed.`,
     );
   }
 }
@@ -127,7 +137,7 @@ export default function contextPivot(pi: ExtensionAPI) {
     name: "context_pivot",
     label: "Context Pivot",
     description:
-      "Deliberately replace a long, noisy active context with a concise brief for the next phase while staying in the same Pi session. Use once context is at least 30k tokens and the work is moving between phases such as research → implementation or implementation → review; below 30k it is rejected. Use /handoff instead for a genuinely new session.",
+      "Deliberately replace a long, noisy active context with a concise brief for the next phase while staying in the same Pi session. Use once context is at least 30k tokens and the work is moving between phases such as research → implementation or implementation → review; below 30k it is rejected. Use /sessions to browse or switch an existing session; start a new Session in Pi when a genuinely new session is needed.",
     promptSnippet:
       "Compress a long current session into a clean brief before changing phase",
     promptGuidelines: [
@@ -176,11 +186,11 @@ export default function contextPivot(pi: ExtensionAPI) {
           onError: (error) => {
             if (pivotGeneration === generation) pending = undefined;
             clear();
+            const message = formatContextPivotError(error);
             if (ctx.hasUI) {
-              ctx.ui.notify(
-                `Context pivot failed: ${error instanceof Error ? error.message : String(error)}`,
-                "error",
-              );
+              ctx.ui.notify(message, "error");
+            } else {
+              console.error(message);
             }
           },
         });

package/extensions/cron/schedule.ts

@@ -81,8 +81,14 @@ export function parseCronCommand(raw: string): ParsedCronCommand {
       error: `Minimum interval is ${MIN_INTERVAL_MS / 1000}s (the scheduler polls about that often).`,
     };
   }
-  const prompt = schedule[3].trim().slice(0, CRON_PROMPT_MAX_CHARS);
+  const prompt = schedule[3].trim();
   if (!prompt) return { action: "help", error: "Provide a prompt to run." };
+  if (prompt.length > CRON_PROMPT_MAX_CHARS) {
+    return {
+      action: "help",
+      error: `Prompt is too long. Maximum is ${CRON_PROMPT_MAX_CHARS} characters.`,
+    };
+  }
   return {
     action: "add",
     intervalMs,

package/extensions/file-mutation-display/render.ts

@@ -1,13 +1,11 @@
-import { isAbsolute, relative } from "node:path";
-import { stripVTControlCharacters } from "node:util";
 import type {
   AgentToolResult,
   Theme,
   ToolDefinition,
 } from "@earendil-works/pi-coding-agent";
-import { truncateToWidth, type Component } from "@earendil-works/pi-tui";
+import type { Component } from "@earendil-works/pi-tui";
 import type { TSchema } from "typebox";
-import { spinnerFrame } from "../shared/spinner.ts";
+import { renderPaddedToolActivityLine } from "../shared/tool-activity.ts";
 
 type ActivityStatus = "pending" | "success" | "error";
 
@@ -23,33 +21,11 @@ type ActivityRenderState<TDetails> = {
   };
 };
 
-type ActivityRow = {
-  verb: string;
-  target: string;
-  detail?: string;
-};
-
-const HORIZONTAL_PADDING = "  ";
-
 const emptyComponent: Component = {
   render: () => [],
   invalidate() {},
 };
 
-function record(value: unknown): Record<string, unknown> {
-  return value !== null && typeof value === "object"
-    ? (value as Record<string, unknown>)
-    : {};
-}
-
-function string(value: unknown) {
-  return typeof value === "string" ? value : "";
-}
-
-function number(value: unknown) {
-  return typeof value === "number" ? value : undefined;
-}
-
 function textOutput(result: AgentToolResult<unknown> | undefined) {
   return (
     result?.content
@@ -59,228 +35,6 @@ function textOutput(result: AgentToolResult<unknown> | undefined) {
   );
 }
 
-function resultCount(result: AgentToolResult<unknown> | undefined) {
-  return textOutput(result)
-    .split(/\r?\n/)
-    .filter((line) => line.trim().length > 0 && !line.trim().startsWith("["))
-    .length;
-}
-
-function grepMatchCount(result: AgentToolResult<unknown> | undefined) {
-  const output = textOutput(result).trim();
-  if (!output || output === "No matches found") return 0;
-  return output.split(/\r?\n/).filter((line) => /^.+:\d+:/.test(line)).length;
-}
-
-function itemCount(
-  result: AgentToolResult<unknown> | undefined,
-  emptyMessage: string,
-) {
-  const output = textOutput(result).trim();
-  return !output || output === emptyMessage ? 0 : resultCount(result);
-}
-
-function plural(count: number, singular: string) {
-  const pluralForm =
-    singular === "match"
-      ? "matches"
-      : singular === "entry"
-        ? "entries"
-        : `${singular}s`;
-  return `${count} ${count === 1 ? singular : pluralForm}`;
-}
-
-function editStats(details: unknown) {
-  const diff = string(record(details).diff);
-  if (!diff) return undefined;
-  let additions = 0;
-  let removals = 0;
-  for (const line of diff.split(/\r?\n/)) {
-    if (line.startsWith("+") && !line.startsWith("+++")) additions += 1;
-    if (line.startsWith("-") && !line.startsWith("---")) removals += 1;
-  }
-  return { additions, removals };
-}
-
-function range(args: Record<string, unknown>) {
-  const offset = number(args.offset);
-  const limit = number(args.limit);
-  if (offset === undefined && limit === undefined) return "";
-  const start = offset ?? 1;
-  return limit === undefined ? `:${start}-` : `:${start}-${start + limit - 1}`;
-}
-
-function displayPath(path: string, cwd: string) {
-  if (!isAbsolute(path)) return path;
-  const local = relative(cwd, path);
-  if (local === "") return ".";
-  return local.startsWith("..") || isAbsolute(local) ? path : local;
-}
-
-function activityRow(
-  name: string,
-  argsValue: unknown,
-  result: AgentToolResult<unknown> | undefined,
-  cwd: string,
-): ActivityRow {
-  const args = record(argsValue);
-  const path = displayPath(string(args.path) || ".", cwd);
-  switch (name) {
-    case "read":
-      return { verb: "Read", target: `${path}${range(args)}` };
-    case "bash":
-      return {
-        verb: "Ran",
-        target: string(args.command).replace(/\s+/g, " ").trim(),
-      };
-    case "write": {
-      const content = string(args.content);
-      const lines =
-        content.length === 0
-          ? 0
-          : content.replace(/\r?\n$/, "").split(/\r?\n/).length;
-      return { verb: "Wrote", target: path, detail: plural(lines, "line") };
-    }
-    case "edit":
-      return { verb: "Edited", target: path };
-    case "grep":
-      return {
-        verb: "Searched",
-        target: string(args.pattern),
-        detail: `in ${path}  ${plural(grepMatchCount(result), "match")}`,
-      };
-    case "find":
-      return {
-        verb: "Searched",
-        target: string(args.pattern),
-        detail: `in ${path}  ${plural(itemCount(result, "No files found matching pattern"), "result")}`,
-      };
-    case "ls":
-      return {
-        verb: "Listed",
-        target: path,
-        detail: plural(itemCount(result, "(empty directory)"), "entry"),
-      };
-    default:
-      return { verb: name, target: "" };
-  }
-}
-
-function pendingVerb(name: string) {
-  switch (name) {
-    case "read":
-      return "Reading";
-    case "bash":
-      return "Running";
-    case "write":
-      return "Writing";
-    case "edit":
-      return "Editing";
-    case "grep":
-    case "find":
-      return "Searching";
-    case "ls":
-      return "Listing";
-    default:
-      return "Running";
-  }
-}
-
-function activityIcon(name: string) {
-  switch (name) {
-    case "read":
-      return "\ueaa4"; // Nerd Fonts Codicon: book
-    case "bash":
-      return "\uea85"; // Nerd Fonts Codicon: terminal
-    case "write":
-    case "edit":
-      return "\uea73"; // Nerd Fonts Codicon: edit
-    case "grep":
-    case "find":
-      return "\uea6d"; // Nerd Fonts Codicon: search
-    case "ls":
-      return "\uea83"; // Nerd Fonts Codicon: folder
-    default:
-      return "✓";
-  }
-}
-
-function errorSummary(result: AgentToolResult<unknown> | undefined) {
-  const lines = textOutput(result)
-    .split(/\r?\n/)
-    .map((line) => stripVTControlCharacters(line).trim())
-    .filter(Boolean);
-  return (
-    [...lines]
-      .reverse()
-      .find((line) =>
-        /(?:command (?:exited|timed out|aborted)|error|denied|failed)/i.test(
-          line,
-        ),
-      ) ?? lines[0]
-  );
-}
-
-function duration(
-  state: NonNullable<ActivityRenderState<unknown>["openpiActivity"]>,
-) {
-  if (state.startedAt === undefined) return undefined;
-  const seconds = Math.floor(
-    ((state.endedAt ?? Date.now()) - state.startedAt) / 1000,
-  );
-  return seconds > 0 ? `${seconds}s` : undefined;
-}
-
-function activityText(
-  name: string,
-  args: unknown,
-  state: NonNullable<ActivityRenderState<unknown>["openpiActivity"]>,
-  theme: Theme,
-  cwd: string,
-) {
-  const row = activityRow(name, args, state.result, cwd);
-  const elapsed = duration(state);
-  const verbText = (
-    state.status === "pending"
-      ? pendingVerb(name)
-      : state.status === "error"
-        ? "Failed"
-        : row.verb
-  ).padEnd(8);
-  const verb = theme.fg(
-    state.status === "error"
-      ? "error"
-      : state.status === "success"
-        ? "muted"
-        : "toolTitle",
-    verbText,
-  );
-  if (state.status === "pending") {
-    const detail = elapsed ? ` · ${elapsed}` : "";
-    return `${theme.fg("warning", spinnerFrame(Date.now()))} ${verb} ${row.target}${theme.fg("dim", detail)}`;
-  }
-  if (state.status === "error") {
-    const summary = errorSummary(state.result);
-    const detail = [elapsed, summary].filter(Boolean).join(" · ");
-    return `${theme.fg("error", "✕")} ${verb} ${row.target}${detail ? theme.fg("dim", ` · ${detail}`) : ""}`;
-  }
-  const parts: string[] = [];
-  if (name === "edit") {
-    // Kimi-style diff stats: additions green, removals red.
-    const stats = editStats(state.result?.details);
-    if (stats) {
-      parts.push(
-        `${theme.fg("success", `+${stats.additions}`)} ${theme.fg("error", `-${stats.removals}`)}`,
-      );
-    }
-  } else if (row.detail) {
-    parts.push(theme.fg("dim", row.detail));
-  }
-  if (elapsed) parts.push(theme.fg("dim", elapsed));
-  const detail = parts.join(theme.fg("dim", " · "));
-  return `${theme.fg("dim", activityIcon(name))} ${verb} ${theme.fg("muted", row.target)}${detail ? `  ${detail}` : ""}`;
-}
-
 function activityComponent(
   name: string,
   args: unknown,
@@ -290,15 +44,21 @@ function activityComponent(
 ): Component {
   return {
     render(width) {
-      const contentWidth = width - HORIZONTAL_PADDING.length * 2;
-      if (contentWidth <= 0) return [];
-      return [
-        `${HORIZONTAL_PADDING}${truncateToWidth(
-          activityText(name, args, state, theme, cwd),
-          contentWidth,
-          "…",
-        )}${HORIZONTAL_PADDING}`,
-      ];
+      const line = renderPaddedToolActivityLine(
+        {
+          name,
+          args,
+          output: textOutput(state.result),
+          details: state.result?.details,
+          status: state.status,
+          cwd,
+          startedAt: state.startedAt,
+          endedAt: state.endedAt,
+        },
+        theme,
+        width,
+      );
+      return line ? [line] : [];
     },
     invalidate() {},
   };