@oh-my-pi/pi-coding-agent 16.2.6 → 16.2.8

package/dist/types/task/worktree.d.ts

@@ -80,11 +80,32 @@ export declare function cleanupIsolation(handle: IsolationHandle): Promise<void>
 export interface CommitToBranchResult {
     branchName?: string;
     nestedPatches: NestedRepoPatch[];
+    /**
+     * SHA of the parent-repo commit the task branch was created on top of, so
+     * {@link mergeTaskBranches} can cherry-pick the range `baseSha..branchName`
+     * and preserve every agent commit's message and author.
+     */
+    baseSha?: string;
 }
 /**
- * Commit task-only changes to a new branch.
- * Only root repo changes go on the branch. Nested repo patches are returned
- * separately since the parent git can't track files inside gitlinks.
+ * Capture task-only changes from the isolation worktree onto a parent-repo
+ * branch named `omp/task/${taskId}`. Only root-repo changes go on the branch;
+ * nested-repo patches are returned separately because the parent git can't
+ * track files inside gitlinks.
+ *
+ * If the agent committed inside isolation (HEAD moved past
+ * `baseline.root.headCommit`), clean-baseline runs fetch the raw commit range
+ * into the parent repo and later cherry-pick `baseSha..branchName`, preserving
+ * every message and author verbatim. Dirty-baseline runs rewrite each agent
+ * commit against the captured baseline WIP before committing it to the task
+ * branch, so user staged/unstaged/untracked changes present at isolation
+ * start are not replayed into the parent commit history.
+ *
+ * If the agent did not commit, the captured delta is collapsed onto a single
+ * branch commit with an AI-generated (or fallback) message — the legacy
+ * behaviour.
+ *
+ * Returns `null` when no root or nested changes exist.
  */
 export declare function commitToBranch(isolationDir: string, baseline: WorktreeBaseline, taskId: string, description: string | undefined, commitMessage?: (diff: string) => Promise<string | null>): Promise<CommitToBranchResult | null>;
 export interface MergeBranchResult {
@@ -95,14 +116,19 @@ export interface MergeBranchResult {
     stashConflict?: string;
 }
 /**
- * Cherry-pick task branch commits sequentially onto HEAD.
- * Each branch has a single commit that gets replayed cleanly.
- * Stops on first conflict and reports which branches succeeded.
+ * Cherry-pick task branch commits sequentially onto HEAD. When `baseSha` is
+ * provided the cherry-pick uses the inclusive range `baseSha..branchName`,
+ * replaying every commit individually and preserving each commit's message
+ * and author. When omitted, the branch is cherry-picked as a single commit
+ * (legacy callers).
+ *
+ * Stops on the first conflict and reports which branches succeeded.
  */
 export declare function mergeTaskBranches(repoRoot: string, branches: Array<{
     branchName: string;
     taskId: string;
     description?: string;
+    baseSha?: string;
 }>): Promise<MergeBranchResult>;
 /** Clean up temporary task branches. */
 export declare function cleanupTaskBranches(repoRoot: string, branches: string[]): Promise<void>;

package/dist/types/tiny/title-client.d.ts

@@ -1,5 +1,9 @@
 import { type RefCountedWorkerHandle, type SpawnedSubprocess } from "../subprocess/worker-client";
 import type { TinyTitleProgressEvent, TinyTitleWorkerInbound, TinyTitleWorkerOutbound } from "./title-protocol";
+export interface TinyTitleDownloadResult {
+    ok: boolean;
+    error?: string;
+}
 export interface TinyTitleDownloadOptions {
     signal?: AbortSignal;
     onProgress?: (event: TinyTitleProgressEvent) => void;
@@ -52,7 +56,7 @@ export declare class TinyTitleClient {
         maxTokens?: number;
         signal?: AbortSignal;
     }): Promise<string | null>;
-    downloadModel(modelKey: string, options?: TinyTitleDownloadOptions): Promise<boolean>;
+    downloadModel(modelKey: string, options?: TinyTitleDownloadOptions): Promise<TinyTitleDownloadResult>;
     terminate(): Promise<void>;
 }
 export declare const tinyTitleClient: TinyTitleClient;

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

@@ -1,6 +1,6 @@
 import type { InMemorySnapshotStore } from "@oh-my-pi/hashline";
 import type { AgentTelemetryConfig, AgentTool } from "@oh-my-pi/pi-agent-core";
-import type { FetchImpl, ImageContent, Model, ServiceTier, ToolChoice } from "@oh-my-pi/pi-ai";
+import type { FetchImpl, ImageContent, Model, ServiceTierByFamily, ToolChoice } from "@oh-my-pi/pi-ai";
 import type { AsyncJobManager } from "../async/job-manager";
 import type { Rule } from "../capability/rule";
 import type { PromptTemplate } from "../config/prompt-templates";
@@ -191,8 +191,8 @@ export interface ToolSession {
     getActiveModelString?: () => string | undefined;
     /** Get the current session model object (provider/api capabilities), regardless of how it was chosen. */
     getActiveModel?: () => Model | undefined;
-    /** Get the session's live effective service tier (undefined = none). Source of truth for subagent `serviceTierSubagent: inherit`. */
-    getServiceTier?: () => ServiceTier | undefined;
+    /** Get the session's live per-family service tiers (undefined = none). Source of truth for subagent `tier.subagent: inherit`. */
+    getServiceTierByFamily?: () => ServiceTierByFamily | undefined;
     /** Auth storage for passing to subagents (avoids re-discovery) */
     authStorage?: import("../session/auth-storage").AuthStorage;
     /** Model registry for passing to subagents (avoids re-discovery) */

package/dist/types/tools/output-schema-validator.d.ts

@@ -14,6 +14,16 @@ export interface OutputValidator {
     validate(value: unknown): JsonSchemaValidationResult;
     /** Top-level required property names. Empty if the schema has no `required` array at root. */
     readonly requiredFields: readonly string[];
+    /**
+     * Per-label validators for incremental yields (`type: ["<label>"]`). Each entry validates the
+     * `data` payload of a single section against the matching top-level property's sub-schema —
+     * array-typed properties (e.g. `findings`) use the items schema since each yield contributes
+     * one element, while scalar properties use the property schema directly. Unknown labels (not
+     * top-level properties) have no entry and skip per-call validation. Lets the yield tool give
+     * the model retry feedback on a section as soon as it arrives, instead of deferring every
+     * mismatch to the parent's post-mortem `schema_violation`.
+     */
+    readonly validateSection: ReadonlyMap<string, (value: unknown) => JsonSchemaValidationResult>;
 }
 export interface BuildOutputValidatorResult {
     /** Present when the schema produced a usable validator (i.e. constraining schemas). Absent for missing/unconstrained schemas. */

package/dist/types/utils/git.d.ts

@@ -63,8 +63,18 @@ export interface StatusOptions {
     readonly untrackedFiles?: "all" | "no" | "normal";
     readonly z?: boolean;
 }
+export interface CommitAuthor {
+    readonly date?: string;
+    readonly email: string;
+    readonly name: string;
+}
+export interface CommitDetails {
+    readonly author: CommitAuthor;
+    readonly message: string;
+}
 export interface CommitOptions {
     readonly allowEmpty?: boolean;
+    readonly author?: CommitAuthor;
     readonly files?: readonly string[];
     readonly signal?: AbortSignal;
 }
@@ -78,6 +88,7 @@ export interface PatchOptions {
     readonly cached?: boolean;
     readonly check?: boolean;
     readonly env?: Record<string, string | undefined>;
+    readonly threeWay?: boolean;
     readonly signal?: AbortSignal;
 }
 export interface RestoreOptions {
@@ -195,12 +206,18 @@ export declare const show: ((cwd: string, revision: string, options?: {
     /** Get the path prefix of the current directory relative to the repo root. */
     prefix(cwd: string, signal?: AbortSignal): Promise<string>;
 };
+/** Read commit message and author metadata for replay/rewrite flows. */
+export declare function commitDetails(cwd: string, revision: string, signal?: AbortSignal): Promise<CommitDetails>;
 export declare const log: {
     /** Recent commit subjects (one-line each). */
     subjects(cwd: string, count: number, signal?: AbortSignal): Promise<string[]>;
     /** Recent commits as `<short-sha> <subject>` onelines. */
     onelines(cwd: string, count: number, signal?: AbortSignal): Promise<string[]>;
 };
+export declare const revList: {
+    /** Commits in `base..head`, oldest first. */
+    range(cwd: string, base: string, head: string, signal?: AbortSignal): Promise<string[]>;
+};
 export declare const branch: {
     /** Current branch name, or null if detached/unavailable. */
     current(cwd: string, signal?: AbortSignal): Promise<string | null>;

package/package.json

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

package/src/cli/bench-cli.ts

@@ -10,9 +10,10 @@ import type {
 	Model,
 	ProviderSessionState,
 	ServiceTier,
+	ServiceTierByFamily,
 	SimpleStreamOptions,
 } from "@oh-my-pi/pi-ai";
-import { streamSimple } from "@oh-my-pi/pi-ai";
+import { resolveModelServiceTier, streamSimple } from "@oh-my-pi/pi-ai";
 import { buildModelProviderPriorityRank, type CanonicalModelVariant } from "@oh-my-pi/pi-catalog/identity";
 import { replaceTabs, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { formatDuration, getProjectDir } from "@oh-my-pi/pi-utils";
@@ -25,7 +26,7 @@ import {
 	getModelMatchPreferences,
 	resolveCliModel,
 } from "../config/model-resolver";
-import { resolveServiceTierSetting } from "../config/service-tier";
+import { buildServiceTierByFamily, serviceTierForAllFamilies, serviceTierSettingToTier } from "../config/service-tier";
 import { Settings } from "../config/settings";
 import benchPrompt from "../prompts/bench.md" with { type: "text" };
 import { discoverAuthStorage, loadCliExtensionProviders } from "../sdk";
@@ -106,8 +107,8 @@ export interface BenchSummary {
 	maxTokens: number;
 	models: BenchModelReport[];
 	failures: number;
-	/** Requested service tier passed to every request; absent when none was requested. Scoped tiers (`openai-only`/`claude-only`) may be dropped per-provider downstream. */
-	serviceTier?: ServiceTier;
+	/** Requested per-family service tiers, resolved per model before reaching the wire. */
+	serviceTierByFamily?: ServiceTierByFamily;
 }
 
 type BenchStreamSimple = (
@@ -518,12 +519,18 @@ export async function runBenchCommand(command: BenchCommandArgs, deps: BenchDepe
 	const runtime = await (deps.createRuntime ?? createDefaultRuntime)();
 	try {
 		const targets = resolveBenchModels(command.models, runtime.modelRegistry, runtime.settings, writeStderr);
-		// Explicit `--service-tier` wins; otherwise fall back to the configured
-		// `serviceTier` setting (`none`/unset omits the wire field). Scope-aware
-		// gating to the model's provider happens downstream in the provider layer.
-		const serviceTierValue = command.flags.serviceTier ?? runtime.settings?.get("serviceTier");
-		const serviceTier = serviceTierValue ? resolveServiceTierSetting(serviceTierValue, undefined) : undefined;
-		if (!json && serviceTier) writeStdout(`${chalk.dim(`service tier: ${serviceTier}`)}\n`);
+		// Explicit `--service-tier` (a single value broadcast across families) wins;
+		// otherwise fall back to the configured per-family `tier.*` settings. Each
+		// model resolves its own family's tier below before reaching the wire.
+		const flagTier = command.flags.serviceTier ? serviceTierSettingToTier(command.flags.serviceTier) : undefined;
+		const serviceTierByFamily = command.flags.serviceTier
+			? serviceTierForAllFamilies(flagTier)
+			: buildServiceTierByFamily(
+					runtime.settings?.get("tier.openai") ?? "none",
+					runtime.settings?.get("tier.anthropic") ?? "none",
+					runtime.settings?.get("tier.google") ?? "none",
+				);
+		if (!json && flagTier) writeStdout(`${chalk.dim(`service tier: ${flagTier}`)}\n`);
 		const reports: BenchModelReport[] = [];
 		for (const { selector, model, thinking } of targets) {
 			if (!json) {
@@ -564,7 +571,7 @@ export async function runBenchCommand(command: BenchCommandArgs, deps: BenchDepe
 						maxTokens,
 						reasoning: toReasoningEffort(thinking),
 						disableReasoning: shouldDisableReasoning(thinking) ? true : undefined,
-						serviceTier,
+						serviceTier: resolveModelServiceTier(serviceTierByFamily, model),
 					},
 					streamFn,
 					now,
@@ -606,7 +613,7 @@ export async function runBenchCommand(command: BenchCommandArgs, deps: BenchDepe
 			reports.push(buildModelReport(selector, model, thinking, results));
 		}
 		const failures = reports.reduce((sum, report) => sum + report.results.filter(result => !result.ok).length, 0);
-		const summary: BenchSummary = { runs, maxTokens, models: reports, failures, serviceTier };
+		const summary: BenchSummary = { runs, maxTokens, models: reports, failures, serviceTierByFamily };
 		if (json) {
 			writeStdout(`${JSON.stringify(summary, null, 2)}\n`);
 		} else if (reports.length > 1 || runs > 1) {

package/src/cli/tiny-models-cli.ts

@@ -28,12 +28,21 @@ interface ProgressReporter {
 interface DownloadResult {
 	model: TinyLocalModelKey;
 	ok: boolean;
+	error?: string;
 }
 
 function writeLine(text = ""): void {
 	process.stdout.write(`${text}\n`);
 }
 
+function downloadErrorSummary(error: string | undefined): string | undefined {
+	return error
+		?.split(/\r?\n/)
+		.map(line => line.trim())
+		.find(line => line.length > 0)
+		?.replace(/^Error:\s*/, "");
+}
+
 export function resolveModels(model: string | undefined): TinyLocalModelKey[] {
 	if (!model) return [DEFAULT_TINY_TITLE_LOCAL_MODEL_KEY];
 	// `all` is a prefetch convenience: skip models that fail before load (unsupported
@@ -101,10 +110,15 @@ async function downloadOne(modelKey: TinyLocalModelKey, json: boolean | undefine
 	const label = getTinyLocalModelSpec(modelKey)?.label ?? modelKey;
 	if (!json && !process.stdout.isTTY) writeLine(`Downloading ${label} (${modelKey})...`);
 	const progress = makeProgressReporter(modelKey, json);
-	const ok = await tinyTitleClient.downloadModel(modelKey, { onProgress: progress.onProgress });
-	progress.finish(ok);
-	if (!json && !process.stdout.isTTY) writeLine(ok ? `Downloaded ${label}.` : `Failed to download ${label}.`);
-	return { model: modelKey, ok };
+	const result = await tinyTitleClient.downloadModel(modelKey, { onProgress: progress.onProgress });
+	progress.finish(result.ok);
+	const error = downloadErrorSummary(result.error);
+	if (!json && !process.stdout.isTTY) {
+		writeLine(result.ok ? `Downloaded ${label}.` : `Failed to download ${label}${error ? `: ${error}` : ""}.`);
+	} else if (!json && !result.ok && error) {
+		writeLine(`${label} failed: ${error}`);
+	}
+	return result.error ? { model: modelKey, ok: result.ok, error: result.error } : { model: modelKey, ok: result.ok };
 }
 
 export async function runTinyModelsCommand(command: TinyModelsCommandArgs): Promise<void> {

package/src/commands/bench.ts

@@ -1,6 +1,6 @@
 import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
 import { runBenchCommand } from "../cli/bench-cli";
-import { SERVICE_TIER_SETTING_VALUES } from "../config/service-tier";
+import { SERVICE_TIER_OPENAI_VALUES } from "../config/service-tier";
 
 export default class Bench extends Command {
 	static description =
@@ -19,8 +19,8 @@ export default class Bench extends Command {
 		"max-tokens": Flags.integer({ description: "Max output tokens per request", default: 512 }),
 		prompt: Flags.string({ description: "Custom prompt text (default: bundled bench prompt)" }),
 		"service-tier": Flags.string({
-			description: "Service tier hint (default: configured `serviceTier` setting; `none` omits it)",
-			options: SERVICE_TIER_SETTING_VALUES,
+			description: "Service tier applied per model family (default: configured `tier.*` settings; `none` omits it)",
+			options: SERVICE_TIER_OPENAI_VALUES,
 		}),
 		json: Flags.boolean({ description: "Output JSON" }),
 		par: Flags.integer({ description: "Execute runs with N parallel queries/requests", default: 4 }),

package/src/config/mcp-schema.json

@@ -22,7 +22,16 @@
     },
     "disabledServers": {
       "type": "array",
-      "description": "User-level denylist for disabling discovered servers by name.",
+      "description": "User-level denylist for disabling discovered servers by name. Highest precedence: a server here is hidden regardless of any other source.",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "uniqueItems": true
+    },
+    "enabledServers": {
+      "type": "array",
+      "description": "User-level allowlist that overrides a discovered server's `enabled: false` flag (e.g. when the source config is owned by another tool such as opencode.json). The denylist still wins.",
       "items": {
         "type": "string",
         "minLength": 1

package/src/config/service-tier.ts

@@ -1,87 +1,116 @@
-import type { ServiceTier } from "@oh-my-pi/pi-ai";
+import type { ServiceTier, ServiceTierByFamily } from "@oh-my-pi/pi-ai";
 import type { SubmenuOption } from "./settings-schema";
 
 /**
- * Service-tier setting values shared by every "Service Tier" setting. `"none"`
- * is the omit-the-parameter sentinel; the remaining values mirror
- * {@link ServiceTier}.
+ * Per-family service-tier setting values. `"none"` is the omit-the-parameter
+ * sentinel; the rest mirror the wire {@link ServiceTier} values each provider
+ * family actually realizes. OpenAI accepts the full set; Anthropic realizes
+ * only `priority` (fast mode); Google (Gemini API + Vertex) realizes
+ * `flex`/`priority`.
  */
-export const SERVICE_TIER_SETTING_VALUES = [
+export const SERVICE_TIER_OPENAI_VALUES = ["none", "auto", "default", "flex", "scale", "priority"] as const;
+export const SERVICE_TIER_ANTHROPIC_VALUES = ["none", "priority"] as const;
+export const SERVICE_TIER_GOOGLE_VALUES = ["none", "flex", "priority"] as const;
+
+export type ServiceTierOpenAISettingValue = (typeof SERVICE_TIER_OPENAI_VALUES)[number];
+export type ServiceTierAnthropicSettingValue = (typeof SERVICE_TIER_ANTHROPIC_VALUES)[number];
+export type ServiceTierGoogleSettingValue = (typeof SERVICE_TIER_GOOGLE_VALUES)[number];
+
+/**
+ * Inherit-capable single value for the subagent/advisor tiers. The chosen tier
+ * is broadcast across families and applied to whichever family the spawned
+ * model belongs to (clamped to what that family realizes); `"inherit"` defers
+ * to the main agent's live per-family selection.
+ */
+export const SERVICE_TIER_INHERIT_SETTING_VALUES = [
+	"inherit",
 	"none",
 	"auto",
 	"default",
 	"flex",
 	"scale",
 	"priority",
-	"openai-only",
-	"claude-only",
 ] as const;
 
-export type ServiceTierSettingValue = (typeof SERVICE_TIER_SETTING_VALUES)[number];
-
-/** Variant value set for scoped service-tier settings (subagent/advisor) that can defer to the main agent. */
-export const SERVICE_TIER_INHERIT_SETTING_VALUES = ["inherit", ...SERVICE_TIER_SETTING_VALUES] as const;
-
 export type ServiceTierInheritSettingValue = (typeof SERVICE_TIER_INHERIT_SETTING_VALUES)[number];
 
-/** Submenu descriptions shared by the base `serviceTier` setting. */
-export const SERVICE_TIER_OPTIONS: ReadonlyArray<SubmenuOption<ServiceTierSettingValue>> = [
-	{ value: "none", label: "None", description: "Omit service_tier parameter" },
-	{ value: "auto", label: "Auto", description: "Use provider default tier selection (OpenAI)" },
-	{ value: "default", label: "Default", description: "Standard priority processing (OpenAI)" },
-	{ value: "flex", label: "Flex", description: "Flexible capacity tier when available (OpenAI)" },
-	{ value: "scale", label: "Scale", description: "Scale Tier credits when available (OpenAI)" },
+export const SERVICE_TIER_OPENAI_OPTIONS: ReadonlyArray<SubmenuOption<ServiceTierOpenAISettingValue>> = [
+	{ value: "none", label: "None", description: "Omit service_tier (standard processing)" },
+	{ value: "auto", label: "Auto", description: "Provider default tier selection" },
+	{ value: "default", label: "Default", description: "Standard priority processing" },
+	{ value: "flex", label: "Flex", description: "Lower cost, higher latency when available" },
+	{ value: "scale", label: "Scale", description: "Scale Tier credits when available" },
+	{ value: "priority", label: "Priority", description: "Faster, higher cost (premium request)" },
+];
+
+export const SERVICE_TIER_ANTHROPIC_OPTIONS: ReadonlyArray<SubmenuOption<ServiceTierAnthropicSettingValue>> = [
+	{ value: "none", label: "None", description: "Standard processing" },
 	{
 		value: "priority",
 		label: "Priority",
-		description: "Priority on every supported provider (OpenAI `service_tier`, Anthropic fast mode)",
-	},
-	{
-		value: "openai-only",
-		label: "Priority (OpenAI only)",
-		description: "Priority on OpenAI/OpenAI-Codex requests; ignored elsewhere",
-	},
-	{
-		value: "claude-only",
-		label: "Priority (Claude only)",
-		description: "Anthropic fast mode on direct Claude requests; ignored elsewhere (incl. Bedrock/Vertex)",
+		description: 'Fast mode (`speed: "fast"`) on supported direct Claude models; ignored on Bedrock/Vertex',
 	},
 ];
 
-/** Submenu descriptions for inherit-capable service-tier settings. */
+export const SERVICE_TIER_GOOGLE_OPTIONS: ReadonlyArray<SubmenuOption<ServiceTierGoogleSettingValue>> = [
+	{ value: "none", label: "None", description: "Standard processing" },
+	{ value: "flex", label: "Flex", description: "Lower cost, higher latency (Gemini API + Vertex)" },
+	{ value: "priority", label: "Priority", description: "Faster, higher reliability (Gemini API + Vertex)" },
+];
+
 export const SERVICE_TIER_INHERIT_OPTIONS: ReadonlyArray<SubmenuOption<ServiceTierInheritSettingValue>> = [
-	{ value: "inherit", label: "Inherit", description: "Use the main agent's Service Tier" },
-	...SERVICE_TIER_OPTIONS,
+	{ value: "inherit", label: "Inherit", description: "Match the main agent's live per-family tiers" },
+	{ value: "none", label: "None", description: "Standard processing" },
+	{ value: "auto", label: "Auto", description: "Provider default tier selection (OpenAI family)" },
+	{ value: "default", label: "Default", description: "Standard priority processing (OpenAI family)" },
+	{ value: "flex", label: "Flex", description: "Flexible capacity tier (OpenAI/Google families)" },
+	{ value: "scale", label: "Scale", description: "Scale Tier credits (OpenAI family)" },
+	{ value: "priority", label: "Priority", description: "Priority on every supported family of the spawned model" },
 ];
 
+/** Map a per-family setting value to a wire {@link ServiceTier}, or `undefined` to omit. */
+export function serviceTierSettingToTier(value: string): ServiceTier | undefined {
+	if (value === "none" || value === "" || value === "inherit") return undefined;
+	return value as ServiceTier;
+}
+
+/** Assemble the live per-family tier map from the three `tier.*` setting values. */
+export function buildServiceTierByFamily(openai: string, anthropic: string, google: string): ServiceTierByFamily {
+	const out: ServiceTierByFamily = {};
+	const o = serviceTierSettingToTier(openai);
+	if (o) out.openai = o;
+	const a = serviceTierSettingToTier(anthropic);
+	if (a) out.anthropic = a;
+	const g = serviceTierSettingToTier(google);
+	if (g) out.google = g;
+	return out;
+}
+
 /**
- * Resolve a service-tier setting value to the wire {@link ServiceTier} (or
- * `undefined` to omit). `"inherit"` defers to `inherited`; `"none"` omits.
+ * Broadcast a single chosen tier across families, clamped to what each family
+ * realizes: OpenAI takes any tier, Anthropic only `priority`, Google only
+ * `flex`/`priority`. Used by the subagent/advisor single-value settings and the
+ * `omp bench --service-tier` flag, which apply one tier to whatever family the
+ * target model belongs to.
  */
-export function resolveServiceTierSetting(value: string, inherited: ServiceTier | undefined): ServiceTier | undefined {
-	if (value === "inherit") return inherited;
-	if (value === "none" || value === "") return undefined;
-	return value as ServiceTier;
+export function serviceTierForAllFamilies(tier: ServiceTier | undefined): ServiceTierByFamily {
+	if (!tier) return {};
+	const out: ServiceTierByFamily = { openai: tier };
+	if (tier === "priority") out.anthropic = "priority";
+	if (tier === "flex" || tier === "priority") out.google = tier;
+	return out;
 }
 
 /**
- * Resolve the `serviceTier` *setting value* to stamp onto a subagent's settings
- * snapshot.
+ * Resolve a subagent/advisor service-tier setting to a per-family map.
  *
- * - A concrete `subagentSetting` (`"none"` or a tier) wins outright.
- * - `"inherit"` defers to the parent's live effective tier when the caller has a
- *   live session (`inherited` passed as `ServiceTier | null`, where `null` means
- *   the parent explicitly has no tier — e.g. `/fast off`). When no live session
- *   is available (`inherited === undefined`, e.g. cold subagent revive) it falls
- *   back to the parent's configured `serviceTier` setting so behavior matches a
- *   plain settings snapshot.
+ * - A concrete tier is broadcast across families (see
+ *   {@link serviceTierForAllFamilies}).
+ * - `"none"` yields an empty map.
+ * - `"inherit"` defers to `inherited` — the parent's live per-family tiers when
+ *   a live session supplied them, else the empty map.
  */
-export function resolveSubagentServiceTier(
-	subagentSetting: string,
-	configuredTier: ServiceTierSettingValue,
-	inherited: ServiceTier | null | undefined,
-): ServiceTierSettingValue {
-	if (subagentSetting !== "inherit") return subagentSetting as ServiceTierSettingValue;
-	if (inherited === undefined) return configuredTier;
-	return inherited ?? "none";
+export function resolveSubagentServiceTier(setting: string, inherited: ServiceTierByFamily): ServiceTierByFamily {
+	if (setting === "inherit") return inherited;
+	return serviceTierForAllFamilies(serviceTierSettingToTier(setting));
 }