pum-agent 0.2.36-beta.1 → 0.2.37-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pum-agent",
-  "version": "0.2.36-beta.1",
+  "version": "0.2.37-beta.1",
   "description": "A compact terminal coding agent powered by pi and OpenTUI.",
   "license": "MIT",
   "type": "module",
@@ -50,8 +50,8 @@
     "pack:check": "bun run scripts/validate-pack.ts"
   },
   "dependencies": {
-    "@earendil-works/pi-ai": "^0.87.1",
-    "@earendil-works/pi-coding-agent": "^0.87.1",
+    "@earendil-works/pi-ai": "1.1.0",
+    "@earendil-works/pi-coding-agent": "1.1.0",
     "@opentui/core": "^0.5.1",
     "@opentui/react": "^0.5.1",
     "react": "^19.2.8",

package/src/app.tsx

@@ -62,7 +62,6 @@ import {
   rawToolText,
   resolveGoalReview,
   resolvePendingDelivery,
-  settleTranscriptMessage,
   streamedDelta,
   StreamLine,
   TextLine,
@@ -74,6 +73,7 @@ import {
 } from "./transcript";
 import { bashOutput, bashResultDisplay, editCounts, toolArgs, type ToolCall } from "./tool-line";
 import { interruptedToolCall, settledToolCall, startedToolCall } from "./tool-row";
+import { settleAssistantTranscript } from "./provider-error";
 import { toolPreviewFromResult, toolPreviewFromStart } from "./tool-preview";
 import { readBranch, watchBranch } from "./git-branch";
 import { HelpPopup, maxHelpScrollOffset } from "./help-popup";
@@ -2222,7 +2222,7 @@ export function App({
         }
         case "message_end":
           if (event.message.role === "assistant") {
-            setTx((value) => settleTranscriptMessage(value));
+            setTx((value) => settleAssistantTranscript(value, event.message));
           } else if (event.message.role === "custom" && event.message.customType === VALIDATION_CUSTOM_TYPE) {
             append({
               kind: "text",

package/src/bash-output.ts

@@ -580,7 +580,12 @@ export type BashToolLike = {
     signal?: AbortSignal,
     onUpdate?: (update: { content: unknown[]; details?: unknown }) => void,
     ctx?: unknown,
-  ) => Promise<{ content: Array<{ type: string; text: string }>; details?: { fullOutputPath?: string } }>;
+  ) => Promise<{
+    content: Array<{ type: string; text: string }>;
+    details?: { fullOutputPath?: string };
+    isError?: boolean;
+    structuredContent?: unknown;
+  }>;
 };
 
 export const bashOutputParameters = Type.Object({
@@ -666,16 +671,27 @@ export function withBashOutput(
           await capture.remove();
           return result; // Fail open to pi's bounded native result; never lose output.
         }
-        const source = captured ?? textOf(result.content);
-        const summary = summarizeBashOutput(source, perCall, {
-          exitCode: 0,
+        const nativeText = textOf(result.content);
+        // pi 1.1.0 returns nonzero exits as error results, not thrown Errors.
+        // Keep native status/error identity while summarizing our trusted stream.
+        const exit = result.isError ? EXIT_RE.exec(nativeText) : null;
+        const status = exit ? `Command exited with code ${exit[2]}` : undefined;
+        if (result.isError && !exit) {
+          await capture?.remove();
+          return result; // Unknown error shape: preserve native evidence intact.
+        }
+        const source = captured ?? (exit ? exit[1] : nativeText);
+        const summary = summarizeBashOutput(source, status
+          ? { ...perCall, maxBytes: Math.max(64, perCall.maxBytes - byteLen(status) - 2) }
+          : perCall, {
+          exitCode: exit ? Number(exit[2]) : 0,
           path: capture?.path,
           patterns,
         });
         if (capture && !summary.lossy) await capture.remove();
         return {
           ...result,
-          content: [{ type: "text", text: summary.content }],
+          content: [{ type: "text", text: status ? `${summary.content}\n\n${status}` : summary.content }],
           details: capture && summary.lossy ? { fullOutputPath: capture.path } : result.details,
         };
       } catch (error) {

package/src/file-mutation-guard.ts

@@ -1,4 +1,4 @@
-import { createReadToolDefinition, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { createReadToolDefinition, type ExtensionToolContext } from "@earendil-works/pi-coding-agent";
 import { createHash } from "node:crypto";
 import { constants, type Stats } from "node:fs";
 import { lstat, open } from "node:fs/promises";
@@ -138,11 +138,11 @@ export class FileMutationGuard {
   }
 
   /** Preserve native image handling and filename retries; observe only a stable successful read. */
-  async read(id: string, input: any, signal?: AbortSignal, onUpdate?: any, ctx?: ExtensionContext, autoResizeImages?: boolean): Promise<any> {
+  async read(id: string, input: any, signal?: AbortSignal, onUpdate?: any, ctx?: ExtensionToolContext, autoResizeImages?: boolean): Promise<any> {
     const target = await this.target(input.path, "read");
     const before = await this.snapshot(target.path, "read");
     const result = await createReadToolDefinition(this.cwd, { autoResizeImages }).execute(
-      id, input, signal, onUpdate, ctx ?? { cwd: this.cwd } as ExtensionContext,
+      id, input, signal, onUpdate, ctx ?? { cwd: this.cwd } as ExtensionToolContext,
     );
     const after = await this.snapshot(target.path, "read");
     if (!signal?.aborted && !this.disposed && before.fingerprint === after.fingerprint) this.remember(target.key, before);

package/src/project-validation.ts

@@ -290,8 +290,9 @@ export class ProjectValidationController {
             outcome = deadline.signal.aborted ? "timeout" : "cancelled";
           } else {
             const result = await tool.execute(toolCall.id, args, signal);
-            const after = await untilAborted(Promise.resolve(session.agent.afterToolCall?.({ assistantMessage, toolCall, args, result, isError: false, context }, signal)), signal);
-            if (after?.isError) outcome = "failed";
+            const isError = result.isError === true;
+            const after = await untilAborted(Promise.resolve(session.agent.afterToolCall?.({ assistantMessage, toolCall, args, result, isError, context }, signal)), signal);
+            if (after?.isError ?? isError) outcome = "failed";
             output = (after?.content ?? result.content).filter((item) => item.type === "text").map((item) => item.text).join("\n");
           }
         } catch (error) {

package/src/provider-error.ts

@@ -0,0 +1,66 @@
+import { flushStream, settleTranscriptMessage, type Line, type PendingTranscriptState } from "./transcript";
+
+/** Redact entire header values, not just the scheme or first credential token. */
+function redactAuthorization(text: string): string {
+  const header = /(["']?\b(?:proxy-)?authorization["']?\s*[:=]\s*)/gi;
+  let safe = "";
+  let copied = 0;
+  for (let match = header.exec(text); match; match = header.exec(text)) {
+    const start = header.lastIndex;
+    let end = start;
+    let quote = "";
+    for (; end < text.length; end++) {
+      const char = text[end]!;
+      if (quote) {
+        // JSON-escaped Digest quotes are part of the value, not its boundary.
+        if (char === "\\") { end++; continue; }
+        if (char === quote) quote = "";
+        continue;
+      }
+      if (char === '"' || char === "'") { quote = char; continue; }
+      // Digest commas and arbitrary scheme whitespace/semicolons can contain
+      // credentials. Only a structured next field or explicit schema diagnostic
+      // is a safe boundary; ambiguous/unclosed values consume the remaining text.
+      if (char === "," && /^,\s*["'][^"'\n]+["']\s*:/.test(text.slice(end))) break;
+      if (char === ";" && /^;\s*(?:[45]\d\d\s+)?tools\.\d+\.custom\b/.test(text.slice(end))) break;
+    }
+    safe += text.slice(copied, start) + "[redacted]";
+    copied = end;
+    header.lastIndex = end;
+  }
+  return safe + text.slice(copied);
+}
+
+/** Provider text is untrusted display data, never a diagnostic or durable rewrite. */
+export function providerErrorLine(message: unknown): Line | null {
+  const assistant = message as { role?: unknown; stopReason?: unknown; errorMessage?: unknown } | null;
+  // An aborted response can also carry errorMessage; cancellation is not failure.
+  if (assistant?.role !== "assistant" || assistant.stopReason !== "error") return null;
+  const raw = typeof assistant.errorMessage === "string" ? assistant.errorMessage : "";
+  // As in login-flow.safeError, redact credential-shaped keys. Provider failures
+  // can also echo headers/JSON or an OAuth URL, so remove those before bounding.
+  const normalized = raw
+    // Normalize control sequences first so they cannot split a credential marker.
+    .replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "")
+    .replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "")
+    .replace(/[\x00-\x08\x0b-\x1f\x7f-\x9f\u202a-\u202e\u2066-\u2069]/g, "");
+  const safe = redactAuthorization(normalized)
+    .replace(/https?:\/\/[^\s<>"']+/gi, "[redacted URL]")
+    .replace(/\bBearer\s+[^\s,"'}]+/gi, "Bearer [redacted]")
+    // Quoted JSON/header values may contain escaped quotes or span whitespace.
+    // An unterminated quoted secret is redacted through the end, never partially.
+    .replace(/(["']?\b(?:api[_ -]?key|x-api-key|access[_ -]?token|refresh[_ -]?token|password|secret|client[_ -]?secret)["']?\s*[:=]\s*)(?:"(?:\\[\s\S]|[^"\\])*(?:"|\\?$)|'(?:\\[\s\S]|[^'\\])*(?:'|\\?$)|[^\s,}\n]+)/gi, "$1[redacted]")
+    .replace(/\b(?:sk|key|token)-[A-Za-z0-9_.-]{8,}\b/gi, "[redacted]")
+    .replace(/\b(?:gh[pousr]_[A-Za-z0-9_]+|github_pat_[A-Za-z0-9_]+|AKIA[A-Z0-9]{16}|eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)\b/g, "[redacted]")
+    .trim();
+  const detail = safe ? safe.slice(0, 4000) + (safe.length > 4000 ? "…" : "") : "The request failed without an error description.";
+  return { kind: "text", role: "error", text: `Provider error: ${detail}` };
+}
+
+/** Finish partial output before its failure, then deliver queued messages. */
+export function settleAssistantTranscript<T extends PendingTranscriptState>(value: T, message: unknown): T {
+  const error = providerErrorLine(message);
+  if (!error) return settleTranscriptMessage(value);
+  const flushed = flushStream(value);
+  return settleTranscriptMessage({ ...flushed, lines: [...flushed.lines, error] });
+}

package/src/replay.ts

@@ -1,4 +1,5 @@
 import type { AgentMessageKind, Line } from "./transcript";
+import { providerErrorLine } from "./provider-error";
 import { toolArgs, type ToolCall } from "./tool-line";
 import { interruptedToolCall, settledToolCall, startedToolCall } from "./tool-row";
 import {
@@ -303,8 +304,8 @@ export function replayEntries(
       continue;
     }
 
-    if (message?.role === "assistant" && Array.isArray(message.content)) {
-      for (const block of message.content) {
+    if (message?.role === "assistant") {
+      for (const block of Array.isArray(message.content) ? message.content : []) {
         if (block?.type === "text" && block.text?.trim()) {
           lines.push({ kind: "text", role: "assistant", text: block.text.trim() });
         } else if (showThinking && block?.type === "thinking" && block.thinking?.trim()) {
@@ -322,6 +323,8 @@ export function replayEntries(
           lines.push({ kind: "tool", call });
         }
       }
+      const error = providerErrorLine(message);
+      if (error) lines.push(error);
       continue;
     }
 

package/src/subagents/manager.ts

@@ -20,6 +20,7 @@ import {
   usageFromEntries,
 } from "../agent-usage";
 import { replayEntries } from "../replay";
+import { settleAssistantTranscript } from "../provider-error";
 import { registerOperationalNotice } from "../operational-context";
 import { bindFileCheckpointSession } from "../file-checkpoints";
 import { ProjectValidationController, VALIDATION_CUSTOM_TYPE } from "../project-validation";
@@ -76,7 +77,6 @@ import { GOAL_VERDICT_TOOL_NAME, goalVerdictParameters } from "../goal-judge";
 import {
   flushStream,
   resolvePendingDelivery,
-  settleTranscriptMessage,
   streamedDelta,
   type Line,
   type PendingLine,
@@ -1041,7 +1041,7 @@ export class SubagentManager {
           this.appendLine(record, { kind: "text", role: event.message.details?.outcome === "passed" ? "system" : "error", text: String(event.message.content) });
         }
         if (event.message?.role === "assistant") {
-          this.updateTranscript(record, (value) => settleTranscriptMessage(value));
+          this.updateTranscript(record, (value) => settleAssistantTranscript(value, event.message));
         }
         break;
       case "message_update": {