@oh-my-pi/pi-coding-agent 17.0.9 → 17.1.1

package/src/export/share.ts

@@ -25,7 +25,7 @@ import { $which, logger } from "@oh-my-pi/pi-utils";
 import { DEFAULT_SHARE_URL } from "@oh-my-pi/pi-wire";
 import { $ } from "bun";
 import { obfuscateToolArguments, type SecretObfuscator } from "../secrets/obfuscator";
-import type { SessionEntry, SessionHeader } from "../session/session-entries";
+import { type SessionEntry, type SessionHeader, TITLE_CHANGE_ENTRY_TYPE } from "../session/session-entries";
 import type { SessionManager } from "../session/session-manager";
 import type { OutputMeta } from "../tools/output-meta";
 import { buildSessionData, type SessionData, type SubSession } from "./html";
@@ -103,54 +103,212 @@ export function buildShareSnapshot(sm: SessionManager, options?: ShareSessionOpt
  * extension `details`/`data`, `mode_change.data`, structured output schemas)
  * are dropped so they cannot leak.
  */
-function redactShareHeader(o: SecretObfuscator, header: SessionHeader | null): SessionHeader | null {
+function collectShareRegexSecretValues(o: SecretObfuscator, data: SessionData): Set<string> {
+	const values = new Set<string>();
+	const add = (value: string | undefined): void => {
+		if (value === undefined) return;
+		for (const secretValue of o.collectRegexSecretValuesForObfuscation(value)) {
+			values.add(secretValue);
+		}
+	};
+	const addJsonStrings = (value: unknown): void => {
+		if (typeof value === "string") {
+			add(value);
+			return;
+		}
+		if (Array.isArray(value)) {
+			for (const item of value) addJsonStrings(item);
+			return;
+		}
+		if (!isRecord(value)) return;
+		for (const item of Object.values(value)) addJsonStrings(item);
+	};
+	const addContent = (content: string | (TextContent | ImageContent)[]): void => {
+		if (typeof content === "string") {
+			add(content);
+			return;
+		}
+		for (const block of content) {
+			if (block.type === "text") add(block.text);
+		}
+	};
+	const addOutputMeta = (meta: OutputMeta | undefined): void => {
+		if (!meta) return;
+		add(meta.source?.value);
+		if (!meta.diagnostics) return;
+		add(meta.diagnostics.summary);
+		for (const message of meta.diagnostics.messages) add(message);
+	};
+	const addMessage = (message: AgentMessage): void => {
+		switch (message.role) {
+			case "user":
+			case "developer":
+			case "custom":
+			case "hookMessage":
+			case "toolResult":
+				addContent(message.content as string | (TextContent | ImageContent)[]);
+				return;
+			case "assistant":
+				add(message.errorMessage);
+				for (const block of message.content) {
+					if (block.type === "text") add(block.text);
+					else if (block.type === "thinking") add(block.thinking);
+					else if (block.type === "toolCall") {
+						addJsonStrings(block.arguments);
+						add(block.intent);
+						add(block.rawBlock);
+					}
+				}
+				return;
+			case "bashExecution":
+				add(message.command);
+				add(message.output);
+				addOutputMeta(message.meta);
+				return;
+			case "pythonExecution":
+				add(message.code);
+				add(message.output);
+				addOutputMeta(message.meta);
+				return;
+			case "branchSummary":
+				add(message.summary);
+				return;
+			case "compactionSummary":
+				add(message.summary);
+				add(message.shortSummary);
+				if (message.blocks) addContent(message.blocks);
+				return;
+			case "fileMention":
+				for (const file of message.files) {
+					add(file.path);
+					add(file.content);
+				}
+				return;
+			default:
+				return;
+		}
+	};
+	const addEntry = (entry: SessionEntry): void => {
+		switch (entry.type) {
+			case "message":
+				addMessage(entry.message);
+				return;
+			case "compaction":
+				add(entry.summary);
+				add(entry.shortSummary);
+				return;
+			case "branch_summary":
+				add(entry.summary);
+				return;
+			case "custom_message":
+				addContent(entry.content);
+				return;
+			case "session_init":
+				add(entry.systemPrompt);
+				add(entry.task);
+				return;
+			case "label":
+				add(entry.label);
+				return;
+			case TITLE_CHANGE_ENTRY_TYPE:
+				add(entry.title);
+				add(entry.previousTitle);
+				add(entry.trigger);
+				return;
+			default:
+				return;
+		}
+	};
+	const addHeader = (header: SessionHeader | null): void => {
+		if (!header) return;
+		add(header.title);
+		add(header.cwd);
+	};
+
+	addHeader(data.header);
+	add(data.systemPrompt);
+	for (const tool of data.tools ?? []) add(tool.description);
+	for (const entry of data.entries) addEntry(entry);
+	for (const sub of Object.values(data.subSessions ?? {})) {
+		addHeader(sub.header);
+		for (const entry of sub.entries) addEntry(entry);
+	}
+	return values;
+}
+
+function redactShareHeader(
+	o: SecretObfuscator,
+	header: SessionHeader | null,
+	sharedRegexSecretValues: ReadonlySet<string>,
+): SessionHeader | null {
 	if (!header) return header;
 	return {
 		...header,
-		title: header.title === undefined ? undefined : o.obfuscate(header.title),
-		cwd: o.obfuscate(header.cwd),
+		title: header.title === undefined ? undefined : o.obfuscate(header.title, sharedRegexSecretValues),
+		cwd: o.obfuscate(header.cwd, sharedRegexSecretValues),
 	};
 }
 
 function redactSessionDataForShare(o: SecretObfuscator, data: SessionData): SessionData {
+	const sharedRegexSecretValues = collectShareRegexSecretValues(o, data);
 	return {
 		...data,
-		header: redactShareHeader(o, data.header),
-		systemPrompt: data.systemPrompt === undefined ? undefined : o.obfuscate(data.systemPrompt),
-		tools: data.tools?.map(tool => ({ ...tool, description: o.obfuscate(tool.description) })),
-		entries: data.entries.map(entry => redactShareEntry(o, entry)),
+		header: redactShareHeader(o, data.header, sharedRegexSecretValues),
+		systemPrompt:
+			data.systemPrompt === undefined ? undefined : o.obfuscate(data.systemPrompt, sharedRegexSecretValues),
+		tools: data.tools?.map(tool => ({
+			...tool,
+			description: o.obfuscate(tool.description, sharedRegexSecretValues),
+		})),
+		entries: data.entries.map(entry => redactShareEntry(o, entry, sharedRegexSecretValues)),
 		subSessions: data.subSessions
 			? Object.fromEntries(
-					Object.entries(data.subSessions).map(([key, sub]) => [key, redactShareSubSession(o, sub)]),
+					Object.entries(data.subSessions).map(([key, sub]) => [
+						key,
+						redactShareSubSession(o, sub, sharedRegexSecretValues),
+					]),
 				)
 			: data.subSessions,
 	};
 }
 
-function redactShareSubSession(o: SecretObfuscator, sub: SubSession): SubSession {
+function redactShareSubSession(
+	o: SecretObfuscator,
+	sub: SubSession,
+	sharedRegexSecretValues: ReadonlySet<string>,
+): SubSession {
 	return {
 		...sub,
-		header: redactShareHeader(o, sub.header),
-		entries: sub.entries.map(entry => redactShareEntry(o, entry)),
+		header: redactShareHeader(o, sub.header, sharedRegexSecretValues),
+		entries: sub.entries.map(entry => redactShareEntry(o, entry, sharedRegexSecretValues)),
 	};
 }
 
-function redactShareEntry(o: SecretObfuscator, entry: SessionEntry): SessionEntry {
+function redactShareEntry(
+	o: SecretObfuscator,
+	entry: SessionEntry,
+	sharedRegexSecretValues: ReadonlySet<string>,
+): SessionEntry {
 	switch (entry.type) {
 		case "message":
-			return { ...entry, message: redactShareMessage(o, entry.message) };
+			return { ...entry, message: redactShareMessage(o, entry.message, sharedRegexSecretValues) };
 		case "compaction":
 			return {
 				...entry,
-				summary: o.obfuscate(entry.summary),
-				shortSummary: entry.shortSummary === undefined ? undefined : o.obfuscate(entry.shortSummary),
+				summary: o.obfuscate(entry.summary, sharedRegexSecretValues),
+				shortSummary:
+					entry.shortSummary === undefined ? undefined : o.obfuscate(entry.shortSummary, sharedRegexSecretValues),
 				details: undefined,
 				preserveData: undefined,
 			};
 		case "branch_summary":
-			return { ...entry, summary: o.obfuscate(entry.summary), details: undefined };
+			return { ...entry, summary: o.obfuscate(entry.summary, sharedRegexSecretValues), details: undefined };
 		case "custom_message":
-			return { ...entry, content: redactShareContent(o, entry.content), details: undefined };
+			return {
+				...entry,
+				content: redactShareContent(o, entry.content, sharedRegexSecretValues),
+				details: undefined,
+			};
 		case "custom":
 			return { ...entry, data: undefined };
 		case "mode_change":
@@ -158,12 +316,25 @@ function redactShareEntry(o: SecretObfuscator, entry: SessionEntry): SessionEntr
 		case "session_init":
 			return {
 				...entry,
-				systemPrompt: o.obfuscate(entry.systemPrompt),
-				task: o.obfuscate(entry.task),
+				systemPrompt: o.obfuscate(entry.systemPrompt, sharedRegexSecretValues),
+				task: o.obfuscate(entry.task, sharedRegexSecretValues),
 				outputSchema: undefined,
 			};
 		case "label":
-			return { ...entry, label: entry.label === undefined ? undefined : o.obfuscate(entry.label) };
+			return {
+				...entry,
+				label: entry.label === undefined ? undefined : o.obfuscate(entry.label, sharedRegexSecretValues),
+			};
+		case TITLE_CHANGE_ENTRY_TYPE:
+			return {
+				...entry,
+				title: o.obfuscate(entry.title, sharedRegexSecretValues),
+				previousTitle:
+					entry.previousTitle === undefined
+						? undefined
+						: o.obfuscate(entry.previousTitle, sharedRegexSecretValues),
+				trigger: entry.trigger === undefined ? undefined : o.obfuscate(entry.trigger, sharedRegexSecretValues),
+			};
 		default:
 			return entry;
 	}
@@ -172,43 +343,60 @@ function redactShareEntry(o: SecretObfuscator, entry: SessionEntry): SessionEntr
 function redactShareContent(
 	o: SecretObfuscator,
 	content: string | (TextContent | ImageContent)[],
+	sharedRegexSecretValues: ReadonlySet<string>,
 ): string | (TextContent | ImageContent)[] {
-	if (typeof content === "string") return o.obfuscate(content);
-	return content.map(block => (block.type === "text" ? { ...block, text: o.obfuscate(block.text) } : block));
+	if (typeof content === "string") return o.obfuscate(content, sharedRegexSecretValues);
+	return content.map(block =>
+		block.type === "text" ? { ...block, text: o.obfuscate(block.text, sharedRegexSecretValues) } : block,
+	);
 }
 
 /** Redact freeform strings in tool output metadata (source path/URL, diagnostics); numeric truncation info is preserved. */
-function redactShareOutputMeta(o: SecretObfuscator, meta: OutputMeta | undefined): OutputMeta | undefined {
+function redactShareOutputMeta(
+	o: SecretObfuscator,
+	meta: OutputMeta | undefined,
+	sharedRegexSecretValues: ReadonlySet<string>,
+): OutputMeta | undefined {
 	if (!meta) return meta;
 	return {
 		...meta,
-		source: meta.source ? { ...meta.source, value: o.obfuscate(meta.source.value) } : meta.source,
+		source: meta.source
+			? { ...meta.source, value: o.obfuscate(meta.source.value, sharedRegexSecretValues) }
+			: meta.source,
 		diagnostics: meta.diagnostics
 			? {
-					summary: o.obfuscate(meta.diagnostics.summary),
-					messages: meta.diagnostics.messages.map(message => o.obfuscate(message)),
+					summary: o.obfuscate(meta.diagnostics.summary, sharedRegexSecretValues),
+					messages: meta.diagnostics.messages.map(message => o.obfuscate(message, sharedRegexSecretValues)),
 				}
 			: meta.diagnostics,
 	};
 }
 
-function redactShareMessage(o: SecretObfuscator, message: AgentMessage): AgentMessage {
+function redactShareMessage(
+	o: SecretObfuscator,
+	message: AgentMessage,
+	sharedRegexSecretValues: ReadonlySet<string>,
+): AgentMessage {
 	switch (message.role) {
 		case "user":
 		case "developer":
 			return {
 				...message,
 				providerPayload: undefined,
-				content: redactShareContent(o, message.content),
+				content: redactShareContent(o, message.content, sharedRegexSecretValues),
 			} as AgentMessage;
 		case "custom":
 		case "hookMessage":
-			return { ...message, details: undefined, content: redactShareContent(o, message.content) } as AgentMessage;
+			return {
+				...message,
+				details: undefined,
+				content: redactShareContent(o, message.content, sharedRegexSecretValues),
+			} as AgentMessage;
 		case "toolResult":
 			return {
 				...message,
 				details: undefined,
-				content: redactShareContent(o, message.content) as (TextContent | ImageContent)[],
+				content: redactShareContent(o, message.content, sharedRegexSecretValues) as (TextContent | ImageContent)[],
 			};
 		case "assistant":
 			// Drop opaque provider-replay state (encrypted reasoning / native history) the viewer
@@ -217,18 +405,27 @@ function redactShareMessage(o: SecretObfuscator, message: AgentMessage): AgentMe
 			return {
 				...message,
 				providerPayload: undefined,
-				errorMessage: message.errorMessage === undefined ? undefined : o.obfuscate(message.errorMessage),
+				errorMessage:
+					message.errorMessage === undefined
+						? undefined
+						: o.obfuscate(message.errorMessage, sharedRegexSecretValues),
 				content: message.content.flatMap((block): AssistantMessage["content"] => {
 					if (block.type === "redactedThinking") return [];
-					if (block.type === "text") return [{ ...block, text: o.obfuscate(block.text) }];
-					if (block.type === "thinking") return [{ ...block, thinking: o.obfuscate(block.thinking) }];
+					if (block.type === "text") return [{ ...block, text: o.obfuscate(block.text, sharedRegexSecretValues) }];
+					if (block.type === "thinking") {
+						return [{ ...block, thinking: o.obfuscate(block.thinking, sharedRegexSecretValues) }];
+					}
 					if (block.type === "toolCall") {
 						return [
 							{
 								...block,
-								arguments: obfuscateToolArguments(o, block.arguments),
-								intent: block.intent === undefined ? undefined : o.obfuscate(block.intent),
-								rawBlock: block.rawBlock === undefined ? undefined : o.obfuscate(block.rawBlock),
+								arguments: obfuscateToolArguments(o, block.arguments, sharedRegexSecretValues),
+								intent:
+									block.intent === undefined ? undefined : o.obfuscate(block.intent, sharedRegexSecretValues),
+								rawBlock:
+									block.rawBlock === undefined
+										? undefined
+										: o.obfuscate(block.rawBlock, sharedRegexSecretValues),
 							},
 						];
 					}
@@ -238,37 +435,40 @@ function redactShareMessage(o: SecretObfuscator, message: AgentMessage): AgentMe
 		case "bashExecution":
 			return {
 				...message,
-				command: o.obfuscate(message.command),
-				output: o.obfuscate(message.output),
-				meta: redactShareOutputMeta(o, message.meta),
+				command: o.obfuscate(message.command, sharedRegexSecretValues),
+				output: o.obfuscate(message.output, sharedRegexSecretValues),
+				meta: redactShareOutputMeta(o, message.meta, sharedRegexSecretValues),
 			};
 		case "pythonExecution":
 			return {
 				...message,
-				code: o.obfuscate(message.code),
-				output: o.obfuscate(message.output),
-				meta: redactShareOutputMeta(o, message.meta),
+				code: o.obfuscate(message.code, sharedRegexSecretValues),
+				output: o.obfuscate(message.output, sharedRegexSecretValues),
+				meta: redactShareOutputMeta(o, message.meta, sharedRegexSecretValues),
 			};
 		case "branchSummary":
-			return { ...message, summary: o.obfuscate(message.summary) };
+			return { ...message, summary: o.obfuscate(message.summary, sharedRegexSecretValues) };
 		case "compactionSummary":
 			return {
 				...message,
 				providerPayload: undefined,
-				summary: o.obfuscate(message.summary),
-				shortSummary: message.shortSummary === undefined ? undefined : o.obfuscate(message.shortSummary),
+				summary: o.obfuscate(message.summary, sharedRegexSecretValues),
+				shortSummary:
+					message.shortSummary === undefined
+						? undefined
+						: o.obfuscate(message.shortSummary, sharedRegexSecretValues),
 				blocks:
 					message.blocks === undefined
 						? undefined
-						: (redactShareContent(o, message.blocks) as (TextContent | ImageContent)[]),
+						: (redactShareContent(o, message.blocks, sharedRegexSecretValues) as (TextContent | ImageContent)[]),
 			};
 		case "fileMention":
 			return {
 				...message,
 				files: message.files.map(file => ({
 					...file,
-					path: o.obfuscate(file.path),
-					content: o.obfuscate(file.content),
+					path: o.obfuscate(file.path, sharedRegexSecretValues),
+					content: o.obfuscate(file.content, sharedRegexSecretValues),
 				})),
 			};
 		default:

package/src/extensibility/extensions/loader.ts

@@ -5,13 +5,22 @@ import type * as fs1 from "node:fs";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Model, TextContent, TSchema } from "@oh-my-pi/pi-ai";
+import type {
+	ImageContent,
+	Model,
+	ServiceTier,
+	ServiceTierByFamily,
+	ServiceTierFamily,
+	TextContent,
+	TSchema,
+} from "@oh-my-pi/pi-ai";
 import type { KeyId } from "@oh-my-pi/pi-tui";
 import { hasFsCode, isEacces, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { Type } from "arktype";
 import * as zodModule from "zod/v4";
 import { type ExtensionModule, extensionModuleCapability } from "../../capability/extension-module";
 import { type Hook, hookCapability } from "../../capability/hook";
+import { isServiceTierFamily, isServiceTierForFamily } from "../../config/service-tier";
 import { loadCapability } from "../../discovery";
 import { getExtensionNameFromPath } from "../../discovery/helpers";
 import type { ExecOptions } from "../../exec/exec";
@@ -107,6 +116,14 @@ export class ExtensionRuntime implements IExtensionRuntime {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
 
+	getServiceTiers(): ServiceTierByFamily {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	setServiceTier(): void {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
 	getSessionName(): string | undefined {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
@@ -252,6 +269,17 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 		this.runtime.setThinkingLevel(level, persist);
 	}
 
+	getServiceTiers(): Readonly<ServiceTierByFamily> {
+		return { ...this.runtime.getServiceTiers() };
+	}
+
+	setServiceTier(family: ServiceTierFamily, tier: ServiceTier | undefined): void {
+		if (!isServiceTierFamily(family) || (tier !== undefined && !isServiceTierForFamily(family, tier))) {
+			throw new TypeError(`Invalid service tier "${String(tier)}" for family "${String(family)}"`);
+		}
+		this.runtime.setServiceTier(family, tier);
+	}
+
 	getSessionName(): string | undefined {
 		return this.runtime.getSessionName();
 	}

package/src/extensibility/extensions/runner.ts

@@ -72,6 +72,10 @@ export type ExtensionErrorListener = (error: ExtensionError) => void;
 export const EXTENSION_HANDLER_TIMEOUT_MS = 30_000;
 let extensionHandlerTimeoutMs = EXTENSION_HANDLER_TIMEOUT_MS;
 
+function throwUnsupportedServiceTierAction(): never {
+	throw new Error("This extension host does not support service-tier actions");
+}
+
 export function testSetExtensionHandlerTimeoutMs(timeoutMs: number): void {
 	extensionHandlerTimeoutMs = timeoutMs;
 }
@@ -298,6 +302,8 @@ export class ExtensionRunner {
 		this.runtime.setModel = actions.setModel;
 		this.runtime.getThinkingLevel = actions.getThinkingLevel;
 		this.runtime.setThinkingLevel = actions.setThinkingLevel;
+		this.runtime.getServiceTiers = actions.getServiceTiers ?? throwUnsupportedServiceTierAction;
+		this.runtime.setServiceTier = actions.setServiceTier ?? throwUnsupportedServiceTierAction;
 		this.runtime.getSessionName = actions.getSessionName;
 		this.runtime.setSessionName = actions.setSessionName;
 

package/src/extensibility/extensions/types.ts

@@ -25,6 +25,9 @@ import type {
 	Model,
 	ModelSpec,
 	ProviderResponseMetadata,
+	ServiceTier,
+	ServiceTierByFamily,
+	ServiceTierFamily,
 	SimpleStreamOptions,
 	Static,
 	TextContent,
@@ -1044,6 +1047,13 @@ export interface RegisteredCommand {
 // biome-ignore lint/suspicious/noConfusingVoidType: void allows bare return statements
 export type ExtensionHandler<E, R = undefined> = (event: E, ctx: ExtensionContext) => Promise<R | void> | R | void;
 
+/** Service tiers accepted by each provider family. */
+export type ExtensionServiceTier<Family extends ServiceTierFamily> = Family extends "anthropic"
+	? "priority"
+	: Family extends "google"
+		? "flex" | "priority"
+		: ServiceTier;
+
 /**
  * ExtensionAPI passed to extension factory functions.
  */
@@ -1230,6 +1240,18 @@ export interface ExtensionAPI {
 	/** Set thinking level for the current session. */
 	setThinkingLevel(level: ThinkingLevel): void;
 
+	/** Get a snapshot of the current session's per-family service tiers. */
+	getServiceTiers(): Readonly<ServiceTierByFamily>;
+
+	/**
+	 * Set one provider family's service tier for subsequent requests, or clear
+	 * its session override with `undefined`.
+	 */
+	setServiceTier<Family extends ServiceTierFamily>(
+		family: Family,
+		tier: ExtensionServiceTier<Family> | undefined,
+	): void;
+
 	/** Get the current session name. */
 	getSessionName(): string | undefined;
 
@@ -1409,6 +1431,10 @@ export type GetThinkingLevelHandler = () => ThinkingLevel | undefined;
 
 export type SetThinkingLevelHandler = (level: ThinkingLevel, persist?: boolean) => void;
 
+export type GetServiceTiersHandler = () => ServiceTierByFamily;
+
+export type SetServiceTierHandler = (family: ServiceTierFamily, tier: ServiceTier | undefined) => void;
+
 /** Shared state created by loader, used during registration and runtime. */
 export interface ExtensionRuntimeState {
 	flagValues: Map<string, boolean | string>;
@@ -1429,6 +1455,8 @@ export interface ExtensionActions {
 	setModel: SetModelHandler;
 	getThinkingLevel: GetThinkingLevelHandler;
 	setThinkingLevel: SetThinkingLevelHandler;
+	getServiceTiers?: GetServiceTiersHandler;
+	setServiceTier?: SetServiceTierHandler;
 	getSessionName: () => string | undefined;
 	setSessionName: (name: string) => Promise<void>;
 }
@@ -1460,8 +1488,11 @@ export interface ExtensionCommandContextActions {
 	reload: () => Promise<void>;
 }
 
-/** Full runtime = state + actions. */
-export interface ExtensionRuntime extends ExtensionRuntimeState, ExtensionActions {}
+/** Full runtime = state + actions, including host-compatible service-tier fallbacks. */
+export interface ExtensionRuntime extends ExtensionRuntimeState, ExtensionActions {
+	getServiceTiers: GetServiceTiersHandler;
+	setServiceTier: SetServiceTierHandler;
+}
 
 /** Loaded extension with all registered items. */
 export interface Extension {