@springbrand/agent-runtime 0.3.0-alpha.21 → 0.3.0-alpha.23

package/src/index.ts

@@ -51,6 +51,7 @@ export type { RuntimeAssemblyView } from "./config/assembly-view";
 export * from "./adapter/cloudflare/define-agent";
 export type { ToolInteractionResponsePreparation } from "./adapter/cloudflare/agent";
 export * from "./conversation/state";
+export type { ModelProtocolResponse } from "./conversation/canonical-context";
 export * from "./tools/workspace/versioning";
 export * from "./lib/execution-level";
 export type {
@@ -150,6 +151,5 @@ export {
 } from "./model-protocol/openrouter";
 export type { OpenRouterRequestOptions } from "./model-protocol/openrouter";
 export type {
-  ModelProtocolResponse,
   OpenRouterProtocol,
 } from "./models/openrouter/protocol-response";

package/src/models/openrouter/protocol-response.ts

@@ -9,20 +9,10 @@ import {
 } from "@earendil-works/pi-ai";
 import type { RuntimeModelProtocol } from "../../config/ports";
 import { overlayProviderStreams } from "../provider-streams";
+import type { ModelProtocolResponse } from "../../conversation/canonical-context";
 
 export type OpenRouterProtocol = Extract<RuntimeModelProtocol, `openrouter-${string}`>;
 
-/** Native output required by OpenRouter's stateless continuation. */
-export interface ModelProtocolResponse {
-  readonly output: readonly Readonly<Record<string, unknown>>[];
-}
-
-declare module "@earendil-works/pi-ai" {
-  interface AssistantMessage {
-    protocolResponse?: ModelProtocolResponse;
-  }
-}
-
 function record(value: unknown): Record<string, unknown> | undefined {
   return value !== null && typeof value === "object" && !Array.isArray(value)
     ? value as Record<string, unknown>

package/src/submission/lifecycle.ts

@@ -597,7 +597,16 @@ export class SubmissionLifecycle<
   activate(submission: TSubmission, active: TActive): () => void {
     this.activeBySubmission.set(submission.submissionId, active);
     const latest = this.options.store.find(submission.submissionId);
-    if (latest?.abortReason) this.options.abortActive(active);
+    if (latest?.abortReason) {
+      // The cancel is already committed; this abort only stops the executor and may lose to it settling.
+      void (async () => this.options.abortActive(active))().catch((error: unknown) => {
+        console.warn(
+          "[runtime-early-abort:failed]",
+          submission.submissionId,
+          error instanceof Error ? error.message : String(error),
+        );
+      });
+    }
     return () => {
       if (this.activeBySubmission.get(submission.submissionId) === active) {
         this.activeBySubmission.delete(submission.submissionId);

package/src/submission/steer-delivery.ts

@@ -6,6 +6,7 @@ import type { SubmitMessageOptions } from "./admission";
 import type { SubmissionHandle } from "./lifecycle";
 import { submissionAbortReason, type StoredSubmission, type SubmissionRepository } from "./repository";
 import type { PiCanonicalUserInput } from "../conversation/message/contract";
+import { captureUIUserSidecar } from "../conversation/message/conversion";
 import type { MessageUiRepository } from "../conversation/repository";
 import type { PendingSteer, SteerRepository } from "./steer-repository";
 
@@ -70,6 +71,7 @@ export async function finishPendingSteers(options: {
     const userMessage = steer.uiMessageJson
       ? JSON.parse(steer.uiMessageJson) as UIMessage & { role: "user" }
       : undefined;
+    const userSidecar = userMessage ? { id: userMessage.id, ...captureUIUserSidecar(userMessage) } : undefined;
     const requestId = `${options.submissionId}:steer:${steer.steerId}`;
     if (options.aborted) {
       const owner = options.transaction(() => {
@@ -81,7 +83,7 @@ export async function finishPendingSteers(options: {
         }
         return handoff?.status === "aborted" || handoff?.status === "skipped" ? handoff.submissionId : options.submissionId;
       });
-      await options.conversation.append(steer.messageId, message, { submissionId: owner, ...(userMessage ? { userMessage } : {}) });
+      await options.conversation.append(steer.messageId, message, { submissionId: owner, ...(userSidecar ? { userSidecar } : {}) });
       options.transaction(() => {
         if (steer.harnessEntryId) options.messageUi.delete(steer.harnessEntryId);
         options.steers.deleteByMessageId(steer.messageId);
@@ -117,7 +119,7 @@ export async function finishPendingSteers(options: {
       }
       return current;
     });
-    if (handoff.status === "skipped" || handoff.status === "aborted") await options.conversation.append(steer.messageId, message, { submissionId: handoff.submissionId, ...(userMessage ? { userMessage } : {}) });
+    if (handoff.status === "skipped" || handoff.status === "aborted") await options.conversation.append(steer.messageId, message, { submissionId: handoff.submissionId, ...(userSidecar ? { userSidecar } : {}) });
     options.transaction(() => options.steers.deleteByMessageId(steer.messageId));
   }
 }

package/src/telemetry/coordinator.ts

@@ -53,6 +53,7 @@ export class RuntimeTelemetryCoordinator {
   private delivery?: TelemetryDelivery;
   private configured = false;
   private draining?: Promise<void>;
+  private drainRequested = false;
   private readonly coldBuffer: BufferedTelemetryFact[] = [];
 
   constructor(
@@ -182,11 +183,19 @@ export class RuntimeTelemetryCoordinator {
   }
 
   private queueDrain(): void {
-    if (!this.delivery || this.draining) return;
+    if (!this.delivery) return;
+    // A drain reads its batch before publishing; facts written after that wait for the next one.
+    if (this.draining) {
+      this.drainRequested = true;
+      return;
+    }
+    this.drainRequested = false;
     const pending = this.drain();
     let tracked: Promise<void>;
     tracked = pending.finally(() => {
-      if (this.draining === tracked) this.draining = undefined;
+      if (this.draining !== tracked) return;
+      this.draining = undefined;
+      if (this.drainRequested) this.queueDrain();
     });
     this.draining = tracked;
     this.options.waitUntil(tracked);
@@ -196,7 +205,8 @@ export class RuntimeTelemetryCoordinator {
     if (!this.delivery) return;
     try {
       const result = await this.delivery.drain();
-      if (!result.hasPending) return;
+      // A queued follow-up drain schedules its own retry if it still leaves work.
+      if (!result.hasPending || this.drainRequested) return;
       await this.options.scheduleRetry(
         TELEMETRY_RETRY_DELAY_MS / 1_000,
         idempotentRetry,