diff --git a/src/main/agent-runtime/cost-writer.ts b/src/main/agent-runtime/cost-writer.ts
index 86b4a277..4acd9747 100644
--- a/src/main/agent-runtime/cost-writer.ts
+++ b/src/main/agent-runtime/cost-writer.ts
@@ -1,6 +1,7 @@
-import { calculateCost, getModel, type Usage } from "@mariozechner/pi-ai";
+import { calculateCost, type Usage } from "@mariozechner/pi-ai";
 import type { AppDatabase } from "@main/database";
 import { getConnectorDefinition } from "@main/connectors";
+import { resolveModel } from "@main/model-resolver";
 
 export interface CostWriterDeps {
   db: AppDatabase;
@@ -29,7 +30,7 @@ export class CostWriter {
     try {
       const definition = getConnectorDefinition(input.connectorId);
       if (definition.provider) {
-        const model = getModel(definition.provider as never, input.modelId as never);
+        const model = resolveModel(definition.provider, input.modelId);
         if (model) {
           const cost = calculateCost(model, input.usage);
           amountUsd = Number.isFinite(cost.total) ? cost.total : null;
diff --git a/src/main/connector-model-policy.ts b/src/main/connector-model-policy.ts
index 76d01b3d..a28c8f5e 100644
--- a/src/main/connector-model-policy.ts
+++ b/src/main/connector-model-policy.ts
@@ -1,6 +1,6 @@
-import { getModels } from "@mariozechner/pi-ai";
 import type { ConnectorId } from "@shared/types";
 import { getConnectorDefinition } from "./connectors";
+import { resolveModels } from "./model-resolver";
 
 interface ConnectorModelPolicyDeps {
   getConnector: (id: ConnectorId) => { id: ConnectorId; label?: string | null; model: string | null };
@@ -26,13 +26,15 @@ function uniqueModels(models: Array<{ id: string; label: string }>) {
   return Array.from(byId.values());
 }
 
+/**
+ * Returns the models available for a given pi-ai provider id, going through
+ * `resolveModels` so that providers not in pi-ai's built-in catalog (currently
+ * the two Fireworks connectors, which serve `accounts/fireworks/routers/...`
+ * and curated `accounts/fireworks/models/...` ids) are represented in the UI
+ * model picker instead of collapsing to an empty list.
+ */
 function listProviderModels(provider: string): Array<{ id: string; label: string }> {
-  try {
-    const models = getModels(provider as never);
-    return models.map((model) => ({ id: model.id, label: model.name ?? model.id }));
-  } catch {
-    return [];
-  }
+  return resolveModels(provider).map((model) => ({ id: model.id, label: model.name }));
 }
 
 export function getConnectorModelPolicy(
diff --git a/src/main/worker/worker-runner.ts b/src/main/worker/worker-runner.ts
index 06f3d262..f5cd6ee8 100644
--- a/src/main/worker/worker-runner.ts
+++ b/src/main/worker/worker-runner.ts
@@ -1,7 +1,8 @@
 import { Agent } from "@mariozechner/pi-agent-core";
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import { getModel, streamSimple } from "@mariozechner/pi-ai";
+import { streamSimple } from "@mariozechner/pi-ai";
 import { createCodingTools } from "@mariozechner/pi-coding-agent";
+import { resolveModel, resolveExtraStreamHeaders } from "../model-resolver";
 import type { RunStatus } from "@shared/types";
 import type { ChildMessage, RunJob } from "./worker-helpers";
 import { applyEnvOverrides, buildRedactor } from "./worker-helpers";
@@ -73,8 +74,12 @@ export class WorkerRunner {
 
       const restoreEnv = applyEnvOverrides(prepared.extraEnv);
       try {
-        const model = getModel(prepared.provider as never, job.model as never);
+        const model = resolveModel(prepared.provider, job.model);
+        if (!model) {
+          throw new Error(`Unknown model ${job.model} for provider ${prepared.provider}.`);
+        }
         resolvedModelId = model.id;
+        const extraHeaders = resolveExtraStreamHeaders(prepared.provider, prepared.apiKey);
 
         const cwd = job.workspacePath ?? process.cwd();
         const tools = createCodingTools(cwd) as never;
@@ -87,7 +92,11 @@ export class WorkerRunner {
             messages: prepared.priorMessages,
           },
           streamFn: (m, messages, options) =>
-            streamSimple(m, messages, { ...options, apiKey: prepared.apiKey }),
+            streamSimple(m, messages, {
+              ...options,
+              apiKey: prepared.apiKey,
+              headers: { ...(options?.headers ?? {}), ...(extraHeaders ?? {}) },
+            }),
           beforeToolCall: async (context) => {
             const verdict = await rpc.invoke(job.runId, "beforeToolCall", {
               agentId: job.agentId,