privateer-agent 0.12.34 → 0.12.36

package/patches/@earendil-works+pi-coding-agent+0.84.4.patch

@@ -68,10 +68,10 @@ index f04269f..536e030 100644
  export const ENV_AGENT_DIR = `${APP_NAME.toUpperCase()}_CODING_AGENT_DIR`;
  export const ENV_SESSION_DIR = `${APP_NAME.toUpperCase()}_CODING_AGENT_SESSION_DIR`;
 diff --git a/node_modules/@earendil-works/pi-coding-agent/dist/core/agent-session.js b/node_modules/@earendil-works/pi-coding-agent/dist/core/agent-session.js
-index fd82b71..5e0821c 100644
+index fd82b71..7c10ba9 100644
 --- a/node_modules/@earendil-works/pi-coding-agent/dist/core/agent-session.js
 +++ b/node_modules/@earendil-works/pi-coding-agent/dist/core/agent-session.js
-@@ -38,6 +38,111 @@ import { createLocalBashOperations } from "./tools/bash.js";
+@@ -38,6 +38,122 @@ import { createLocalBashOperations } from "./tools/bash.js";
  import { createAllToolDefinitions } from "./tools/index.js";
  import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
  import { addUsageToTotals, createUsageTotals } from "./usage-totals.js";
@@ -139,6 +139,17 @@ index fd82b71..5e0821c 100644
 +    const status = Number(m[1]);
 +    return status >= 400 && status < 500 && !PV_TRANSIENT_CLIENT_STATUS.has(status);
 +}
++// Privateer patch: undici's idle-timeout errors. Mirrors isIdleTimeoutError in
++// src/engine/errors.ts. The text is exact and stable — undici throws
++// BodyTimeoutError / HeadersTimeoutError with message "Body/Headers Timeout Error"
++// and code UND_ERR_BODY_TIMEOUT / UND_ERR_HEADERS_TIMEOUT — and it carries NO HTTP
++// status. pi's retry regex therefore reads the word "timeout" and silently re-sends
++// the whole turn across the full budget: three 5-minute stalls before the user sees
++// anything at all. A stalled transport is a fact; a body substring is a guess.
++export function isIdleTimeoutError(text) {
++    const s = typeof text === "string" ? text : "";
++    return /(?:^|\b)(?:Body|Headers) Timeout Error\b/i.test(s) || /^UND_ERR_(?:BODY|HEADERS)_TIMEOUT$/.test(s.trim());
++}
 +// Privateer patch: throttle handling. Mirrors isThrottleFailure / retryAfterMs /
 +// retryDelayMs in src/engine/errors.ts — see the incident note there.
 +export function isThrottleFailure(text) {
@@ -183,7 +194,7 @@ index fd82b71..5e0821c 100644
  /**
   * Parse a skill block from message text.
   * Returns null if the text doesn't contain a skill block.
-@@ -102,6 +207,8 @@ export class AgentSession {
+@@ -102,6 +218,8 @@ export class AgentSession {
      // Retry state
      _retryAbortController = undefined;
      _retryAttempt = 0;
@@ -192,7 +203,7 @@ index fd82b71..5e0821c 100644
      // Bash execution state
      _bashAbortControllers = new Set();
      _pendingBashMessages = [];
-@@ -186,6 +293,14 @@ export class AgentSession {
+@@ -186,6 +304,14 @@ export class AgentSession {
          }
          const isOAuth = this._modelRuntime.isUsingOAuth(model.provider);
          if (isOAuth) {
@@ -207,7 +218,7 @@ index fd82b71..5e0821c 100644
              throw new Error(`Authentication failed for "${model.provider}". ` +
                  `Credentials may have expired or network is unavailable. ` +
                  `Run '/login ${model.provider}' to re-authenticate.`);
-@@ -380,6 +495,16 @@ export class AgentSession {
+@@ -380,6 +506,16 @@ export class AgentSession {
                  }
              }
          }
@@ -224,7 +235,7 @@ index fd82b71..5e0821c 100644
          // Emit to extensions first
          await this._emitExtensionEvent(event);
          // Notify all listeners
-@@ -801,6 +926,33 @@ export class AgentSession {
+@@ -801,6 +937,33 @@ export class AgentSession {
                  finalError: msg.errorMessage,
              });
              this._retryAttempt = 0;
@@ -258,7 +269,7 @@ index fd82b71..5e0821c 100644
          }
          if (await this._checkCompaction(msg)) {
              return true;
-@@ -882,6 +1034,14 @@ export class AgentSession {
+@@ -882,6 +1045,14 @@ export class AgentSession {
              if (!hasConfiguredAuth) {
                  const isOAuth = this._modelRuntime.isUsingOAuth(this.model.provider);
                  if (isOAuth) {
@@ -273,7 +284,7 @@ index fd82b71..5e0821c 100644
                      throw new Error(`Authentication failed for "${this.model.provider}". ` +
                          `Credentials may have expired or network is unavailable. ` +
                          `Run '/login ${this.model.provider}' to re-authenticate.`);
-@@ -891,7 +1051,13 @@ export class AgentSession {
+@@ -891,7 +1062,13 @@ export class AgentSession {
              // Check if we need to compact before sending (catches aborted responses).
              // The user's new prompt is sent below, so do not call agent.continue() here.
              const lastAssistant = this._findLastAssistantMessage();
@@ -288,7 +299,7 @@ index fd82b71..5e0821c 100644
                  await this._checkCompaction(lastAssistant, false);
              }
              // Build messages array (custom message if any, then user message)
-@@ -2242,6 +2408,27 @@ export class AgentSession {
+@@ -2242,6 +2419,34 @@ export class AgentSession {
          // Context overflow is handled by compaction, not retry.
          if (isContextOverflow(message, this.model?.contextWindow ?? 0))
              return false;
@@ -312,11 +323,18 @@ index fd82b71..5e0821c 100644
 +        // rate limit is affected. Mirrors isAccountCapCode in src/engine/errors.ts.
 +        if (this.model?.provider === "privateer" &&
 +            /"code"\s*:\s*"[A-Z0-9_]*(?:CAP|QUOTA|LIMIT_REACHED|INSUFFICIENT|TOP_?UP)[A-Z0-9_]*"|limit of [^.]*reached|upgrade or top ?up|usage limit reached/i.test(message.errorMessage ?? ""))
++            return false;
++        // Privateer patch: a stalled stream is a transport fact, not a body substring.
++        // undici's "Body/Headers Timeout Error" contains "timeout", so pi spent the
++        // whole retry budget re-sending a turn the transport had already given up on —
++        // a 5-minute stall became three, and only then did the user see a message.
++        // Mirrors isIdleTimeoutError in src/engine/errors.ts.
++        if (isIdleTimeoutError(message.errorMessage))
 +            return false;
          return isRetryableAssistantError(message);
      }
      /**
-@@ -2287,7 +2474,11 @@ export class AgentSession {
+@@ -2287,7 +2492,11 @@ export class AgentSession {
              this._retryAttempt--;
              return false;
          }
@@ -375,7 +393,7 @@ index 197bccc..bc9ac3f 100644
  //# sourceMappingURL=auth-guidance.js.map
 
 diff --git a/node_modules/@earendil-works/pi-coding-agent/dist/core/extensions/loader.js b/node_modules/@earendil-works/pi-coding-agent/dist/core/extensions/loader.js
-index bb022d4..382ff2b 100644
+index bb022d4..207f3ba 100644
 --- a/node_modules/@earendil-works/pi-coding-agent/dist/core/extensions/loader.js
 +++ b/node_modules/@earendil-works/pi-coding-agent/dist/core/extensions/loader.js
 @@ -18,7 +18,7 @@ import { createJiti } from "jiti/static";
@@ -387,7 +405,23 @@ index bb022d4..382ff2b 100644
  // NOTE: This import works because loader.ts exports are NOT re-exported from index.ts,
  // avoiding a circular dependency. Extensions can import from @earendil-works/pi-coding-agent.
  import * as _bundledPiCodingAgent from "../../index.js";
-@@ -621,9 +621,23 @@ export async function discoverAndLoadExtensions(configuredPaths, cwd, agentDir =
+@@ -419,11 +419,14 @@ async function loadExtensionModule(extensionPath, cacheToken) {
+         // Compiled binaries and the bundled Node distribution use embedded modules.
+         // Source TypeScript reuses host modules and root tsconfig paths. Unbundled
+         // Node builds use dist aliases.
++        // Privateer: reuse the host's Pi/Typebox namespaces in Node builds too.
++        // Otherwise each extension can reload that graph through Jiti. Aliases
++        // remain a fallback for non-virtual imports; extension reload is unchanged.
+         ...(isBunBinary || isNodeSeaBinary || isBundledNode
+             ? { virtualModules: VIRTUAL_MODULES, tryNative: false }
+             : isTypeScriptSourceRuntime
+                 ? { virtualModules: VIRTUAL_MODULES, tsconfigPaths: true }
+-                : { alias: getAliases() }),
++                : { virtualModules: VIRTUAL_MODULES, alias: getAliases() }),
+     });
+     const module = await jiti.import(extensionPath, { default: true });
+     const factory = module;
+@@ -621,9 +624,23 @@ export async function discoverAndLoadExtensions(configuredPaths, cwd, agentDir =
              }
          }
      };
@@ -1641,7 +1675,7 @@ index c33fc39..060a38f 100644
          if (content) {
              text += `\n\n${content}`;
 diff --git a/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/interactive-mode.js b/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/interactive-mode.js
-index a27754f..61a1fff 100644
+index a27754f..3403ca8 100644
 --- a/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/interactive-mode.js
 +++ b/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/interactive-mode.js
 @@ -10,7 +10,7 @@ import * as TuiLayouts from "@earendil-works/pi-tui";
@@ -1667,7 +1701,7 @@ index a27754f..61a1fff 100644
      if (!sessionManager.usesDefaultSessionDir()) {
          args.push("--session-dir", quoteIfNeeded(sessionManager.getSessionDir()));
      }
-@@ -232,6 +237,54 @@ export function createInteractiveTuiReference(getTui) {
+@@ -232,6 +237,64 @@ export function createInteractiveTuiReference(getTui) {
          getPrototypeOf: () => Reflect.getPrototypeOf(getTui()),
      });
  }
@@ -1700,8 +1734,18 @@ index a27754f..61a1fff 100644
 +function pvDescribeErrorText(text) {
 +    const s = typeof text === "string" ? text : "";
 +    const status = Number(/^\s*(\d{3})\b/.exec(s)?.[1] ?? NaN);
-+    if (!Number.isFinite(status))
++    if (!Number.isFinite(status)) {
++        // Privateer patch: no HTTP status, but undici's idle-timeout message is exact
++        // and is the one error a stalled turn produces — printing it raw leaves the
++        // user with two words and no next step. Mirrors isIdleTimeoutError /
++        // describeErrorText in src/engine/errors.ts.
++        if (/(?:^|\b)(?:Body|Headers) Timeout Error\b/i.test(s))
++            return {
++                message: "The provider stopped responding — the connection went idle.",
++                hint: "No data arrived for the whole idle-timeout window, so the turn was cut off. Send it again, or run /model to switch providers (a slow model can be given longer in /settings → HTTP idle timeout).",
++            };
 +        return null;
++    }
 +    if (status === 429) {
 +        const stated = pvRetryAfterMs(s);
 +        return {
@@ -1722,7 +1766,7 @@ index a27754f..61a1fff 100644
  export class InteractiveMode {
      runtimeHost;
      renderer;
-@@ -439,9 +492,15 @@ export class InteractiveMode {
+@@ -439,9 +502,15 @@ export class InteractiveMode {
      }
      getBuiltInCommandConflictDiagnostics(extensionRunner) {
          const builtinNames = new Set(BUILTIN_SLASH_COMMANDS.map((command) => command.name));
@@ -1739,7 +1783,7 @@ index a27754f..61a1fff 100644
              .map((command) => ({
              type: "warning",
              message: command.invocationName === command.name
-@@ -815,20 +874,18 @@ export class InteractiveMode {
+@@ -815,20 +884,18 @@ export class InteractiveMode {
                  this.showNewVersionNotification(newRelease);
              }
          });
@@ -1772,7 +1816,7 @@ index a27754f..61a1fff 100644
          // Check tmux keyboard setup asynchronously
          this.checkTmuxKeyboardSetup().then((warning) => {
              if (warning) {
-@@ -2393,7 +2450,17 @@ export class InteractiveMode {
+@@ -2393,7 +2460,17 @@ export class InteractiveMode {
              if (text === "/model" || text.startsWith("/model ")) {
                  const searchTerm = text.startsWith("/model ") ? text.slice(7).trim() : undefined;
                  this.editor.setText("");
@@ -1791,7 +1835,7 @@ index a27754f..61a1fff 100644
                  return;
              }
              if (text === "/thinking" || text.startsWith("/thinking ")) {
-@@ -2465,12 +2532,42 @@ export class InteractiveMode {
+@@ -2465,12 +2542,42 @@ export class InteractiveMode {
              if (text === "/login" || text.startsWith("/login ")) {
                  const providerRef = text.startsWith("/login ") ? text.slice(7).trim() : undefined;
                  this.editor.setText("");
@@ -1836,7 +1880,30 @@ index a27754f..61a1fff 100644
                  return;
              }
              if (text === "/new") {
-@@ -3164,7 +3261,7 @@ export class InteractiveMode {
+@@ -2788,9 +2895,19 @@ export class InteractiveMode {
+                     if (entries[0]?.type !== "compaction") {
+                         throw new Error("Completed compaction is missing from the session context");
+                     }
+-                    this.chatContainer.clear();
+-                    // The latest compaction is prepended for model context; append it below at its chronological position.
+-                    this.renderSessionEntries(entries.slice(1));
++                    // Privateer patch: a compaction must never erase what the user can see.
++                    // Stock Pi cleared the whole chat container here and re-rendered only
++                    // buildContextEntries().slice(1) — the MODEL's new context, a summary plus
++                    // the firstKeptEntryId tail. That is the right set of messages to send to
++                    // the model and the wrong set to leave on screen: every prompt, answer and
++                    // tool result above the keep boundary vanished from the transcript the
++                    // instant the summary appeared, so the user watched the thing they typed get
++                    // swallowed and replaced by a summary — worst of all when the compaction was
++                    // triggered by that very prompt. The model context is allowed to shrink; the
++                    // transcript is the record of what actually happened and does not. The kept
++                    // tail is already on screen (it was rendered as it happened), so re-rendering
++                    // it would duplicate it — keep every child and append the summary at its
++                    // chronological position, which is the boundary ("now").
+                     this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
+                     if (event.result.usage) {
+                         this.addCompactionCostNotice({
+@@ -3164,7 +3281,7 @@ export class InteractiveMode {
          if (this.chatContainer.children.length > 0) {
              this.chatContainer.addChild(new Spacer(1));
          }
@@ -1845,7 +1912,7 @@ index a27754f..61a1fff 100644
      }
      async getUserInput() {
          const queuedInput = this.pendingUserInputs.shift();
-@@ -3504,7 +3601,17 @@ export class InteractiveMode {
+@@ -3504,7 +3621,17 @@ export class InteractiveMode {
      }
      showError(errorMessage) {
          this.chatContainer.addChild(new Spacer(1));

package/patches/pi-background-tasks+2.4.2.patch

@@ -0,0 +1,110 @@
+diff --git a/node_modules/pi-background-tasks/src/core/registry.ts b/node_modules/pi-background-tasks/src/core/registry.ts
+index cfbf133..c632390 100644
+--- a/node_modules/pi-background-tasks/src/core/registry.ts
++++ b/node_modules/pi-background-tasks/src/core/registry.ts
+@@ -1,11 +1,11 @@
+ import { spawn as nodeSpawn, type SpawnOptions } from 'node:child_process';
+-import { randomBytes } from 'node:crypto';
++import { createHash, randomBytes } from 'node:crypto';
+ import { createWriteStream, existsSync } from 'node:fs';
+ import { mkdir, realpath, writeFile } from 'node:fs/promises';
+-import { join } from 'node:path';
++import { join, resolve } from 'node:path';
+ import type { Api, Model } from '@earendil-works/pi-ai';
+ import type { ExtensionContext } from '@earendil-works/pi-coding-agent';
+-import { formatSize } from '@earendil-works/pi-coding-agent';
++import { formatSize, getAgentDir } from '@earendil-works/pi-coding-agent';
+ import {
+   boundedRead,
+   deriveTaskNameFromCommand,
+@@ -781,9 +781,29 @@ export class BackgroundTaskRegistry {
+     if (this.runtimeDir) return this.runtimeDir;
+     const sessionId = sanitizePathSegment(ctx.sessionId ?? `session-${String(process.pid)}`);
+     const runId = `${sessionId}-${String(process.pid)}`;
+-    const runtimeDirAbs = join(ctx.cwd, '.pi', 'tasks', runId);
+-    const runtimeDirDisplay = join('.pi', 'tasks', runId);
+-    await mkdir(runtimeDirAbs, { recursive: true });
++    let runtimeDirAbs = join(ctx.cwd, '.pi', 'tasks', runId);
++    let runtimeDirDisplay = join('.pi', 'tasks', runId);
++    try {
++      await mkdir(runtimeDirAbs, { recursive: true });
++    } catch (error) {
++      // Privateer: Git Bash can open in Program Files. Keep the command cwd,
++      // but store task artifacts in the user's agent dir when cwd is protected.
++      const code = (error as NodeJS.ErrnoException).code;
++      if (code !== 'EACCES' && code !== 'EPERM' && code !== 'EROFS') throw error;
++      const projectDir = runtimeDirAbs;
++      const projectId = createHash('sha256').update(resolve(ctx.cwd)).digest('hex').slice(0, 16);
++      runtimeDirAbs = resolve(getAgentDir(), 'tasks', projectId, runId);
++      // Never describe an external artifact as project-relative.
++      runtimeDirDisplay = runtimeDirAbs;
++      try {
++        await mkdir(runtimeDirAbs, { recursive: true, mode: 0o700 });
++      } catch (fallbackError) {
++        throw new Error(
++          `Cannot create background task storage at ${projectDir} (${code}) or ${runtimeDirAbs}: ${fallbackError instanceof Error ? fallbackError.message : String(fallbackError)}`,
++          { cause: fallbackError },
++        );
++      }
++    }
+     this.runtimeDir = { abs: runtimeDirAbs, display: runtimeDirDisplay };
+     return this.runtimeDir;
+   }
+diff --git a/node_modules/pi-background-tasks/src/extension.ts b/node_modules/pi-background-tasks/src/extension.ts
+index 3afbd8e..d003a57 100644
+--- a/node_modules/pi-background-tasks/src/extension.ts
++++ b/node_modules/pi-background-tasks/src/extension.ts
+@@ -473,14 +473,15 @@ export default function backgroundTasksExtension(pi: ExtensionAPI): void {
+   pi.on('session_start', async (_event, ctx) => {
+     registry.setShuttingDown(false);
+     currentCtx = ctx;
+-    await registry.ensureRuntimeDir(ctx);
++    // Privateer: no project writes just to open a session. Each task-start path
++    // creates its runtime directory on demand, with a per-user fallback.
+     updateUi(ctx);
+     if (statusInterval) clearInterval(statusInterval);
+     statusInterval = setInterval(() => {
+       updateUi();
+     }, STATUS_INTERVAL_MS);
+-    // One-shot, non-blocking: never awaited on the session-start path or the status tick.
+-    void scheduleUpdateCheck(ctx);
++    // Privateer: update check disabled. Privateer manages updates at the distribution
++    // level via `privateer update`; individual tool packs shouldn't check npm or prompt /bg-update.
+   });
+ 
+   pi.on('session_shutdown', async (_event, ctx) => {
+@@ -565,22 +566,11 @@ export default function backgroundTasksExtension(pi: ExtensionAPI): void {
+   });
+ 
+   pi.registerCommand('bg-update', {
+-    description: 'Show how to update pi-background-tasks to the latest published version',
++    description: 'Show update guidance for background tasks in Privateer',
+     handler: (_args, ctx) => {
+-      const current = PACKAGE_VERSION ?? 'unknown';
+-      const latest = latestKnownVersion;
+-      const pinnedNpm = latest ? `${PACKAGE_NAME}@${latest}` : `${PACKAGE_NAME}@<version>`;
+       const lines = [
+-        latest
+-          ? `pi-background-tasks ${current} is installed; ${latest} is the latest published version.`
+-          : `pi-background-tasks ${current} is installed.`,
+-        'Update from npm:',
+-        `  pi install npm:${PACKAGE_NAME}@latest`,
+-        `  pi install npm:${pinnedNpm}`,
+-        'Git releases are independent of npm versions; use main only when you want current repository state:',
+-        `  pi install ${GIT_INSTALL_TARGET}@main`,
+-        `For a pinned git release, first verify the tag exists, then use ${GIT_INSTALL_TARGET}@<existing-tag>.`,
+-        'This command only prints update instructions; it does not install or self-update.',
++        'pi-background-tasks is built into Privateer.',
++        'To update Privateer and bundled tools, run: privateer update',
+       ];
+       ctx.ui.notify(lines.join('\n'), 'info');
+       return Promise.resolve();
+@@ -682,7 +672,7 @@ export default function backgroundTasksExtension(pi: ExtensionAPI): void {
+   pi.registerTool<typeof BgRunParams, BgRunDetails>({
+     name: 'bg_run',
+     label: 'Background Run',
+-    description: `Start a named long-running shell command in the background and return immediately with a task ID and output path. By default, completed, failed, or killed terminal state is delivered automatically as <background-task-notification> and starts a follow-up agent turn; do not sleep or poll merely to wait. Output is written to .pi/tasks and model-visible logs are bounded to ${formatSize(MAX_LOG_BYTES)}.`,
++    description: `Start a named long-running shell command in the background and return immediately with a task ID and output path. By default, completed, failed, or killed terminal state is delivered automatically as <background-task-notification> and starts a follow-up agent turn; do not sleep or poll merely to wait. Output is written to .pi/tasks (or per-user agent storage when the project denies writes); use the returned output path. Model-visible logs are bounded to ${formatSize(MAX_LOG_BYTES)}.`,
+     promptSnippet:
+       'Start a named long-running shell command; default terminal notification wakes a follow-up turn, so yield instead of polling',
+     promptGuidelines: [

package/src/boot.ts

@@ -38,6 +38,13 @@ process.env[PI_AGENT_DIR_ENV] ??= agentDir();
 // (2) Install the attestation dispatcher (idempotent).
 installAttestationDispatcher();
 
+// (3) Suppress upstream update checks: Pi's CLI update banner and pi-background-tasks'
+// update check / footer notice ("bg ⬆ v... /bg-update"). Privateer manages updates
+// at the distribution level via `privateer update` and its own banner; individual
+// bundled tool packs must not query npm or display `/bg-update`.
+process.env.PI_SKIP_VERSION_CHECK ??= "1";
+process.env.PI_BG_DISABLE_UPDATE_CHECK ??= "1";
+
 // Marker other modules can assert on to catch an accidental "imported Pi before
 // boot" regression during development.
 export const BOOTED = true;

package/src/bridge/engineAdapter.ts

@@ -10,9 +10,9 @@
 //   - `finish` carries usage + finishReason,
 //   - compaction / auto-retry / agent-end-error mapped through.
 //
-// Field names for the compaction/retry/error events are best-effort against Pi
-// 0.80 and marked TODO(verify) — Phase 1's test (`tests/engine.test.ts`, ported
-// from tree-cli) asserts the mapping against a real event stream and pins them.
+// Pi's turn_end is ONE model response plus tools, not the user's whole run.
+// agent_end can still be followed by retries/compaction. Only agent_settled
+// (Pi 0.84) is terminal; keeping this distinction preserves the app's busy pill.
 
 import {
   addUsage,
@@ -55,7 +55,7 @@ function textOf(result: unknown): string {
   const parts = (result as any)?.content;
   if (Array.isArray(parts)) return parts.map((p: any) => p.text ?? `[${p.type}]`).join("");
   try {
-    return JSON.stringify(result);
+    return JSON.stringify(result) ?? "";
   } catch {
     return String(result);
   }
@@ -70,9 +70,16 @@ function num(v: unknown, fallback = 0): number {
 // each Pi event; feed each through in `session.subscribe`.
 export function createEngineEventAdapter() {
   let sessionTotal: UsageTotals = emptyUsage();
+  let turnTotal: UsageTotals = emptyUsage();
+  let lastMessage: any;
+  let terminalSent = false;
 
   function toEngineEvents(ev: PiSessionEvent): EngineEvent[] {
     switch (ev.type) {
+      case "agent_start":
+        terminalSent = false;
+        return [];
+
       case "message_update": {
         const a = ev.assistantMessageEvent as any;
         if (a?.type === "text_delta") return [{ type: "text", text: a.delta }];
@@ -90,6 +97,16 @@ export function createEngineEventAdapter() {
           },
         ];
 
+      // Pi partial results are snapshots, NOT deltas. Transports bound these;
+      // cloud redaction must see the full text BEFORE any tail truncation.
+      case "tool_execution_update":
+        return [{
+          type: "tool-progress",
+          id: ev.toolCallId as string,
+          name: ev.toolName as string,
+          output: textOf(ev.partialResult),
+        }];
+
       case "tool_execution_end":
         return ev.isError
           ? [
@@ -113,43 +130,35 @@ export function createEngineEventAdapter() {
         const msg = ev.message as any;
         const turn = normUsage(msg?.usage);
         sessionTotal = addUsage(sessionTotal, turn);
-        const finishReason =
-          (ev.finishReason as string) ?? (msg?.stopReason as string) ?? "stop";
-        const out: EngineEvent[] = [{ type: "usage", usage: sessionTotal, turn }];
-        // A FAILED turn ends here, not by throwing — and this is the only place the
-        // app can learn it failed.
-        //
-        // Pi reports a dead model call as an assistant message with
-        // `stopReason: "error"` and an `errorMessage`; `prompt()` then resolves
-        // NORMALLY, so the desktop's runTurn catch never fires. Our own pi patch
-        // widened that path deliberately (a hard 4xx, and a 429 that outlived the
-        // retry budget, both end the turn instead of re-entering the agent loop),
-        // which is right for the CLI — its TUI reads the assistant message and
-        // prints describeErrorText. The app reads EngineEvents, and this adapter
-        // used to drop `errorMessage` on the floor: the turn arrived as a bare
-        // `finish`, which RemoteDriveContext closes as a green ✓ "done". A signed-in
-        // user whose first turn 401'd or hit their cap saw a tick and no words.
-        //
-        // So say it. Same wording the terminal gets, ahead of the finish so the feed
-        // reads in order, and redacted either way because an unrecognised body goes
-        // out verbatim.
+        turnTotal = addUsage(turnTotal, turn);
+        lastMessage = msg;
+        return [{ type: "usage", usage: sessionTotal, turn: turnTotal }, { type: "step-finish" }];
+      }
+
+      case "agent_settled": {
+        if (terminalSent) return [];
+        terminalSent = true;
+        const msg = lastMessage;
+        lastMessage = undefined;
+        turnTotal = emptyUsage();
+        // Failed model calls often resolve prompt() normally. Delay the error
+        // until retries/overflow recovery are exhausted, but never hide it.
         if (msg?.stopReason === "error") {
           const raw = typeof msg.errorMessage === "string" ? msg.errorMessage : "";
           const described = describeErrorText(raw);
-          out.push({
+          return [{
             type: "error",
             error: described?.message ?? redactText(raw || "The model call failed."),
             ...(described?.hint ? { hint: described.hint } : {}),
             ...(described?.retryable != null ? { retryable: described.retryable } : {}),
-          });
+          }];
         }
-        out.push({ type: "finish", usage: sessionTotal, finishReason });
-        return out;
+        if (msg?.stopReason === "aborted") return [{ type: "aborted" }];
+        return [{ type: "finish", usage: sessionTotal, finishReason: msg?.stopReason ?? "stop" }];
       }
 
-      // Compaction: Pi collapses history to free context. TODO(verify) field
-      // names for before/after token counts against a real compaction event.
       case "compaction_start":
+        return [{ type: "step-finish" }];
       case "compaction_end":
         return [
           {
@@ -173,28 +182,17 @@ export function createEngineEventAdapter() {
           },
         ];
 
-      // Terminal error surfaced at the end of an agent run.
-      //
-      // ⚠️ Pi 0.84's `agent_end` is `{ messages, willRetry }` — there is NO `error`
-      // field, so this branch has been returning [] for every run since the 0.84
-      // refactor. It is kept (harmless, and other Pi versions have carried one)
-      // but it is NOT the error path: a failed model call arrives on `turn_end`
-      // above, which is where the real mapping lives. Do not "restore" error
-      // reporting here and delete it there.
-      case "agent_end": {
-        const err = (ev as any).error;
-        if (!err) return [];
-        return [
-          {
-            type: "error",
-            error: typeof err === "string" ? err : (err.message ?? String(err)),
-            retryable: Boolean((ev as any).retryable),
-          },
-        ];
-      }
+      // agent_end is only a low-level loop boundary. willRetry:false still
+      // permits overflow compaction and queued continuation; never finish here.
+      case "agent_end":
+        return [];
 
       case "abort":
       case "aborted":
+        if (terminalSent) return [];
+        terminalSent = true;
+        lastMessage = undefined;
+        turnTotal = emptyUsage();
         return [{ type: "aborted" }];
 
       default:

package/src/config/privacyDisabled.ts

@@ -0,0 +1,45 @@
+// Privacy toggle: completely disable pi-privacy across agent sessions.
+//
+// When active, all pi-privacy hooks are completely bypassed:
+//   - Outbound PII scanning and prompts are disabled (IP addresses, emails, and
+//     other non-sensitive data that trigger detection can be sent as-is with NO interference).
+//   - Unattended mode does NOT auto-redact PII.
+//   - Tool exfiltration guards and warnings are disabled.
+//   - Tool result credential scanning / redaction is disabled.
+//   - Model downgrade guards are disabled.
+//
+// THE ENV VAR IS THE STORE:
+// Exactly like `src/permissions/noQuarter.ts`, state is stored in `process.env.PRIVATEER_PRIVACY_OFF`
+// and `process.env.PI_PRIVACY_OFF`:
+//   1. ACROSS PROCESSES: subagent children inherit the env var and run without privacy gates.
+//   2. ACROSS EXTENSIONS: different jiti instances and late-loaded extensions all share process.env.
+//   3. LAUNCH CONFIG: users can launch with `PRIVATEER_PRIVACY_OFF=1` or `PI_PRIVACY_OFF=1`
+//      or `--privacy-off` / `--no-privacy` CLI flags.
+
+const ENV = "PRIVATEER_PRIVACY_OFF";
+const ALT_ENV = "PI_PRIVACY_OFF";
+
+/** True while pi-privacy is completely disabled for this session. Read live, never cached. */
+export function privacyDisabled(): boolean {
+  return process.env[ENV] === "1" || process.env[ALT_ENV] === "1";
+}
+
+/**
+ * Set the disabled state. Modifies process.env so every module copy and child process agrees.
+ * Returns the new state.
+ */
+export function setPrivacyDisabled(disabled: boolean): boolean {
+  if (disabled) {
+    process.env[ENV] = "1";
+    process.env[ALT_ENV] = "1";
+  } else {
+    delete process.env[ENV];
+    delete process.env[ALT_ENV];
+  }
+  return disabled;
+}
+
+/** Flip the disabled state. Returns the new state. */
+export function togglePrivacyDisabled(): boolean {
+  return setPrivacyDisabled(!privacyDisabled());
+}