@springbrand/agent-runtime 0.1.1 → 0.1.3-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/agent-runtime",
-  "version": "0.1.1",
+  "version": "0.1.3-alpha.0",
   "type": "module",
   "files": [
     "src",

package/src/kernel/bindings.ts

@@ -759,6 +759,7 @@ export interface RuntimeBrowserPort {
  */
 export type RuntimeModelProtocol =
   | "openai-chat"
+  | "openrouter-chat"
   | "anthropic-messages"
   | "google-generative-ai"
   | "openai-codex-responses";

package/src/pi/runtime-adapter/models.ts

@@ -26,6 +26,9 @@ import {
 import {
   openaiProvider,
 } from "@earendil-works/pi-ai/providers/openai";
+import {
+  openrouterProvider,
+} from "@earendil-works/pi-ai/providers/openrouter";
 import {
   googleProvider,
 } from "@earendil-works/pi-ai/providers/google";
@@ -40,6 +43,7 @@ import type {
 
 const CATALOGS = {
   "openai-chat": openaiProvider().getModels(),
+  "openrouter-chat": openrouterProvider().getModels(),
   "anthropic-messages": anthropicProvider().getModels(),
   "google-generative-ai": googleProvider().getModels(),
   "openai-codex-responses": openaiCodexProvider().getModels(),
@@ -126,6 +130,7 @@ function providerId(endpoint: RuntimeModelEndpoint, index: number): string {
 function apiFor(protocol: RuntimeModelProtocol): Api {
   switch (protocol) {
     case "openai-chat":
+    case "openrouter-chat":
       return "openai-completions";
     case "anthropic-messages":
       return "anthropic-messages";
@@ -139,6 +144,7 @@ function apiFor(protocol: RuntimeModelProtocol): Api {
 function piApiFor(protocol: RuntimeModelProtocol) {
   switch (protocol) {
     case "openai-chat":
+    case "openrouter-chat":
       return openAICompletionsApi();
     case "anthropic-messages":
       return anthropicMessagesApi();
@@ -165,12 +171,11 @@ function configuredModel(
       `Model is not in Pi's built-in catalog for ${endpoint.protocol}: ${modelId}`,
     );
   }
-  // 待确认：当前统一丢弃 catalogModel.compat；现有提交历史没有说明这样做对 Anthropic 兼容参数的影响，修改前需先验证 Pi 的流式请求行为。
   const {
     api: _api,
     provider: _provider,
     baseUrl: _baseUrl,
-    compat: _compat,
+    compat,
     headers: catalogHeaders,
     ...metadata
   } = catalogModel;
@@ -183,6 +188,9 @@ function configuredModel(
     api: apiFor(endpoint.protocol),
     provider: providerId(endpoint, index),
     baseUrl: endpoint.baseURL,
+    ...(endpoint.protocol === "openrouter-chat" && compat
+      ? { compat }
+      : {}),
     ...(Object.keys(headers).length > 0 ? { headers } : {}),
   };
 }
@@ -228,10 +236,10 @@ export function resolvePiApiKey(
  * 用当前部署端点完整重建一个已有的 Pi 模型集合。
  *
  * PiRuntimeAdapter 激活新运行快照时调用它；需要复用 MutableModels 的调用方也可以调用，并继续使用返回的同一实例。
- * 该函数会先清空集合，所以调用方必须把传入对象视为由 Runtime 独占管理，不能期待自定义 provider 被保留。
+ * 该函数在全部新 provider 校验通过后才清空并替换集合，所以失败时旧集合保持可用。
  *
  * Pi 当前用 provider.id 在 Map 中注册和路由请求，因此每个部署端点都必须同时注册唯一 provider、对应模型、认证解析器和协议实现。
- * 先 clearProviders 是为了避免配置更新后旧端点继续可用；所有模型在注册时都会经过 catalog 校验，因此任一未知 modelId 会让整次配置失败。
+ * 替换时先构建新 provider，确保任一未知 modelId 都不会让旧端点失效；校验通过后再清空旧集合，避免配置更新后旧端点继续可用。
  *
  * @returns 传入并已重建完成的 `models` 实例。
  * @throws 当任一部署模型不在 Pi 内置 OpenAI、Anthropic catalog 中时抛出错误。
@@ -240,9 +248,8 @@ export function configurePiModels(
   models: MutableModels,
   provider: RuntimeProviderPort,
 ): MutableModels {
-  models.clearProviders();
-  provider.endpoints.forEach((endpoint, index) => {
-    models.setProvider(createProvider({
+  const configuredProviders = provider.endpoints.map((endpoint, index) =>
+    createProvider({
       id: providerId(endpoint, index),
       name: endpoint.protocol,
       baseUrl: endpoint.baseURL,
@@ -259,8 +266,12 @@ export function configurePiModels(
         configuredModel(endpoint, index, modelId),
       ),
       api: piApiFor(endpoint.protocol),
-    }));
-  });
+    })
+  );
+  models.clearProviders();
+  configuredProviders.forEach((configuredProvider) =>
+    models.setProvider(configuredProvider)
+  );
   return models;
 }
 

package/src/pi/tool/base.ts

@@ -66,9 +66,9 @@ function candidate<T extends TSchema>(tool: AgentTool<T>): PiToolCandidate {
   };
 }
 
-/** Runtime-permanent Pi tools, independent of optional Host plugins. */
+/** Runtime base tools, including native web search when the model supports it. */
 export function basePiToolCandidates(
-  webSearch: WebSearch,
+  webSearch?: WebSearch,
 ): PiToolCandidate[] {
   return [
     candidate({
@@ -105,6 +105,6 @@ export function basePiToolCandidates(
         });
       },
     }),
-    webSearchPiToolCandidate(webSearch),
+    ...(webSearch ? [webSearchPiToolCandidate(webSearch)] : []),
   ];
 }

package/src/pi/tool/core-host.ts

@@ -14,6 +14,8 @@ import type { PiToolCandidate } from "./compiler";
 
 // 本文件沿用 `../../index.ts` 入口定义的 Workspace、Port 和 Tool Candidate 术语。
 
+const CODEMODE_SANDBOX_TIMEOUT_MS = 55_000;
+
 /**
  * 把宿主的 Worker Loader、出站网络和 Workspace 组装成 Pi 代码执行工具候选项。
  *
@@ -32,6 +34,8 @@ export function workspaceCodeExecutionPiToolCandidate(options: {
     executor: new DynamicWorkerExecutor({
       loader: options.loader,
       globalOutbound: options.outbound,
+      // 先于外层 60s 截止结束，给 Runtime RPC 结算和 Worker 释放留出时间。
+      timeout: CODEMODE_SANDBOX_TIMEOUT_MS,
     }),
     connectors: [
       new StateConnector(

package/src/pi/tool/core.ts

@@ -205,6 +205,7 @@ const executeParameters = Type.Object({
       "Plain JavaScript async function. TypeScript annotations are not supported.",
   }),
 });
+const CODEMODE_EXECUTE_TIMEOUT_MS = 60_000;
 
 /**
  * 把 Cloudflare Codemode Runtime handle 包装为高风险 Pi 代码执行工具候选项。
@@ -235,7 +236,33 @@ export function codeExecutionPiToolCandidate(
     // 必须通过 Runtime handle 而不是直接调用 executor，因为 Cloudflare Codemode 把重放、审批和执行日志放在持久化 Runtime 层。
     async execute(_toolCallId, input, signal) {
       signal?.throwIfAborted();
-      return result(await runtime.execute(input));
+      // ponytail: 外层截止只保证 Agent 继续；Codemode 支持 AbortSignal 或宿主 dispose 后再终止底层执行。
+      let timeout: ReturnType<typeof setTimeout> | undefined;
+      const deadline = new Promise<{
+        status: "error";
+        code: "timeout";
+        error: string;
+        retryable: false;
+        outcome: "unknown";
+      }>((resolve) => {
+        timeout = setTimeout(() => resolve({
+          status: "error",
+          code: "timeout",
+          error:
+            `Code Mode execute exceeded ${CODEMODE_EXECUTE_TIMEOUT_MS} ms; ` +
+            "use existing results and state the missing evidence.",
+          retryable: false,
+          outcome: "unknown",
+        }), CODEMODE_EXECUTE_TIMEOUT_MS);
+      });
+      try {
+        return result(await Promise.race([
+          runtime.execute(input),
+          deadline,
+        ]));
+      } finally {
+        if (timeout !== undefined) clearTimeout(timeout);
+      }
     },
   };
   return {

package/src/pi/tool/web-search/api.ts

@@ -1106,6 +1106,8 @@ export interface WebSearchOptions {
 
 function apiFor(endpoint: RuntimeModelEndpoint): NativeApi {
     switch (endpoint.protocol) {
+        case "openrouter-chat":
+            throw new Error("Native web search is unavailable for openrouter-chat");
         case "google-generative-ai":
             return "google-generative-ai";
         case "openai-chat":

package/src/plugins.ts

@@ -863,12 +863,22 @@ class RuntimeBuilder implements RuntimeContributionContext {
       );
     }
     const resolvedModel = resolvePiModel(provider, profile.model);
-    const webSearch = createWebSearch({
-      endpoint: endpoints[0]!,
-      model: profile.model,
-      maxTokens: resolvedModel.maxTokens,
-      reasoning: resolvedModel.reasoning,
-    });
+    const endpoint = endpoints[0]!;
+    const webSearch = endpoint.protocol === "openrouter-chat"
+      ? undefined
+      : createWebSearch({
+        endpoint,
+        model: profile.model,
+        maxTokens: resolvedModel.maxTokens,
+        reasoning: resolvedModel.reasoning,
+      });
+    if (!webSearch) {
+      this.reportDegradation({
+        capability: "web_search",
+        reason: "unavailable",
+        detail: "Native web search is unavailable for openrouter-chat",
+      });
+    }
     for (const candidate of basePiToolCandidates(webSearch)) {
       this.addPiTool(candidate);
     }