@tt-a1i/openpi 0.4.0 → 0.5.0

package/extensions/shared/setup-config.ts

@@ -72,6 +72,22 @@ export const DEFAULT_FOOTER_LINES: FooterLines = [
   ["model", "context", "flex", "git", "pr", "cwd"],
 ];
 
+/** Stable skeleton for the legacy flat-selection adapter. */
+const FLAT_FOOTER_ITEM_LINES: FooterLines = [
+  [
+    "model",
+    "thinking",
+    "context",
+    "cache",
+    "cost",
+    "throughput",
+    "flex",
+    "git",
+    "pr",
+    "cwd",
+  ],
+];
+
 /** The persisted canonical default before model/context moved to the left. */
 const LEGACY_DEFAULT_FOOTER_LINES: FooterLines = [
   ["cwd", "git", "pr", "flex", "model", "context"],
@@ -136,9 +152,7 @@ export interface MyPiSetupConfig {
     readonly showHeader: boolean;
     readonly customFooter: boolean;
     readonly footerStyle: FooterStyle;
-    /** Canonical footer layout. `footerItems` is always derived from this. */
     readonly footerLines: FooterLines;
-    readonly footerItems: readonly FooterItem[];
     readonly subagentResultDisplay: DetailDisplay;
     readonly bashToolDisplay: DetailDisplay;
     readonly fileMutationDisplay: DetailDisplay;
@@ -169,8 +183,7 @@ export const DEFAULT_SETUP_CONFIG: MyPiSetupConfig = {
     customFooter: true,
     footerStyle: DEFAULT_FOOTER_STYLE,
     footerLines: DEFAULT_FOOTER_LINES,
-    footerItems: DEFAULT_FOOTER_ITEMS,
-    subagentResultDisplay: "full",
+    subagentResultDisplay: "compact",
     bashToolDisplay: "compact",
     fileMutationDisplay: "compact",
   },
@@ -261,13 +274,13 @@ export function normalizeFooterLines(value: unknown): FooterLines {
   return lines.length > 0 ? lines : DEFAULT_FOOTER_LINES;
 }
 
-/** Map a flat item list onto the default one-line skeleton (legacy compat). */
+/** Map a flat item list onto the stable one-line skeleton (legacy compat). */
 export function footerLinesFromItems(
   items: readonly FooterItem[],
 ): FooterLines {
   const selected = new Set(items);
   return normalizeFooterLines(
-    DEFAULT_FOOTER_LINES.map((line) =>
+    FLAT_FOOTER_ITEM_LINES.map((line) =>
       line.filter((item) => item === "flex" || selected.has(item)),
     ),
   );
@@ -335,7 +348,6 @@ export function applyFooterConfig(
   return {
     footerStyle: style,
     footerLines: normalized,
-    footerItems: flattenFooterItems(normalized),
   };
 }
 
@@ -358,7 +370,7 @@ function sameFooterLines(left: FooterLines, right: FooterLines) {
 
 function parseUiFooter(
   ui: Record<string, unknown>,
-): Pick<MyPiSetupConfig["ui"], "footerStyle" | "footerLines" | "footerItems"> {
+): Pick<MyPiSetupConfig["ui"], "footerStyle" | "footerLines"> {
   const style = isFooterStyle(ui.footerStyle)
     ? ui.footerStyle
     : DEFAULT_FOOTER_STYLE;
@@ -371,7 +383,6 @@ function parseUiFooter(
     return {
       footerStyle: style,
       footerLines: lines,
-      footerItems: flattenFooterItems(lines),
     };
   }
 
@@ -382,14 +393,12 @@ function parseUiFooter(
     return {
       footerStyle: style,
       footerLines: lines,
-      footerItems: flattenFooterItems(lines),
     };
   }
 
   return {
     footerStyle: style,
     footerLines: DEFAULT_FOOTER_LINES,
-    footerItems: DEFAULT_FOOTER_ITEMS,
   };
 }
 
@@ -484,7 +493,7 @@ export function parseSetupConfig(value: unknown): MyPiSetupConfig {
         ui.subagentResultDisplay as DetailDisplay,
       )
         ? (ui.subagentResultDisplay as DetailDisplay)
-        : "full",
+        : "compact",
       bashToolDisplay: DETAIL_DISPLAYS.includes(
         ui.bashToolDisplay as DetailDisplay,
       )
@@ -504,9 +513,9 @@ export function parseSetupConfig(value: unknown): MyPiSetupConfig {
 /** An empty or invalid value disables the post-edit command (the safe default). */
 function parsePostEditCommand(value: unknown) {
   if (!isRecord(value)) return "";
-  return typeof value.command === "string"
-    ? value.command.trim().slice(0, POST_EDIT_COMMAND_MAX_CHARS)
-    : "";
+  if (typeof value.command !== "string") return "";
+  const command = value.command.trim();
+  return command.length <= POST_EDIT_COMMAND_MAX_CHARS ? command : "";
 }
 
 export function hasSavedSetupConfig() {
@@ -561,6 +570,9 @@ function replacedFields(
   ) {
     paths.push("summaries → suggestions");
   }
+  if (path === "ui" && "footerItems" in raw && "footerLines" in normalized) {
+    paths.push("ui.footerItems");
+  }
   for (const [key, value] of Object.entries(normalized)) {
     if (!(key in raw)) continue;
     const here = path ? `${path}.${key}` : key;
@@ -627,24 +639,55 @@ const sameOwner = (left: LockOwner, right: LockOwner) =>
 const sameFile = (left: Stats, right: Stats) =>
   left.dev === right.dev && left.ino === right.ino;
 
+const parsePowerShellProcessStartedAt = (stdout: string) => {
+  const startedAt = Number(stdout.trim());
+  return isPositiveInteger(startedAt) ? startedAt : undefined;
+};
+
+const parsePsProcessStartedAt = (stdout: string) => {
+  const startedAt = Date.parse(stdout.trim());
+  return Number.isFinite(startedAt) ? startedAt : undefined;
+};
+
+export function processStartedAtQuery(
+  pid: number,
+  platform = process.platform,
+) {
+  if (platform === "win32") {
+    const script = [
+      "$ErrorActionPreference='Stop'",
+      `$p=Get-Process -Id ${pid}`,
+      "[Console]::Out.Write(([DateTimeOffset]$p.StartTime).ToUnixTimeMilliseconds())",
+    ].join("; ");
+    return {
+      command: "powershell.exe",
+      args: ["-NoProfile", "-NonInteractive", "-Command", script],
+      env: undefined,
+      parseOutput: parsePowerShellProcessStartedAt,
+    };
+  }
+  return {
+    command: "ps",
+    args: ["-o", "lstart=", "-p", String(pid)],
+    env: { LC_ALL: "C" },
+    parseOutput: parsePsProcessStartedAt,
+  };
+}
+
 const queryProcessStartedAt = (pid: number) =>
   new Promise<number | undefined>((resolve) => {
-    if (process.platform === "win32") {
-      resolve(undefined);
-      return;
-    }
+    const query = processStartedAtQuery(pid);
     try {
       execFile(
-        "ps",
-        ["-o", "lstart=", "-p", String(pid)],
+        query.command,
+        query.args,
         {
           encoding: "utf8",
-          env: { ...process.env, LC_ALL: "C" },
+          env: query.env ? { ...process.env, ...query.env } : process.env,
           timeout: 1_000,
         },
         (error, stdout) => {
-          const startedAt = error ? Number.NaN : Date.parse(stdout.trim());
-          resolve(Number.isFinite(startedAt) ? startedAt : undefined);
+          resolve(error ? undefined : query.parseOutput(stdout));
         },
       );
     } catch {
@@ -938,13 +981,15 @@ async function withSetupConfigLock<A>(action: () => Promise<A>) {
 }
 
 async function writeSetupConfig(config: MyPiSetupConfig) {
+  const canonical = parseSetupConfig(config);
   const tempPath = `${SETUP_CONFIG_PATH}.${process.pid}.${randomUUID()}.tmp`;
   try {
-    await writeFile(tempPath, `${JSON.stringify(config, null, 2)}\n`, {
+    await writeFile(tempPath, `${JSON.stringify(canonical, null, 2)}\n`, {
       encoding: "utf8",
       mode: 0o600,
     });
     await rename(tempPath, SETUP_CONFIG_PATH);
+    return canonical;
   } catch (error) {
     await unlink(tempPath).catch(() => undefined);
     throw error;
@@ -958,10 +1003,7 @@ export async function saveSetupConfig(config: MyPiSetupConfig) {
   });
 }
 
-export function formatSetupConfig(
-  config = loadSetupConfig(),
-  integrationLines: readonly string[] = [],
-) {
+export function formatSetupConfig(config = loadSetupConfig()) {
   const suggestionModel = config.suggestions.model;
   const suggestions =
     !config.suggestions.enabled || !suggestionModel
@@ -978,9 +1020,8 @@ export function formatSetupConfig(
     `Subagent results: ${config.ui.subagentResultDisplay === "full" ? "full by default" : "compact status summary (Ctrl+O expands full output)"}`,
     `Bash operations: ${config.ui.bashToolDisplay === "full" ? "expanded by default" : "one-line activity summary (Ctrl+O restores native evidence)"}`,
     `Write/Edit operations: ${config.ui.fileMutationDisplay === "full" ? "expanded by default" : "one-line activity summary (Ctrl+O restores native evidence)"}`,
-    `Post-edit command: ${config.postEdit.command ? config.postEdit.command : "off"}`,
+    `Post-edit command: ${config.postEdit.command ? "configured" : "off"}`,
     `Agent role models (Subagents + Workflows): ${SUBAGENT_ROLE_NAMES.map((role) => `${role} ${config.subagents.roleModels[role] ? `${config.subagents.roleModels[role].provider}/${config.subagents.roleModels[role].model}` : "inherit"}`).join(" · ")}`,
-    ...integrationLines,
   ].join("\n");
 }
 
@@ -998,8 +1039,7 @@ export async function updateSetupConfig(
   return withSetupConfigLock(async () => {
     const raw = readDocumentForWrite();
     const current = parseSetupConfig(raw);
-    const config = mutate(current);
-    await writeSetupConfig(config);
+    const config = await writeSetupConfig(mutate(current));
     return { config, replaced: replacedFields(raw, current) };
   });
 }

package/extensions/shared/setup-episode-state.ts

@@ -2,6 +2,6 @@
 export const OPENPI_SETUP_EPISODE_CHANNEL = "openpi:setup-episode";
 
 export interface OpenPiSetupEpisodeState {
-  /** True for both armed and actively running setup episodes. */
+  /** True only while the owned setup writer is active for a delivered request. */
   readonly active: boolean;
 }

package/extensions/shared/terminal-text.ts

@@ -1,35 +1,122 @@
-// OSC may end in BEL or ST. DCS/SOS/PM/APC end only in ST; treating BEL as
-// their terminator would expose the rest of a still-hidden payload. Both
-// patterns consume an unterminated string through the bounded input's end.
-// eslint-disable-next-line no-control-regex
-const OSC_PATTERN =
-  /(?:\u001b\]|\u009d)(?:[^\u0007\u001b\u009c]|\u001b(?!\\))*(?:\u0007|\u001b\\|\u009c|$)/g;
-// eslint-disable-next-line no-control-regex
-const ST_STRING_PATTERN =
-  /(?:\u001b[PX^_]|[\u0090\u0098\u009e\u009f])(?:[^\u001b\u009c]|\u001b(?!\\))*(?:\u001b\\|\u009c|$)/g;
-// eslint-disable-next-line no-control-regex
-const CSI_PATTERN = /(?:\u001b\[|\u009b)[0-?]*[ -/]*[@-~]/g;
-// Remaining two-byte/charset escape forms (for example ESC ( 0).
-// eslint-disable-next-line no-control-regex
-const ESCAPE_PATTERN = /\u001b(?:[()][0-2A-Z]|[ -/]*[@-~])/g;
 // Invisible Unicode format controls can reorder or disguise untrusted text.
 // Keep only ZWNJ/ZWJ (U+200C/U+200D), which carry legitimate shaping and emoji
 // semantics; variation selectors are marks rather than Cf and remain intact.
-const UNSAFE_FORMAT_PATTERN = /(?![\u200c\u200d])\p{Cf}/gu;
+const UNSAFE_FORMAT_CHARACTER = /\p{Cf}/u;
 // eslint-disable-next-line no-control-regex
 const TERMINAL_CONTROL_PATTERN =
   /[\u0000-\u001f\u007f-\u009f]|(?:(?![\u200c\u200d])\p{Cf})/u;
 
+type SanitizerState =
+  | "text"
+  | "escape"
+  | "escape_intermediate"
+  | "csi"
+  | "osc"
+  | "st_string";
+
+/** Stateful terminal-text projection for streams whose retained head can move. */
+export class TerminalTextSanitizer {
+  private state: SanitizerState = "text";
+  private stringEscape = false;
+
+  push(text: string) {
+    let safe = "";
+    for (const character of text) {
+      const code = character.codePointAt(0)!;
+
+      if (this.state === "osc" || this.state === "st_string") {
+        if (character === "\u009c") {
+          this.state = "text";
+          this.stringEscape = false;
+        } else if (this.state === "osc" && character === "\u0007") {
+          this.state = "text";
+          this.stringEscape = false;
+        } else if (this.stringEscape && character === "\\") {
+          this.state = "text";
+          this.stringEscape = false;
+        } else {
+          this.stringEscape = character === "\u001b";
+        }
+        continue;
+      }
+
+      if (this.state === "csi") {
+        if (code >= 0x40 && code <= 0x7e) this.state = "text";
+        else if (code < 0x20 || code > 0x3f) {
+          this.state = "text";
+          safe += this.safeCharacter(character, code);
+        }
+        continue;
+      }
+
+      if (this.state === "escape" || this.state === "escape_intermediate") {
+        if (this.state === "escape") {
+          if (character === "[") {
+            this.state = "csi";
+            continue;
+          }
+          if (character === "]") {
+            this.state = "osc";
+            continue;
+          }
+          if (
+            character === "P" ||
+            character === "X" ||
+            character === "^" ||
+            character === "_"
+          ) {
+            this.state = "st_string";
+            continue;
+          }
+        }
+        if (code >= 0x20 && code <= 0x2f) {
+          this.state = "escape_intermediate";
+        } else if (code >= 0x30 && code <= 0x7e) {
+          this.state = "text";
+        } else {
+          this.state = "text";
+          safe += this.safeCharacter(character, code);
+        }
+        continue;
+      }
+
+      if (character === "\u001b") {
+        this.state = "escape";
+      } else if (character === "\u009b") {
+        this.state = "csi";
+      } else if (character === "\u009d") {
+        this.state = "osc";
+      } else if (
+        character === "\u0090" ||
+        character === "\u0098" ||
+        character === "\u009e" ||
+        character === "\u009f"
+      ) {
+        this.state = "st_string";
+      } else {
+        safe += this.safeCharacter(character, code);
+      }
+    }
+    return safe;
+  }
+
+  private safeCharacter(character: string, code: number) {
+    if (character === "\t") return "  ";
+    if (
+      character === "\n" ||
+      character === "\u200c" ||
+      character === "\u200d"
+    ) {
+      return character;
+    }
+    if (code <= 0x1f || (code >= 0x7f && code <= 0x9f)) return "";
+    return UNSAFE_FORMAT_CHARACTER.test(character) ? "" : character;
+  }
+}
+
 /** Strip terminal control sequences and direction-spoofing format controls. */
 export function sanitizeTerminalText(text: string) {
-  return text
-    .replace(OSC_PATTERN, "")
-    .replace(ST_STRING_PATTERN, "")
-    .replace(CSI_PATTERN, "")
-    .replace(ESCAPE_PATTERN, "")
-    .replace(UNSAFE_FORMAT_PATTERN, "")
-    .replaceAll("\t", "  ")
-    .replace(/[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g, "");
+  return new TerminalTextSanitizer().push(text);
 }
 
 /** Reject raw terminal or direction-spoofing controls in display patterns. */

package/extensions/shared/text-projection.ts

@@ -1,6 +1,13 @@
-import { formatSize, truncateHead } from "@earendil-works/pi-coding-agent";
+import {
+  formatSize,
+  truncateHead,
+  truncateTail,
+} from "@earendil-works/pi-coding-agent";
 
 const HEAD_SHARE = 0.75;
+const OMISSION_MARKER = "[... middle omitted ...]";
+// Three framing blanks, the omission marker, and the footer.
+const STATIC_PROJECTION_OVERHEAD_LINES = 5;
 
 function utf8Prefix(content: string, maxBytes: number) {
   const bytes = Buffer.from(content, "utf8");
@@ -14,16 +21,46 @@ function utf8Prefix(content: string, maxBytes: number) {
   return "";
 }
 
-function utf8Suffix(content: string, maxBytes: number) {
-  const bytes = Buffer.from(content, "utf8");
-  if (bytes.length <= maxBytes) return content;
-  let start = Math.max(0, bytes.length - maxBytes);
-  while (start < bytes.length) {
-    const value = bytes.subarray(start).toString("utf8");
-    if (!value.startsWith("�")) return value;
-    start += 1;
-  }
-  return "";
+function boundedHead(content: string, maxBytes: number, maxLines: number) {
+  const result = truncateHead(content, { maxBytes, maxLines });
+  if (result.content || !result.firstLineExceedsLimit) return result.content;
+  return utf8Prefix(content, maxBytes);
+}
+
+function compactProjection(
+  content: string,
+  maxBytes: number,
+  maxLines: number,
+) {
+  const marker =
+    maxBytes >= OMISSION_MARKER.length
+      ? OMISSION_MARKER
+      : ".".repeat(Math.min(3, maxBytes));
+  if (!marker || maxLines <= 0) return "";
+  if (maxLines === 1) return marker;
+
+  const bodyLineBudget = maxLines - 1;
+  const keepTail = bodyLineBudget >= 2;
+  const separatorBytes = keepTail ? 2 : 1;
+  const bodyByteBudget = maxBytes - marker.length - separatorBytes;
+  if (bodyByteBudget <= 0 || (keepTail && bodyByteBudget < 2)) return marker;
+
+  const headLines = keepTail
+    ? Math.max(1, Math.floor(bodyLineBudget * HEAD_SHARE))
+    : bodyLineBudget;
+  const tailLines = keepTail ? Math.max(1, bodyLineBudget - headLines) : 0;
+  const headBytes = keepTail
+    ? Math.max(1, Math.floor(bodyByteBudget * HEAD_SHARE))
+    : bodyByteBudget;
+  const tailBytes = keepTail ? Math.max(1, bodyByteBudget - headBytes) : 0;
+  const head = boundedHead(content, headBytes, headLines);
+  const tail = keepTail
+    ? truncateTail(content, {
+        maxBytes: tailBytes,
+        maxLines: tailLines,
+      }).content
+    : "";
+  return [head, marker, tail].filter(Boolean).join("\n");
 }
 
 /** Keep decision context at the start and verdict/evidence at the end. */
@@ -31,26 +68,46 @@ export function projectText(
   content: string,
   options: { maxBytes: number; maxLines: number; recovery: string },
 ) {
+  if (options.maxBytes <= 0 || options.maxLines <= 0) return "";
+
   const probe = truncateHead(content, {
     maxBytes: options.maxBytes,
     maxLines: options.maxLines,
   });
   if (!probe.truncated) return content;
 
+  const recoveryNewlines = options.recovery.split("\n").length - 1;
+  const bodyLineBudget =
+    options.maxLines - STATIC_PROJECTION_OVERHEAD_LINES - recoveryNewlines;
+  if (bodyLineBudget < 2) {
+    return compactProjection(content, options.maxBytes, options.maxLines);
+  }
+  const headLines = Math.max(1, Math.floor(bodyLineBudget * HEAD_SHARE));
+  const tailLines = Math.max(1, bodyLineBudget - headLines);
+
   let bodyBudget = options.maxBytes;
   let projected = "";
   for (let attempt = 0; attempt < 8; attempt++) {
     const headBytes = Math.max(1, Math.floor(bodyBudget * HEAD_SHARE));
     const tailBytes = Math.max(1, bodyBudget - headBytes);
-    const head = utf8Prefix(content, headBytes);
-    const tail = utf8Suffix(content, tailBytes);
+    const head = boundedHead(content, headBytes, headLines);
+    const tail = truncateTail(content, {
+      maxBytes: tailBytes,
+      maxLines: tailLines,
+    }).content;
     const shown =
       Buffer.byteLength(head, "utf8") + Buffer.byteLength(tail, "utf8");
     const footer = `[Projection bounded: showing ${formatSize(shown)} of ${formatSize(probe.totalBytes)} across the head and tail. ${options.recovery}]`;
-    projected = `${head}\n\n[... middle omitted ...]\n\n${tail}\n\n${footer}`;
+    projected = `${head}\n\n${OMISSION_MARKER}\n\n${tail}\n\n${footer}`;
     const overflow = Buffer.byteLength(projected, "utf8") - options.maxBytes;
     if (overflow <= 0 || bodyBudget <= overflow + 2) break;
     bodyBudget -= overflow;
   }
-  return projected;
+  const projectedProbe = truncateHead(projected, {
+    maxBytes: options.maxBytes,
+    maxLines: options.maxLines,
+  });
+  return projectedProbe.truncated
+    ? compactProjection(content, options.maxBytes, options.maxLines)
+    : projected;
 }