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

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/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));
   }
 }