@springbrand/agent-runtime 0.2.0-alpha.56 → 0.2.0-alpha.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/agent-runtime",
-  "version": "0.2.0-alpha.56",
+  "version": "0.2.0-alpha.57",
   "type": "module",
   "files": [
     "src",

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

@@ -45,6 +45,7 @@ import {
 } from "./assembly";
 import {
   isRecoverableAssistantError,
+  isOpenRouterServerToolTimeout,
   isModelStreamStallMessage,
   withProviderRetry,
   type PiGenerationLifecycleObserver,
@@ -490,7 +491,7 @@ export interface PiTurnDurability {
 export interface CreatePreparedPiTurnOptions {
   readonly prepared: PreparedPiRuntime;
   readonly pinnedDescriptor: string;
-  /** 同一 Session 的所有 Submission 共用的稳定 Provider 路由身份。 */
+  /** Session 当前的稳定 Provider 路由身份；终态 Provider 故障可在下一 Submission 前旋转它。 */
   readonly modelSessionId: string;
   readonly submission: {
     readonly id: string;
@@ -609,6 +610,7 @@ export type PiCanonicalMessageCommit =
 export interface PiTurnTerminalIntent {
   readonly outcome: "succeeded" | "failed" | "aborted";
   readonly message?: string;
+  readonly resetModelSession?: boolean;
 }
 
 export interface PiPreparedTurnRunOptions {
@@ -1134,6 +1136,9 @@ export class PreparedPiTurnAdapter {
           );
           this.terminalIntent = {
             outcome: terminal.outcome,
+            ...(isOpenRouterServerToolTimeout(authoritativeMessage)
+              ? { resetModelSession: true }
+              : {}),
             ...(authoritativeMessage.errorMessage
               ? { message: authoritativeMessage.errorMessage }
               : terminal.message

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

@@ -182,6 +182,32 @@ export function readModelStreamStallDetails(
   }
 }
 
+export function isOpenRouterServerToolTimeout(
+  message: AssistantMessage,
+): boolean {
+  if (
+    message.stopReason !== "error" ||
+    !message.provider.startsWith("model-api-openrouter-messages-") ||
+    !message.errorMessage
+  ) return false;
+  try {
+    const payload = JSON.parse(message.errorMessage) as {
+      type?: unknown;
+      error?: {
+        type?: unknown;
+        message?: unknown;
+        error_type?: unknown;
+      };
+    };
+    return payload.type === "error" &&
+      payload.error?.type === "timeout_error" &&
+      payload.error.message === "Server tool request failed" &&
+      payload.error.error_type === "timeout";
+  } catch {
+    return false;
+  }
+}
+
 export function isRecoverableAssistantError(
   message: AssistantMessage,
 ): boolean {
@@ -189,6 +215,7 @@ export function isRecoverableAssistantError(
     message.stopReason === "error" &&
     /thought[_ ]signature/i.test(message.errorMessage ?? "")
   ) return false;
+  if (isOpenRouterServerToolTimeout(message)) return false;
   return isRetryableAssistantError(message) ||
     (message.stopReason === "error" &&
       /upstream http\/2 stream failed/i.test(message.errorMessage ?? ""));

package/src/runtime.ts

@@ -134,6 +134,7 @@ import {
 const SCHEDULED_STABLE_TIMEOUT_MS = 30_000;
 const TURN_EVENT_RETRY_SECONDS = 10;
 const RUNTIME_EVENT_MAX_ATTEMPTS = 5;
+const MODEL_SESSION_ID_STORAGE_KEY = "universal-agent:model-session-id";
 
 // 计划续跑丢失多久后由看门狗接手。必须显著长于一个正常执行片的时长，
 // 否则会在健康的长执行片上误判并派发出重复的一片。
@@ -442,6 +443,8 @@ export abstract class AgentRuntimeKernel<
   private readonly approvals: ApprovalLifecycle<StoredSubmission>;
   private readonly interactions: InteractionLifecycle<StoredSubmission>;
   private runtimeLoadTracker?: RuntimeLoadTracker;
+  private modelSessionId?: string;
+  private readonly modelSessionIdReady?: Promise<void>;
   private runtimeEventDrainTail?: Promise<void>;
   private readonly streamBySubmission = new Map<string, string>();
   private migratedSubmissionIds?: Set<string>;
@@ -521,6 +524,11 @@ export abstract class AgentRuntimeKernel<
       snapshotKey: "__cfPiFiberSnapshot",
       snapshotKind: "pi-turn",
     });
+    this.modelSessionIdReady = ctx.storage.get<string>(
+      MODEL_SESSION_ID_STORAGE_KEY,
+    ).then((stored) => {
+      this.modelSessionId = stored;
+    });
     this.piAdapter = pi;
     this.db = new RuntimeDatabase(
       this.sql.bind(this),
@@ -734,6 +742,7 @@ export abstract class AgentRuntimeKernel<
   }
 
   protected async initCandidate(candidate: RuntimeCandidate): Promise<void> {
+    await this.modelSessionIdReady;
     const previous = this.activeRuntime;
     const candidateSnapshot = candidate.snapshot;
     this.runtimeLoad.advance("assembly");
@@ -870,6 +879,7 @@ export abstract class AgentRuntimeKernel<
         terminal: {
           outcome: "succeeded" | "failed" | "aborted";
           message?: string;
+          resetModelSession?: boolean;
         },
       ) => void | Promise<void>;
     } = {},
@@ -909,7 +919,7 @@ export abstract class AgentRuntimeKernel<
     return this.pi.createTurn({
       prepared: this.preparedPi(),
       pinnedDescriptor: submission.assemblyDescriptor,
-      modelSessionId: this.name,
+      modelSessionId: this.modelSessionId ?? this.name,
       submission: {
         id: submission.submissionId,
         requestId: submission.requestId,
@@ -3038,6 +3048,7 @@ export abstract class AgentRuntimeKernel<
       | {
           outcome: "succeeded" | "failed" | "aborted";
           message?: string;
+          resetModelSession?: boolean;
         }
       | undefined;
     const startedAt = ready.createdAt;
@@ -3050,13 +3061,20 @@ export abstract class AgentRuntimeKernel<
         this.migratedSubmissions.has(submissionId)
           ? undefined
           : this.persistAndBroadcastRecord(turn, record),
-      onTerminal: (intent) => {
+      onTerminal: async (intent) => {
         terminalIntent = intent;
         this.appendTerminalIntent(
           submission,
           intent.outcome,
           intent.message,
         );
+        if (intent.resetModelSession) {
+          this.modelSessionId = crypto.randomUUID();
+          await this.ctx.storage.put(
+            MODEL_SESSION_ID_STORAGE_KEY,
+            this.modelSessionId,
+          );
+        }
       },
     });
     for (const pending of this.db.steers.listForSubmission(submissionId)) {