@yeaft/webchat-agent 1.0.159 → 1.0.161

package/connection/message-router.js

@@ -29,7 +29,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, handleYeaftSubAgentPrompt, handleYeaftTaskCancel, 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, preloadYeaftSkillSlashCommands } from '../yeaft/web-bridge.js';
+import { handleYeaftSessionSend, handleYeaftAskUserAnswer, handleYeaftSubAgentPrompt, handleYeaftTaskCancel, 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, preloadYeaftSkillSlashCommands } from '../yeaft/web-bridge.js';
 import { startYeaftStatusRefresh, forceRefreshYeaftStatus } from '../yeaft/status-cache.js';
 import { handleWorkCenterRequest } from '../yeaft/work-center/bridge.js';
 
@@ -282,6 +282,10 @@ export async function handleMessage(msg) {
       handleAskUserAnswer(msg);
       break;
 
+    case 'yeaft_ask_user_answer':
+      handleYeaftAskUserAnswer(msg);
+      break;
+
 
     // Port proxy
     case 'proxy_request':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.159",
+  "version": "1.0.161",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "author": "Yeaft",
   "devDependencies": {
-    "nodemon": "^3.0.2"
+    "nodemon": "^3.1.14"
   },
   "nodemonConfig": {
     "watch": [
@@ -60,7 +60,7 @@
     "dotenv": "^16.3.1",
     "tweetnacl": "^1.0.3",
     "tweetnacl-util": "^0.15.1",
-    "uuid": "^11.1.0",
-    "ws": "^8.16.0"
+    "uuid": "^11.1.1",
+    "ws": "^8.21.0"
   }
 }

package/yeaft/engine.js

@@ -1185,6 +1185,7 @@ export class Engine {
       // Null in non-VP / test contexts — tools tolerate missing slots.
       getCurrentTodos: vpCtx?.getCurrentTodos || null,
       setCurrentTodos: vpCtx?.setCurrentTodos || null,
+      askUser: vpCtx?.askUser || null,
       // task-707: tool-callable end-turn signal. The engine threads this
       // setter when constructing toolCtx so a tool (e.g. route_forward)
       // can mark "after this batch, end the turn — do NOT call adapter
@@ -1649,7 +1650,7 @@ export class Engine {
    *   string-prompt shape (no regression for existing callers).
    * @yields {EngineEvent}
    */
-  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null } = {}) {
+  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, askUser = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null } = {}) {
     if (!prompt || typeof prompt !== 'string' || !prompt.trim()) {
       yield {
         type: 'error',
@@ -1717,7 +1718,7 @@ export class Engine {
 
     try {
       this.#currentThreadId = threadId || MAIN_THREAD_ID;
-      yield* this.#runQuery({ prompt: effectivePrompt, promptParts: effectivePromptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, threadId: this.#currentThreadId, vpTurnId, drainPendingUserMessages, collabToolPolicy: effectiveCollabToolPolicy, explicitSkillName: parsedSkill.skillName });
+      yield* this.#runQuery({ prompt: effectivePrompt, promptParts: effectivePromptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, askUser, threadId: this.#currentThreadId, vpTurnId, drainPendingUserMessages, collabToolPolicy: effectiveCollabToolPolicy, explicitSkillName: parsedSkill.skillName });
     } finally {
       if (signal) {
         try { signal.removeEventListener('abort', onExternalAbort); } catch { /* ignore */ }
@@ -1761,7 +1762,7 @@ export class Engine {
    * in a try/finally without indenting the whole loop.
    * @private
    */
-  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null, explicitSkillName = null }) {
+  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, askUser = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null, explicitSkillName = null }) {
 
     const effectiveCollabToolPolicy = collabToolPolicy === COLLAB_TOOL_POLICY.SINGLE_VP || collabToolPolicy === COLLAB_TOOL_POLICY.MULTI_VP
       ? collabToolPolicy
@@ -3086,6 +3087,7 @@ export class Engine {
         contextWindow: currentContextWindow,
         getCurrentTodos,
         setCurrentTodos,
+        askUser,
         workDir,
         currentToolCall: () => currentToolCallForAsyncTask ? { ...currentToolCallForAsyncTask } : null,
         requestEndTurn: (reason) => {

package/yeaft/tools/ask-user.js

@@ -9,7 +9,6 @@
  */
 
 import { defineTool } from './types.js';
-import { randomUUID } from 'crypto';
 
 export default defineTool({
   name: 'AskUser',
@@ -57,22 +56,16 @@ Guidelines:
   },
   isConcurrencySafe: () => false,
   isReadOnly: () => true,
+  // This is an intentionally user-driven wait, not a stalled tool call.
+  timeoutMs: 0,
   async execute(input, ctx) {
     const { question, options } = input;
     if (!question) return JSON.stringify({ error: 'question is required' });
+    if (typeof ctx?.askUser !== 'function') {
+      return JSON.stringify({ error: 'Interactive user input is unavailable in this runtime.' });
+    }
 
-    // Generate a unique request ID for this ask
-    const requestId = `ask_${randomUUID().slice(0, 8)}`;
-
-    // In a full web-bridge integration, this would send an ask_user event
-    // and await the answer. For now, return a formatted prompt that the
-    // LLM can see — the web-bridge handles the ask flow externally.
-    return JSON.stringify({
-      type: 'ask_user',
-      requestId,
-      question,
-      ...(options ? { options } : {}),
-      message: `Question sent to user: "${question}"${options ? ` [Options: ${options.join(', ')}]` : ''}`,
-    });
+    const answers = await ctx.askUser({ question, options });
+    return JSON.stringify({ question, answers });
   },
 });

package/yeaft/tools/types.js

@@ -32,6 +32,8 @@
  * @property {number} [contextWindow] — current model's context window in
  *   tokens (used by ToolRegistry.execute to cap a single tool result at a
  *   fraction of the window so one runaway grep can't blow the wire).
+ * @property {(input: {question:string, options?:string[]}) => Promise<object>} [askUser]
+ *   — host-provided interactive prompt. Resolves only after the user answers.
  * @property {(reason?: string|object) => void} [requestEndTurn]
  *   — tool-callable signal that the current engine turn should end after
  *   this batch of tool calls completes (no follow-up adapter.stream call).

package/yeaft/web-bridge.js

@@ -79,6 +79,9 @@ const YEAFT_SKILL_COMMAND_PREFIX = 'yeaft-skills:';
 const PROJECT_SKILL_TIERS = new Set(['project', 'project-claude', 'project-codex']);
 const BASE_RUNTIME_KEY = '__base__';
 
+/** @type {Map<string, {resolve:Function, sessionId:string, vpId:string, threadId:string, turnId:string, signal?:AbortSignal, onAbort?:Function}>} */
+const pendingUserPrompts = new Map();
+
 /** @type {import('./session.js').Session | null} */
 let session = null;
 
@@ -4361,6 +4364,44 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
         // each write a copy of the user message, and history replay
         // would render the user's prompt N times.
         userAlreadyPersisted: true,
+        askUser: ({ question, options }) => new Promise((resolve, reject) => {
+          const requestId = `ask_${randomUUID()}`;
+          const signal = vpAbort.signal;
+          // User think time is not engine silence. Pause the query watchdog until
+          // the card is answered; the normal tool/LLM budget resumes afterward.
+          if (queryTimer) {
+            clearTimeout(queryTimer);
+            queryTimer = null;
+          }
+          const onAbort = () => {
+            pendingUserPrompts.delete(requestId);
+            reject(new Error('aborted'));
+          };
+          pendingUserPrompts.set(requestId, {
+            resolve: answers => {
+              resetQueryTimer();
+              resolve(answers);
+            },
+            sessionId,
+            vpId,
+            threadId,
+            turnId,
+            signal,
+            onAbort,
+          });
+          signal.addEventListener('abort', onAbort, { once: true });
+          sendSessionEvent({
+            type: 'ask_user_question',
+            requestId,
+            questions: [{
+              question,
+              options: Array.isArray(options)
+                ? options.map(label => ({ label, description: '' }))
+                : [],
+              multiSelect: false,
+            }],
+          }, envelope);
+        }),
         threadId,
         vpTurnId: turnId,
         drainPendingUserMessages: () => {
@@ -5387,6 +5428,24 @@ export async function handleYeaftFetchDebugHistory(msg = {}) {
   });
 }
 
+/** Resolve a pending Yeaft AskUser prompt from the web UI. */
+export function handleYeaftAskUserAnswer(msg) {
+  const requestId = typeof msg?.requestId === 'string' ? msg.requestId : '';
+  const pending = pendingUserPrompts.get(requestId);
+  if (!pending) return false;
+  if (msg.sessionId && msg.sessionId !== pending.sessionId) return false;
+  if (msg.vpId && msg.vpId !== pending.vpId) return false;
+  if (msg.turnId && msg.turnId !== pending.turnId) return false;
+  if (msg.threadId && msg.threadId !== pending.threadId) return false;
+
+  pendingUserPrompts.delete(requestId);
+  if (pending.signal && pending.onAbort) {
+    try { pending.signal.removeEventListener('abort', pending.onAbort); } catch { /* ignore */ }
+  }
+  pending.resolve(msg.answers || {});
+  return true;
+}
+
 export async function handleYeaftSessionSend(msg) {
   return runYeaftSessionSend(msg);
 }
@@ -6207,6 +6266,15 @@ export const __testHooks = {
     vpAborts.clear();
     vpInboxes.clear();
   },
+  seedPendingUserPrompt({ requestId = 'ask-test', sessionId = 'session-test', vpId = 'vp-test', threadId = 'main', turnId = 'turn-test' } = {}) {
+    let resolved;
+    const promise = new Promise(resolve => { resolved = resolve; });
+    pendingUserPrompts.set(requestId, { resolve: resolved, sessionId, vpId, threadId, turnId });
+    return promise;
+  },
+  resetPendingUserPrompts() {
+    pendingUserPrompts.clear();
+  },
   resetVpStatusBroker() {
     if (vpStatusBroker) vpStatusBroker.reset();
   },