@yeaft/webchat-agent 0.1.948 → 0.1.949

package/connection/buffer.js

@@ -2,9 +2,10 @@ import WebSocket from 'ws';
 import ctx from '../context.js';
 import { encrypt, decrypt, isEncrypted } from '../encryption.js';
 
-// 需要在断连期间缓冲的消息类型（Claude 输出相关的关键消息）
+// 需要在断连期间缓冲的消息类型（CLI / Session 输出相关的关键消息）
 export const BUFFERABLE_TYPES = new Set([
-  'claude_output', 'turn_completed', 'conversation_closed',
+  'claude_output', 'yeaft_output', 'yeaft_session_output', 'session_output',
+  'turn_completed', 'conversation_closed',
   'session_id_update', 'compact_status', 'slash_commands_update',
   'background_task_started', 'background_task_output',
   'subagent_started', 'subagent_message', 'subagent_completed',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.948",
+  "version": "0.1.949",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/yeaft/history-compact.js

@@ -442,7 +442,7 @@ export function findCutIndex(messages, keepRecent) {
 /**
  * Wrap a summary string into the canonical "session continued" recovery
  * message. The wording is deliberately close to Claude Code's compact
- * marker so frontend filters (already in `web/stores/helpers/claudeOutput.js`,
+ * marker so frontend filters (already in `web/stores/helpers/assistantOutput.js`,
  * `server/db/message-db.js`) recognise it.
  *
  * @param {string} summary

package/yeaft/vp/vp-bridge.js

@@ -12,7 +12,7 @@
  *   • color / avatar → web-derived, NOT emitted here
  *
  * task-334h — live diff:
- *   • subscribers (Set of sendYeaftEvent fns) receive per-vp `vp_updated`
+ *   • subscribers (Set of sendSessionEvent fns) receive per-vp `vp_updated`
  *     and `vp_removed` events as VpLoader's debounced rescan commits
  *     added / updated / removed vpIds.
  *   • Event shape: `{ type, vpId, vp?, reason? }` where `reason` ∈
@@ -232,19 +232,19 @@ export function buildVpSnapshot(registry = defaultRegistry) {
 /**
  * Handle an `yeaft_vp_subscribe` request from the web client.
  *
- * Registers `sendYeaftEvent` as a live-diff subscriber, emits an initial
+ * Registers `sendSessionEvent` as a live-diff subscriber, emits an initial
  * `vp_snapshot`, and (on first call process-wide) starts the VpLoader
  * whose debounced rescan fans out `vp_updated` / `vp_removed` events.
  *
  * Returns an unsubscribe fn the caller MAY invoke on WS close to prevent
  * sending to a dead socket. Web-bridge is expected to manage this.
  *
- * @param {(event: object) => void} sendYeaftEvent
+ * @param {(event: object) => void} sendSessionEvent
  * @param {import('./registry.js').Registry} [registry]
  * @param {{dir?: string}} [options]
  * @returns {() => void} unsubscribe fn
  */
-export function handleVpSubscribe(sendYeaftEvent, registry = defaultRegistry, options = {}) {
+export function handleVpSubscribe(sendSessionEvent, registry = defaultRegistry, options = {}) {
   const { loader, fresh } = ensureLoader(registry, options);
   // task-338-F2 + task-339-followup: replay semantics.
   //
@@ -273,13 +273,13 @@ export function handleVpSubscribe(sendYeaftEvent, registry = defaultRegistry, op
   if (shouldRescan && loader && typeof loader.rescanNow === 'function') {
     try { loader.rescanNow(); } catch { /* never crash subscribe on rescan */ }
   }
-  _subscribers.add(sendYeaftEvent);
+  _subscribers.add(sendSessionEvent);
   try {
-    sendYeaftEvent(buildVpSnapshot(registry));
+    sendSessionEvent(buildVpSnapshot(registry));
   } catch {
     // Never crash the WS pipeline from snapshot serialisation.
   }
-  return () => { _subscribers.delete(sendYeaftEvent); };
+  return () => { _subscribers.delete(sendSessionEvent); };
 }
 
 /**

package/yeaft/web-bridge.js

@@ -6,8 +6,8 @@
  * inbox, abort, todo, persistence, and frontend timeline boundaries. Legacy
  * 1:1 chat paths still use the default `main` thread.
  *
- * Translates Engine events into claude_output-format messages so the
- * frontend can fully reuse the standard Chat rendering pipeline
+ * Translates Engine events into provider-neutral assistant output frames so
+ * the frontend can fully reuse the standard Chat rendering pipeline
  * (MessageList, AssistantTurn, ToolLine, AskCard, waiting cat, etc.).
  *
  * task-330c lint guard:
@@ -119,7 +119,7 @@ const inflightScopedDreamGroups = new Set();
 async function sendDreamSnapshotForSession(sessionId, extra = {}) {
   const snapshot = await buildDreamOutputSnapshot(session, sessionId);
   if (!snapshot) return null;
-  sendYeaftEvent({ type: 'yeaft_dream_snapshot', ...extra, snapshot }, { sessionId });
+  sendSessionEvent({ type: 'yeaft_dream_snapshot', ...extra, snapshot }, { sessionId });
   return snapshot;
 }
 
@@ -157,7 +157,7 @@ const turnAbortMeta = new Map();
 
 /**
  * Per-VP status broker — the agent-side authority for VP timeline
- * status. Lazy-initialized on first use because `sendYeaftEvent` is
+ * status. Lazy-initialized on first use because `sendSessionEvent` is
  * declared below; trying to call it at module top-level would crash
  * with a TDZ error during agent boot.
  *
@@ -173,7 +173,7 @@ function getVpStatusBroker() {
     vpStatusBroker = createVpStatusBroker({
       send: (event) => {
         // The broker emits both `vp_status_changed` and
-        // `vp_status_snapshot`. Both ride the standard sendYeaftEvent
+        // `vp_status_snapshot`. Both ride the standard sendSessionEvent
         // envelope so the frontend's existing yeaft_output dispatcher
         // sees them. We stamp sessionId/vpId on the envelope for
         // events that target a specific VP so the server's per-client
@@ -185,7 +185,7 @@ function getVpStatusBroker() {
           if (event.vpId) env.vpId = event.vpId;
           if (event.turnId) env.turnId = event.turnId;
         }
-        sendYeaftEvent(event, env);
+        sendSessionEvent(event, env);
       },
     });
   }
@@ -1023,7 +1023,7 @@ async function routeEnvelopeToVpThread(sessionId, vpId, envelope) {
     });
     thread.updatedAt = Date.now();
     try {
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'vp_thread_user_appended',
         sessionId,
         vpId,
@@ -1045,7 +1045,7 @@ async function routeEnvelopeToVpThread(sessionId, vpId, envelope) {
   inbox.push({ envelope, turnId, thread });
 
   try {
-    sendYeaftEvent({
+    sendSessionEvent({
       type: 'vp_typing_start',
       sessionId,
       vpId,
@@ -1137,7 +1137,7 @@ function ensureDriverRunning(sessionId, vpId, threadId = 'main') {
         turnAbortMeta.delete(turnId);
         if (vpAborts.get(key) === vpAbort) vpAborts.delete(key);
         try {
-          sendYeaftEvent({
+          sendSessionEvent({
             type: 'vp_typing_end',
             sessionId,
             vpId,
@@ -1149,7 +1149,7 @@ function ensureDriverRunning(sessionId, vpId, threadId = 'main') {
       }
       try {
         if (text && envelope?.msg) {
-          sendYeaftEvent({
+          sendSessionEvent({
             type: 'session_message',
             sessionId,
             vpId,
@@ -1217,7 +1217,7 @@ function ensureDriverRunning(sessionId, vpId, threadId = 'main') {
             console.warn('[Yeaft] vp-status typing transition (rescue) failed:', err?.message || err);
           }
           try {
-            sendYeaftEvent({
+            sendSessionEvent({
               type: 'vp_typing_start',
               sessionId,
               vpId,
@@ -1285,9 +1285,11 @@ export async function __testResetVpState() {
 
 
 /**
- * Send a yeaft_output message carrying claude_output-format data.
- * Envelope fields: conversationId, sessionId, vpId, turnId, threadId let the
- * frontend route incremental deltas to the correct per-VP/thread block.
+ * Send a provider-neutral assistant output frame for a Yeaft Session.
+ *
+ * Wire compatibility: this still emits the legacy `yeaft_output` envelope so
+ * upgraded agents continue to work with older servers. The frame in `data` is
+ * intentionally generic and is consumed by the web's assistant-output handler.
  */
 function resolveGroupDefaultVpId(sessionId) {
   if (!sessionId) return null;
@@ -1300,7 +1302,7 @@ function resolveGroupDefaultVpId(sessionId) {
   }
 }
 
-function sendYeaftOutput(data, { sessionId, chatId, vpId, turnId, threadId } = {}) {
+function sendSessionOutputFrame(data, { sessionId, chatId, vpId, turnId, threadId } = {}) {
   const resolvedVpId = vpId || (sessionId ? resolveGroupDefaultVpId(sessionId) : null);
   sendToServer({
     type: 'yeaft_output',
@@ -1314,8 +1316,8 @@ function sendYeaftOutput(data, { sessionId, chatId, vpId, turnId, threadId } = {
   });
 }
 
-/** Send a yeaft_output event (non-claude_output metadata). */
-function sendYeaftEvent(event, { sessionId, chatId, vpId, turnId, threadId } = {}) {
+/** Send a Yeaft Session metadata event over the legacy-compatible envelope. */
+function sendSessionEvent(event, { sessionId, chatId, vpId, turnId, threadId } = {}) {
   sendToServer({
     type: 'yeaft_output',
     conversationId: yeaftConversationId,
@@ -1345,7 +1347,7 @@ export function handleYeaftVpSubscribe(_msg) {
   }
   const { libDir } = configuredVpPaths();
   _vpUnsubscribe = handleVpSubscribe(
-    sendYeaftEvent,
+    sendSessionEvent,
     undefined,
     libDir ? { dir: libDir } : {},
   );
@@ -1355,7 +1357,7 @@ export function handleYeaftVpSubscribe(_msg) {
  * VP CRUD from the web client. See historic doc for full message shapes.
  */
 function sendVpCrudResult(payload) {
-  sendYeaftEvent({ type: 'vp_crud_result', ...payload });
+  sendSessionEvent({ type: 'vp_crud_result', ...payload });
 }
 
 export function handleYeaftVpCreate(msg) {
@@ -1462,7 +1464,7 @@ export function handleYeaftVpRead(msg) {
  * Session CRUD wired to WS events.
  */
 function sendSessionCrudResult(payload) {
-  sendYeaftEvent({ type: 'session_crud_result', ...payload });
+  sendSessionEvent({ type: 'session_crud_result', ...payload });
 }
 
 function sendSessionSnapshotBroadcast() {
@@ -1470,7 +1472,7 @@ function sendSessionSnapshotBroadcast() {
     const yeaftDir = ctx.CONFIG?.yeaftDir;
     if (!yeaftDir) return;
     const sessions = snapshotSessions(yeaftDir);
-    sendYeaftEvent({ type: 'session_list_updated', sessions });
+    sendSessionEvent({ type: 'session_list_updated', sessions });
   } catch (err) {
     console.warn('[Yeaft] sendSessionSnapshotBroadcast failed:', err?.message || err);
   }
@@ -1502,7 +1504,7 @@ function sendSessionRosterChanged(session) {
     defaultVpId: session.defaultVpId,
     workDir: session.workDir || '',
   };
-  sendYeaftEvent({ type: 'session_roster_changed', ...payload });
+  sendSessionEvent({ type: 'session_roster_changed', ...payload });
 }
 
 function sessionErrorPayload(err) {
@@ -1859,11 +1861,11 @@ export function installYeaftRuntimeBridge(s) {
     try {
       if (evt.type === 'turn_open' || evt.type === 'turn_close' || evt.type === 'loop') {
         const tag = evt && evt.sessionId ? { sessionId: evt.sessionId } : {};
-        sendYeaftEvent(evt, tag);
+        sendSessionEvent(evt, tag);
       } else {
         const out = { type: 'dream_progress', ...evt };
         const tag = evt && evt.sessionId ? { sessionId: evt.sessionId } : {};
-        sendYeaftEvent(out, tag);
+        sendSessionEvent(out, tag);
       }
     } catch { /* never let event delivery throw */ }
   };
@@ -1893,14 +1895,14 @@ export function installYeaftRuntimeBridge(s) {
   };
 
   // Wire the post-compact WS sink. Compactor is constructed in
-  // session.js with a no-op sink; bridge owns `sendYeaftEvent` /
+  // session.js with a no-op sink; bridge owns `sendSessionEvent` /
   // `yeaftConversationId`, so the sink is wired here once a session is
   // present. Per-group `yeaft_history_compacted` events fire after a
   // successful summarize+swap.
   if (s.compactor && typeof s.compactor.setOnCompacted === 'function') {
     s.compactor.setOnCompacted((sessionId, result) => {
       try {
-        sendYeaftEvent({
+        sendSessionEvent({
           type: 'yeaft_history_compacted',
           reason: result?.reason ?? null,
           beforeTurns: result?.beforeTurns,
@@ -1979,7 +1981,7 @@ function handleEngineEvent(event, hctx) {
   switch (event.type) {
     case 'text_delta':
       hctx.assistantTextParts.push(event.text);
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'assistant',
         message: { content: [{ type: 'text', text: event.text }] },
       }, envelope);
@@ -1990,7 +1992,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'thinking_delta':
-      sendYeaftEvent({ type: 'thinking_delta', text: event.text }, envelope);
+      sendSessionEvent({ type: 'thinking_delta', text: event.text }, envelope);
       break;
 
     case 'thinking_block_end':
@@ -1999,7 +2001,7 @@ function handleEngineEvent(event, hctx) {
       // turns / VPs includes it. Without this echo Anthropic 400s the
       // next request with "content[].thinking in the thinking mode must
       // be passed back to the API". The signature stays server-side
-      // only — wire serializers (stripMetaForWire / sendYeaftOutput)
+      // only — wire serializers (stripMetaForWire / sendSessionOutputFrame)
       // never reference thinkingBlocks, so it cannot leak to the UI.
       if (hctx.thinkingBlocksAccum && event.signature) {
         if (event.redacted) {
@@ -2029,11 +2031,11 @@ function handleEngineEvent(event, hctx) {
         });
       }
       // Finish any in-progress text streaming so UI shows typing dots
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'assistant',
         message: { content: [] },
       }, envelope);
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'assistant',
         message: {
           content: [{
@@ -2048,7 +2050,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'tool_start':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'tool_start',
         id: event.id,
         name: event.name,
@@ -2064,7 +2066,7 @@ function handleEngineEvent(event, hctx) {
           isError: !!event.isError,
         });
       }
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'user',
         tool_use_result: [{
           type: 'tool_result',
@@ -2109,7 +2111,7 @@ function handleEngineEvent(event, hctx) {
         } catch (err) {
           console.warn('[Yeaft] vp-status settleIdle (route_forward) failed:', err?.message || err);
         }
-        sendYeaftEvent({
+        sendSessionEvent({
           type: 'vp_turn_end',
           sessionId: hctx.sessionId,
           vpId: hctx.vpId,
@@ -2125,7 +2127,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'usage':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'context_usage',
         inputTokens: event.inputTokens,
         outputTokens: event.outputTokens,
@@ -2133,7 +2135,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'recall':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'recall',
         entryCount: event.entryCount,
         cached: event.cached,
@@ -2144,7 +2146,7 @@ function handleEngineEvent(event, hctx) {
       // Engine compressed the context — clear THIS group's accumulated
       // history. Other groups' histories stay intact.
       if (hctx.sessionId) setGroupHistory(hctx.sessionId, []);
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'consolidate',
         archivedCount: event.archivedCount,
         extractedCount: event.extractedCount,
@@ -2152,7 +2154,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'fallback':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'fallback',
         from: event.from,
         to: event.to,
@@ -2161,7 +2163,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'reflection':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'reflection',
         // feat-6af5f9f1 PR B: stamp turnId/loopNumber so the debug panel
         // can attach reflection cards to the matching loop.
@@ -2178,7 +2180,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'turn_open':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'turn_open',
         turnId: event.turnId,
         userPrompt: event.userPrompt,
@@ -2189,7 +2191,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'turn_close':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'turn_close',
         turnId: event.turnId,
         totalMs: event.totalMs,
@@ -2199,7 +2201,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'memory_used':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'memory_used',
         turnId: event.turnId,
         loaded: event.loaded || [],
@@ -2207,7 +2209,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'dream_memory_loaded':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'dream_memory_loaded',
         turnId: event.turnId,
         vpId: event.vpId || null,
@@ -2218,7 +2220,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'memory_adjust':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'memory_adjust',
         turnId: event.turnId,
         sessionKey: event.sessionKey,
@@ -2233,7 +2235,7 @@ function handleEngineEvent(event, hctx) {
       if (hctx && Array.isArray(hctx.appendedUserPrompts) && event.preview) {
         hctx.appendedUserPrompts.push(String(event.preview));
       }
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'vp_thread_user_append_consumed',
         turnId: event.turnId,
         threadId: event.threadId,
@@ -2244,7 +2246,7 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'tool_exec':
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'tool_exec',
         turnId: event.turnId,
         loopNumber: event.loopNumber,
@@ -2258,7 +2260,7 @@ function handleEngineEvent(event, hctx) {
     case 'loop':
       // feat-6af5f9f1 PR B: replaces the old `debug_turn` event. Same
       // payload shape plus turnId + loopNumber + usage.totalTokens.
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'loop',
         turnId: event.turnId,
         loopNumber: event.loopNumber,
@@ -2281,7 +2283,7 @@ function handleEngineEvent(event, hctx) {
       if (isPermissionErrorMsg(errMsg)) {
         if (!_permissionDiagnosticSent) {
           _permissionDiagnosticSent = true;
-          sendYeaftOutput({
+          sendSessionOutputFrame({
             type: 'assistant',
             message: {
               content: [{
@@ -2292,7 +2294,7 @@ function handleEngineEvent(event, hctx) {
           }, envelope);
         }
       } else {
-        sendYeaftOutput({
+        sendSessionOutputFrame({
           type: 'assistant',
           message: {
             content: [{ type: 'text', text: `⚠️ Error: ${errMsg}` }],
@@ -2358,11 +2360,11 @@ export async function handleYeaftSessionSend(msg) {
   // session lying around.
   const yeaftDir = ctx.CONFIG?.yeaftDir;
   if (!yeaftDir) {
-    sendYeaftOutput({
+    sendSessionOutputFrame({
       type: 'assistant',
       message: { content: [{ type: 'text', text: '⚠️ Yeaft session error: no yeaft directory configured.' }] },
     }, { sessionId });
-    sendYeaftOutput({ type: 'result', result_text: '' }, { sessionId });
+    sendSessionOutputFrame({ type: 'result', result_text: '' }, { sessionId });
     return;
   }
 
@@ -2393,11 +2395,11 @@ export async function handleYeaftSessionSend(msg) {
   }
 
   if (!sessionHandle) {
-    sendYeaftOutput({
+    sendSessionOutputFrame({
       type: 'assistant',
       message: { content: [{ type: 'text', text: `⚠️ Session ${sessionId} not found.` }] },
     }, { sessionId });
-    sendYeaftOutput({ type: 'result', result_text: '' }, { sessionId });
+    sendSessionOutputFrame({ type: 'result', result_text: '' }, { sessionId });
     return;
   }
 
@@ -2477,7 +2479,7 @@ export async function handleYeaftSessionSend(msg) {
     const detail = attachmentBundle.failed
       .map((f) => `  - ${f.name}: ${f.error}`)
       .join('\n');
-    sendYeaftOutput({
+    sendSessionOutputFrame({
       type: 'assistant',
       message: { content: [{ type: 'text', text: `⚠️ ${attachmentBundle.failed.length} file(s) could not be attached:\n${detail}` }] },
     }, { sessionId });
@@ -2507,11 +2509,11 @@ export async function handleYeaftSessionSend(msg) {
     });
   } catch (err) {
     console.warn('[Yeaft] yeaft_session_chat: coord.ingest failed', err?.message || err);
-    sendYeaftOutput({
+    sendSessionOutputFrame({
       type: 'assistant',
       message: { content: [{ type: 'text', text: `⚠️ Session dispatch error: ${err?.message || err}` }] },
     }, { sessionId });
-    sendYeaftOutput({ type: 'result', result_text: '' }, { sessionId });
+    sendSessionOutputFrame({ type: 'result', result_text: '' }, { sessionId });
     return;
   }
 
@@ -2528,11 +2530,11 @@ export async function handleYeaftSessionSend(msg) {
     // with a healthy roster. Surface the failure explicitly rather than
     // silently retrying as a single-VP turn (the legacy fallback masked
     // group-roster bugs).
-    sendYeaftOutput({
+    sendSessionOutputFrame({
       type: 'assistant',
       message: { content: [{ type: 'text', text: '⚠️ No VP available to respond — check the group roster.' }] },
     }, { sessionId });
-    sendYeaftOutput({ type: 'result', result_text: '' }, { sessionId });
+    sendSessionOutputFrame({ type: 'result', result_text: '' }, { sessionId });
     return;
   }
 
@@ -2727,7 +2729,7 @@ async function ensureSessionLoaded() {
     if (session.engine && typeof session.engine.setSubAgentEventSink === 'function') {
       session.engine.setSubAgentEventSink((agentId, evt) => {
         try {
-          sendYeaftEvent({ type: 'sub_agent_event', agentId, payload: evt });
+          sendSessionEvent({ type: 'sub_agent_event', agentId, payload: evt });
         } catch { /* ignore */ }
       });
     }
@@ -2753,7 +2755,7 @@ async function ensureSessionLoaded() {
   // Per-group history is hydrated lazily on first `getOrCreateSessionHistory`
   // — there's no global "all conversations" tape any more.
 
-  sendYeaftEvent({
+  sendSessionEvent({
     type: 'session_ready',
     conversationId: yeaftConversationId,
     model: session.config.model,
@@ -2812,7 +2814,7 @@ async function runVpTurnWithEscalation(args) {
         `[Yeaft] runVpTurn watchdog escalation: VP ${vpId} did not return ${deadlineMs}ms after enqueue — emitting synthetic stop and unblocking driver`,
       );
       try {
-        sendYeaftOutput(
+        sendSessionOutputFrame(
           { type: 'result', result_text: '', stopped: true },
           { sessionId, vpId, turnId, threadId },
         );
@@ -2918,7 +2920,7 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
     if (turnEndEmitted) return;
     turnEndEmitted = true;
     try {
-      sendYeaftEvent({
+      sendSessionEvent({
         type: 'vp_turn_end',
         sessionId,
         vpId,
@@ -2952,7 +2954,7 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
     resetQueryTimer();
 
     // Emit turn_start so frontend can create the message block.
-    sendYeaftEvent({ type: 'vp_turn_start', vpId, threadId, turnId, sessionId, title: thread?.title || '' }, envelope);
+    sendSessionEvent({ type: 'vp_turn_start', vpId, threadId, turnId, sessionId, title: thread?.title || '' }, envelope);
     // vp-status: LLM call about to start, no text/tool yet → 'thinking'.
     try {
       getVpStatusBroker().transition({ sessionId, vpId, threadId, title: thread?.title || '', state: 'thinking', turnId, messageCount: thread?.messageIds?.length || 0 });
@@ -3034,11 +3036,11 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
       // Turn completed — atomically append this VP's output to shared history.
       appendTurnToSessionHistory(sessionId, threadId, vpId, [prompt, ...appendedUserPrompts], assistantTextParts, toolCallsAccum, toolResultsAccum, thinkingBlocksAccum);
 
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'assistant',
         message: { content: [] },
       }, envelope);
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'result',
         result_text: '',
       }, envelope);
@@ -3052,7 +3054,7 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
   } catch (err) {
     const isAbort = err && (err.name === 'AbortError' || err.name === 'LLMAbortError');
     if (isAbort) {
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'result',
         result_text: '',
         stopped: true,
@@ -3079,7 +3081,7 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
     if (isPermissionErrorMsg(err.message)) {
       if (!_permissionDiagnosticSent) {
         _permissionDiagnosticSent = true;
-        sendYeaftOutput({
+        sendSessionOutputFrame({
           type: 'assistant',
           message: {
             content: [{
@@ -3090,7 +3092,7 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
         }, envelope);
       }
     } else {
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'assistant',
         message: {
           content: [{
@@ -3100,7 +3102,7 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
         },
       }, envelope);
     }
-    sendYeaftOutput({
+    sendSessionOutputFrame({
       type: 'result',
       result_text: '',
     }, envelope);
@@ -3374,7 +3376,7 @@ export function handleYeaftAbortThread(_msg = {}) {
       const thread = vpMap.get(targetThreadId);
       if (thread) thread.status = 'aborted';
     }
-    sendYeaftEvent({ type: 'yeaft_aborted', aborted, all: false, threadId: targetThreadId });
+    sendSessionEvent({ type: 'yeaft_aborted', aborted, all: false, threadId: targetThreadId });
     return { aborted, all: false };
   }
 
@@ -3388,7 +3390,7 @@ export function handleYeaftAbortThread(_msg = {}) {
   turnAbortCtrls.clear();
   turnAbortMeta.clear();
   abortAllVpRuntime(aborted);
-  sendYeaftEvent({ type: 'yeaft_aborted', aborted, all: false });
+  sendSessionEvent({ type: 'yeaft_aborted', aborted, all: false });
   return { aborted, all: false };
 }
 
@@ -3409,7 +3411,7 @@ export function handleYeaftAbortAll() {
   turnAbortCtrls.clear();
   turnAbortMeta.clear();
   abortAllVpRuntime(aborted);
-  sendYeaftEvent({ type: 'yeaft_aborted', aborted, all: true });
+  sendSessionEvent({ type: 'yeaft_aborted', aborted, all: true });
   return { aborted, all: true };
 }
 
@@ -3421,7 +3423,7 @@ export function handleYeaftAbortAll() {
 export function handleYeaftAbortTurn(msg = {}) {
   const { turnId } = msg;
   if (!turnId) {
-    sendYeaftEvent({ type: 'yeaft_turn_aborted', turnId: null, success: false });
+    sendSessionEvent({ type: 'yeaft_turn_aborted', turnId: null, success: false });
     return;
   }
   const ctrl = turnAbortCtrls.get(turnId);
@@ -3429,11 +3431,11 @@ export function handleYeaftAbortTurn(msg = {}) {
     try { ctrl.abort(); } catch { /* best-effort */ }
     turnAbortCtrls.delete(turnId);
     turnAbortMeta.delete(turnId);
-    sendYeaftEvent({ type: 'yeaft_turn_aborted', turnId, success: true });
+    sendSessionEvent({ type: 'yeaft_turn_aborted', turnId, success: true });
   } else {
     turnAbortCtrls.delete(turnId);
     turnAbortMeta.delete(turnId);
-    sendYeaftEvent({ type: 'yeaft_turn_aborted', turnId, success: false });
+    sendSessionEvent({ type: 'yeaft_turn_aborted', turnId, success: false });
   }
 }
 
@@ -3445,7 +3447,7 @@ export function abortYeaftSession(opts = {}) {
   if (opts && opts.all) return handleYeaftAbortAll();
   if (opts && opts.threadId) return handleYeaftAbortThread({ threadId: opts.threadId });
   // No payload — conservative no-op ack.
-  sendYeaftEvent({ type: 'yeaft_aborted', aborted: [], all: false });
+  sendSessionEvent({ type: 'yeaft_aborted', aborted: [], all: false });
   return { aborted: [], all: false };
 }
 
@@ -3812,7 +3814,7 @@ export function handleYeaftModelSwitch(msg) {
 
   session.config.model = msg.model;
 
-  sendYeaftEvent({
+  sendSessionEvent({
     type: 'model_switched',
     model: msg.model,
   });
@@ -3870,7 +3872,7 @@ export async function handleYeaftLoadHistory(msg) {
   }
 
   // Always replay session_ready so refresh / reconnect rebuilds UI state.
-  sendYeaftEvent({
+  sendSessionEvent({
     type: 'session_ready',
     conversationId: yeaftConversationId,
     model: session.config.model,
@@ -3907,7 +3909,7 @@ export async function handleYeaftLoadHistory(msg) {
     const delta = session.conversationStore.loadAfterSeqByGroup(sessionId, afterSeq);
     for (const entry of delta.messages) {
       if (entry.role === 'user') {
-        sendYeaftOutput({
+        sendSessionOutputFrame({
           type: 'user',
           message: {
             content: entry.content,
@@ -3923,15 +3925,15 @@ export async function handleYeaftLoadHistory(msg) {
           turnId: entry.turnId || entry.threadId || 'main',
         };
         if (entry.speakerVpId) envelopeOpts.vpId = entry.speakerVpId;
-        sendYeaftOutput({
+        sendSessionOutputFrame({
           type: 'assistant',
           message: { id: entry.id || null, content: [{ type: 'text', text: entry.content }] },
           ts: entry.ts || null,
         }, envelopeOpts);
-        sendYeaftOutput({ type: 'result', result_text: '' }, envelopeOpts);
+        sendSessionOutputFrame({ type: 'result', result_text: '' }, envelopeOpts);
       }
     }
-    sendYeaftEvent({
+    sendSessionEvent({
       type: 'history_loaded',
       mode: 'delta',
       count: delta.messages.length,
@@ -3962,7 +3964,7 @@ export async function handleYeaftLoadHistory(msg) {
 
   for (const entry of replayEntries) {
     if (entry.role === 'user') {
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'user',
         message: {
           content: entry.content,
@@ -3982,12 +3984,12 @@ export async function handleYeaftLoadHistory(msg) {
         turnId: entry.turnId || entry.threadId || 'main',
       };
       if (entry.speakerVpId) envelopeOpts.vpId = entry.speakerVpId;
-      sendYeaftOutput({
+      sendSessionOutputFrame({
         type: 'assistant',
         message: { id: entry.id || null, content: [{ type: 'text', text: entry.content }] },
         ts: entry.ts || null,
       }, envelopeOpts);
-      sendYeaftOutput({ type: 'result', result_text: '' }, envelopeOpts);
+      sendSessionOutputFrame({ type: 'result', result_text: '' }, envelopeOpts);
     }
   }
 
@@ -4021,7 +4023,7 @@ export async function handleYeaftLoadHistory(msg) {
     if (last && last.id) latestSeq = session.conversationStore.getMessageSeqById(last.id);
   }
 
-  sendYeaftEvent({
+  sendSessionEvent({
     type: 'history_loaded',
     mode: 'recent',
     count: replayEntries.length,
@@ -4168,7 +4170,7 @@ export async function resetYeaftSession() {
     // Per-group history hydrates lazily via getOrCreateSessionHistory on
     // first read. Nothing to seed here.
 
-    sendYeaftEvent({
+    sendSessionEvent({
       type: 'session_ready',
       conversationId: yeaftConversationId,
       model: session.config.model,