@yeaft/webchat-agent 1.0.22 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/yeaft/vp-status-broker.js

@@ -17,6 +17,11 @@ export const VALID_STATES = new Set([
 ]);
 
 const RUNNING_STATES = new Set(['typing', 'thinking', 'streaming', 'tool']);
+
+export function isVpStatusRunning(state) {
+  return RUNNING_STATES.has(state || 'idle');
+}
+
 const STATE_PRIORITY = ['tool', 'streaming', 'thinking', 'typing', 'error', 'idle'];
 const MAX_RETAINED_THREADS_PER_VP = 20;
 const COMPLETED_TTL_MS = 30 * 60 * 1000;
@@ -52,7 +57,7 @@ export function createVpStatusBroker({ send, now = Date.now } = {}) {
       }
     }
 
-    const runningThreadCount = rows.filter(r => RUNNING_STATES.has(r.state)).length;
+    const runningThreadCount = rows.filter(r => isVpStatusRunning(r.state)).length;
     const latest = rows[0] || null;
     return {
       sessionId: sessionId || null,
@@ -83,14 +88,14 @@ export function createVpStatusBroker({ send, now = Date.now } = {}) {
     }
     const cutoff = now() - COMPLETED_TTL_MS;
     for (const [key, row] of rows) {
-      if (RUNNING_STATES.has(row.state)) continue;
+      if (isVpStatusRunning(row.state)) continue;
       if ((row.updatedAt || row.since || 0) < cutoff) threads.delete(key);
     }
     const remaining = rows
       .filter(([key]) => threads.has(key))
       .sort((a, b) => (b[1].updatedAt || b[1].since || 0) - (a[1].updatedAt || a[1].since || 0));
     for (const [key, row] of remaining.slice(MAX_RETAINED_THREADS_PER_VP)) {
-      if (!RUNNING_STATES.has(row.state)) threads.delete(key);
+      if (!isVpStatusRunning(row.state)) threads.delete(key);
     }
   }
 

package/yeaft/web-bridge.js

@@ -66,7 +66,7 @@ import { isHiddenConversationRow } from './conversation/internal-control.js';
 import { sliceLastNTurns } from './turn-utils.js';
 import { pairSanitize } from './pair-sanitize.js';
 import { filterSnapshotForVp } from './snapshot-filter.js';
-import { createVpStatusBroker } from './vp-status-broker.js';
+import { createVpStatusBroker, isVpStatusRunning } from './vp-status-broker.js';
 import { classifyThread as defaultClassifyThread, fallbackTitle } from './vp/thread-classifier.js';
 import { listMcpServers, upsertMcpServer, removeMcpServer } from './config-api.js';
 import { buildMcpFlattenedTools } from './tools/mcp-tools.js';
@@ -433,6 +433,32 @@ function buildVpPromptPayload(vpId, envelope) {
   return { text, prompt, promptParts };
 }
 
+function buildPendingRescueEnvelope({ sessionId, taskId = null, threadId = 'main', followUpId, leftover, replayText, replayParts = null }) {
+  const leftoverIsInternal = Boolean(leftover?.internal);
+  const leftoverInjectedBy = leftoverIsInternal && typeof leftover?.injectedBy === 'string'
+    ? leftover.injectedBy
+    : null;
+  return {
+    sessionId,
+    taskId,
+    trigger: 'pending_rescue',
+    msg: {
+      id: followUpId,
+      from: leftoverIsInternal && leftover.senderVpId ? leftover.senderVpId : 'user',
+      role: leftoverIsInternal ? 'assistant' : 'user',
+      text: replayText,
+      meta: {
+        rescuedFrom: 'pendingQueries',
+        threadId,
+        ...(leftoverInjectedBy ? { injectedBy: leftoverInjectedBy } : {}),
+        ...(leftoverIsInternal && leftover.senderVpId ? { senderVpId: leftover.senderVpId } : {}),
+        ...(leftoverIsInternal && leftover.sourceThreadId ? { sourceThreadId: leftover.sourceThreadId } : {}),
+      },
+    },
+    ...(Array.isArray(replayParts) && replayParts.length > 0 ? { _promptParts: replayParts } : {}),
+  };
+}
+
 export function visibleInboundThreadId(envelope, fallbackThreadId = 'main') {
   const meta = envelope?.msg?.meta || {};
   if (
@@ -1350,6 +1376,9 @@ async function routeEnvelopeToVpThread(sessionId, vpId, envelope) {
       originalText: text,
       originalParts: Array.isArray(envelope?._promptParts) ? envelope._promptParts : null,
       internal: isInternalAppend,
+      injectedBy: isInternalAppend ? injectedBy : null,
+      senderVpId: isInternalAppend ? (envelope?.msg?.meta?.senderVpId || envelope?.msg?.from || null) : null,
+      sourceThreadId: isInternalAppend ? visibleInboundThreadId(envelope, thread.threadId) : null,
     });
     persistInboundMessageOnceByMsgId({
       msgId: envelope?.msg?.id,
@@ -1534,18 +1563,15 @@ function ensureDriverRunning(sessionId, vpId, threadId = 'main') {
             : null;
           if (!replayText && !replayParts) continue;
           const followUpId = `followup_${Date.now().toString(36)}_${randomUUID().slice(0, 8)}`;
-          const followUpEnvelope = {
+          const followUpEnvelope = buildPendingRescueEnvelope({
             sessionId,
             taskId: envelope?.taskId || null,
-            trigger: 'pending_rescue',
-            msg: {
-              id: followUpId,
-              from: 'user',
-              text: replayText,
-              meta: { rescuedFrom: 'pendingQueries', threadId: thread.threadId },
-            },
-            ...(replayParts ? { _promptParts: replayParts } : {}),
-          };
+            threadId: thread.threadId,
+            followUpId,
+            leftover,
+            replayText,
+            replayParts,
+          });
           const followUpTurnId = `${randomUUID().slice(0, 8)}:${vpId}`;
           inbox.push({ envelope: followUpEnvelope, turnId: followUpTurnId, thread });
           try {
@@ -1825,7 +1851,7 @@ function decorateSessionsWithRuntimeState(sessions) {
     const sessionId = status?.sessionId || status?.groupId || null;
     if (!sessionId) continue;
     const state = status.state || 'idle';
-    const running = !['idle', 'offline', 'completed', 'failed', 'aborted'].includes(state);
+    const running = isVpStatusRunning(state);
     const updatedAt = status.updatedAt || status.since || Date.now();
     const prev = bySession.get(sessionId) || { running: false, runningVpCount: 0, latestActivityAt: 0 };
     if (running) prev.runningVpCount += 1;
@@ -5260,6 +5286,7 @@ export async function handleYeaftMcpReload(msg = {}) {
 export const __testHooks = {
   loadVisibleGroupHistoryPage,
   persistInboundMessageOnceByMsgId,
+  buildPendingRescueEnvelope,
   setSessionForTest(nextSession) {
     session = nextSession || null;
   },
@@ -5269,6 +5296,13 @@ export const __testHooks = {
     vpAborts.clear();
     vpInboxes.clear();
   },
+  resetVpStatusBroker() {
+    if (vpStatusBroker) vpStatusBroker.reset();
+  },
+  seedVpStatus(status) {
+    return getVpStatusBroker().transition(status);
+  },
+  decorateSessionsWithRuntimeState,
   seedQueuedVpTurn({ sessionId = 'session-test', vpId = 'vp-test', threadId = 'main', turnId = 'turn-test' } = {}) {
     const key = threadKey(sessionId, vpId, threadId);
     const inbox = vpInboxes.get(key) || [];