@vellumai/assistant 0.12.3-staging.1 → 0.12.3-staging.2

package/src/live-voice/live-voice-photo.ts

@@ -71,15 +71,21 @@
 
 import { v7 as uuidv7 } from "uuid";
 
+import type { ModeSession } from "../api/mode-session.js";
 import {
   type PersistMessageOptions,
   persistQueuedMessageBody,
 } from "../daemon/conversation-messaging.js";
+import type {
+  ConversationModeSessionCoordinator,
+  ModeSessionSourceHandle,
+} from "../daemon/conversation-mode-session.js";
 import { findConversation } from "../daemon/conversation-registry.js";
 import {
   getConversationIfExists,
   isSameIncarnation,
 } from "../daemon/conversation-store.js";
+import { bestEffortModeSessionTracking } from "../daemon/mode-session-tracking.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import {
   deleteOrphanAttachments,
@@ -691,6 +697,7 @@ function persistStandaloneImage(
     | "onUndiscardedAttachments"
   >,
   acceptedIncarnation?: number,
+  modeSessionSource?: ModeSessionSourceHandle,
 ): Promise<LiveVoicePhotoResult> {
   let incarnation: number | null;
   try {
@@ -734,6 +741,51 @@ function persistStandaloneImage(
     }
     return Promise.resolve({ ok: false });
   }
+  const requestId = uuidv7();
+  let modeSessionCoordinator: ConversationModeSessionCoordinator | undefined;
+  let modeSession: ModeSession | undefined;
+  if (modeSessionSource) {
+    const conversation = findConversation(conversationId);
+    modeSessionCoordinator = conversation?.modeSessions;
+    let owner: ModeSession | undefined;
+    let trackingFailed = false;
+    try {
+      owner = modeSessionCoordinator?.claimTurn(
+        requestId,
+        modeSessionSource,
+        Date.now(),
+      );
+    } catch (err) {
+      trackingFailed = true;
+      log.warn(
+        { err, conversationId, attachmentId },
+        "Standalone camera image could not claim its accepted session owner",
+      );
+    }
+    if (
+      !conversation ||
+      (!trackingFailed && owner?.id !== modeSessionSource.id)
+    ) {
+      log.warn(
+        { conversationId, attachmentId },
+        "Standalone camera image lost its accepted session owner",
+      );
+      bestEffortModeSessionTracking("stale camera claim release", () =>
+        modeSessionCoordinator?.releaseTurn(requestId),
+      );
+      reclaimOrDefer(
+        conversationId,
+        [attachmentId],
+        persistOptions.content,
+        requestId,
+        kind,
+      );
+      return Promise.resolve({ ok: false });
+    }
+    if (owner) {
+      modeSession = { id: owner.id, mode: owner.mode };
+    }
+  }
   return enqueueStandaloneImagePersist(
     conversationId,
     attachmentId,
@@ -747,8 +799,19 @@ function persistStandaloneImage(
         incarnation,
         persistOptions,
         queueWaitMs,
+        requestId,
+        modeSession,
       ),
-  );
+  ).finally(() => {
+    try {
+      modeSessionCoordinator?.releaseTurn(requestId);
+    } catch (err) {
+      log.warn(
+        { err, conversationId, attachmentId },
+        "Standalone camera image could not release its session owner",
+      );
+    }
+  });
 }
 
 /**
@@ -787,11 +850,10 @@ async function writeStandaloneImage(
     | "onUndiscardedAttachments"
   >,
   queueWaitMs: number,
+  requestId: string,
+  modeSession?: ModeSession,
 ): Promise<LiveVoicePhotoResult> {
   const { content } = persistOptions;
-  // The id the row is inserted under, so a failure can ask whether the insert
-  // landed before deciding the frame is safe to reclaim.
-  const requestId = uuidv7();
   // Ids the persist materialized for this attempt and then could not delete.
   // A frame already linked elsewhere is cloned into this conversation under a
   // fresh id, and nothing but the persist knows it: reclaiming under the id
@@ -868,6 +930,7 @@ async function writeStandaloneImage(
         ...persistOptions,
         attachments,
         requestId,
+        publishModeSessionChanges: false,
         // Asked again in the insert's own tick, about both things that can
         // stop being true across the awaits the persist takes to materialize
         // the attachment and build its content.
@@ -897,7 +960,13 @@ async function writeStandaloneImage(
       // of.
       conversation.markHistoryStaleForForeignScope(persistOptions.trustContext);
 
-      announcePersistedImage(conversationId, content, persisted.id, kind);
+      announcePersistedImage(
+        conversationId,
+        content,
+        persisted.id,
+        kind,
+        modeSession,
+      );
 
       return {
         ok: true,
@@ -945,7 +1014,13 @@ async function writeStandaloneImage(
       // `ensureActorScopedHistory` reloads instead of reusing what it holds.
       findConversation(conversationId)?.markHistoryStale();
       try {
-        announcePersistedImage(conversationId, content, requestId, kind);
+        announcePersistedImage(
+          conversationId,
+          content,
+          requestId,
+          kind,
+          modeSession,
+        );
       } catch (announceErr) {
         log.warn(
           { err: announceErr, conversationId, messageId: requestId },
@@ -992,6 +1067,7 @@ function announcePersistedImage(
   text: string,
   messageId: string,
   kind: "photo" | "sight_frame",
+  modeSession?: ModeSession,
 ): void {
   broadcastMessage({
     type: "user_message_echo",
@@ -999,6 +1075,7 @@ function announcePersistedImage(
     conversationId,
     messageId,
     ...(kind === "sight_frame" ? { cameraFrame: true as const } : {}),
+    ...(modeSession ? { modeSession } : {}),
   });
   recordConversationPersistedSeq(conversationId, getCurrentSeq());
   publishConversationMessagesChanged(conversationId);
@@ -1106,6 +1183,7 @@ export async function persistAmbientSightFrame(
   surface: SightFrameSurface,
   trustContext?: TrustContext,
   acceptedIncarnation?: number,
+  modeSessionSource?: ModeSessionSourceHandle,
 ): Promise<LiveVoicePhotoResult> {
   return persistStandaloneImage(
     conversationId,
@@ -1113,7 +1191,9 @@ export async function persistAmbientSightFrame(
     "sight_frame",
     {
       content: SIGHT_FRAME_MESSAGE_CONTENT,
-      metadata: surface === "voice" ? { voiceSessionTurn: true } : {},
+      metadata: {
+        ...(surface === "voice" ? { voiceSessionTurn: true } : {}),
+      },
       ...(trustContext ? { trustContext } : {}),
       scripted: true,
       // The camera sampled this, nobody sent it. Indexing it would feed
@@ -1126,5 +1206,6 @@ export async function persistAmbientSightFrame(
       sightFrameAttachmentIds: [attachmentId],
     },
     acceptedIncarnation,
+    modeSessionSource,
   );
 }

package/src/live-voice/live-voice-session-manager.ts

@@ -1,5 +1,6 @@
 import { randomUUID } from "node:crypto";
 
+import type { SubagentParentNotification } from "../subagent/parent-notification.js";
 import {
   createLiveVoiceServerFrameSequencer,
   type LiveVoiceClientFrame,
@@ -52,6 +53,9 @@ export interface LiveVoiceSession {
   handleClientFrame(frame: LiveVoiceClientFrame): MaybePromise<void>;
   handleBinaryAudio(chunk: Uint8Array): MaybePromise<void>;
   close(reason: LiveVoiceSessionCloseReason): MaybePromise<void>;
+  receiveSubagentNotification?(
+    notification: SubagentParentNotification,
+  ): boolean;
 }
 
 export interface LiveVoiceServerFrameSink {
@@ -264,6 +268,17 @@ export class LiveVoiceSessionManager {
     return this.activeSession?.sessionId ?? null;
   }
 
+  deliverSubagentNotification(
+    conversationId: string,
+    notification: SubagentParentNotification,
+  ): boolean {
+    const active = this.activeSession;
+    if (active === null || active.holder.conversationId !== conversationId) {
+      return false;
+    }
+    return active.session.receiveSubagentNotification?.(notification) ?? false;
+  }
+
   async startSession(
     startFrame: LiveVoiceClientStartFrame,
     sink: LiveVoiceServerFrameSink,