@springbrand/agent-runtime 0.2.0-alpha.72 → 0.3.0-alpha.2

package/src/{db/index.ts → adapter/cloudflare/database.ts}

@@ -1,26 +1,28 @@
 import type { SqlTaggedTemplate } from "agents/chat";
 
 import { initializeSchema } from "./schema";
-import { SubmissionRepository } from "./submission.repo";
-import { ApprovalRepository } from "./approval.repo";
-import { ToolInteractionRepository } from "./interaction.repo";
-import { ToolSettlementRepository } from "./settlement.repo";
-import { RecoveryMilestoneRepository } from "./milestone.repo";
-import { ExtContextRepository } from "./ext-context.repo";
-import { MessageUiRepository } from "./message-ui.repo";
-import { SteerRepository } from "./steer.repo";
-import { RuntimeEventOutboxRepository } from "./runtime-event-outbox.repo";
-import { TelemetryOutboxRepository } from "./telemetry-outbox.repo";
-import { AgentToolRepository } from "./agent-tool.repo";
-import { SubmissionAdmissionRepository } from "./submission-admission.repo";
+import {
+  SubmissionAdmissionRepository,
+  SubmissionRepository,
+  SteerRepository,
+} from "../../submission";
+import {
+  AgentToolRepository,
+  ApprovalRepository,
+  ToolInteractionRepository,
+} from "../../tools";
+import { ExtContextRepository } from "../../context";
+import { MessageUiRepository } from "../../conversation";
+import {
+  RuntimeEventOutboxRepository,
+  TelemetryOutboxRepository,
+} from "../../telemetry";
 
 // 数据库术语以这里为准。
 // Submission 是一次可持久化的用户提交，从排队到终态都用同一个 submissionId 跟踪。
 // Approval 是某次工具调用的持久化审批记录，executionId 是对外决策时的主键。
 // Tool Interaction 是「结果由客户端提供」的工具调用的 park 记录，interactionId 是主键；
-// 它只回答还等不等得到响应，答案的权威副本仍是 Settlement。
-// Settlement 是工具调用的最终结果，同一 Submission 内用 toolCallId 防止重复落盘。
-// Recovery Milestone 是按 seq 重放的恢复事实，milestoneKey 用来去重。
+// 它保存人的回答，Harness Session 保存工具执行位置和最终 ToolResult。
 // Extension Context 是扩展按 label 保存的文本，不随清空聊天记录删除。
 // Message UI 是会话消息的用户界面补充数据，它由 Transcript 而不是 Turn 生命周期管理。
 // Agent Tool Run 是 Agents SDK 派发的子运行，唯一一张不归 Runtime 所有的表：SDK 建它、写它、清它，
@@ -28,26 +30,10 @@ import { SubmissionAdmissionRepository } from "./submission-admission.repo";
 // 是因为 SDK 没有公开父级侧的「还有没有子运行在跑」读法，而复制一份必然产生第二个真相源。
 // Repository 只把 Runtime 语义翻译成参数化 SQL，所有表都位于当前 Agent 实例自己的 Durable Object SQLite 存储中。
 // Transaction 指 Cloudflare transactionSync 包住的同步操作，回调抛错时整体回滚。
-export * from "./schema";
-export * from "./submission.repo";
-export * from "./approval.repo";
-export * from "./interaction.repo";
-export * from "./settlement.repo";
-export * from "./milestone.repo";
-export * from "./ext-context.repo";
-export * from "./message-ui.repo";
-export * from "./steer.repo";
-export * from "./runtime-event-outbox.repo";
-export * from "./telemetry-outbox.repo";
-export * from "./agent-tool.repo";
-export * from "./submission-admission.repo";
-
 export class RuntimeDatabase {
   readonly submissions: SubmissionRepository;
   readonly approvals: ApprovalRepository;
   readonly interactions: ToolInteractionRepository;
-  readonly settlements: ToolSettlementRepository;
-  readonly milestones: RecoveryMilestoneRepository;
   readonly extContext: ExtContextRepository;
   readonly messageUi: MessageUiRepository;
   readonly steers: SteerRepository;
@@ -63,11 +49,9 @@ export class RuntimeDatabase {
     private readonly sql: SqlTaggedTemplate,
     private readonly transact: <T>(fn: () => T) => T,
   ) {
-    this.submissions = new SubmissionRepository(sql);
+    this.submissions = new SubmissionRepository(sql, transact);
     this.approvals = new ApprovalRepository(sql);
     this.interactions = new ToolInteractionRepository(sql);
-    this.settlements = new ToolSettlementRepository(sql);
-    this.milestones = new RecoveryMilestoneRepository(sql);
     this.extContext = new ExtContextRepository(sql);
     this.messageUi = new MessageUiRepository(sql);
     this.steers = new SteerRepository(sql);
@@ -77,25 +61,6 @@ export class RuntimeDatabase {
     this.submissionAdmissions = new SubmissionAdmissionRepository(sql);
   }
 
-  /**
-   * 有未完成 Submission，且每一条都停在人机等待上。
-   *
-   * 换装配的忙碌闸门调用它。「停在等人」有两种形态：待决审批，和等客户端
-   * 投递结果的 Tool Interaction —— 两者都意味着没有模型请求在飞、没有工具
-   * 在执行，因此换掉能力语义是安全的。
-   *
-   * 注意它不是「存在待处理的人机等待」：只要有一条 Submission 正在真的执行，
-   * 整个判断就必须为假，否则会把执行中的 Turn 切成两套能力语义。
-   */
-  everyUnfinishedSubmissionParked(): boolean {
-    const unfinished = this.submissions.listUnfinishedIds();
-    if (unfinished.length === 0) return false;
-    return unfinished.every((submissionId) =>
-      this.approvals.listPendingForSubmission(submissionId).length > 0 ||
-      this.interactions.listPendingForSubmission(submissionId).length > 0
-    );
-  }
-
   // 在一个同步 SQLite 事务里运行一组读写。
   // Submission、Approval、Transcript 等需要一起成功或一起回滚时调用，回调不得返回 Promise。
   // 这里直接保留 transactionSync 的抛错回滚语义；待确认：当前泛型签名无法在类型层阻止 async 回调。
@@ -118,8 +83,6 @@ export class RuntimeDatabase {
     this.sql`DELETE FROM pi_submissions`;
     this.sql`DELETE FROM pi_approvals`;
     this.sql`DELETE FROM pi_tool_interactions`;
-    this.sql`DELETE FROM pi_tool_settlements`;
-    this.sql`DELETE FROM pi_recovery_milestones`;
     this.sql`DELETE FROM pi_telemetry_outbox`;
   }
 }

package/src/{runtime-agent.ts → adapter/cloudflare/define-agent.ts}

@@ -5,53 +5,53 @@ import {
   type ChatCapableAgentClass,
 } from "agents";
 import type { UIMessage } from "ai";
-import type { PiCanonicalTranscriptSnapshot } from "./pi/runtime-adapter";
+import type { PiCanonicalTranscriptSnapshot } from "../../conversation";
 import type {
   ApprovalDecision,
   ApprovalReceipt,
   MessageDelivery,
   MessageDispatchReceipt,
   SubmissionReceipt,
-} from "./kernel/receipts";
-import type { RuntimeState } from "./kernel/state";
+} from "../../submission";
+import type { RuntimeState } from "../../conversation";
 import type {
   TemporaryAgentApprovalDecision,
   TemporaryAgentApprovalRequest,
   TemporaryAgentLaunch,
-} from "./layers/orchestration/temporary-agent/core";
-import { TEMPORARY_AGENT_LAUNCH_KEY } from "./layers/orchestration/temporary-agent/core";
+} from "../../tools";
+import { TEMPORARY_AGENT_LAUNCH_KEY } from "../../tools";
 import {
   temporaryAgentExtensionIsSafe,
   temporaryAgentToolAllowed,
-} from "./layers/orchestration/temporary-agent/runner";
+} from "../../tools";
 import {
   EXECUTION_LEVELS,
   requiresExecutionApproval,
   type ExecutionLevel,
-} from "./lib/execution-level";
+} from "../../lib/execution-level";
 import {
   assembleRuntimeSnapshot,
   type RuntimeCandidate,
-} from "./runtime-assembler";
+} from "../../config";
 import type {
   ResolvedResources,
   ToolAssemblyResult,
-} from "./runtime-definition";
-import type { RuntimeAssemblyView } from "./kernel/runtime-assembly-view";
-import type { RuntimeConfigUpdateResult } from "./kernel/runtime-config";
+} from "../../config";
+import type { RuntimeAssemblyView } from "../../config";
+import type { RuntimeConfigUpdateResult } from "../../config";
 import {
   logRuntimeLoadFailure,
   RUNTIME_LOAD_TIMEOUT_MS,
   withRuntimeLoadTimeout,
-} from "./kernel/runtime-load";
-import { AgentToolRuntimeKernel } from "./agent-tool-runtime";
+} from "../../config";
+import { AgentToolRuntimeKernel } from "./agent-tool";
 import type {
   RuntimeAgentConfigContext,
   RuntimeAgentPlanningContext,
   RuntimeAgentRole,
   RuntimeAgentToolResult,
-} from "./runtime-agent-context";
-import type { AgentTelemetryBinding } from "./telemetry/contract";
+} from "../../config";
+import type { AgentTelemetryBinding } from "../../telemetry";
 
 /**
  * 本文件把应用提供的 Config Definition 与 Planner 接到 Cloudflare Agent 生命周期。
@@ -70,7 +70,7 @@ export type {
   RuntimeAgentRole,
   RuntimeAgentToolResult,
   RuntimeAssemblyContext,
-} from "./runtime-agent-context";
+} from "../../config";
 
 /** Host 一次性准备的完整 Runtime 加载结果。 */
 export interface LoadedRuntime<Config> {
@@ -163,15 +163,6 @@ export interface RuntimeAgentControls {
     runtimeKey?: string,
     options?: { force?: boolean },
   ): Promise<void>;
-  /**
-   * 确保 Runtime 已加载，再请求 Kernel 刷新当前 Session Context。
-   *
-   * @remarks
-   * 业务侧在外部 Context 变更后调用，例如 Inbox 需要让已存在的聊天立即重读内容。
-   *
-   * 待确认：当前 `refreshContext` 只检查 Snapshot 已安装，没有重新读取 Context 或刷新缓存。
-   */
-  refreshMemoryContext(): Promise<void>;
   /**
    * Read the Runtime Snapshot currently installed on this Session facet.
    *
@@ -318,7 +309,7 @@ export interface RuntimeAgentConfigControls<Command, Change> {
 /** Type-only Host extension seam implemented by AgentRuntimeKernel. */
 declare class RuntimeAgentHostSeam {
   protected prepareToolInteractionResponse(
-    input: import("./runtime").ToolInteractionResponsePreparation,
+    input: import("./agent").ToolInteractionResponsePreparation,
   ): Promise<unknown | null>;
 }
 
@@ -449,6 +440,10 @@ export function defineRuntimeAgent<
         return this.ensureConfig();
       }
 
+      protected override ensureRuntimeVersion(runtimeKey: string): Promise<void> {
+        return this.ensureConfig(runtimeKey);
+      }
+
       protected async prepareRuntimeForSubmission(submissionId: string): Promise<void> {
         const beforeSubmission = definition.beforeSubmission as RuntimeAgentDefinitionBase<Env, Config, Command, Change>["beforeSubmission"];
         try {
@@ -502,14 +497,6 @@ export function defineRuntimeAgent<
         }
       }
 
-      // 作用：确保 Runtime 可用后请求 Kernel 刷新 Session Context。
-      // 调用：Inbox 等 RPC 调用方在外部 Context 变更后调用。
-      // 待确认：当前 Kernel 的 `refreshContext` 只检查 Snapshot，并未执行实际刷新。
-      async refreshMemoryContext(): Promise<void> {
-        await this.ensureRuntimeReady();
-        await this.refreshContext();
-      }
-
       async getRuntimeAssembly(): Promise<RuntimeAssemblyView> {
         await this.ensureRuntimeReady();
         return this.readRuntimeAssembly();
@@ -666,7 +653,10 @@ export function defineRuntimeAgent<
               ...(telemetry ? { telemetry } : {}),
             });
 
-            await this.initCandidate(candidate);
+            await this.initCandidate({
+              ...candidate,
+              runtimeKey: resolvedRuntimeKey,
+            });
             this.hasLoadedRuntime = true;
             this.loadedRuntimeKey = resolvedRuntimeKey;
             this.runtimeLoad.complete();

package/src/adapter/cloudflare/dynamic-worker-observability.ts

@@ -1,4 +1,4 @@
-import type { RuntimePlatformPort } from "../../kernel/bindings";
+import type { RuntimePlatformPort } from "../../config/ports";
 import { WorkerEntrypoint } from "cloudflare:workers";
 
 export type DynamicWorkerObservation = {

package/src/adapter/cloudflare/resources/runtime-resources.ts

@@ -1,7 +1,7 @@
-import type { RuntimeDegradation } from "../../../kernel/degradation";
-import type { RuntimeExtensionConfig } from "../../../kernel/extensions";
-import { withRuntimeLoadTimeout } from "../../../kernel/runtime-load";
-import type { RuntimeExtensionContribution } from "../../../runtime-definition";
+import type { RuntimeDegradation } from "../../../config/degradation";
+import type { RuntimeExtensionConfig } from "../../../context/extension/contracts";
+import { withRuntimeLoadTimeout } from "../../../config/runtime-load";
+import type { RuntimeExtensionContribution } from "../../../config/definition";
 export { createR2SkillSource } from "./r2-skill-source";
 
 export interface CloudflareRuntimeExtensionSource {

package/src/adapter/cloudflare/sandbox/adapter.ts

@@ -24,7 +24,7 @@ import {
   type SandboxSyncFailure,
   type SandboxSyncResult,
   type WorkspacePort,
-} from "../../../kernel/bindings";
+} from "../../../config/ports";
 import type {
   WorkspaceFileVersion,
   WorkspacePublishPort,

package/src/{db → adapter/cloudflare}/schema.ts

@@ -4,8 +4,7 @@ import type { SqlTaggedTemplate } from "agents/chat";
 // 创建当前 Runtime 需要但尚不存在的 SQLite 表。
 // AgentRuntimeKernel 构造时通过 RuntimeDatabase.initializeSchema 调用，重复启动依赖 IF NOT EXISTS 保留现有表。
 // pi_approvals 有一次显式的 risk → 四档升级；步骤均可重入，中断后下次初始化会继续。
-// pi_tool_interactions 是 client-settled tool 的 pending 索引：结果的权威副本仍在 pi_tool_settlements，
-// 这张表只回答「这次工具调用还等不等得到客户端响应」。
+// pi_tool_interactions 只保存宿主交互事实；Tool 结果由 Pi Session 唯一持久化。
 export function initializeSchema(sql: SqlTaggedTemplate): void {
   sql`CREATE TABLE IF NOT EXISTS pi_message_ui (
     message_id TEXT PRIMARY KEY,
@@ -23,31 +22,21 @@ export function initializeSchema(sql: SqlTaggedTemplate): void {
     assembly_revision TEXT NOT NULL,
     assembly_descriptor TEXT NOT NULL,
     assistant_message_id TEXT NOT NULL,
-    abort_reason TEXT,
-    recovery_error_count INTEGER NOT NULL DEFAULT 0,
-    recovery_reason TEXT,
-    context_overflow_retried INTEGER NOT NULL DEFAULT 0
+    abort_reason TEXT
   )`;
   const submissionColumns = new Set(
     sql<{ name: string }>`PRAGMA table_info(pi_submissions)`
       .map((column) => column.name),
   );
+  if (!submissionColumns.has("runtime_key")) {
+    sql`ALTER TABLE pi_submissions ADD COLUMN runtime_key TEXT NOT NULL DEFAULT ''`;
+  }
   if (!submissionColumns.has("run_id")) {
     sql`ALTER TABLE pi_submissions ADD COLUMN run_id TEXT`;
   }
   if (!submissionColumns.has("admission_retryable")) {
     sql`ALTER TABLE pi_submissions ADD COLUMN admission_retryable INTEGER`;
   }
-  // 跨执行片累计的模型回合数。让步把一个 Turn 切成多片后，每片的回合计数都从 0 开始，
-  // 只有把总数落到持久层，全局预算才拦得住「一直让步、永不收敛」的工具循环。
-  if (!submissionColumns.has("model_turns")) {
-    sql`ALTER TABLE pi_submissions
-        ADD COLUMN model_turns INTEGER NOT NULL DEFAULT 0`;
-  }
-  // 当前让步片的标识。用来丢弃重复到期的续跑 alarm，并让看门狗判断这一轮有没有推进。
-  if (!submissionColumns.has("continuation_id")) {
-    sql`ALTER TABLE pi_submissions ADD COLUMN continuation_id TEXT`;
-  }
   sql`CREATE UNIQUE INDEX IF NOT EXISTS pi_submissions_run_id
       ON pi_submissions(run_id) WHERE run_id IS NOT NULL`;
   if (!submissionColumns.has("queued_input_json")) {
@@ -62,17 +51,6 @@ export function initializeSchema(sql: SqlTaggedTemplate): void {
   if (!submissionColumns.has("regenerate_message_id")) {
     sql`ALTER TABLE pi_submissions ADD COLUMN regenerate_message_id TEXT`;
   }
-  if (!submissionColumns.has("recovery_error_count")) {
-    sql`ALTER TABLE pi_submissions
-        ADD COLUMN recovery_error_count INTEGER NOT NULL DEFAULT 0`;
-  }
-  if (!submissionColumns.has("recovery_reason")) {
-    sql`ALTER TABLE pi_submissions ADD COLUMN recovery_reason TEXT`;
-  }
-  if (!submissionColumns.has("context_overflow_retried")) {
-    sql`ALTER TABLE pi_submissions
-        ADD COLUMN context_overflow_retried INTEGER NOT NULL DEFAULT 0`;
-  }
   sql`CREATE UNIQUE INDEX IF NOT EXISTS pi_submissions_one_running
       ON pi_submissions(status)
       WHERE status = 'running'`;
@@ -80,20 +58,21 @@ export function initializeSchema(sql: SqlTaggedTemplate): void {
     steer_id TEXT PRIMARY KEY,
     submission_id TEXT NOT NULL,
     message_id TEXT NOT NULL UNIQUE,
+    harness_entry_id TEXT,
     canonical_json TEXT NOT NULL,
     ui_message_json TEXT,
     created_at INTEGER NOT NULL
   )`;
-  sql`CREATE TABLE IF NOT EXISTS pi_tool_settlements (
-    submission_id TEXT NOT NULL,
-    tool_call_id TEXT NOT NULL,
-    tool_name TEXT NOT NULL,
-    args TEXT NOT NULL,
-    result TEXT NOT NULL,
-    is_error INTEGER NOT NULL,
-    created_at INTEGER NOT NULL,
-    PRIMARY KEY (submission_id, tool_call_id)
-  )`;
+  const steerColumns = new Set(
+    sql<{ name: string }>`PRAGMA table_info(pi_pending_steers)`
+      .map((column) => column.name),
+  );
+  if (!steerColumns.has("harness_entry_id")) {
+    sql`ALTER TABLE pi_pending_steers ADD COLUMN harness_entry_id TEXT`;
+  }
+  sql`CREATE UNIQUE INDEX IF NOT EXISTS pi_pending_steers_harness_entry_id
+      ON pi_pending_steers(harness_entry_id)
+      WHERE harness_entry_id IS NOT NULL`;
   sql`CREATE TABLE IF NOT EXISTS pi_turn_event_outbox (
     event_id TEXT PRIMARY KEY,
     body TEXT NOT NULL,
@@ -211,52 +190,6 @@ export function initializeSchema(sql: SqlTaggedTemplate): void {
     responded_at INTEGER,
     UNIQUE (submission_id, tool_call_id)
   )`;
-  sql`CREATE TABLE IF NOT EXISTS pi_recovery_milestones (
-    submission_id TEXT NOT NULL,
-    seq INTEGER NOT NULL,
-    milestone_key TEXT NOT NULL,
-    body TEXT NOT NULL,
-    PRIMARY KEY (submission_id, seq),
-    UNIQUE (submission_id, milestone_key)
-  )`;
-  sql`UPDATE pi_recovery_milestones
-      SET body = json_remove(
-        json_set(
-          body,
-          '$.approval.executionLevel', 'safe',
-          '$.approval.requiredExecutionLevel',
-          COALESCE(json_extract(body, '$.approval.risk'), 'safe')
-        ),
-        '$.approval.risk'
-      )
-      WHERE json_valid(body)
-        AND json_extract(body, '$.version') = 1
-        AND json_extract(body, '$.type') = 'approval'
-        AND json_type(body, '$.turnId') = 'text'
-        AND json_type(body, '$.assemblyRevision') = 'text'
-        AND json_type(body, '$.approval') = 'object'
-        AND json_type(body, '$.approval.executionId') = 'text'
-        AND json_type(body, '$.approval.requestId') = 'text'
-        AND json_extract(body, '$.approval.source') IN (
-          'action', 'codemode', 'temporary-agent'
-        )
-        AND json_type(body, '$.approval.toolCallId') = 'text'
-        AND json_type(body, '$.approval.toolName') = 'text'
-        AND json_type(body, '$.approval.summary') = 'text'
-        AND json_type(body, '$.approval.inputJson') = 'text'
-        AND json_type(body, '$.approval.createdAt') IN ('integer', 'real')
-        AND json_extract(body, '$.approval.status') IN (
-          'pending', 'approved', 'rejected'
-        )
-        AND (
-          json_type(body, '$.approval.risk') IS NULL
-          OR json_type(body, '$.approval.risk') = 'null'
-          OR json_extract(body, '$.approval.risk') IN (
-            'low', 'medium', 'high'
-          )
-        )
-        AND json_type(body, '$.approval.executionLevel') IS NULL
-        AND json_type(body, '$.approval.requiredExecutionLevel') IS NULL`;
   sql`CREATE TABLE IF NOT EXISTS pi_extension_context (
     label TEXT PRIMARY KEY,
     content TEXT NOT NULL,

package/src/adapter/cloudflare/subagent/definition.ts

@@ -7,29 +7,31 @@ import {
   type FiberRecoveryContext,
   type FiberRecoveryResult,
 } from "agents";
-import type { AgentEvent } from "@earendil-works/pi-agent-core";
+import type { HarnessEvent } from "@earendil-works/pi-agent-core";
+import type { UIMessageChunk } from "ai";
 import {
   AGENT_TYPES,
-} from "../../../layers/orchestration/subagents/agent-types/registry";
-import type { AgentType } from "../../../layers/orchestration/subagents/agent-types/contract";
+} from "../../../tools/subagent-types/registry";
+import type { AgentType } from "../../../tools/subagent-types/contract";
 import type {
   RuntimeProviderPort,
   WorkspacePort,
-} from "../../../kernel/bindings";
-import { PiChunkEncoder } from "../../../pi/message";
+} from "../../../config/ports";
+import { HarnessStreamProjection } from "../../../conversation/harness-stream";
 import {
   createPiModels,
   resolvePiModel,
-  withProviderRetry,
-} from "../../../pi/runtime-adapter/models";
+  withProviderBoundary,
+} from "../../../models";
 import { runCloudflareSubAgent } from "./runner";
+import { openCloudflareSession } from "../../../session";
 import {
   addSubagentUsage,
   decodeSubagentCompletion,
   emptySubagentUsage,
   encodeSubagentCompletion,
-} from "../../../kernel/subagent-runtime";
-import type { RuntimeSubagentUsageMetrics } from "../../../kernel/submission-authority";
+} from "../../../tools/subagent-runtime";
+import type { RuntimeSubagentUsageMetrics } from "../../../tools/subagent-authority";
 import { createCloudflareSubAgentTools } from "./tools";
 
 type RunStatus =
@@ -92,24 +94,24 @@ function stringifyJson(value: unknown): string {
 }
 
 function progressFor(
-  event: AgentEvent,
+  event: HarnessEvent,
 ): Omit<AgentToolProgressSnapshot, "at"> | null {
-  if (event.type === "agent_start") {
+  if (event.type === "run_start" || event.type === "run_resume") {
     return { phase: "running", message: "SubAgent started" };
   }
-  if (event.type === "tool_execution_start") {
+  if (event.type === "tool_start") {
     return {
       phase: "tool",
       message: `Running ${event.toolName}`,
     };
   }
-  if (event.type === "tool_execution_update") {
+  if (event.type === "tool_update") {
     return {
       phase: "tool",
       message: `${event.toolName} is still running`,
     };
   }
-  if (event.type === "tool_execution_end") {
+  if (event.type === "tool_end") {
     return {
       phase: event.isError ? "tool-error" : "tool",
       message: event.isError
@@ -362,6 +364,15 @@ export abstract class CloudflareSubAgent<
     `;
 
     const usage = this.readUsage(runId);
+    let streamSequence = 0;
+    let projection: HarnessStreamProjection | undefined;
+    const publish = (chunks: readonly UIMessageChunk[]) => {
+      for (const chunk of chunks) {
+        this.appendChunk(runId, stringifyJson({
+          v: 1, messageId: runId, sequence: streamSequence++, chunk,
+        }));
+      }
+    };
     try {
       const { provider, workspace, loader, outbound } =
         await this.prepareExecution();
@@ -387,16 +398,19 @@ export abstract class CloudflareSubAgent<
           );
         },
       });
-      let streamSequence = 0;
-      const encoder = new PiChunkEncoder({
+      projection = new HarnessStreamProjection({
         messageId: runId,
+        turnId: runId,
         startedAt: this.readRun(runId)?.started_at ?? Date.now(),
       });
       const output = await runCloudflareSubAgent({
         type,
         input,
         model,
-        streamFn: withProviderRetry(models.streamSimple.bind(models)),
+        models,
+        openSession: () => openCloudflareSession(this.ctx.storage),
+        operationId: runId,
+        streamFn: withProviderBoundary(models.streamSimple.bind(models)),
         tools,
         signal,
         onEvent: (event) => {
@@ -404,20 +418,19 @@ export abstract class CloudflareSubAgent<
             addSubagentUsage(usage, event.message.usage);
             this.persistUsage(runId, usage);
           }
-          for (const chunk of encoder.encode(event)) {
-            this.appendChunk(runId, stringifyJson({
-              v: 1,
-              messageId: runId,
-              sequence: streamSequence++,
-              chunk,
-            }));
-          }
+          publish(projection!.event(event));
           const progress = progressFor(event);
           if (progress) this.persistProgress(runId, progress);
         },
       });
+      publish(projection.finish({ status: "completed", endedAt: Date.now() }));
       this.completeRun(runId, output, usage);
     } catch (error) {
+      if (projection) publish(projection.finish({
+        status: signal.aborted ? "aborted" : "failed",
+        endedAt: Date.now(),
+        error: { code: signal.aborted ? "aborted" : "failed", message: errorMessage(error) },
+      }));
       this.failRun(
         runId,
         signal.aborted ? "aborted" : "error",
@@ -611,16 +624,33 @@ export abstract class CloudflareSubAgent<
       typeof context.metadata?.runId === "string"
         ? context.metadata.runId
         : context.idempotencyKey;
-    if (runId) {
-      this.failRun(
-        runId,
-        "error",
-        "SubAgent run was interrupted before completion",
-      );
+    if (!runId) {
+      return { status: "interrupted", reason: "SubAgent run ID is missing" };
+    }
+    const row = this.readRun(runId);
+    if (!row) {
+      return { status: "interrupted", reason: "SubAgent run is missing" };
+    }
+    if (!TERMINAL.has(row.status)) {
+      const type = this.resolveType(row.agent_type);
+      const input = type.inputSchema.parse(parseJson(row.input_json));
+      await this.executeRun(runId, type, input, new AbortController().signal);
+    }
+    const recovered = this.readRun(runId);
+    if (recovered?.status === "completed") {
+      return { status: "completed", snapshot: { runId } };
+    }
+    if (recovered?.status === "aborted") {
+      return {
+        status: "aborted",
+        reason: recovered.error_message ?? "SubAgent run aborted",
+        snapshot: { runId },
+      };
     }
     return {
-      status: "interrupted",
-      reason: "SubAgent run was interrupted before completion",
+      status: "error",
+      error: recovered?.error_message ?? "SubAgent recovery failed",
+      snapshot: { runId },
     };
   }
 }