@springbrand/agent-runtime 0.3.0-alpha.2 → 0.3.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/agent-runtime",
-  "version": "0.3.0-alpha.2",
+  "version": "0.3.0-alpha.4",
   "type": "module",
   "files": [
     "src",
@@ -17,10 +17,10 @@
     "./models": "./src/lib/model-catalog.ts"
   },
   "dependencies": {
-    "@cloudflare/codemode": "0.5.1",
+    "@cloudflare/codemode": "0.5.2",
     "@cloudflare/sandbox": "0.12.4",
     "@cloudflare/shell": "0.4.3",
-    "@cloudflare/think": "0.17.0",
+    "@cloudflare/think": "0.18.0",
     "@earendil-works/pi-agent-core": "0.85.1",
     "@earendil-works/pi-ai": "0.85.1",
     "@types/lodash-es": "^4.17.12",
@@ -30,11 +30,11 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "agents": "^0.22.0",
+    "agents": "^0.23.0",
     "ai": "^7.0.0"
   },
   "devDependencies": {
-    "agents": "0.22.0",
+    "agents": "0.23.0",
     "ai": "7.0.56"
   }
 }

package/src/adapter/cloudflare/define-agent.ts

@@ -114,7 +114,7 @@ interface RuntimeAgentDefinitionBase<
   /** Prepare the optional telemetry consumer for this concrete Agent facet. */
   readonly telemetry?: (
     context: RuntimeAgentPlanningContext<Env, Command, Change>,
-  ) => AgentTelemetryBinding | undefined;
+  ) => AgentTelemetryBinding | undefined | Promise<AgentTelemetryBinding | undefined>;
 }
 
 export interface ReadonlyRuntimeAgentDefinition<
@@ -406,14 +406,14 @@ export function defineRuntimeAgent<
     | MutableRuntimeAgentDefinition<Env, Config, Command, Change>
     | ReadonlyRuntimeAgentDefinition<Env, Config>,
 ): RuntimeAgentClass<Env, Command, Change> {
-  const resolveDefinitionTelemetry = (
+  const resolveDefinitionTelemetry = async (
     context: RuntimeAgentPlanningContext<Env, Command, Change>,
-  ): AgentTelemetryBinding | undefined => {
+  ): Promise<AgentTelemetryBinding | undefined> => {
     const telemetry = definition.telemetry;
     if (!telemetry) return undefined;
-    return (telemetry as (
+    return await (telemetry as (
       context: RuntimeAgentPlanningContext<Env, Command, Change>,
-    ) => AgentTelemetryBinding | undefined)(context);
+    ) => AgentTelemetryBinding | undefined | Promise<AgentTelemetryBinding | undefined>)(context);
   };
 
   const GeneratedRuntimeAgent = {
@@ -635,7 +635,7 @@ export function defineRuntimeAgent<
             let resources = loaded.resources;
             let commitGuard = loaded.commitGuard;
             if (!this.telemetryResolved) {
-              this.resolvedTelemetry = resolveDefinitionTelemetry(context);
+              this.resolvedTelemetry = await resolveDefinitionTelemetry(context);
               this.telemetryResolved = true;
             }
             const telemetry = this.resolvedTelemetry;

package/src/context/assembly.ts

@@ -1,4 +1,4 @@
-import { estimateStringTokens } from "agents/experimental/memory/utils";
+import { estimateStringTokens } from "../lib/token-estimate";
 import type { RuntimeMemoryPort } from "../config/ports";
 import type { RuntimeDegradation } from "../config/degradation";
 import type { RuntimeMemoryProfile } from "../config/profile";

package/src/lib/token-estimate.ts

@@ -0,0 +1,8 @@
+/** Conservative token estimate for prompt budgeting, not provider billing. */
+export function estimateStringTokens(text: string): number {
+  if (!text) return 0;
+  return Math.ceil(Math.max(
+    text.length / 4,
+    text.split(/\s+/u).filter(Boolean).length * 1.3,
+  ));
+}

package/src/session/cloudflare/migration.ts

@@ -43,6 +43,13 @@ const RETIRED_SCHEDULE_CALLBACKS = [
   "_chatRecoveryRetry",
 ] as const;
 
+const LEGACY_TERMINAL_SUBMISSION_STATUSES = new Set([
+  "completed",
+  "failed",
+  "aborted",
+  "skipped",
+]);
+
 type LegacyRecord = Record<string, unknown> & {
   id: string;
   parentId: string | null;
@@ -310,6 +317,34 @@ function hasToolExecution(value: ToolExecution | undefined): boolean {
       typeof value.args === "object" && !Array.isArray(value.args));
 }
 
+/** A terminal Submission cannot resume, so its stale lane pointer is not active work. */
+function clearTerminalOperationPointers(sql: SqlStorage): void {
+  if (!hasTable(sql, "pi_submissions")) return;
+  const lanes = sql.exec<{ key: string; body: string }>(
+    "SELECT key, body FROM pi_values WHERE namespace = ?",
+    laneState("").namespace,
+  ).toArray();
+  for (const lane of lanes) {
+    const state = JSON.parse(lane.body) as LaneState;
+    if (state.currentOperationId === null) continue;
+    const terminal = sql.exec(
+      `SELECT 1 FROM pi_submissions
+       WHERE submission_id = ?
+         AND status IN ('completed', 'failed', 'aborted', 'skipped')
+       LIMIT 1`,
+      state.currentOperationId,
+    ).toArray().length === 1;
+    if (!terminal) continue;
+    sql.exec(
+      `UPDATE pi_values
+       SET body = json_set(body, '$.currentOperationId', json('null'))
+       WHERE namespace = ? AND key = ?`,
+      laneState("").namespace,
+      lane.key,
+    );
+  }
+}
+
 /** Old active tool outcomes cannot be reconstructed from error text or approval facts. */
 function assertActiveToolProvenance(sql: SqlStorage): void {
   const read = <T>(address: Value<T>): T | undefined => {
@@ -379,6 +414,7 @@ export function migrateCurrentPiSession(
     if (version !== 1 && version !== 2) {
       throw new Error(`Unsupported Cloudflare Pi storage version: ${version}`);
     }
+    clearTerminalOperationPointers(sql);
     assertActiveToolProvenance(sql);
     if (version === 1) removeRetiredRuntimeArtifacts(sql);
     repairDuplicatedUserSidecars(sql);
@@ -761,6 +797,9 @@ export function migrateLegacyPiSession(
         const knownSubmissions = new Set(
           submissions.map((row) => row.submission_id),
         );
+        const submissionStatuses = new Map(
+          submissions.map((row) => [row.submission_id, row.status]),
+        );
         for (const submission of submissions) {
           if (submission.status !== "pending" || !submission.queued_input_json)
             continue;
@@ -809,8 +848,12 @@ export function migrateLegacyPiSession(
             if (!knownSubmissions.has(row.submission_id))
               throw new Error("Dangling recovery submission");
             const record = decodePiToolRecoveryMilestone(row.body);
-            if (!record || record.turnId !== row.submission_id)
+            if (!record || record.turnId !== row.submission_id) {
+              if (LEGACY_TERMINAL_SUBMISSION_STATUSES.has(
+                submissionStatuses.get(row.submission_id) ?? "",
+              )) continue;
               throw new Error("Invalid legacy recovery milestone");
+            }
             const bodies = bySubmission.get(row.submission_id) ?? [];
             bodies.push(row.body);
             bySubmission.set(row.submission_id, bodies);

package/src/tools/base.ts

@@ -8,7 +8,7 @@ import {
   type Static,
   type TSchema,
 } from "@earendil-works/pi-ai";
-import { estimateStringTokens } from "agents/experimental/memory/utils";
+import { estimateStringTokens } from "../lib/token-estimate";
 import type { RuntimeMemoryPort } from "../config/ports";
 import type { RuntimeMemoryProfile } from "../config/profile";
 import { serializeOutput } from "../lib/artifacts";