@springbrand/agent-runtime 0.2.0-alpha.27 → 0.2.0-alpha.28

package/package.json

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

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

@@ -210,6 +210,41 @@ function projectToolResultsForModel(
   return changed ? projected : [...messages];
 }
 
+function orderLateToolResultsBeforeTurnAbortMarker(
+  messages: readonly AgentMessage[],
+): AgentMessage[] {
+  const ordered: AgentMessage[] = [];
+  for (let index = 0; index < messages.length; index += 1) {
+    const message = messages[index]!;
+    const previous = ordered.at(-1);
+    if (
+      message.role !== "custom" ||
+      message.customType !== "turn-aborted" ||
+      previous?.role !== "assistant"
+    ) {
+      ordered.push(message);
+      continue;
+    }
+    const pending = new Set(
+      previous.content.flatMap((part) =>
+        part.type === "toolCall" ? [part.id] : []
+      ),
+    );
+    let cursor = index + 1;
+    while (true) {
+      const result = messages[cursor];
+      if (result?.role !== "toolResult" || !pending.has(result.toolCallId)) {
+        break;
+      }
+      ordered.push(result);
+      cursor += 1;
+    }
+    ordered.push(message);
+    index = cursor - 1;
+  }
+  return ordered;
+}
+
 class PiTurnAdapter {
   private piInstance?: PiCore;
   private abortRequested = false;
@@ -304,7 +339,9 @@ class PiTurnAdapter {
       transformContext: async (messages, signal) => {
         const ctx = await this.opts.transformContext(messages, signal);
         return transformMessages(
-          projectToolResultsForModel(ctx, selfBounded) as Message[],
+          orderLateToolResultsBeforeTurnAbortMarker(
+            projectToolResultsForModel(ctx, selfBounded),
+          ) as Message[],
           this.opts.pi.model,
         ) as AgentMessage[];
       },

package/src/runtime.ts

@@ -2560,6 +2560,36 @@ export abstract class AgentRuntimeKernel<
           return { kind: "settled" };
         case "resume-turn": {
           const last = (await this.transcript.canonicalMessages()).at(-1);
+          if (last?.role === "assistant" && last.stopReason === "toolUse") {
+            // Tool input 会在真正执行前持久化。恢复状态仍为 idle 证明这些
+            // canonical Tool Call 还没越过 attempt 边界，包括非幂等 Tool 也可以安全首次执行。
+            const unstartedCalls = last.content.filter((part) =>
+              part.type === "toolCall"
+            );
+            if (unstartedCalls.length > 0) {
+              for (const call of unstartedCalls) {
+                try {
+                  if (
+                    !await adapter.retryTool({
+                      toolName: call.name,
+                      toolCallId: call.id,
+                      input: call.arguments,
+                    })
+                  ) {
+                    return {
+                      kind: "unresumable",
+                      reason:
+                        `SpringBrand could not resume this turn: Tool "${call.name}" is no longer available.`,
+                    };
+                  }
+                } catch {
+                  // The governed Tool persisted its bounded error ToolResult.
+                }
+              }
+              decision = await this.materializeRecoveredToolResults(submission);
+              continue;
+            }
+          }
           // Pi 的 agentLoopContinue 拒绝从 assistant 消息继续。悬空的尾部 assistant
           // 意味着这条 transcript 续不下去了 —— 判断出来就必须收尾,不能默默退场。
           return last?.role === "user" || last?.role === "toolResult"