Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Add an Astra Ultrafast speed switch

Regan Bell6c09f179ec07
diff --git a/docs/model-gateway.md b/docs/model-gateway.md
index c972af28c..7666bc481 100644
--- a/docs/model-gateway.md
+++ b/docs/model-gateway.md
@@ -47,3 +47,27 @@ returned as HTTP 429; missing or retired models fail closed.
The managed browse runner needs browser-use 0.12.9 with
`ChatOpenAI.default_headers` support. It never requests separate browser model
credentials or falls back to them on account or gateway errors.
+
+## Astra Ultrafast
+
+Pi offers `gpt-6-astra-ultrafast` as **GPT-6 Astra · Ultrafast (6× cost)**.
+This is a QM selection identifier: requests use `gpt-6-astra` with
+`service_tier: "ultrafast"` through the Responses API. Standard Astra and its
+Fast switch retain their existing behavior. Ultrafast has its own pricing card,
+including cached input, cache writes, and long-context rates.
+
+Use an OpenAI API key or explicitly map `gpt-6-astra-ultrafast` to your gateway's
+Astra group in `MODEL_GATEWAY_MODELS`. The gateway must support Responses and
+forward `service_tier`. The choice is supported in Pi only, and is unavailable
+with ChatGPT subscription authentication. It is never selected as the default
+merely by enabling Fast.
+
+OpenAI currently makes Astra Ultrafast broadly available with separate rate
+limits. Sol Ultrafast remains a preview and is not enabled by this choice.
+See [Ultrafast availability](https://developers.openai.com/api/docs/guides/ultrafast-mode)
+and [pricing](https://developers.openai.com/api/docs/pricing?latest-pricing=ultrafast).
+
+In the web picker, select Astra and use the Ultrafast switch. The picker shows a
+distinct active badge and the 6× cost before enabling it. Fast and Ultrafast are
+mutually exclusive, and both speeds share one Astra preset. The internal model
+ID above preserves routing, authorization, pricing, and saved selections.
diff --git a/plugins/web-ui/src/composer-loadout.ts b/plugins/web-ui/src/composer-loadout.ts
index 9c1c2d0cd..649822c41 100644
--- a/plugins/web-ui/src/composer-loadout.ts
+++ b/plugins/web-ui/src/composer-loadout.ts
@@ -15,10 +15,29 @@ export function loadoutModelId(value: string): string {
return separator < 0 ? value : value.slice(separator + 1);
}
+export const ULTRAFAST_MODEL_ID = "gpt-6-astra-ultrafast";
+export const ULTRAFAST_BASE_MODEL_ID = "gpt-6-astra";
+
+export function presetModelId(value: string): string {
+ const id = loadoutModelId(value);
+ return id === ULTRAFAST_MODEL_ID ? ULTRAFAST_BASE_MODEL_ID : id;
+}
+
+export function ultrafastChoice(options: readonly ModelOption[], selected: ModelOption): ModelOption | undefined {
+ if (selected.harnessId !== "pi") return undefined;
+ const id = selected.model.id;
+ if (id !== ULTRAFAST_BASE_MODEL_ID && id !== ULTRAFAST_MODEL_ID) return undefined;
+ return options.find(
+ (option) =>
+ option.harnessId === selected.harnessId &&
+ option.model.id === (id === ULTRAFAST_MODEL_ID ? ULTRAFAST_BASE_MODEL_ID : ULTRAFAST_MODEL_ID),
+ );
+}
+
function uniqueLoadout(entries: readonly LoadoutEntry[]): LoadoutEntry[] {
const seen = new Set<string>();
return entries.filter(({ value }) => {
- const modelId = loadoutModelId(value);
+ const modelId = presetModelId(value);
if (seen.has(modelId)) return false;
seen.add(modelId);
return true;
@@ -49,7 +68,7 @@ export function parseLoadout(raw: string | null): LoadoutEntry[] {
export function upsertLoadout(entries: readonly LoadoutEntry[], entry: LoadoutEntry): LoadoutEntry[] {
const next = uniqueLoadout(entries).slice(0, LOADOUT_CAP);
- const index = next.findIndex(({ value }) => loadoutModelId(value) === loadoutModelId(entry.value));
+ const index = next.findIndex(({ value }) => presetModelId(value) === presetModelId(entry.value));
if (index >= 0) next[index] = { ...entry };
else if (next.length === LOADOUT_CAP) next[LOADOUT_CAP - 1] = { ...entry };
else next.push({ ...entry });
@@ -107,12 +126,13 @@ export function modelLoadoutOptions(
entries: readonly LoadoutEntry[],
preferredHarnessId?: string,
): ModelOption[] {
- const saved = new Map(uniqueLoadout(entries).map((entry) => [loadoutModelId(entry.value), entry.value]));
- return [...new Set(options.map(({ model }) => model.id))].flatMap((modelId) => {
- const compatible = compatibleHarnessOptions(options, modelId);
+ const saved = new Map(uniqueLoadout(entries).map((entry) => [presetModelId(entry.value), entry.value]));
+ return [...new Set(options.map((option) => presetModelId(option.value)))].flatMap((modelId) => {
+ const compatible = options.filter((option) => presetModelId(option.value) === modelId);
const preferred =
compatible.find(({ value }) => value === saved.get(modelId)) ??
- compatible.find(({ harnessId }) => harnessId === preferredHarnessId) ??
+ compatible.find(({ harnessId, model }) => harnessId === preferredHarnessId && model.id === modelId) ??
+ compatible.find(({ model }) => model.id === modelId) ??
compatible[0];
return preferred ? [preferred] : [];
});
diff --git a/plugins/web-ui/src/composer.ts b/plugins/web-ui/src/composer.ts
index 775914b7c..295ae9255 100644
--- a/plugins/web-ui/src/composer.ts
+++ b/plugins/web-ui/src/composer.ts
@@ -56,6 +56,9 @@ import { tip } from "./tooltip";
import { isPhone } from "./viewport";
import {
LOADOUT_CAP,
+ ULTRAFAST_MODEL_ID,
+ presetModelId,
+ ultrafastChoice,
loadLoadout,
saveLoadout,
reconcileLoadout,
@@ -411,7 +414,7 @@ export function createComposerSurface(ctx: ConvCtx, options: ComposerOptions = {
const threadRef = ctx.chat.state.threadRef;
if (selected && threadRef && !threadModelPicks.has(threadRef)) {
const preferred = modelLoadoutOptions(getModelOptions(scopeKey()), loadout, selected.harnessId).find(
- (option) => option.model.id === selected!.model.id,
+ (option) => presetModelId(option.value) === presetModelId(selected!.value),
);
if (preferred && preferred.value !== selected.value) {
rememberThreadPick(threadRef, preferred.value);
@@ -1898,6 +1901,11 @@ export function createComposerSurface(ctx: ConvCtx, options: ComposerOptions = {
function toggleFastMode(agent: Agent): void {
const selected = currentModelOption();
if (ctx.chat.hasUnresolvedApproval() || ctx.chat.state.resolvingApprovals.size > 0) return;
+ if (selected?.model.id === ULTRAFAST_MODEL_ID) {
+ const target = ultrafastChoice(getModelOptions(scopeKey()), selected);
+ if (target) applyLoadout({ ...activeLoadoutEntry(selected), value: target.value, fast: true }, agent);
+ return;
+ }
if (
!selected ||
!harnessSupportsFastMode(selected.harnessId) ||
diff --git a/plugins/web-ui/src/context-model.ts b/plugins/web-ui/src/context-model.ts
index b98d27b9f..9981ce3a0 100644
--- a/plugins/web-ui/src/context-model.ts
+++ b/plugins/web-ui/src/context-model.ts
@@ -11,6 +11,8 @@ import {
} from "./model-options";
import { createModelPicker } from "./model-picker";
import {
+ ULTRAFAST_MODEL_ID,
+ ultrafastChoice,
loadLoadout,
saveLoadout,
reconcileLoadout,
@@ -218,7 +220,11 @@ function contextPicker(scopeId: string) {
compatibleHarnessOptions(options(), selected.model.id).find((option) => option.harnessId === harnessId);
if (target) apply({ ...current(), value: target.value });
},
- toggleFastMode: () => apply({ ...current(), fast: !current().fast }),
+ toggleFastMode: () => {
+ const selected = options().find((option) => option.value === current().value);
+ const target = selected?.model.id === ULTRAFAST_MODEL_ID ? ultrafastChoice(options(), selected) : undefined;
+ apply({ ...current(), ...(target ? { value: target.value } : {}), fast: !current().fast });
+ },
effectiveFastMode: () => current().fast,
changeDefault: () => choose(scopeId, INHERIT),
showDefaultAction: false,
diff --git a/plugins/web-ui/src/model-picker.ts b/plugins/web-ui/src/model-picker.ts
index e24c49f2c..e939c5b85 100644
--- a/plugins/web-ui/src/model-picker.ts
+++ b/plugins/web-ui/src/model-picker.ts
@@ -18,9 +18,12 @@ import {
import { modelSupportsFastMode } from "./pi-models";
import {
LOADOUT_CAP,
+ ULTRAFAST_MODEL_ID,
+ ULTRAFAST_BASE_MODEL_ID,
+ ultrafastChoice,
effortLevelsForHarness,
compatibleHarnessOptions,
- loadoutModelId,
+ presetModelId,
modelLoadoutOptions,
type LoadoutEntry,
} from "./composer-loadout";
@@ -65,7 +68,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
add: addLoadoutEntry,
selectEffort,
selectHarness,
- toggleFastMode,
+ toggleFastMode: applyFastMode,
effectiveFastMode,
changeDefault: changeScopeRuntime,
} = bindings;
@@ -75,6 +78,15 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
let loadoutCloseTimer: ReturnType<typeof setTimeout> | null = null;
let disposed = false;
+ function focusSpeedControl(label: string): void {
+ requestAnimationFrame(() => bindings.host()?.querySelector<HTMLElement>(`button[aria-label="${label}"]`)?.focus());
+ }
+
+ function toggleFastMode(target: T): void {
+ applyFastMode(target);
+ focusSpeedControl("Fast");
+ }
+
function removeLoadoutEntry(value: string, selected: ModelOption): void {
if (value === activeLoadoutEntry(selected).value) return;
const entries = seededLoadout(selected);
@@ -89,6 +101,14 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
});
}
+ function modelLabel(option: ModelOption): string {
+ return option.model.id === ULTRAFAST_MODEL_ID
+ ? (getModelOptions(scopeKey()).find(
+ (candidate) => candidate.harnessId === option.harnessId && candidate.model.id === ULTRAFAST_BASE_MODEL_ID,
+ )?.label ?? "Astra")
+ : option.label;
+ }
+
function modelGlyph(option: ModelOption): TemplateResult {
const provider = option.displayProvider ?? String(option.model.provider);
const mark =
@@ -130,12 +150,13 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
${modelGlyph(option)}
<span class="loadout-model-copy">
<span class="loadout-title">
- <span class="loadout-name">${option.label}</span>
+ <span class="loadout-name">${modelLabel(option)}</span>
${isDefault ? html`<span class="loadout-default">my default</span>` : nothing}
</span>
<span class="loadout-details">
<span class="loadout-harness">${option.harnessLabel}</span>
<span>${effortText(settings.effort)}</span>
+ ${option.model.id === ULTRAFAST_MODEL_ID ? html`<span class="loadout-ultrafast-badge">${icon(Zap, 10)} Ultrafast</span>` : nothing}
${settings.fast ? html`<span class="loadout-bolt" aria-label="Fast">${icon(Zap, 10)}</span>` : nothing}
</span>
</span>
@@ -147,7 +168,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
data-default=${isDefault ? "true" : "false"}
type="button"
role="menuitem"
- aria-label=${`Make ${option.label} default`}
+ aria-label=${`Make ${modelLabel(option)} default`}
${tip("Make default")}
@click=${async (event: MouseEvent) => {
const row = (event.currentTarget as HTMLElement).closest(".loadout-row");
@@ -175,7 +196,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
? html`<button
class="loadout-remove"
type="button"
- aria-label=${`Remove ${option.label} from presets`}
+ aria-label=${`Remove ${modelLabel(option)} from presets`}
${tip("Remove from presets")}
@click=${() => removeLoadoutEntry(entry.value, selected)}
>
@@ -252,8 +273,8 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
const query = composerState.menuQuery.trim().toLocaleLowerCase();
const catalog = modelLoadoutOptions(getModelOptions(scopeKey()), entries, selected.harnessId).filter(
(option) =>
- !entries.some((entry) => loadoutModelId(entry.value) === option.model.id) &&
- (!query || `${option.harnessLabel} ${option.label}`.toLocaleLowerCase().includes(query)),
+ !entries.some((entry) => presetModelId(entry.value) === presetModelId(option.value)) &&
+ (!query || `${option.harnessLabel} ${modelLabel(option)}`.toLocaleLowerCase().includes(query)),
);
return html`<div
class="loadout-submenu"
@@ -351,14 +372,17 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
class="menu-option"
type="button"
role="menuitem"
- aria-label=${`Add ${option.label} to presets`}
+ aria-label=${`Add ${modelLabel(option)} to presets`}
@click=${() => {
dismissSelection();
addLoadoutEntry(option, agent);
}}
>
${modelGlyph(option)}<span class="menu-option-copy"
- ><span>${option.label}</span><span class="loadout-meta">${option.harnessLabel}</span></span
+ ><span>${modelLabel(option)}</span
+ ><span class="loadout-meta"
+ >${option.harnessLabel}${option.model.id === ULTRAFAST_MODEL_ID ? " · Ultrafast · 6× cost" : ""}</span
+ ></span
><span class="loadout-add-label" aria-hidden="true">Add</span>
</button>`,
)}
@@ -413,10 +437,20 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
if (!selected) return html`<span class="context-model-status">No models available</span>`;
const open = composerState.openMenu === "loadout";
const entries = seededLoadout(selected);
- const modelSupportsFast = modelSupportsFastMode(scopeKey(), selected.model.id);
- const fastAvailable = !!choice && harnessSupportsFastMode(selected.harnessId) && modelSupportsFast;
+ const ultrafastOn = selected.model.id === ULTRAFAST_MODEL_ID;
+ const ultrafastTarget = ultrafastChoice(getModelOptions(scopeKey()), selected);
+ const modelSupportsFast = modelSupportsFastMode(
+ scopeKey(),
+ ultrafastOn ? ULTRAFAST_BASE_MODEL_ID : selected.model.id,
+ );
+ const fastAvailable =
+ !!choice &&
+ (!ultrafastOn || !!ultrafastTarget) &&
+ harnessSupportsFastMode(selected.harnessId) &&
+ modelSupportsFast;
const fastUnsupportedReason = modelSupportsFast ? "Not supported by this harness" : "Not supported by this model";
const fastOn = fastAvailable && effectiveFastMode();
+ const speedLabel = (ultrafastOn && ", Ultrafast") || (fastOn && ", Fast") || "";
return html`<div
class="menu-control loadout-control"
data-align="left"
@@ -435,10 +469,10 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
}}
>
<button
- class="menu-button loadout-button"
+ class="menu-button loadout-button ${ultrafastOn ? "ultrafast-active" : ""}"
data-focus-key=${`${loadoutMenuId}-trigger`}
type="button"
- aria-label=${choice ? `Model: ${choice.label}, ${effortLabel(composerState.effortLevel)} effort${fastOn ? ", Fast" : ""}` : "Choose model"}
+ aria-label=${choice ? `Model: ${modelLabel(choice)}, ${effortLabel(composerState.effortLevel)} effort${speedLabel}` : "Choose model"}
aria-haspopup="menu"
aria-expanded=${open ? "true" : "false"}
aria-controls=${loadoutMenuId}
@@ -466,8 +500,9 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
placeLoadout();
}}
>
- <span class="menu-label">${choice?.label ?? "Choose model"}</span>
+ <span class="menu-label">${choice ? modelLabel(choice) : "Choose model"}</span>
${choice ? html`<span class="menu-suffix">${effortText(composerState.effortLevel)}</span>` : nothing}
+ ${ultrafastOn ? html`<span class="loadout-ultrafast-badge">${icon(Zap, 12)} Ultrafast</span>` : nothing}
${fastOn ? html`<span class="loadout-bolt">${icon(Zap, 13)}</span>` : nothing}${icon(ChevronDown, 13)}
</button>
${
@@ -584,7 +619,36 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
<span class="loadout-knob"></span>
</span>
</span>
- </button>`
+ </button>
+ ${
+ ultrafastTarget || ultrafastOn
+ ? html`<button
+ class="loadout-setting loadout-ultrafast"
+ type="button"
+ role="menuitemcheckbox"
+ aria-label="Ultrafast"
+ ?disabled=${!ultrafastTarget}
+ aria-description="Six times standard token cost. Turning on Ultrafast turns off Fast."
+ aria-checked=${ultrafastOn ? "true" : "false"}
+ @click=${() => {
+ if (!ultrafastTarget) return;
+ applyLoadout(
+ { ...activeLoadoutEntry(selected), value: ultrafastTarget.value, fast: false },
+ agent,
+ );
+ focusSpeedControl("Ultrafast");
+ }}
+ >
+ <span class="loadout-setting-label">${icon(Zap, 14)} Ultrafast</span>
+ <span class="loadout-setting-value">
+ <span class="loadout-shortcut">6× cost</span>
+ <span class="loadout-toggle ${ultrafastOn ? "on" : ""}" aria-hidden="true"
+ ><span class="loadout-knob"></span
+ ></span>
+ </span>
+ </button>`
+ : nothing
+ }`
: nothing
}
</div>
diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.css
index 6ce923897..c0753fa11 100644
--- a/plugins/web-ui/src/shell.css
+++ b/plugins/web-ui/src/shell.css
@@ -33,6 +33,7 @@
/* Height reserved at the bottom of every chat message for its own hover footer; it doubles
as the rhythm between message blocks. */
--meta-lane: 24px;
+ --ultrafast-accent: #7540bd;
--brand-accent: #4f46e5;
--dev-accent: #8a5a00;
--markdown-link: #2563b8;
@@ -87,6 +88,7 @@
}
.dark {
+ --ultrafast-accent: #ceadff;
--markdown-link: #4c8edb;
--cta: oklch(0.42 0.085 250);
--cta-hover: oklch(0.48 0.09 250);
@@ -13188,3 +13190,25 @@ body.app-edit-embed .custom-chat-shell.app-edit-chat > .chat-bottom-dock {
.inline-steer .user-row .message-meta {
justify-content: flex-end;
}
+
+.loadout-ultrafast-badge {
+ display: inline-flex;
+ align-items: center;
+ gap: 3px;
+ color: var(--ultrafast-accent);
+ font-size: 10px;
+ font-weight: 600;
+}
+.loadout-button.ultrafast-active {
+ background: color-mix(in srgb, var(--ultrafast-accent) 14%, var(--background));
+ border-color: color-mix(in srgb, var(--ultrafast-accent) 45%, var(--background));
+}
+.loadout-ultrafast .loadout-setting-label {
+ display: inline-flex;
+ align-items: center;
+ gap: 5px;
+}
+.loadout-setting.loadout-ultrafast .loadout-toggle.on,
+.loadout-setting.loadout-ultrafast:not(:disabled):hover .loadout-toggle.on {
+ background: var(--ultrafast-accent);
+}
diff --git a/plugins/web-ui/src/theme-import.ts b/plugins/web-ui/src/theme-import.ts
index a4c46c174..322b49224 100644
--- a/plugins/web-ui/src/theme-import.ts
+++ b/plugins/web-ui/src/theme-import.ts
@@ -339,6 +339,7 @@ export function themeTokens(palette: Palette): ThemeTokens {
"--popover": step(0.1, 0),
"--popover-foreground": fg,
"--markdown-link": link,
+ "--ultrafast-accent": readable(ansiOrBright(ANSI.magenta) ?? action),
"--primary": action,
"--primary-foreground": textOn(action),
"--secondary": step(0.09, 0.04),
diff --git a/plugins/web-ui/test/composer-loadout.test.ts b/plugins/web-ui/test/composer-loadout.test.ts
index e1634414a..3d742a2b0 100644
--- a/plugins/web-ui/test/composer-loadout.test.ts
+++ b/plugins/web-ui/test/composer-loadout.test.ts
@@ -246,3 +246,13 @@ test("native reasoning choices require model and harness metadata while legacy s
const saved = [entry("pi:one", "adaptive"), entry("pi:two", "default"), entry("pi:three", "auto")];
assert.deepEqual(parseLoadout(JSON.stringify(saved)), saved);
});
+
+test("Astra speed variants share a preset and preserve a saved tier", () => {
+ const base = option("pi:gpt-6-astra");
+ const ultra = option("pi:gpt-6-astra-ultrafast");
+ const saved = entry(ultra.value, "high");
+ assert.deepEqual(modelLoadoutOptions([ultra, base], [], "pi"), [base]);
+ assert.deepEqual(modelLoadoutOptions([base, ultra], [saved], "pi"), [ultra]);
+ assert.deepEqual(modelLoadoutOptions([ultra], [], "pi"), [ultra]);
+ assert.deepEqual(upsertLoadout([entry(base.value)], saved), [saved]);
+});
diff --git a/plugins/web-ui/test/composer-picker.test.ts b/plugins/web-ui/test/composer-picker.test.ts
index 8a073e610..cf27ad7c3 100644
--- a/plugins/web-ui/test/composer-picker.test.ts
+++ b/plugins/web-ui/test/composer-picker.test.ts
@@ -682,6 +682,36 @@ test("the personal-account picker preserves composer choices and saves context d
await tick();
assert.equal(updates.at(-1)?.effortLevel, "adaptive");
assert.equal(context.contextModelState.config.effective.effortLevel, "adaptive");
+ config.modelsByHarness.pi.push("gpt-6-astra", "gpt-6-astra-ultrafast");
+ config.modelCatalog!["gpt-6-astra"] = model("gpt-6-astra", "Astra", "openai");
+ config.modelCatalog!["gpt-6-astra-ultrafast"] = model("gpt-6-astra-ultrafast", "Astra Ultrafast", "openai");
+ config.fastModeModelIds!.push("gpt-6-astra");
+ config.effective = { harnessId: "pi", modelId: "gpt-6-astra", effortLevel: "high", fastMode: true };
+ ctx.chat.state.threadRef = "web:tester:ultrafast";
+ localStorage.removeItem("web-ui:loadout");
+ await composer!.refreshRuntimeSelection(null, agent, true);
+ await mount();
+ button('[aria-label="Ultrafast"]').click();
+ assert.match(button(".loadout-button").getAttribute("aria-label")!, /Astra, High effort, Ultrafast/);
+ assert.equal(button('button[aria-label="Fast"]').getAttribute("aria-checked"), "false");
+ assert.equal(button('[aria-label="Ultrafast"]').getAttribute("aria-checked"), "true");
+ assert.deepEqual(
+ saved().filter(({ value }) => value.includes("astra")),
+ [{ value: "pi:gpt-6-astra-ultrafast", effort: "high", fast: false }],
+ );
+ ctx.chat.state.threadRef = "web:tester:ultrafast-new-thread";
+ await mount();
+ assert.match(button(".loadout-button").getAttribute("aria-label")!, /High effort, Ultrafast/);
+ button('[data-loadout-section="add"]').click();
+ assert.equal(host.querySelector('[aria-label="Add Astra Ultrafast to presets"]'), null);
+ button('button[aria-label="Fast"]').click();
+ assert.equal(button('button[aria-label="Fast"]').getAttribute("aria-checked"), "true");
+ assert.equal(button('[aria-label="Ultrafast"]').getAttribute("aria-checked"), "false");
+ button('[aria-label="Ultrafast"]').click();
+ button('[aria-label="Ultrafast"]').click();
+ assert.equal(button('button[aria-label="Fast"]').getAttribute("aria-checked"), "false");
+ assert.equal(button('[aria-label="Ultrafast"]').getAttribute("aria-checked"), "false");
+ assert.equal(composer!.state.effortLevel, "high");
} finally {
resetContext?.();
composer?.dispose();
diff --git a/src/api/routes/browser-model.ts b/src/api/routes/browser-model.ts
index 66530ad3b..0112a4790 100644
--- a/src/api/routes/browser-model.ts
+++ b/src/api/routes/browser-model.ts
@@ -1,3 +1,4 @@
+import { modelRequestOverrides } from "../../model/pi-models.ts";
import { orgId } from "../../config.ts";
import { scopeId } from "../../types.ts";
import { resolveBrowserModel } from "../../model/browser-model.ts";
@@ -54,7 +55,9 @@ async function browserModel(ctx: ApiCtx): Promise<void> {
return sendJson(res, 409, {
error: "AI access changed or is unavailable; start a new turn to refresh browser access",
});
- if (selected.account !== "company" || !gateway) {
+ const nativeVariant = Boolean(modelRequestOverrides(capability.browserModel));
+ if (nativeVariant && selected.account === "company") await gateway?.refresh?.();
+ if (selected.account !== "company" || !gateway || nativeVariant) {
if (selected.account !== "company" && !selected.routing)
return sendJson(res, 409, { error: "Reconnect your selected AI account in Settings" });
if (selected.routing?.kind === "oauth" && selected.routing.provider === "anthropic")
@@ -72,6 +75,7 @@ async function browserModel(ctx: ApiCtx): Promise<void> {
200,
await nativeBrowserCompletion({
selection: selected,
+ modelGateway: selected.account === "company" ? gateway : undefined,
credentials: deps.userModelCredentials,
companyProviderKeys:
selected.account === "company" ? await deps.resolveBrowserCompanyKeys?.(useCompanySubscription) : undefined,
diff --git a/src/core/individual-auth-routing.ts b/src/core/individual-auth-routing.ts
index 9e0360b63..dfa2286a4 100644
--- a/src/core/individual-auth-routing.ts
+++ b/src/core/individual-auth-routing.ts
@@ -9,6 +9,7 @@ import {
resolveModel,
isOverlayModel,
modelUnavailableReason,
+ modelRequestOverrides,
type ModelProvider,
} from "../model/pi-models.ts";
import type { UserModelCredential } from "../model/user-model-credential-store.ts";
@@ -37,6 +38,12 @@ export function resolveIndividualAuthRouting(
return null;
})();
if (!pick) return null;
+ if (
+ requestedModel &&
+ modelRequestOverrides(requestedModel) &&
+ (pick.provider !== requestedProvider || pick.cred.kind !== "apikey")
+ )
+ return null;
if (
requestedModel &&
isOverlayModel(requestedModel) &&
diff --git a/src/harness/pi-harness.ts b/src/harness/pi-harness.ts
index 96a85fe45..786d4695b 100644
--- a/src/harness/pi-harness.ts
+++ b/src/harness/pi-harness.ts
@@ -66,6 +66,7 @@ import {
modelSupportsAdaptiveThinking,
modelSupportsProviderDefault,
modelDisplayName,
+ modelRequestOverrides,
resolveModel,
getRequiredModel,
modelSupportsFastMode,
@@ -1244,7 +1245,7 @@ export async function buildModelRuntime(
if (!body || typeof body !== "object" || Array.isArray(body)) {
throw new Error("model request payload must be an object");
}
- return { ...body, model: await target() };
+ return { ...body, ...modelRequestOverrides(model.id), model: await target() };
},
}) as T;
const route = <T extends ModelsSimpleStreamOptions | undefined>(
@@ -1254,7 +1255,9 @@ export async function buildModelRuntime(
const request = modelGatewayRequest(modelGateway, model);
if (!request) {
const providerModelId =
- model.provider === CODEX_SUBSCRIPTION_PROVIDER ? codexProviderModelId(model.id) : model.id;
+ model.provider === CODEX_SUBSCRIPTION_PROVIDER
+ ? codexProviderModelId(model.id)
+ : (modelRequestOverrides(model.id)?.model ?? model.id);
const candidate = withRequestHeaders(model, true, false);
const passthrough = {
...retained(options),
diff --git a/src/model/browser-completion.ts b/src/model/browser-completion.ts
index 1d71fd38c..4bc7cc4ff 100644
--- a/src/model/browser-completion.ts
+++ b/src/model/browser-completion.ts
@@ -1,4 +1,5 @@
import { Type } from "typebox";
+import { modelGatewayRequest, type ModelGatewayTransportConfig } from "./provider-endpoints.ts";
import type { Context, ImageContent, TextContent } from "@earendil-works/pi-ai";
import { buildModelRuntime, type ProviderKeys } from "../harness/pi-harness.ts";
import { zeroUsage } from "../harness/replay.ts";
@@ -28,6 +29,7 @@ export async function nativeBrowserCompletion(
selection: Awaited<ReturnType<typeof resolveBrowserModel>>;
credentials?: UserModelCredentialStore;
companyProviderKeys?: ProviderKeys;
+ modelGateway?: ModelGatewayTransportConfig;
companySubscriptionProvider?: ModelProvider;
actorId: string;
body: Record<string, unknown>;
@@ -35,6 +37,7 @@ export async function nativeBrowserCompletion(
},
runtimeFactory: (
keys: Parameters<typeof buildModelRuntime>[0],
+ modelGateway?: ModelGatewayTransportConfig,
) => Promise<Pick<Awaited<ReturnType<typeof buildModelRuntime>>, "completeSimple">> = buildModelRuntime,
) {
const { selection, body } = input;
@@ -112,11 +115,13 @@ export async function nativeBrowserCompletion(
const limit = body.max_completion_tokens ?? body.max_tokens ?? 4096;
if (typeof limit !== "number" || !Number.isSafeInteger(limit) || limit <= 0)
throw new BrowserCompletionError("Invalid browser output token limit");
+ const gateway = selection.account === "company" ? input.modelGateway : undefined;
+ const gatewayRequest = modelGatewayRequest(gateway, model);
let keys: ProviderKeys;
if (selection.account === "company") {
const key = input.companyProviderKeys?.[model.provider];
- if (!key) throw new BrowserCompletionError("Company model credentials are unavailable", 503);
- keys = { [model.provider]: key };
+ if (!key && !gatewayRequest) throw new BrowserCompletionError("Company model credentials are unavailable", 503);
+ keys = key ? { [model.provider]: key } : {};
} else {
if (!routing) throw new BrowserCompletionError("Selected browser model is unavailable", 409);
const auth =
@@ -126,7 +131,7 @@ export async function nativeBrowserCompletion(
if (!auth) throw new BrowserCompletionError("Reconnect your selected AI account in Settings", 409);
keys = { [routing.kind === "apikey" ? routing.provider : CODEX_SUBSCRIPTION_PROVIDER]: auth };
}
- const runtime = await runtimeFactory(keys);
+ const runtime = await runtimeFactory(keys, gateway);
const modelApi = model.api;
const result = await runtime.completeSimple(model, context, {
signal: input.signal,
diff --git a/src/model/pi-models.ts b/src/model/pi-models.ts
index e9274c7fb..7f9cd7e22 100644
--- a/src/model/pi-models.ts
+++ b/src/model/pi-models.ts
@@ -93,6 +93,7 @@ interface ModelEntry {
webui: boolean;
base: boolean;
auxiliary?: boolean;
+ request?: { model: string; service_tier: "ultrafast" };
clone?: {
template: string;
input: number;
@@ -230,6 +231,23 @@ export const MODEL_REGISTRY: readonly ModelEntry[] = [
tiers: [{ inputTokensAbove: 272_000, input: 20, output: 75, cacheRead: 2, cacheWrite: 25 }],
},
},
+ {
+ id: "gpt-6-astra-ultrafast",
+ buttonLabel: "Astra Ultrafast",
+ name: "GPT-6 Astra · Ultrafast (6× cost)",
+ fastMode: false,
+ webui: true,
+ base: true,
+ request: { model: "gpt-6-astra", service_tier: "ultrafast" },
+ clone: {
+ ...GPT_56_CLONE,
+ input: 60,
+ output: 300,
+ cacheRead: 6,
+ cacheWrite: 75,
+ tiers: [{ inputTokensAbove: 272_000, input: 120, output: 450, cacheRead: 12, cacheWrite: 150 }],
+ },
+ },
{
id: "gpt-6-sol",
buttonLabel: "6 Sol",
@@ -454,9 +472,15 @@ export function registerOpenRouterCatalogModel(definition: OpenRouterCatalogMode
return model;
}
+export function modelRequestOverrides(id: string): ModelEntry["request"] {
+ const request = REGISTRY_BY_ID.get(id)?.request;
+ return request ? { ...request } : undefined;
+}
+
export function resolveBuiltinModel(id: string): PiModel | undefined {
if (id.startsWith(CODEX_SUBSCRIPTION_PREFIX)) {
const providerId = codexProviderModelId(id);
+ if (modelRequestOverrides(providerId)) return undefined;
const m = getModel(CODEX_SUBSCRIPTION_PROVIDER, providerId);
if (m) return { ...m, id };
const entry = REGISTRY_BY_ID.get(providerId);
@@ -547,6 +571,7 @@ export function contextTokenBudgetForModel(id: string): number | undefined {
}
export function modelSupportedByHarness(id: string | undefined, harness: string): boolean {
+ if (id && modelRequestOverrides(id)) return harness === "pi" || harness === "mock";
if (id && isGatewayModelId(id)) return (harness === "pi" || harness === "mock") && Boolean(resolveGatewayModel(id));
if (!id || unavailableOverlays.has(id)) return false;
if (overlays.has(id)) return harness === "pi" || harness === "mock";
diff --git a/test/browser-model-account.test.ts b/test/browser-model-account.test.ts
index 62a0cbd4d..0b489b754 100644
--- a/test/browser-model-account.test.ts
+++ b/test/browser-model-account.test.ts
@@ -255,3 +255,52 @@ test("company Codex subscription auth uses the native subscription transport wit
(error: unknown) => error instanceof BrowserCompletionError && error.status === 422,
);
});
+
+for (const mapped of [true, false]) {
+ test(`Ultrafast browser inference retains native routing with ${mapped ? "mapped" : "unrelated"} gateway`, async () => {
+ const id = "gpt-6-astra-ultrafast";
+ const gateway: NonNullable<Parameters<typeof nativeBrowserCompletion>[0]["modelGateway"]> = {
+ url: "https://gateway.example.test/v1",
+ apiKey: "gateway-key",
+ apiKeyHeader: "api-key",
+ models: mapped ? { [id]: "router/astra" } : { "claude-opus-5": "router/opus" },
+ };
+ const input = {
+ selection: { account: "company" as const, model: id, routing: null },
+ actorId: "U1",
+ modelGateway: gateway,
+ companyProviderKeys: mapped ? {} : { openai: "direct-key" },
+ body: { messages: [{ role: "user", content: "test" }] },
+ signal: new AbortController().signal,
+ };
+ const result = await nativeBrowserCompletion(input, async (keys, transport) => {
+ assert.deepEqual(keys, input.companyProviderKeys);
+ assert.equal(transport, gateway);
+ return {
+ completeSimple: async (model) => {
+ assert.equal(model.id, id);
+ assert.equal(model.api, "openai-responses");
+ return {
+ role: "assistant",
+ api: model.api,
+ provider: model.provider,
+ model: model.id,
+ usage: zeroUsage(),
+ timestamp: Date.now(),
+ stopReason: "stop",
+ content: [{ type: "text", text: "done" }],
+ };
+ },
+ };
+ });
+ assert.equal(result.choices[0]?.message.content, "done");
+ await assert.rejects(
+ nativeBrowserCompletion({
+ ...input,
+ modelGateway: { ...gateway, models: {}, reservedModelIds: new Set([id]) },
+ companyProviderKeys: { openai: "must-not-fallback" },
+ }),
+ /Gateway model is unavailable/,
+ );
+ });
+}
diff --git a/test/model-credential-route.test.ts b/test/model-credential-route.test.ts
index b03f1ed04..7a4894287 100644
--- a/test/model-credential-route.test.ts
+++ b/test/model-credential-route.test.ts
@@ -71,6 +71,7 @@ test("admin model credentials are encrypted, write-only, live, and removable", a
{ id: "gpt-5.6-terra", name: "GPT-5.6 Terra", provider: "openai" },
{ id: "gpt-5.6-luna", name: "GPT-5.6 Luna", provider: "openai" },
{ id: "gpt-6-astra", name: "GPT-6 Astra", provider: "openai" },
+ { id: "gpt-6-astra-ultrafast", name: "GPT-6 Astra · Ultrafast (6× cost)", provider: "openai" },
{ id: "gpt-6-sol", name: "GPT-6 Sol", provider: "openai" },
{ id: "gpt-6-luna", name: "GPT-6 Luna", provider: "openai" },
{ id: "openrouter/auto", name: "OpenRouter Auto", provider: "openrouter" },
diff --git a/test/pi-harness-fast-mode.test.ts b/test/pi-harness-fast-mode.test.ts
index dabbbf73a..31ac08b83 100644
--- a/test/pi-harness-fast-mode.test.ts
+++ b/test/pi-harness-fast-mode.test.ts
@@ -326,7 +326,11 @@ async function runTurn(
url: "https://gateway.example/v1",
apiKey: "sk-gateway-test",
apiKeyHeader: "x-gateway-key",
- models: { "gpt-6-astra": "openai/gpt-6-astra", "claude-sonnet-5": "anthropic/claude-sonnet-5" },
+ models: {
+ "gpt-6-astra": "openai/gpt-6-astra",
+ "gpt-6-astra-ultrafast": "openai/gpt-6-astra",
+ "claude-sonnet-5": "anthropic/claude-sonnet-5",
+ },
},
}
: {}),
@@ -449,3 +453,20 @@ test("a refusal fallback prices each step on its actual model and tier", async (
assertUsd(rows[0]!.usage!.costUsd, 0);
assertUsd(rows[1]!.usage!.costUsd, 0.15);
});
+
+for (const gateway of [true, false]) {
+ test(`Ultrafast prices a successful turn exactly once through ${gateway ? "gateway" : "direct"}`, async () => {
+ const { rows, payloads } = await runTurn(
+ `astra-ultrafast-${gateway}`,
+ "gpt-6-astra-ultrafast",
+ false,
+ () => responsesReply("done", ASTRA_WIRE_USAGE, "ultrafast"),
+ gateway,
+ );
+ assert.equal(payloads[0]?.model, gateway ? "openai/gpt-6-astra" : "gpt-6-astra");
+ assert.equal(payloads[0]?.service_tier, "ultrafast");
+ assert.equal(rows.length, 1);
+ assertUsd(rows[0]!.usage!.costUsd, 1.8);
+ assert.equal(rows[0]!.model, "gpt-6-astra-ultrafast");
+ });
+}
diff --git a/test/pi-models.test.ts b/test/pi-models.test.ts
index 10097bba8..fcdf9f9a3 100644
--- a/test/pi-models.test.ts
+++ b/test/pi-models.test.ts
@@ -115,6 +115,7 @@ test("the curated catalog contains only current model families", () => {
"gpt-5.6-terra",
"gpt-5.6-luna",
"gpt-6-astra",
+ "gpt-6-astra-ultrafast",
"gpt-6-sol",
"gpt-6-luna",
"openrouter/auto",
diff --git a/test/ultrafast.test.ts b/test/ultrafast.test.ts
new file mode 100644
index 000000000..573c77768
--- /dev/null
+++ b/test/ultrafast.test.ts
@@ -0,0 +1,89 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { calculateCost } from "@earendil-works/pi-ai";
+import { zeroUsage } from "../src/harness/replay.ts";
+import { zstdDecompressSync } from "node:zlib";
+import { buildModelRuntime, piUsageToCallUsage, wantsFastMode } from "../src/harness/pi-harness.ts";
+import { getRequiredModel, modelSupportedByHarness, resolveModel } from "../src/model/pi-models.ts";
+import { resolveIndividualAuthRouting } from "../src/core/individual-auth-routing.ts";
+
+const id = "gpt-6-astra-ultrafast";
+
+test("Ultrafast is an explicit API-only Pi choice with its own full pricing card", () => {
+ const model = getRequiredModel(id);
+ assert.equal(model.provider, "openai");
+ assert.equal(model.api, "openai-responses");
+ assert.equal(wantsFastMode(true, id), false);
+ assert.equal(modelSupportedByHarness(id, "pi"), true);
+ for (const harness of ["codex", "claude", "opencode"]) assert.equal(modelSupportedByHarness(id, harness), false);
+ assert.equal(resolveModel(`codex/${id}`), undefined);
+ for (const tokens of [
+ { input: 10_000, output: 2_000, cacheRead: 50_000, cacheWrite: 4_000 },
+ { input: 300_000, output: 2_000, cacheRead: 50_000, cacheWrite: 4_000 },
+ ]) {
+ const standardUsage = { ...zeroUsage(), ...tokens };
+ const ultrafastUsage = { ...zeroUsage(), ...tokens };
+ calculateCost(getRequiredModel("gpt-6-astra"), standardUsage);
+ calculateCost(model, ultrafastUsage);
+ const standard = piUsageToCallUsage(standardUsage, getRequiredModel("gpt-6-astra"), false)!;
+ const ultrafast = piUsageToCallUsage(ultrafastUsage, model, false)!;
+ assert.ok(Math.abs(standard.costUsd - (tokens.input === 10_000 ? 0.3 : 6.35)) < 1e-9);
+ assert.ok(Math.abs(ultrafast.costUsd - (tokens.input === 10_000 ? 1.8 : 38.1)) < 1e-9);
+ assert.ok(Math.abs(ultrafast.costUsd - standard.costUsd * 6) < 1e-9);
+ }
+ const oauth = { kind: "oauth", oauth: { accessToken: "test" } } as never;
+ for (const harness of ["pi", "codex"]) assert.equal(resolveIndividualAuthRouting(null, oauth, id, harness), null);
+ const apiKey = { kind: "apikey", apiKey: "test" } as never;
+ assert.equal(resolveIndividualAuthRouting(null, apiKey, id, "pi")?.model, id);
+ assert.equal(resolveIndividualAuthRouting(apiKey, null, id, "pi"), null);
+});
+
+for (const gateway of [false, true]) {
+ test(`Ultrafast reaches the wire across every runtime call path (${gateway ? "gateway" : "direct"})`, async (t) => {
+ const config = gateway
+ ? {
+ url: "https://gateway.example.test/v1",
+ apiKey: "gateway-key",
+ apiKeyHeader: "api-key",
+ models: { [id]: "router/astra" },
+ }
+ : undefined;
+ const runtime = await buildModelRuntime({ openai: "test-key" }, config);
+ const originalFetch = globalThis.fetch;
+ t.after(() => {
+ globalThis.fetch = originalFetch;
+ });
+ for (const method of ["stream", "streamSimple", "complete", "completeSimple"] as const) {
+ let request: { url: string; body: Record<string, unknown>; headers: Headers } | undefined;
+ globalThis.fetch = (async (url: string | URL | Request, init?: RequestInit) => {
+ const headers = new Headers(init?.headers);
+ const text =
+ headers.get("content-encoding") === "zstd"
+ ? zstdDecompressSync(init?.body as Uint8Array).toString()
+ : String(init?.body);
+ request = { url: String(url), body: JSON.parse(text), headers };
+ return new Response(JSON.stringify({ error: { message: "offline test" } }), { status: 400 });
+ }) as typeof fetch;
+ const result = runtime[method](
+ getRequiredModel(id),
+ { messages: [{ role: "user", content: "hello", timestamp: 0 }] },
+ {
+ transport: "sse",
+ maxRetries: 0,
+ onPayload: (payload) => ({
+ ...(payload as object),
+ service_tier: "priority",
+ metadata: { preserved: "yes" },
+ }),
+ },
+ );
+ const response = "result" in result ? await result.result() : await result;
+ assert.ok(request, `${method}: ${response.errorMessage}`);
+ assert.equal(request.body.model, gateway ? "router/astra" : "gpt-6-astra");
+ assert.equal(request.body.service_tier, "ultrafast");
+ assert.deepEqual(request.body.metadata, { preserved: "yes" });
+ assert.equal(response.model, id);
+ if (gateway) assert.equal(request.headers.get("api-key"), "gateway-key");
+ }
+ });
+}