@springbrand/agent-runtime 0.2.0-alpha.51 → 0.2.0-alpha.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/agent-runtime",
-  "version": "0.2.0-alpha.51",
+  "version": "0.2.0-alpha.53",
   "type": "module",
   "files": [
     "src",
@@ -20,7 +20,7 @@
     "@cloudflare/codemode": "0.5.1",
     "@cloudflare/sandbox": "0.12.4",
     "@cloudflare/shell": "0.4.3",
-    "@cloudflare/think": "0.15.1",
+    "@cloudflare/think": "0.17.0",
     "@earendil-works/pi-agent-core": "0.83.0",
     "@earendil-works/pi-ai": "0.83.0",
     "@types/lodash-es": "^4.17.12",

package/src/kernel/state.ts

@@ -59,6 +59,7 @@ export interface RuntimeQueuedSubmission {
 export interface RuntimeTurnState {
   activeSubmissionId?: string;
   activeRequestId?: string;
+  activeMessageId?: string;
   recoveryAttempt?: number;
   recoveryMax?: number;
   recoveryReason?: "no_meaningful_model_progress" | "transient_model_error";

package/src/lib/prompt.ts

@@ -113,9 +113,9 @@ export const INTERACTION =
   "a bounded choice; for required free text, omit the options field entirely — never pass an empty or single-item options array; " +
   "continue the same turn when its result arrives. " +
   "Don't use it when a sensible default lets you proceed. " +
-  "After completing a substantive task (report, analysis, multi-step job): write your full answer " +
-  "FIRST, then call suggest_followups (2-4 directions) as the very last action and end the turn — " +
-  "write no text after it (the tool renders its own closing block). Never for small talk or while a " +
+  "After completing a substantive task (report, analysis, multi-step job), finish all work and other Tool calls, " +
+  "then call suggest_followups (2-4 directions) as the last Tool call before your final answer. " +
+  "After it returns, write your complete final answer and make no further Tool calls. Never for small talk or while a " +
   "task is still in progress; it is non-blocking, unlike ask_user.";
 
 // Separates short always-on memory from indexed long-tail workspace files.

package/src/pi/tool/base.ts

@@ -300,7 +300,7 @@ export function basePiToolCandidates(
         name: "suggest_followups",
         label: "Suggest follow-ups",
         description:
-          "Offer the user 2-4 optional follow-up directions after completing a substantive task (a report, an analysis, a multi-step job). Call this at most once, and it MUST be the very last thing you do: finish all of your prose FIRST, then call this tool and END the turn immediately — do NOT write any text after calling it. Do NOT call it for small talk, quick answers, or while a task is still in progress.",
+          "Offer the user 2-4 optional follow-up directions after completing a substantive task (a report, an analysis, a multi-step job). Call this at most once, after all work and other Tool calls are complete. It MUST be the last Tool call before the final answer. After it returns, write the complete final answer and make no further Tool calls. Do NOT call it for small talk, quick answers, or while a task is still in progress.",
         parameters: suggestFollowupsParameters,
         async execute(_toolCallId, input) {
           return result({ noted: true, count: input.items.length });

package/src/runtime.ts

@@ -442,6 +442,7 @@ export abstract class AgentRuntimeKernel<
   private readonly approvals: ApprovalLifecycle<StoredSubmission>;
   private readonly interactions: InteractionLifecycle<StoredSubmission>;
   private runtimeLoadTracker?: RuntimeLoadTracker;
+  private runtimeEventDrainTail?: Promise<void>;
   private readonly streamBySubmission = new Map<string, string>();
   private migratedSubmissionIds?: Set<string>;
   private db!: RuntimeDatabase;
@@ -1153,7 +1154,19 @@ export abstract class AgentRuntimeKernel<
     );
   }
 
-  private async drainRuntimeEvents(idempotentRetry = true): Promise<void> {
+  private drainRuntimeEvents(idempotentRetry = true): Promise<void> {
+    const drain = (this.runtimeEventDrainTail ?? Promise.resolve())
+      .catch(() => undefined)
+      .then(() => this.deliverRuntimeEvents(idempotentRetry));
+    this.runtimeEventDrainTail = drain;
+    return drain.finally(() => {
+      if (this.runtimeEventDrainTail === drain) {
+        this.runtimeEventDrainTail = undefined;
+      }
+    });
+  }
+
+  private async deliverRuntimeEvents(idempotentRetry: boolean): Promise<void> {
     const turnEvents = this.turnEventsPort();
     if (!turnEvents) return;
 
@@ -3411,15 +3424,15 @@ export abstract class AgentRuntimeKernel<
    * @remarks
    * Cloudflare Agents SDK 为每条新 WebSocket 连接调用。
    *
-   * 先发送 transcript，再让恢复基类通知正在续传的流，
-   * 使普通历史和恢复握手保持各自的协议帧。
+   * 先发送已完成 transcript，再让恢复基类独自重建 active assistant，
+   * 使持久化历史和 resumable stream 只有一个生产者。
    */
   async onConnect(connection: Connection): Promise<void> {
     sendIfOpen(
       connection,
       json({
         type: MessageType.CF_AGENT_CHAT_MESSAGES,
-        messages: await this.getMessages(),
+        messages: await this.hydrationMessages(),
       }),
     );
     await super.onConnect(connection);
@@ -3435,8 +3448,13 @@ export abstract class AgentRuntimeKernel<
    * 避免在这里复制 Agents SDK 的默认协议行为。
    */
   async onRequest(request: Request): Promise<Response> {
-    if (new URL(request.url).pathname.endsWith("/get-messages")) {
-      return Response.json(await this.getMessages());
+    const url = new URL(request.url);
+    if (url.pathname.endsWith("/get-messages")) {
+      return Response.json(
+        url.searchParams.get("view") === "hydration"
+          ? await this.hydrationMessages()
+          : await this.getMessages(),
+      );
     }
     return super.onRequest(request);
   }
@@ -3577,12 +3595,20 @@ export abstract class AgentRuntimeKernel<
    * @remarks
    * 新连接、HTTP 读取、Turn 完成投影和 RPC 调用方需要消息快照时调用。
    *
-   * 统一从 transcript 生成完整视图；活跃 assistant 也必须随首帧恢复，后续流按相同消息 ID 接管。
+   * 统一从 transcript 生成完整视图；HTTP fallback、fork 和 RPC 读取保留 active assistant。
    */
   async getMessages(): Promise<UIMessage[]> {
     return this.transcript.browserMessages();
   }
 
+  private async hydrationMessages(): Promise<UIMessage[]> {
+    const messages = await this.getMessages();
+    const running = this.db.submissions.findRunning();
+    return running?.assistantMessageId
+      ? messages.filter(({ id }) => id !== running.assistantMessageId)
+      : messages;
+  }
+
   /** 读取当前 canonical transcript 中最后一条助手文本。 */
   protected async latestAssistantText(): Promise<string | undefined> {
     const message = [...await this.transcript.canonicalMessages()]
@@ -4620,6 +4646,7 @@ export abstract class AgentRuntimeKernel<
         ...(current
           ? {
               activeSubmissionId: current.submissionId,
+              activeMessageId: current.assistantMessageId,
               ...(current.requestId
                 ? { activeRequestId: current.requestId }
                 : {}),