@springbrand/agent-runtime 0.3.0-alpha.22 → 0.3.0-alpha.24

package/src/index.ts

@@ -51,6 +51,7 @@ export type { RuntimeAssemblyView } from "./config/assembly-view";
 export * from "./adapter/cloudflare/define-agent";
 export type { ToolInteractionResponsePreparation } from "./adapter/cloudflare/agent";
 export * from "./conversation/state";
+export type { ModelProtocolResponse } from "./conversation/canonical-context";
 export * from "./tools/workspace/versioning";
 export * from "./lib/execution-level";
 export type {
@@ -144,12 +145,3 @@ export {
   modelRequestUrl,
   resolvePiModel,
 } from "./models";
-export {
-  openRouterRequestUrl,
-  requestOpenRouter,
-} from "./model-protocol/openrouter";
-export type { OpenRouterRequestOptions } from "./model-protocol/openrouter";
-export type {
-  ModelProtocolResponse,
-  OpenRouterProtocol,
-} from "./models/openrouter/protocol-response";

package/src/models/index.ts

@@ -1,4 +1,9 @@
 import type { StreamFn } from "@earendil-works/pi-agent-core";
+import {
+  openRouterRequestUrl,
+  withOpenRouterStructuredOutput,
+  type OpenRouterGenerationProtocol,
+} from "@springbrand/model-client";
 import {
   createModels,
   createProvider,
@@ -148,18 +153,23 @@ type ProviderBoundStream = (
   options?: SimpleStreamOptions,
 ) => ReturnType<StreamFn>;
 
+function openRouterProtocolForModel(model: Model<Api>): OpenRouterGenerationProtocol | undefined {
+  if (model.api === "anthropic-messages" &&
+    model.provider.startsWith("model-api-openrouter-messages-")) return "openrouter-messages";
+  if (model.api === "openai-completions" &&
+    model.provider.startsWith("model-api-openrouter-chat-")) return "openrouter-chat";
+  if (model.api === "openai-responses" &&
+    model.provider.startsWith("model-api-openrouter-responses-")) return "openrouter-responses";
+  return undefined;
+}
+
 export function structuredOutputStream(
   streamFn: StreamFn,
   model: Model<Api>,
   schema: Record<string, unknown>,
 ): StreamFn | undefined {
-  const messages = model.api === "anthropic-messages" &&
-    model.provider.startsWith("model-api-openrouter-messages-");
-  const chat = model.api === "openai-completions" &&
-    model.provider.startsWith("model-api-openrouter-chat-");
-  const responses = model.api === "openai-responses" &&
-    model.provider.startsWith("model-api-openrouter-responses-");
-  if (!messages && !chat && !responses) return undefined;
+  const protocol = openRouterProtocolForModel(model);
+  if (!protocol) return undefined;
 
   return (activeModel, context, options) =>
     streamFn(activeModel, context, {
@@ -169,38 +179,9 @@ export function structuredOutputStream(
         if (!value || typeof value !== "object" || Array.isArray(value)) {
           throw new Error("Structured model payload must be an object");
         }
-        const body = value as Record<string, unknown>;
-        if (messages) {
-          const current = body.output_config;
-          return {
-            ...body,
-            output_config: {
-              ...(current && typeof current === "object" && !Array.isArray(current)
-                ? current
-                : {}),
-              format: { type: "json_schema", schema },
-            },
-          };
-        }
-        if (chat) {
-          return {
-            ...body,
-            response_format: {
-              type: "json_schema",
-              json_schema: { name: "agent_output", strict: true, schema },
-            },
-          };
-        }
-        const current = body.text;
-        return {
-          ...body,
-          text: {
-            ...(current && typeof current === "object" && !Array.isArray(current)
-              ? current
-              : {}),
-            format: { type: "json_schema", name: "agent_output", strict: true, schema },
-          },
-        };
+        return withOpenRouterStructuredOutput(
+          value as Record<string, unknown>, protocol, schema, "agent_output",
+        );
       },
     });
 }
@@ -506,6 +487,8 @@ function trimTrailingSlash(value: string): string {
  * Codex 走 `resolveCodexUrl`。不要在这里"顺手规范化"路径，否则日志会与真实请求脱节，反而掩盖配置错误。
  */
 export function modelRequestUrl(model: Model<Api>): string {
+  const protocol = openRouterProtocolForModel(model);
+  if (protocol) return openRouterRequestUrl({ protocol, baseURL: model.baseUrl ?? "" });
   const base = trimTrailingSlash(model.baseUrl ?? "");
   switch (model.api) {
     case "openai-completions":
@@ -766,7 +749,7 @@ function piApiFor(endpoint: RuntimeModelEndpoint): ProviderStreams {
     }
   })();
   const api = protocol.startsWith("openrouter-")
-    ? withModelProtocolResponse(implementation, protocol as "openrouter-messages" | "openrouter-chat" | "openrouter-responses")
+    ? withModelProtocolResponse(implementation, protocol as OpenRouterGenerationProtocol)
     : implementation;
   const contextFor = (
     model: Model<Api>,

package/src/models/openrouter/messages.ts

@@ -5,6 +5,7 @@ import type {
   TranscriptContext,
 } from "@earendil-works/pi-ai";
 import { getCurrentTools } from "@earendil-works/pi-ai";
+import { createOpenRouterFetch, openRouterHeaders, withOpenRouterRouting } from "@springbrand/model-client";
 import {
   anthropicMessagesApi,
 } from "@earendil-works/pi-ai/api/anthropic-messages.lazy";
@@ -60,13 +61,7 @@ function decoratePayload(
   }
 
   return {
-    ...body,
-    ...(sessionId ? { session_id: sessionId } : {}),
-    provider: {
-      ...record(body.provider),
-      ...model.compat?.openRouterRouting,
-      require_parameters: true,
-    },
+    ...withOpenRouterRouting(body, { ...model.compat?.openRouterRouting }, sessionId),
     ...(deferred.length > 0
       ? {
           tools: [
@@ -96,12 +91,14 @@ function openRouterOptions(
   return {
     ...options,
     apiKey: undefined,
+    fetch: createOpenRouterFetch({ apiKey, fetch: options?.fetch }),
     headers: {
+      // Pi uses null to suppress SDK/model defaults before building native headers.
       ...headers,
+      ...Object.fromEntries(openRouterHeaders(apiKey)),
       ...(model.compat?.supportsStrictTools === true
         ? { "x-anthropic-beta": STRUCTURED_OUTPUTS_BETA }
         : {}),
-      ...(apiKey ? { authorization: `Bearer ${apiKey}` } : {}),
       "x-api-key": null,
     },
     onPayload: async (payload, activeModel) => {

package/src/models/openrouter/openai.ts

@@ -6,6 +6,7 @@ import type {
   TranscriptContext,
 } from "@earendil-works/pi-ai";
 import { getCurrentTools } from "@earendil-works/pi-ai";
+import { createOpenRouterFetch, withOpenRouterRouting } from "@springbrand/model-client";
 import {
   openAICompletionsApi,
 } from "@earendil-works/pi-ai/api/openai-completions.lazy";
@@ -27,6 +28,7 @@ function openRouterOptions(
 ): StreamOptions {
   return {
     ...options,
+    fetch: createOpenRouterFetch({ apiKey: options?.apiKey, fetch: options?.fetch }),
     onPayload: async (payload, activeModel) => {
       const callerPayload = await options?.onPayload?.(payload, activeModel) ?? payload;
       const body = record(callerPayload);
@@ -48,18 +50,12 @@ function openRouterOptions(
       const reasoning = record(replayed.reasoning);
       const include = Array.isArray(replayed.include) ? replayed.include : [];
       return {
-        ...replayed,
+        ...withOpenRouterRouting(replayed, compat?.openRouterRouting, options?.sessionId),
         ...(model.api === "openai-responses" && reasoning?.effort !== undefined &&
           reasoning.effort !== null && reasoning.effort !== "none" &&
           !include.includes("reasoning.encrypted_content")
           ? { include: [...include, "reasoning.encrypted_content"] }
           : {}),
-        ...(options?.sessionId ? { session_id: options.sessionId } : {}),
-        provider: {
-          ...record(replayed.provider),
-          ...compat?.openRouterRouting,
-          require_parameters: true,
-        },
       };
     },
   };

package/src/models/openrouter/protocol-response.ts

@@ -7,21 +7,9 @@ import {
   type ProviderStreams,
   type StreamOptions,
 } from "@earendil-works/pi-ai";
-import type { RuntimeModelProtocol } from "../../config/ports";
+import type { OpenRouterGenerationProtocol } from "@springbrand/model-client";
 import { overlayProviderStreams } from "../provider-streams";
-
-export type OpenRouterProtocol = Extract<RuntimeModelProtocol, `openrouter-${string}`>;
-
-/** Native output required by OpenRouter's stateless continuation. */
-export interface ModelProtocolResponse {
-  readonly output: readonly Readonly<Record<string, unknown>>[];
-}
-
-declare module "@earendil-works/pi-ai" {
-  interface AssistantMessage {
-    protocolResponse?: ModelProtocolResponse;
-  }
-}
+import type { ModelProtocolResponse } from "../../conversation/canonical-context";
 
 function record(value: unknown): Record<string, unknown> | undefined {
   return value !== null && typeof value === "object" && !Array.isArray(value)
@@ -73,7 +61,7 @@ function streamWithProtocolResponse<T extends StreamOptions>(
 
 export function withModelProtocolResponse(
   api: ProviderStreams,
-  protocol: OpenRouterProtocol,
+  protocol: OpenRouterGenerationProtocol,
 ): ProviderStreams {
   if (protocol !== "openrouter-responses") return api;
   return overlayProviderStreams(api, {

package/src/submission/steer-delivery.ts

@@ -6,6 +6,7 @@ import type { SubmitMessageOptions } from "./admission";
 import type { SubmissionHandle } from "./lifecycle";
 import { submissionAbortReason, type StoredSubmission, type SubmissionRepository } from "./repository";
 import type { PiCanonicalUserInput } from "../conversation/message/contract";
+import { captureUIUserSidecar } from "../conversation/message/conversion";
 import type { MessageUiRepository } from "../conversation/repository";
 import type { PendingSteer, SteerRepository } from "./steer-repository";
 
@@ -70,6 +71,7 @@ export async function finishPendingSteers(options: {
     const userMessage = steer.uiMessageJson
       ? JSON.parse(steer.uiMessageJson) as UIMessage & { role: "user" }
       : undefined;
+    const userSidecar = userMessage ? { id: userMessage.id, ...captureUIUserSidecar(userMessage) } : undefined;
     const requestId = `${options.submissionId}:steer:${steer.steerId}`;
     if (options.aborted) {
       const owner = options.transaction(() => {
@@ -81,7 +83,7 @@ export async function finishPendingSteers(options: {
         }
         return handoff?.status === "aborted" || handoff?.status === "skipped" ? handoff.submissionId : options.submissionId;
       });
-      await options.conversation.append(steer.messageId, message, { submissionId: owner, ...(userMessage ? { userMessage } : {}) });
+      await options.conversation.append(steer.messageId, message, { submissionId: owner, ...(userSidecar ? { userSidecar } : {}) });
       options.transaction(() => {
         if (steer.harnessEntryId) options.messageUi.delete(steer.harnessEntryId);
         options.steers.deleteByMessageId(steer.messageId);
@@ -117,7 +119,7 @@ export async function finishPendingSteers(options: {
       }
       return current;
     });
-    if (handoff.status === "skipped" || handoff.status === "aborted") await options.conversation.append(steer.messageId, message, { submissionId: handoff.submissionId, ...(userMessage ? { userMessage } : {}) });
+    if (handoff.status === "skipped" || handoff.status === "aborted") await options.conversation.append(steer.messageId, message, { submissionId: handoff.submissionId, ...(userSidecar ? { userSidecar } : {}) });
     options.transaction(() => options.steers.deleteByMessageId(steer.messageId));
   }
 }

package/src/tools/web/search/api.ts

@@ -6,6 +6,7 @@
  */
 
 import type { RuntimeModelEndpoint } from "../../../config/ports";
+import { createOpenRouterFetch, openRouterRequestUrl } from "@springbrand/model-client";
 
 export interface WebSearchSource {
   title: string;
@@ -295,6 +296,9 @@ function isOpenRouterModel(model: NativeWebSearchModel): boolean {
 }
 
 function resolveOpenAIResponsesUrl(model: NativeWebSearchModel): string {
+  if (isOpenRouterModel(model)) {
+    return openRouterRequestUrl({ protocol: "openrouter-responses", baseURL: model.baseUrl });
+  }
   const base = trimTrailingSlash(model.baseUrl);
   if (!isOpenAICodexModel(model)) return `${base}/responses`;
   if (base.endsWith("/codex/responses")) return base;
@@ -733,7 +737,8 @@ async function callOpenAIStream(
     requestBody.parallel_tool_calls = true;
   }
 
-  const response = await fetch(resolveOpenAIResponsesUrl(model), {
+  const fetcher = isOpenRouter ? createOpenRouterFetch({ apiKey: auth.apiKey }) : fetch;
+  const response = await fetcher(resolveOpenAIResponsesUrl(model), {
     method: "POST",
     headers: requestHeaders,
     body: JSON.stringify(requestBody),

package/src/model-protocol/openrouter.ts

@@ -1,41 +0,0 @@
-import type { RuntimeModelEndpoint } from "../config/ports";
-
-export interface OpenRouterRequestOptions {
-  readonly headers?: HeadersInit;
-  readonly signal?: AbortSignal;
-  readonly fetch?: typeof fetch;
-}
-
-export function openRouterRequestUrl(
-  endpoint: Pick<RuntimeModelEndpoint, "protocol" | "baseURL">,
-): string {
-  const baseURL = endpoint.baseURL.replace(/\/+$/, "");
-  switch (endpoint.protocol) {
-    case "openrouter-messages":
-      return `${baseURL}/v1/messages`;
-    case "openrouter-chat":
-      return `${baseURL}/chat/completions`;
-    case "openrouter-responses":
-      return `${baseURL}/responses`;
-    default:
-      throw new Error(`Not an OpenRouter protocol: ${endpoint.protocol}`);
-  }
-}
-
-export function requestOpenRouter(
-  endpoint: RuntimeModelEndpoint,
-  body: Readonly<Record<string, unknown>>,
-  options: OpenRouterRequestOptions = {},
-): Promise<Response> {
-  const url = openRouterRequestUrl(endpoint);
-  const headers = new Headers(endpoint.headers);
-  new Headers(options.headers).forEach((value, name) => headers.set(name, value));
-  headers.set("content-type", "application/json");
-  headers.set("authorization", `Bearer ${endpoint.apiKey}`);
-  return (options.fetch ?? globalThis.fetch)(url, {
-    method: "POST",
-    headers,
-    body: JSON.stringify(body),
-    ...(options.signal ? { signal: options.signal } : {}),
-  });
-}