@springbrand/agent-runtime 0.3.0-alpha.20 → 0.3.0-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/agent-runtime",
-  "version": "0.3.0-alpha.20",
+  "version": "0.3.0-alpha.22",
   "type": "module",
   "files": [
     "src",
@@ -17,10 +17,10 @@
     "./models": "./src/lib/model-catalog.ts"
   },
   "dependencies": {
-    "@cloudflare/codemode": "0.5.2",
+    "@cloudflare/codemode": "0.5.4",
     "@cloudflare/sandbox": "0.12.4",
     "@cloudflare/shell": "0.4.3",
-    "@cloudflare/think": "0.18.0",
+    "@cloudflare/think": "0.20.2",
     "@earendil-works/pi-agent-core": "1.1.0",
     "@earendil-works/pi-ai": "1.1.0",
     "@types/lodash-es": "^4.17.12",
@@ -32,11 +32,11 @@
     "@earendil-works/chord": "1.1.0"
   },
   "peerDependencies": {
-    "agents": "^0.23.0",
+    "agents": ">=0.28.1 <0.29.0",
     "ai": "^7.0.0"
   },
   "devDependencies": {
-    "agents": "0.23.0",
+    "agents": "0.28.1",
     "ai": "7.0.56"
   }
 }

package/src/adapter/cloudflare/agent.ts

@@ -19,6 +19,7 @@ import {
   isTerminalSubmissionStatus,
   SubmissionLifecycle,
   SubmissionAdmission,
+  ADMISSION_ATTEMPT_WINDOW_MS,
   SubmissionDelivery,
   SubmissionFinalizer,
   projectSubmissionReceipt,
@@ -33,6 +34,8 @@ import {
   type SubmissionReceipt,
   type SubmissionExecutionMode,
   type SubmissionHandle,
+  type StoredRuntimeKey,
+  type RuntimeKeyRewrite,
   type RuntimeUnattendedExecutionGrant,
 } from "../../submission";
 import type { ExecutionLevel } from "../../lib/execution-level";
@@ -43,7 +46,6 @@ import {
   RuntimeLoadTracker,
   prepareRuntimeCandidate,
   projectRuntimeAssembly,
-  type PreparedPiRuntime,
   type RuntimeAssemblyInput,
   type RuntimeAssemblyView,
   type RuntimeCandidate,
@@ -88,7 +90,10 @@ import {
   type TemporaryAgentRequest,
   type TemporaryAgentRunContext,
 } from "../../tools";
-import { sha256Hex } from "../../lib/artifacts";
+import {
+  ASK_USER_TOOL_NAME,
+  askUserPiToolCandidate,
+} from "../../tools/assistant/ask-user";
 import { RuntimeDatabase } from "./database";
 
 /**
@@ -156,17 +161,22 @@ export abstract class AgentRuntimeKernel<
   };
 
   protected abstract ensureRuntimeReady(): Promise<void>;
-  /** Prepare per-Submission Host state before the first assembly pin. */
+  /** Prepare per-Submission Host state before first execution. */
   protected prepareRuntimeForSubmission(_submissionId: string): Promise<void> {
     return this.ensureRuntimeReady();
   }
 
   /** Runs before a new Submission records its Runtime key. */
-  protected prepareRuntimeForAdmission(): Promise<void> {
-    return this.ensureRuntimeReady();
+  protected async prepareRuntimeForAdmission(): Promise<{
+    runtimeKey: string;
+    admission?: ActiveRuntime["admission"];
+  }> {
+    await this.ensureRuntimeReady();
+    const runtime = this.requireRuntime();
+    return { runtimeKey: runtime.runtimeKey, admission: runtime.admission };
   }
 
-  protected ensureRuntimeVersion(_runtimeKey: string): Promise<void> {
+  protected ensureRuntimeVersion(_runtimeKey: string, _force = false): Promise<void> {
     return this.ensureRuntimeReady();
   }
   protected get submissionContext() {
@@ -176,6 +186,37 @@ export abstract class AgentRuntimeKernel<
     };
   }
 
+  /** Narrow storage seam for Host-validated, one-time Agent identity upgrades. */
+  protected savedRuntimeKeys(): readonly StoredRuntimeKey[] {
+    return this.db.submissions.listRuntimeKeys();
+  }
+
+  protected rewriteSavedRuntimeKeys(rewrites: readonly RuntimeKeyRewrite[]): void {
+    this.db.submissions.rewriteRuntimeKeys(rewrites);
+  }
+
+  /** One Runtime-owned fact for Host lifecycle guards; includes async preparation. */
+  protected hasUnfinishedRuntimeWork(): boolean {
+    return this.submissions.isBusy() ||
+      this.db.submissionAdmissions.countPending(Date.now() - ADMISSION_ATTEMPT_WINDOW_MS) > 0 ||
+      this.db.agentTools.hasRunning() ||
+      Boolean(
+        this.state.turn?.activeSubmissionId ||
+        this.state.approvals?.length ||
+        (this.state.activity?.activity && this.state.activity.activity !== "idle"),
+      );
+  }
+
+  /** True while a Submission owns this Chat's active execution slice. */
+  protected isSubmissionExecuting(): boolean {
+    return this.submissions.currentActive() !== undefined;
+  }
+
+  /** External Runtime changes share the same serial queue as Submission execution. */
+  protected runConfigControl<T>(run: () => Promise<T>): Promise<T> {
+    return this.submissions.runConfigControl(run);
+  }
+
   /** Let the Host prepare a validated client response before Tool settlement. */
   protected prepareToolInteractionResponse(
     input: ToolInteractionResponsePreparation,
@@ -318,7 +359,6 @@ export abstract class AgentRuntimeKernel<
       createExtensionHostBinding: (permissions, labels) =>
         this.createExtensionHostBinding(permissions, labels),
       advance: (phase) => this.runtimeLoad.advance(phase),
-      isExecuting: () => Boolean(this.submissions.currentActive()),
       commit: (runtime) => {
         this.telemetry.configure(candidate.telemetry);
         this.activeRuntime = runtime;
@@ -516,57 +556,7 @@ export abstract class AgentRuntimeKernel<
 
   // #endregion
 
-  // #region Submission 准入与配置固定
-
-  /** Pin dynamic Context and execution policy before the first assembly is used. */
-  private async admissionPin(fresh: boolean, submissionId: string): Promise<{
-    revision: string;
-    descriptor: string;
-  }> {
-    if (fresh) await this.prepareRuntimeForSubmission(submissionId);
-    const submission = this.db.submissions.find(submissionId);
-    if (!submission) {
-      throw new Error(`Unknown SpringBrand submission: ${submissionId}`);
-    }
-    return this.currentAssemblyPin(submission.origin !== "scheduled");
-  }
-
-  // initConfig can call this inside its serialized load; re-entering ensureRuntimeReady would deadlock.
-  private async currentAssemblyPin(includeMemory = true): Promise<{
-    revision: string;
-    descriptor: string;
-  }> {
-    await this.runtimeTurnEvents.drain();
-    const runtime = this.activeRuntime;
-    if (!runtime) {
-      throw new Error("Runtime revision is not initialized");
-    }
-    return this.pinAssembly(runtime.pi, runtime.revision, includeMemory);
-  }
-
-  private async pinAssembly(
-    prepared: PreparedPiRuntime,
-    baseRevision: string,
-    includeMemory: boolean,
-  ): Promise<{ revision: string; descriptor: string }> {
-    const pinned = await this.pi.pin({
-      prepared,
-      baseRevision,
-      includeMemory,
-      readExtensionContext: ({ label }) =>
-        this._hostGetContext(label),
-    });
-    if (pinned.degradations.length > 0) {
-      console.warn(
-        "[runtime-context:degraded]",
-        json({ degradations: pinned.degradations }),
-      );
-    }
-    return {
-      revision: await sha256Hex(pinned.descriptor),
-      descriptor: pinned.descriptor,
-    };
-  }
+  // #region Submission 准入与当前配置
 
   private get admission(): SubmissionAdmission {
     return this.submissionAdmission ??= new SubmissionAdmission({
@@ -574,10 +564,7 @@ export abstract class AgentRuntimeKernel<
       steers: this.db.steers,
       submissions: this.db.submissions,
       transaction: (run) => this.db.transaction(run),
-      prepareRuntime: async () => {
-        await this.prepareRuntimeForAdmission();
-        return { runtimeKey: this.activeRuntime!.runtimeKey, admission: this.activeRuntime?.admission };
-      },
+      prepareRuntime: () => this.prepareRuntimeForAdmission(),
       findUserMessage: (id) => this.transcript.findUserMessage(id),
       onAdmitted: (submission, hostAccepted) =>
         this.runtimeTurnEvents.submissionAdmitted(submission, hostAccepted),
@@ -783,27 +770,32 @@ export abstract class AgentRuntimeKernel<
   ): Promise<StoredSubmission> {
     const continuation = mode !== "fresh";
     const submissionId = submission.submissionId;
-    submission = await this.admission.pin(
+    submission = await this.admission.prepareCurrentRuntime(
       submission,
-      () => this.admissionPin(mode === "fresh", submissionId),
-      (key) => this.ensureRuntimeVersion(key),
+      (key) => this.ensureRuntimeVersion(key, true),
     );
+    if (!continuation) await this.prepareRuntimeForSubmission(submissionId);
+    await this.runtimeTurnEvents.drain();
     const activeRuntime = this.requireRuntime();
     // A fresh provider Session per Submission keeps one failing upstream route from pinning later turns.
     const recovery = new ModelRecovery(submissionId);
-    const harnessInput = this.pi.harnessInputs(
+    const harnessInput = await this.pi.harnessInputs(
       activeRuntime.pi,
-      submission.assemblyDescriptor,
       {
-          modelSessionId: () => recovery.sessionId(),
-          assertRequestAllowed: () => {
-            const current = this.db.submissions.find(submissionId);
-            if (current?.abortReason || current?.unattendedFailure) throw new Error(current.abortReason ?? current.unattendedFailure!);
-          },
-          onGeneration: (event) => this.telemetry.generation(submissionId, event),
-          onCompactionGeneration: (event) => this.runtimeTurnEvents.compactionGeneration(submissionId, event),
+        modelSessionId: () => recovery.sessionId(),
+        assertRequestAllowed: () => {
+          const current = this.db.submissions.find(submissionId);
+          if (current?.abortReason || current?.unattendedFailure) throw new Error(current.abortReason ?? current.unattendedFailure!);
+        },
+        onGeneration: (event) => this.telemetry.generation(submissionId, event),
+        onCompactionGeneration: (event) => this.runtimeTurnEvents.compactionGeneration(submissionId, event),
+        includeMemory: submission.origin !== "scheduled",
+        readExtensionContext: ({ label }) => this._hostGetContext(label),
       },
     );
+    if (harnessInput.degradations.length > 0) {
+      console.warn("[runtime-context:degraded]", json({ degradations: harnessInput.degradations }));
+    }
     const prepareToolInput = (toolName: string, input: unknown): unknown => {
       const prepare = harnessInput.candidates.find(({ tool }) =>
         tool.name === toolName
@@ -906,7 +898,6 @@ export abstract class AgentRuntimeKernel<
         this.db.submissions.transition(submissionId, "running", ["pending"]);
         this.telemetry.capture("turnStarted", {
           submissionId,
-          assemblyRevision: submission.assemblyRevision,
         });
         submission = this.db.submissions.find(submissionId)!;
       }
@@ -1533,11 +1524,19 @@ export abstract class AgentRuntimeKernel<
     if (!submission || isTerminalSubmissionStatus(submission.status)) {
       return { ok: false };
     }
-    await this.ensureRuntimeReady();
-    const spec = this.pi.harnessInputs(
-      this.requireRuntime().pi,
-      submission.assemblyDescriptor,
-    ).candidates.find(({ tool }) => tool.name === pending.toolName)?.interaction;
+    const active = this.submissions.currentActive();
+    if (active && active.submissionId !== submission.submissionId) {
+      return { ok: false };
+    }
+    // ask_user has a Config-independent validator. A parked answer must not
+    // replace the Gateway; the continuation loads current Config instead.
+    const askUser = pending.toolName === ASK_USER_TOOL_NAME;
+    if (!askUser && !active) {
+      await this.ensureRuntimeVersion(submission.runtimeKey, true);
+    }
+    const spec = askUser
+      ? askUserPiToolCandidate().interaction
+      : this.pi.interaction(this.requireRuntime().pi, pending.toolName);
     if (!spec) return { ok: false };
 
     const accepted = await this.humanDecisions.respond(