@yeaft/webchat-agent 0.1.1091 → 0.1.1093

package/connection/message-router.js

@@ -38,7 +38,7 @@ import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getYeaftSettings, updateYeaftSettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../yeaft/config-api.js';
 import { discoverLlmModels } from '../llm-model-discovery.js';
 import { fetchModelsDev } from '../yeaft/llm/models-dev.js';
-import { handleYeaftSessionSend, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftCreateSession, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftScanWorkdirSessions, handleYeaftRestoreSession, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, handleYeaftMcpList, handleYeaftMcpAdd, handleYeaftMcpRemove, handleYeaftMcpReload, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager } from '../yeaft/web-bridge.js';
+import { handleYeaftSessionSend, handleYeaftSubAgentPrompt, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftCreateSession, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftScanWorkdirSessions, handleYeaftRestoreSession, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, handleYeaftMcpList, handleYeaftMcpAdd, handleYeaftMcpRemove, handleYeaftMcpReload, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager } from '../yeaft/web-bridge.js';
 import { startYeaftStatusRefresh, refreshYeaftStatus } from '../yeaft/status-cache.js';
 
 export async function handleMessage(msg) {
@@ -655,6 +655,9 @@ export async function handleMessage(msg) {
     case 'yeaft_session_send':
       handleYeaftSessionSend(msg);
       break;
+    case 'yeaft_sub_agent_prompt':
+      handleYeaftSubAgentPrompt(msg);
+      break;
 
     // wave-6b: manual dream trigger from VP detail page
     case 'yeaft_dream_trigger':

package/package.json

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

package/yeaft/sub-agent/runner.js

@@ -274,13 +274,19 @@ async function driveSubAgent(agent, subEngine, vpPersona, deps) {
     ? deps.idleAbandonMs : IDLE_ABANDON_MS;
 
   const wrapEvt = (evt) => ({ ...evt, agentId: agent.id, agentName: agent.name });
+  let lastTaskLogRefreshAt = 0;
+  const refreshTaskLog = ({ force = false } = {}) => {
+    if (!agent.taskId || !deps.taskManager || !agent.parentSessionId) return;
+    const now = Date.now();
+    if (!force && now - lastTaskLogRefreshAt < 250) return;
+    lastTaskLogRefreshAt = now;
+    try { deps.taskManager.refreshTaskLog(agent.parentSessionId, agent.taskId); } catch { /* ignore */ }
+  };
 
   const emit = (evt) => {
     const wrapped = wrapEvt(evt);
     try { agent.outputLog?.write(wrapped); } catch { /* ignore log failures */ }
-    if (agent.taskId && deps.taskManager && agent.parentSessionId) {
-      try { deps.taskManager.refreshTaskLog(agent.parentSessionId, agent.taskId); } catch { /* ignore */ }
-    }
+    refreshTaskLog({ force: true });
     if (onEvent) {
       try { onEvent(agent.id, wrapped); } catch { /* ignore listener errors */ }
     }
@@ -360,15 +366,14 @@ async function driveSubAgent(agent, subEngine, vpPersona, deps) {
           // the bump.
           bumpLivenessFromEvent(agent.liveness, evt);
 
-          // Mirror every raw event to the durable log, but do not live-stream
-          // assistant text to the parent/UI. A sub-agent's answer is consumed
-          // as one complete result at sub_agent_turn_end / task_result re-entry;
-          // streaming deltas here make the card look like the result itself
-          // and can leave users staring at an "idle" preview before the parent
-          // VP consumes the completed task result.
+          // Mirror every raw event to the durable log. We still keep
+          // `sub_agent_event` text_delta suppressed so the inline transcript
+          // card remains result-oriented, but task-backed sub-agents refresh
+          // their task log so the Session status pane can show a live stream.
           if (agent.outputLog) {
             try { agent.outputLog.write(wrapEvt(evt)); } catch { /* ignore */ }
           }
+          refreshTaskLog({ force: evt?.type !== 'text_delta' });
           if (onEvent && evt?.type !== 'text_delta') {
             try { onEvent(agent.id, wrapEvt(evt)); } catch { /* ignore listener errors */ }
           }
@@ -460,12 +465,14 @@ async function driveSubAgent(agent, subEngine, vpPersona, deps) {
         return;
       }
 
-      // Turn complete cleanly. Task-backed sub-agents are one-shot
+      // Turn complete cleanly. Task-backed sub-agents are usually one-shot
       // background tasks: once they produce their mission result, complete
       // the agent/task instead of letting the idle watchdog later mark the
-      // already-delivered work as abandoned. Legacy in-process callers with
-      // no TaskManager keep the old idle/PromptAgent continuation flow.
-      if (agent.taskId && deps.taskManager && agent.parentSessionId) {
+      // already-delivered work as abandoned. If the user queued a follow-up
+      // while the turn was running, keep the driver alive and immediately
+      // continue into the next prompt instead of dropping that input.
+      const hasQueuedFollowUp = Array.isArray(agent.pendingPrompts) && agent.pendingPrompts.length > 0;
+      if (agent.taskId && deps.taskManager && agent.parentSessionId && !hasQueuedFollowUp) {
         transitionTerminal(agent, STATUS.COMPLETED, {
           diagnostic: 'task_turn_complete',
           deps,
@@ -473,7 +480,7 @@ async function driveSubAgent(agent, subEngine, vpPersona, deps) {
         emit({ type: 'sub_agent_turn_end', content: assistantText, status: STATUS.COMPLETED });
         return;
       }
-      emit({ type: 'sub_agent_turn_end', content: assistantText, status: STATUS.IDLE });
+      emit({ type: 'sub_agent_turn_end', content: assistantText, status: hasQueuedFollowUp ? STATUS.RUNNING : STATUS.IDLE });
     }
   } finally {
     if (wallTimeWatchdog) clearTimeout(wallTimeWatchdog);

package/yeaft/web-bridge.js

@@ -69,6 +69,8 @@ import { createVpStatusBroker } 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';
+import { getAgentRegistry, agentBelongsToScope } from './tools/agent.js';
+import { isPromptableAgentStatus } from './sub-agent/status.js';
 
 /** @type {import('./session.js').Session | null} */
 let session = null;
@@ -4314,6 +4316,74 @@ export async function handleYeaftFetchDebugHistory(msg = {}) {
   });
 }
 
+export function handleYeaftSubAgentPrompt(msg) {
+  const sessionId = typeof msg?.sessionId === 'string' ? msg.sessionId.trim() : '';
+  const taskId = typeof msg?.taskId === 'string' ? msg.taskId.trim() : '';
+  const subAgentId = typeof msg?.subAgentId === 'string' ? msg.subAgentId.trim() : '';
+  const message = typeof msg?.message === 'string' ? msg.message.trim() : '';
+  const clientPromptId = typeof msg?.clientPromptId === 'string' ? msg.clientPromptId.trim() : '';
+  const fail = (error) => {
+    sendSessionEvent({
+      type: 'yeaft_sub_agent_prompt_result',
+      success: false,
+      taskId: taskId || null,
+      subAgentId: subAgentId || null,
+      clientPromptId: clientPromptId || null,
+      error,
+    }, sessionId ? { sessionId } : undefined);
+  };
+
+  if (!sessionId || !taskId || !subAgentId || !message) {
+    fail('sessionId, taskId, subAgentId and message are required');
+    return;
+  }
+  const task = session?.taskManager?.getTask?.(sessionId, taskId) || null;
+  if (!task || task.kind !== 'sub_agent' || task.status !== 'running' || task.runtime?.subAgentId !== subAgentId) {
+    fail('sub-agent task not found');
+    return;
+  }
+
+  const agent = getAgentRegistry().get(subAgentId);
+  const scope = {
+    sessionId,
+    parentVpId: task.ownerVpId || null,
+    parentThreadId: task.source?.threadId || 'main',
+  };
+  if (!agent || !agentBelongsToScope(agent, scope)) {
+    fail('sub-agent not found');
+    return;
+  }
+  if (!isPromptableAgentStatus(agent.status)) {
+    fail(`sub-agent status "${agent.status}" does not accept prompts`);
+    return;
+  }
+
+  if (!Array.isArray(agent.pendingPrompts)) agent.pendingPrompts = [];
+  agent.pendingPrompts.push(message);
+  if (!Array.isArray(agent.messages)) agent.messages = [];
+  agent.messages.push({ role: 'user', content: message, timestamp: Date.now() });
+  if (agent.status === 'idle' || agent.status === 'created') agent.status = 'running';
+
+  try {
+    agent.outputLog?.write?.({
+      type: 'user_prompt',
+      agentId: agent.id,
+      agentName: agent.name,
+      content: message,
+    });
+    session?.taskManager?.refreshTaskLog?.(sessionId, taskId);
+  } catch { /* prompt queueing must not depend on log refresh */ }
+
+  sendSessionEvent({
+    type: 'yeaft_sub_agent_prompt_result',
+    success: true,
+    taskId,
+    subAgentId,
+    clientPromptId: clientPromptId || null,
+    pending: agent.pendingPrompts.length,
+  }, { sessionId, vpId: task.ownerVpId || null, threadId: task.source?.threadId || null });
+}
+
 /** Deprecated mode switch — Yeaft is single-mode. */
 export function handleYeaftModeSwitch(_msg) {
   console.warn('[Yeaft] yeaft_mode_switch is deprecated and ignored — Yeaft now runs in a single unified mode.');
@@ -5022,6 +5092,9 @@ export async function handleYeaftMcpReload(msg = {}) {
 }
 
 export const __testHooks = {
+  setSessionForTest(nextSession) {
+    session = nextSession || null;
+  },
   resetAbortState() {
     turnAbortCtrls.clear();
     turnAbortMeta.clear();