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

package/src/adapter/cloudflare/scheduling/zoned-cron.ts

@@ -55,7 +55,8 @@ export function nextCronOccurrence(
         for (const second of parsed.seconds) {
           const wall = day + hour * 3_600_000 + minute * 60_000 + second * 1_000;
           if (wall <= wallAfter) continue;
-          const resolved = wallTimeCandidates(wall, timeZone, after)[0];
+          const resolved = wallTimeInstants(wall, timeZone)
+            .find((instant) => instant > after);
           if (resolved !== undefined) return resolved;
         }
       }
@@ -73,18 +74,22 @@ export function isValidTimeZone(timeZone: string): boolean {
   }
 }
 
-function wallTimeCandidates(wallUtc: number, timeZone: string, after: number): number[] {
+/**
+ * 所有本地墙上时间恰好等于 `wallUtc` 的 UTC 瞬时,升序。
+ *
+ * `wallUtc` 是"把本地钟点当作 UTC"的伪瞬时(见 {@link zoneOffsetMs})。
+ * 返回空数组 = 该钟点在当地被夏令时拨快抹掉;返回两个 = 拨慢导致同一钟点出现两次。
+ * 这是 `nextCronOccurrence` 与本地规则计算共用的唯一钟点解析边界。
+ */
+export function wallTimeInstants(wallUtc: number, timeZone: string): number[] {
   const offsets = new Set([
-    zoneOffsetMs(after, timeZone),
     zoneOffsetMs(wallUtc - 2 * 86_400_000, timeZone),
     zoneOffsetMs(wallUtc, timeZone),
     zoneOffsetMs(wallUtc + 2 * 86_400_000, timeZone),
   ]);
   return [...offsets]
     .map((offset) => wallUtc - offset)
-    .filter((instant) =>
-      instant > after && instant + zoneOffsetMs(instant, timeZone) === wallUtc
-    )
+    .filter((instant) => instant + zoneOffsetMs(instant, timeZone) === wallUtc)
     .sort((left, right) => left - right);
 }
 

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,16 +51,17 @@ 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("origin")) {
+    sql`ALTER TABLE pi_submissions ADD COLUMN origin TEXT NOT NULL DEFAULT 'user'`;
+  }
+  if (!submissionColumns.has("scheduled_max_execution_level")) {
+    sql`ALTER TABLE pi_submissions ADD COLUMN scheduled_max_execution_level TEXT`;
   }
-  if (!submissionColumns.has("recovery_reason")) {
-    sql`ALTER TABLE pi_submissions ADD COLUMN recovery_reason TEXT`;
+  if (!submissionColumns.has("unattended_execution_grant_json")) {
+    sql`ALTER TABLE pi_submissions ADD COLUMN unattended_execution_grant_json TEXT`;
   }
-  if (!submissionColumns.has("context_overflow_retried")) {
-    sql`ALTER TABLE pi_submissions
-        ADD COLUMN context_overflow_retried INTEGER NOT NULL DEFAULT 0`;
+  if (!submissionColumns.has("unattended_failure")) {
+    sql`ALTER TABLE pi_submissions ADD COLUMN unattended_failure TEXT`;
   }
   sql`CREATE UNIQUE INDEX IF NOT EXISTS pi_submissions_one_running
       ON pi_submissions(status)
@@ -80,20 +70,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,
@@ -177,6 +168,9 @@ export function initializeSchema(sql: SqlTaggedTemplate): void {
         .map((column) => column.name),
     );
   let columns = approvalColumns();
+  if (!columns.has("confirmation_json")) {
+    sql`ALTER TABLE pi_approvals ADD COLUMN confirmation_json TEXT`;
+  }
   if (!columns.has("execution_level")) {
     // 旧 Session 没有持久化当时的授权档位，safe 失败关闭；只影响旧 pending 回执展示，不会静默放行。
     sql`ALTER TABLE pi_approvals
@@ -211,52 +205,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 },
     };
   }
 }