@oh-my-pi/pi-coding-agent 16.1.14 → 16.1.16

package/dist/types/tools/eval.d.ts

@@ -6,29 +6,21 @@ export { EVAL_DEFAULT_PREVIEW_LINES, evalToolRenderer } from "./eval-render";
 /** Language tokens the eval tool accepts, in stable display order. */
 export type EvalLanguageToken = "py" | "js" | "rb" | "jl";
 /**
- * Per-cell input. Each cell runs in order; state persists within a language
- * across cells and across tool calls. This static schema carries the full
- * language union for typing; {@link buildEvalSchema} narrows the wire copy per
- * session so disabled backends are never advertised to the model.
+ * Per-call input: a single cell. State persists within a language across
+ * separate eval calls and across tool calls, so each call is one logical step
+ * and later calls reuse what earlier ones defined. This static schema carries
+ * the full language union for typing; {@link buildEvalSchema} narrows the wire
+ * copy per session so disabled backends are never advertised to the model.
  */
-declare const evalCellSchema: import("arktype/internal/variants/object.ts").ObjectType<{
+export declare const evalSchema: import("arktype/internal/variants/object.ts").ObjectType<{
     title?: string | undefined;
     timeout?: number | undefined;
     reset?: boolean | undefined;
     language: "jl" | "js" | "py" | "rb";
     code: string;
 }, {}>;
-export type EvalCellInput = typeof evalCellSchema.infer;
-export declare const evalSchema: import("arktype/internal/variants/object.ts").ObjectType<{
-    cells: {
-        title?: string | undefined;
-        timeout?: number | undefined;
-        reset?: boolean | undefined;
-        language: "jl" | "js" | "py" | "rb";
-        code: string;
-    }[];
-}, {}>;
 export type EvalToolParams = typeof evalSchema.infer;
+export type EvalCellInput = EvalToolParams;
 export type EvalToolResult = {
     content: Array<{
         type: "text";
@@ -62,10 +54,12 @@ export declare class EvalTool implements AgentTool<typeof evalSchema> {
     readonly approval: "exec";
     readonly formatApprovalDetails: (args: unknown) => string[];
     get summary(): string;
-    readonly loadMode = "discoverable";
+    readonly loadMode = "essential";
     readonly label = "Eval";
     get description(): string;
-    readonly examples: readonly ToolExample<typeof evalSchema.infer>[];
+    /** All reuse-chain examples; the `examples` getter filters by enabled languages. */
+    private static readonly ALL_EXAMPLES;
+    get examples(): readonly ToolExample<typeof evalSchema.infer>[];
     get parameters(): typeof evalSchema;
     readonly concurrency = "exclusive";
     readonly strict = true;

package/dist/types/tools/todo.d.ts

@@ -24,16 +24,14 @@ export interface TodoToolDetails {
     completedTasks?: TodoCompletionTransition[];
 }
 declare const todoSchema: import("arktype/internal/variants/object.ts").ObjectType<{
-    ops: {
-        op: "append" | "done" | "drop" | "init" | "rm" | "start" | "view";
-        list?: {
-            phase: string;
-            items: string[];
-        }[] | undefined;
-        task?: string | undefined;
-        phase?: string | undefined;
-        items?: string[] | undefined;
-    }[];
+    op: "append" | "done" | "drop" | "init" | "rm" | "start" | "view";
+    list?: {
+        phase: string;
+        items: string[];
+    }[] | undefined;
+    task?: string | undefined;
+    phase?: string | undefined;
+    items?: string[] | undefined;
 }, {}>;
 type TodoParams = TodoSchema;
 type TodoSchema = typeof todoSchema.infer;
@@ -70,7 +68,7 @@ export declare function selectStickyTodoWindow(tasks: TodoItem[], maxVisible?: n
  */
 export declare function todoMatchesAnyDescription(content: string, descriptions: readonly string[]): boolean;
 /** Apply an array of `todo`-style ops to existing phases. Used by /todo slash command. */
-export declare function applyOpsToPhases(currentPhases: TodoPhase[], ops: TodoParams["ops"]): {
+export declare function applyOpsToPhases(currentPhases: TodoPhase[], ops: TodoParams[]): {
     phases: TodoPhase[];
     errors: string[];
 };
@@ -90,16 +88,14 @@ export declare class TodoTool implements AgentTool<typeof todoSchema, TodoToolDe
     readonly summary = "Write a structured todo list to track progress within a session";
     readonly description: string;
     readonly parameters: import("arktype/internal/variants/object.ts").ObjectType<{
-        ops: {
-            op: "append" | "done" | "drop" | "init" | "rm" | "start" | "view";
-            list?: {
-                phase: string;
-                items: string[];
-            }[] | undefined;
-            task?: string | undefined;
-            phase?: string | undefined;
-            items?: string[] | undefined;
-        }[];
+        op: "append" | "done" | "drop" | "init" | "rm" | "start" | "view";
+        list?: {
+            phase: string;
+            items: string[];
+        }[] | undefined;
+        task?: string | undefined;
+        phase?: string | undefined;
+        items?: string[] | undefined;
     }, {}>;
     readonly concurrency = "exclusive";
     readonly strict = true;
@@ -108,13 +104,15 @@ export declare class TodoTool implements AgentTool<typeof todoSchema, TodoToolDe
     constructor(session: ToolSession);
     execute(_toolCallId: string, params: TodoParams, _signal?: AbortSignal, _onUpdate?: AgentToolUpdateCallback<TodoToolDetails>, _context?: AgentToolContext): Promise<AgentToolResult<TodoToolDetails>>;
 }
-type TodoRenderArgs = {
-    ops?: Array<{
-        op?: string;
-        task?: string;
-        phase?: string;
-        items?: string[];
-    }>;
+type TodoRenderOp = {
+    op?: string;
+    task?: string;
+    phase?: string;
+    items?: string[];
+};
+/** New single-op shape `{op,...}`; legacy `{ops:[...]}` still seen in old transcripts. */
+type TodoRenderArgs = TodoRenderOp & {
+    ops?: TodoRenderOp[];
 };
 /** One-based ASCII roman numeral for display (I, II, III, IV, …). */
 export declare function phaseRomanNumeral(oneBasedIndex: number): string;

package/dist/types/tui/output-block.d.ts

@@ -26,6 +26,14 @@ export type FramedBlockComponent = Component & {
 };
 export declare function markFramedBlockComponent<T extends Component>(component: T): T & FramedBlockComponent;
 export declare function isFramedBlockComponent(component: Component): boolean;
+/**
+ * Inner content width that {@link renderOutputBlock} wraps its body to, for a
+ * given outer `width`: both vertical borders (1 cell each) plus the left
+ * content padding. Renderers that size a tail window MUST budget visual rows
+ * against this, not the outer width — otherwise the block re-wraps their lines
+ * into more rows than they counted and the box overflows its intended height.
+ */
+export declare function outputBlockContentWidth(width: number, contentPaddingLeft?: number): number;
 export declare function renderOutputBlock(options: OutputBlockOptions, theme: Theme): string[];
 /**
  * Cached wrapper around `renderOutputBlock`.

package/dist/types/utils/image-resize.d.ts

@@ -2,6 +2,8 @@ import type { ImageContent } from "@oh-my-pi/pi-ai";
 export interface ImageResizeOptions {
     maxWidth?: number;
     maxHeight?: number;
+    /** Smallest allowed edge length (px). Inputs below this are scaled up. */
+    minDimension?: number;
     maxBytes?: number;
     jpegQuality?: number;
     excludeWebP?: boolean;

package/dist/types/utils/shell-snapshot.d.ts

@@ -1,3 +1,13 @@
+/**
+ * Strip alias definitions brush's whitespace-only expander cannot execute.
+ *
+ * Returns the rewritten snapshot plus the list of dropped alias names so the
+ * caller can surface them in the debug log.
+ */
+export declare function sanitizeSnapshotForBrush(content: string): {
+    content: string;
+    dropped: string[];
+};
 /**
  * Create a shell snapshot, caching the result.
  * Returns the path to the snapshot file, or null if creation failed.

package/dist/types/web/search/providers/exa.d.ts

@@ -10,6 +10,8 @@ import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+/** Reset Exa request pacing state for isolated provider tests. */
+export declare function resetExaSearchThrottleForTest(): void;
 type ExaSearchType = "neural" | "fast" | "auto" | "deep";
 type ExaSearchParamType = ExaSearchType | "keyword";
 export interface ExaSearchParams {

package/dist/types/web/search/providers/perplexity.d.ts

@@ -33,11 +33,25 @@ export declare function searchPerplexity(params: PerplexitySearchParams): Promis
 export declare class PerplexityProvider extends SearchProvider {
     readonly id = "perplexity";
     readonly label = "Perplexity";
+    /**
+     * Auto-chain admission. Requires a direct Perplexity credential
+     * (`PERPLEXITY_COOKIES`, OAuth session, or `PERPLEXITY_API_KEY`).
+     *
+     * OpenRouter auth is intentionally NOT accepted here: silently using
+     * OpenRouter's `perplexity/sonar-pro` whenever any OpenRouter key is
+     * configured surprises users (and bills them) for a path they never
+     * asked for. The auto chain skips Perplexity in that case and falls
+     * through to the next configured provider. Users who DO want the
+     * OpenRouter-backed Perplexity path can still opt in by setting
+     * `webSearch: perplexity` explicitly — see {@link isExplicitlyAvailable}.
+     */
     isAvailable(authStorage: AuthStorage): boolean;
     /**
-     * Perplexity accepts anonymous browser-style ask requests, but keep auto
-     * provider selection credential-gated so a configured provider keeps priority
-     * over the anonymous fallback.
+     * Perplexity accepts anonymous browser-style ask requests, and the
+     * OpenRouter-backed `perplexity/sonar-pro` path is opt-in through
+     * explicit selection. Keep auto-chain admission credential-gated so a
+     * configured provider keeps priority over the anonymous/OpenRouter
+     * fallbacks.
      */
     isExplicitlyAvailable(_authStorage: AuthStorage): boolean;
     search(params: SearchParams): Promise<SearchResponse>;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "16.1.14",
+	"version": "16.1.16",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -48,17 +48,17 @@
 		"@agentclientprotocol/sdk": "0.25.0",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "16.1.14",
-		"@oh-my-pi/omp-stats": "16.1.14",
-		"@oh-my-pi/pi-agent-core": "16.1.14",
-		"@oh-my-pi/pi-ai": "16.1.14",
-		"@oh-my-pi/pi-catalog": "16.1.14",
-		"@oh-my-pi/pi-mnemopi": "16.1.14",
-		"@oh-my-pi/pi-natives": "16.1.14",
-		"@oh-my-pi/pi-tui": "16.1.14",
-		"@oh-my-pi/pi-utils": "16.1.14",
-		"@oh-my-pi/pi-wire": "16.1.14",
-		"@oh-my-pi/snapcompact": "16.1.14",
+		"@oh-my-pi/hashline": "16.1.16",
+		"@oh-my-pi/omp-stats": "16.1.16",
+		"@oh-my-pi/pi-agent-core": "16.1.16",
+		"@oh-my-pi/pi-ai": "16.1.16",
+		"@oh-my-pi/pi-catalog": "16.1.16",
+		"@oh-my-pi/pi-mnemopi": "16.1.16",
+		"@oh-my-pi/pi-natives": "16.1.16",
+		"@oh-my-pi/pi-tui": "16.1.16",
+		"@oh-my-pi/pi-utils": "16.1.16",
+		"@oh-my-pi/pi-wire": "16.1.16",
+		"@oh-my-pi/snapcompact": "16.1.16",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",

package/scripts/build-binary.ts

@@ -5,7 +5,15 @@ import * as path from "node:path";
 
 const packageDir = path.join(import.meta.dir, "..");
 const repoRoot = path.join(packageDir, "..", "..");
-const outputPath = path.join(packageDir, "dist", "omp");
+// Optional cross-compile target, e.g. CROSS_TARGET=linux-arm64 → bun build
+// --target=bun-linux-arm64, embeds the matching native, outputs dist/omp-<target>.
+const crossTarget = Bun.env.CROSS_TARGET || null;
+const [crossPlatform, crossArch] = crossTarget ? crossTarget.split("-") : [null, null];
+// x64 uses the baseline bun runtime so it runs under Rosetta / pre-AVX2 CPUs
+// (the modern bun-linux-x64 target SIGILLs under Apple-Silicon Rosetta).
+const bunTarget = crossTarget ? (crossTarget === "linux-x64" ? "bun-linux-x64-baseline" : `bun-${crossTarget}`) : null;
+const outName = crossTarget ? `omp-${crossTarget}` : "omp";
+const outputPath = path.join(packageDir, "dist", outName);
 
 // Transformers.js is an optional, native-heavy dependency that is never bundled
 // into the binary; the tiny-model worker `bun install`s it into a runtime cache
@@ -17,7 +25,7 @@ const transformersVersion = (
 ).version;
 
 function shouldAdhocSignDarwinBinary(): boolean {
-	return process.platform === "darwin";
+	return process.platform === "darwin" && !crossTarget;
 }
 
 async function runCommand(
@@ -43,7 +51,12 @@ async function main(): Promise<void> {
 	try {
 		await runCommand(["bun", "--cwd=../stats", "scripts/generate-client-bundle.ts", "--generate"]);
 		await runCommand(["bun", "scripts/generate-docs-index.ts", "--generate"]);
-		await runCommand(["bun", "--cwd=../natives", "run", "embed:native"]);
+		await runCommand(
+			["bun", "--cwd=../natives", "run", "embed:native"],
+			crossTarget
+				? { ...Bun.env, TARGET_PLATFORM: crossPlatform as string, TARGET_ARCH: crossArch as string }
+				: Bun.env,
+		);
 		await runCommand(["bun", "scripts/embed-mupdf-wasm.ts", "--generate"]);
 		try {
 			const buildEnv = shouldAdhocSignDarwinBinary() ? { ...Bun.env, BUN_NO_CODESIGN_MACHO_BINARY: "1" } : Bun.env;
@@ -52,6 +65,7 @@ async function main(): Promise<void> {
 					"bun",
 					"build",
 					"--compile",
+					...(bunTarget ? ["--target", bunTarget] : []),
 					"--no-compile-autoload-bunfig",
 					"--no-compile-autoload-dotenv",
 					"--no-compile-autoload-tsconfig",
@@ -85,7 +99,7 @@ async function main(): Promise<void> {
 					"./packages/coding-agent/src/extensibility/legacy-pi-ai-shim.ts",
 					"./packages/coding-agent/src/extensibility/legacy-pi-coding-agent-shim.ts",
 					"--outfile",
-					"packages/coding-agent/dist/omp",
+					`packages/coding-agent/dist/${outName}`,
 				],
 				buildEnv,
 				repoRoot,

package/src/advisor/__tests__/advisor.test.ts

@@ -3,6 +3,7 @@ import type { AgentMessage, AgentTelemetryConfig } from "@oh-my-pi/pi-agent-core
 import { type } from "arktype";
 import { createAdvisorMessageCard } from "../../modes/components/advisor-message";
 import { getThemeByName } from "../../modes/theme/theme";
+import { SecretObfuscator } from "../../secrets/obfuscator";
 import { formatSessionHistoryMarkdown } from "../../session/session-history-format";
 import { YieldQueue } from "../../session/yield-queue";
 import {
@@ -447,6 +448,119 @@ describe("advisor", () => {
 			expect(promptInputs[0]).not.toContain("note");
 		});
 
+		it("obfuscates session updates before prompting the advisor", async () => {
+			const secret = "ADVISOR_SECRET_TOKEN_123";
+			const obfuscator = new SecretObfuscator([{ type: "plain", content: secret }]);
+			const placeholder = obfuscator.obfuscate(secret);
+			const promptInputs: string[] = [];
+			const agent = makeAgent(promptInputs);
+			const messages: AgentMessage[] = [{ role: "user", content: `token ${secret}`, timestamp: 1 } as AgentMessage];
+			const host: AdvisorRuntimeHost = {
+				snapshotMessages: () => messages,
+				enqueueAdvice: () => {},
+				obfuscator,
+			};
+			const runtime = new AdvisorRuntime(agent, host);
+
+			runtime.onTurnEnd();
+			await Promise.resolve();
+
+			expect(promptInputs).toHaveLength(1);
+			expect(promptInputs[0]).toContain(placeholder);
+			expect(promptInputs[0]).not.toContain(secret);
+		});
+
+		it("redacts expanded primary context before XML escaping", async () => {
+			const secret = "ADVISOR&SECRET<TOKEN>123";
+			const obfuscator = new SecretObfuscator([{ type: "plain", content: secret }]);
+			const placeholder = obfuscator.obfuscate(secret);
+			const promptInputs: string[] = [];
+			const agent = makeAgent(promptInputs);
+			const messages: AgentMessage[] = [
+				{
+					role: "custom",
+					customType: "plan-mode-context",
+					content: `Plan mode carries ${secret}`,
+					display: false,
+					timestamp: 1,
+				} as AgentMessage,
+			];
+			const host: AdvisorRuntimeHost = {
+				snapshotMessages: () => messages,
+				enqueueAdvice: () => {},
+				obfuscator,
+			};
+			const runtime = new AdvisorRuntime(agent, host);
+
+			runtime.onTurnEnd();
+			await Promise.resolve();
+
+			expect(promptInputs).toHaveLength(1);
+			expect(promptInputs[0]).toContain(placeholder);
+			expect(promptInputs[0]).not.toContain(secret);
+			expect(promptInputs[0]).not.toContain("ADVISOR&amp;SECRET&lt;TOKEN&gt;123");
+		});
+
+		it("redacts file-mention paths before formatting", async () => {
+			const secret = "MENTION_SECRET_TOKEN_123";
+			const obfuscator = new SecretObfuscator([{ type: "plain", content: secret }]);
+			const placeholder = obfuscator.obfuscate(secret);
+			const promptInputs: string[] = [];
+			const agent = makeAgent(promptInputs);
+			const messages: AgentMessage[] = [
+				{
+					role: "fileMention",
+					files: [{ path: `notes/${secret}.txt`, content: "ignored" }],
+					timestamp: 1,
+				} as unknown as AgentMessage,
+			];
+			const host: AdvisorRuntimeHost = {
+				snapshotMessages: () => messages,
+				enqueueAdvice: () => {},
+				obfuscator,
+			};
+			const runtime = new AdvisorRuntime(agent, host);
+
+			runtime.onTurnEnd();
+			await Promise.resolve();
+
+			expect(promptInputs).toHaveLength(1);
+			expect(promptInputs[0]).toContain(placeholder);
+			expect(promptInputs[0]).not.toContain(secret);
+		});
+
+		it("redacts nested async-result job labels before formatting", async () => {
+			const secret = "JOB_LABEL_SECRET_TOKEN_123";
+			const obfuscator = new SecretObfuscator([{ type: "plain", content: secret }]);
+			const placeholder = obfuscator.obfuscate(secret);
+			const promptInputs: string[] = [];
+			const agent = makeAgent(promptInputs);
+			const messages: AgentMessage[] = [
+				{
+					role: "custom",
+					customType: "async-result",
+					content: "",
+					details: { jobs: [{ label: `bash: echo ${secret}`, jobId: "j1" }] },
+					display: true,
+					attribution: "agent",
+					timestamp: 1,
+				} as unknown as AgentMessage,
+			];
+			const host: AdvisorRuntimeHost = {
+				snapshotMessages: () => messages,
+				enqueueAdvice: () => {},
+				obfuscator,
+			};
+			const runtime = new AdvisorRuntime(agent, host);
+
+			runtime.onTurnEnd();
+			await Promise.resolve();
+
+			expect(promptInputs).toHaveLength(1);
+			expect(promptInputs[0]).toContain(placeholder);
+			expect(promptInputs[0]).not.toContain(secret);
+		});
+
 		it("expands plan-mode context once, then collapses an unchanged re-injection", async () => {
 			const promptInputs: string[] = [];
 			const agent = makeAgent(promptInputs);

package/src/advisor/runtime.ts

@@ -1,6 +1,8 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { estimateTokens } from "@oh-my-pi/pi-agent-core/compaction";
+import type { AssistantMessage, ImageContent, TextContent } from "@oh-my-pi/pi-ai";
 import { logger } from "@oh-my-pi/pi-utils";
+import { obfuscateToolArguments, type SecretObfuscator } from "../secrets/obfuscator";
 import { formatSessionHistoryMarkdown, PRIMARY_CONTEXT_CUSTOM_TYPES } from "../session/session-history-format";
 
 /** Minimal slice of `Agent` the runtime drives — satisfied by pi-agent-core `Agent`. */
@@ -16,6 +18,8 @@ export interface AdvisorRuntimeHost {
 	snapshotMessages(): AgentMessage[];
 	/** Surface one advice note to the primary (enqueues into the session YieldQueue). */
 	enqueueAdvice(note: string, severity?: "nit" | "concern" | "blocker"): void;
+	/** Redact primary transcript bytes before they reach the advisor model. */
+	obfuscator?: SecretObfuscator;
 	/**
 	 * Pre-prompt context maintenance for the advisor's own append-only context.
 	 * Promotes the advisor model to a larger sibling when its context nears the
@@ -174,7 +178,9 @@ export class AdvisorRuntime {
 			.map(m => this.#dedupContextMessage(m));
 		this.#lastCount = all.length;
 		if (delta.length === 0) return null;
-		const md = formatSessionHistoryMarkdown(delta, {
+		const obfuscator = this.host.obfuscator;
+		const formattedDelta = obfuscator?.hasSecrets() ? obfuscateAdvisorDelta(obfuscator, delta) : delta;
+		const md = formatSessionHistoryMarkdown(formattedDelta, {
 			includeThinking: true,
 			includeToolIntent: true,
 			watchedRoles: true,
@@ -304,3 +310,125 @@ export class AdvisorRuntime {
 		}
 	}
 }
+
+type TextualContent = string | readonly (TextContent | ImageContent)[];
+
+function obfuscateTextualContent(obfuscator: SecretObfuscator, content: TextualContent): TextualContent {
+	if (typeof content === "string") return obfuscator.obfuscate(content);
+	let changed = false;
+	const result = content.map((block): TextContent | ImageContent => {
+		if (block.type !== "text") return block;
+		const text = obfuscator.obfuscate(block.text);
+		if (text === block.text) return block;
+		changed = true;
+		return { ...block, text };
+	});
+	return changed ? result : content;
+}
+
+function obfuscateAssistantMessage(obfuscator: SecretObfuscator, message: AssistantMessage): AssistantMessage {
+	let changed = false;
+	const content = message.content.map((block): AssistantMessage["content"][number] => {
+		if (block.type === "text") {
+			const text = obfuscator.obfuscate(block.text);
+			if (text === block.text) return block;
+			changed = true;
+			return { ...block, text };
+		}
+		if (block.type === "toolCall") {
+			const args = obfuscateToolArguments(obfuscator, block.arguments);
+			if (args === block.arguments) return block;
+			changed = true;
+			return { ...block, arguments: args };
+		}
+		return block;
+	});
+	return changed ? { ...message, content } : message;
+}
+
+function obfuscateDetails(
+	obfuscator: SecretObfuscator,
+	details: Record<string, unknown> | undefined,
+): Record<string, unknown> | undefined {
+	if (!details) return details;
+	// Walk strings at every depth: `customOneLiner` renders nested fields
+	// (e.g. `async-result` reads `details.jobs[].label`/`jobId`), so a shallow
+	// pass leaks any secret a background job's label happens to contain.
+	return obfuscateToolArguments(obfuscator, details);
+}
+
+function obfuscateAdvisorMessage(obfuscator: SecretObfuscator, message: AgentMessage): AgentMessage {
+	switch (message.role) {
+		case "user":
+		case "developer":
+		case "toolResult": {
+			const content = obfuscateTextualContent(obfuscator, message.content as TextualContent);
+			return content === message.content ? message : ({ ...(message as object), content } as AgentMessage);
+		}
+		case "assistant":
+			return obfuscateAssistantMessage(obfuscator, message as AssistantMessage) as AgentMessage;
+		case "custom":
+		case "hookMessage": {
+			const msg = message as AgentMessage & {
+				content: TextualContent;
+				details?: Record<string, unknown>;
+			};
+			const content = obfuscateTextualContent(obfuscator, msg.content);
+			const details = obfuscateDetails(obfuscator, msg.details);
+			if (content === msg.content && details === msg.details) return message;
+			return { ...(message as object), content, details } as AgentMessage;
+		}
+		case "bashExecution": {
+			const msg = message as AgentMessage & { command: string; output: string };
+			const command = obfuscator.obfuscate(msg.command);
+			const output = obfuscator.obfuscate(msg.output);
+			return command === msg.command && output === msg.output
+				? message
+				: ({ ...(message as object), command, output } as AgentMessage);
+		}
+		case "pythonExecution": {
+			const msg = message as AgentMessage & { code: string; output: string };
+			const code = obfuscator.obfuscate(msg.code);
+			const output = obfuscator.obfuscate(msg.output);
+			return code === msg.code && output === msg.output
+				? message
+				: ({ ...(message as object), code, output } as AgentMessage);
+		}
+		case "branchSummary": {
+			const msg = message as AgentMessage & { summary: string };
+			const summary = obfuscator.obfuscate(msg.summary);
+			return summary === msg.summary ? message : ({ ...(message as object), summary } as AgentMessage);
+		}
+		case "compactionSummary": {
+			const msg = message as AgentMessage & { summary: string };
+			const summary = obfuscator.obfuscate(msg.summary);
+			return summary === msg.summary ? message : ({ ...(message as object), summary } as AgentMessage);
+		}
+		case "fileMention": {
+			const msg = message as AgentMessage & {
+				files: Array<{ path: string; content: string; image?: unknown }>;
+			};
+			let changed = false;
+			const files = msg.files.map(file => {
+				const path = obfuscator.obfuscate(file.path);
+				const content = obfuscator.obfuscate(file.content);
+				if (path === file.path && content === file.content) return file;
+				changed = true;
+				return { ...file, path, content };
+			});
+			return changed ? ({ ...(message as object), files } as AgentMessage) : message;
+		}
+		default:
+			return message;
+	}
+}
+
+function obfuscateAdvisorDelta(obfuscator: SecretObfuscator, messages: AgentMessage[]): AgentMessage[] {
+	let changed = false;
+	const result = messages.map(message => {
+		const next = obfuscateAdvisorMessage(obfuscator, message);
+		if (next !== message) changed = true;
+		return next;
+	});
+	return changed ? result : messages;
+}

package/src/cli/args.ts

@@ -1,10 +1,9 @@
 /**
  * CLI argument parsing and help display
  */
-import { type Effort, THINKING_EFFORTS } from "@oh-my-pi/pi-catalog/effort";
 import { APP_NAME, CONFIG_DIR_NAME, logger } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-import { parseEffort } from "../thinking";
+import { CLI_THINKING_LEVELS, type ConfiguredThinkingLevel, parseCliThinkingLevel } from "../thinking";
 import { BUILTIN_TOOL_NAMES } from "../tools/builtin-names";
 import {
 	OPTIONAL_FLAGS,
@@ -32,7 +31,7 @@ export interface Args {
 	apiKey?: string;
 	systemPrompt?: string;
 	appendSystemPrompt?: string;
-	thinking?: Effort;
+	thinking?: ConfiguredThinkingLevel;
 	hideThinking?: boolean;
 	advisor?: boolean;
 	continue?: boolean;
@@ -89,9 +88,9 @@ export interface Args {
  */
 const PARSE_DEPS: ParseDeps = {
 	logger,
-	parseEffort,
+	parseThinking: parseCliThinkingLevel,
 	builtinToolNames: BUILTIN_TOOL_NAMES,
-	thinkingEfforts: THINKING_EFFORTS,
+	thinkingEfforts: CLI_THINKING_LEVELS,
 };
 
 export function parseArgs(inputArgs: string[], extensionFlags?: Map<string, { type: "boolean" | "string" }>): Args {

package/src/cli/flag-tables.ts

@@ -30,7 +30,7 @@
  * real implementations at the dispatch site.
  */
 
-import type { Effort } from "@oh-my-pi/pi-ai";
+import type { ConfiguredThinkingLevel } from "../thinking";
 import type { Args } from "./args";
 
 /**
@@ -44,7 +44,7 @@ import type { Args } from "./args";
  */
 export interface ParseDeps {
 	logger: { warn: (message: string, meta?: Record<string, unknown>) => void };
-	parseEffort: (value: string | null | undefined) => Effort | undefined;
+	parseThinking: (value: string | null | undefined) => ConfiguredThinkingLevel | undefined;
 	builtinToolNames: readonly string[];
 	thinkingEfforts: readonly string[];
 }
@@ -165,7 +165,7 @@ export const STRING_SETTERS: Record<string, StringSetter> = {
 		result.tools = valid;
 	},
 	"--thinking": (result, value, deps) => {
-		const thinking = deps.parseEffort(value);
+		const thinking = deps.parseThinking(value);
 		if (thinking !== undefined) {
 			result.thinking = thinking;
 		} else {