@yeaft/webchat-agent 1.0.103 → 1.0.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.103",
+  "version": "1.0.104",
   "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/debug-trace.js

@@ -232,12 +232,50 @@ function buildRawRequestBase(value) {
 }
 
 function buildRawMessagesDelta(previousMessages, nextMessages) {
-  if (!Array.isArray(previousMessages) || !Array.isArray(nextMessages)) return null;
-  const prefix = messagesPrefixLength(previousMessages, nextMessages);
-  if (prefix === previousMessages.length && prefix <= nextMessages.length) {
+  if (!Array.isArray(nextMessages)) return null;
+  const priorMessages = Array.isArray(previousMessages) ? previousMessages : [];
+  const prefix = messagesPrefixLength(priorMessages, nextMessages);
+  if (prefix === priorMessages.length && prefix <= nextMessages.length) {
     return { messagesFrom: prefix, messagesAppend: boundRawValue(nextMessages.slice(prefix), 'raw_request_messages_append_budget') };
   }
-  return { messages: boundRawValue(nextMessages, 'raw_request_messages_budget') };
+  return { messagesFrom: 0, messagesAppend: boundRawValue(nextMessages, 'raw_request_messages_append_budget') };
+}
+
+function rawRequestMessageKey(body) {
+  if (!isPlainObject(body)) return null;
+  if (Array.isArray(body.messages)) return 'messages';
+  if (Array.isArray(body.input)) return 'input';
+  return null;
+}
+
+function buildInitialRawRequestDelta(value) {
+  if (value == null) return null;
+  if (typeof value === 'string') return { replacement: rawRequestSentinel('raw_request_string_replaced', value) };
+  if (!isPlainObject(value)) return { replacement: boundRawValue(value) };
+  const delta = { set: {}, body: {} };
+  for (const [key, item] of Object.entries(value)) {
+    if (key === 'body') continue;
+    delta.set[key] = boundRawValue(item, `raw_request_${key}_budget`);
+  }
+  const body = isPlainObject(value.body) ? value.body : null;
+  if (body) {
+    for (const [key, bodyValue] of Object.entries(body)) {
+      if (key === 'messages' || key === 'input') continue;
+      delta.body[key] = boundRawValue(bodyValue, `raw_request_body_${key}_budget`);
+    }
+    const messageKey = rawRequestMessageKey(body);
+    if (messageKey) {
+      delta.body.messagesKey = messageKey;
+      Object.assign(delta.body, buildRawMessagesDelta([], body[messageKey]) || {});
+    }
+  } else if (Object.prototype.hasOwnProperty.call(value, 'body')) {
+    delta.set.body = rawRequestSentinel('raw_request_body_replaced');
+  }
+  if (Object.keys(delta.set).length === 0) delete delta.set;
+  if (Object.keys(delta.body).length === 0) delete delta.body;
+  if (!delta.set && !delta.body) return null;
+  if (jsonByteLength(delta) > MAX_RAW_REQUEST_BYTES) return { replacement: rawRequestSentinel('raw_request_delta_budget') };
+  return delta;
 }
 
 function rawComparableRequest(value) {
@@ -250,7 +288,7 @@ function rawComparableRequest(value) {
 
 function buildRawRequestDelta(previous, next) {
   if (next == null) return previous == null ? null : { replacement: null };
-  if (previous == null) return { base: buildRawRequestBase(next) };
+  if (previous == null) return buildInitialRawRequestDelta(next);
   const comparablePrevious = rawComparableRequest(previous);
   const comparableNext = rawComparableRequest(next);
   if (typeof comparablePrevious === 'string' || typeof comparableNext === 'string') {
@@ -273,13 +311,15 @@ function buildRawRequestDelta(previous, next) {
   const nextBody = isPlainObject(comparableNext.body) ? comparableNext.body : null;
   if (prevBody && nextBody) {
     for (const key of Object.keys(nextBody)) {
-      if (key === 'messages') continue;
+      if (key === 'messages' || key === 'input') continue;
       if (!stableEqual(prevBody[key], nextBody[key])) delta.body[key] = boundRawValue(nextBody[key], `raw_request_body_${key}_budget`);
     }
     for (const key of Object.keys(prevBody)) {
-      if (key !== 'messages' && !Object.prototype.hasOwnProperty.call(nextBody, key)) delta.body[key] = null;
+      if (key !== 'messages' && key !== 'input' && !Object.prototype.hasOwnProperty.call(nextBody, key)) delta.body[key] = null;
     }
-    const msgDelta = buildRawMessagesDelta(prevBody.messages, nextBody.messages);
+    const prevMessages = Array.isArray(prevBody.messages) ? prevBody.messages : prevBody.input;
+    const nextMessages = Array.isArray(nextBody.messages) ? nextBody.messages : nextBody.input;
+    const msgDelta = buildRawMessagesDelta(prevMessages, nextMessages);
     if (msgDelta) Object.assign(delta.body, msgDelta);
   } else if (!stableEqual(previous.body, next.body)) {
     delta.set.body = rawRequestSentinel('raw_request_body_replaced');
@@ -294,7 +334,7 @@ function buildRawRequestDelta(previous, next) {
   return delta;
 }
 
-function applyRawRequestDelta(previous, delta) {
+export function applyRawRequestDelta(previous, delta) {
   if (!delta) return previous ?? null;
   if (Object.prototype.hasOwnProperty.call(delta, 'base')) return cloneJsonValue(delta.base) ?? delta.base ?? null;
   if (Object.prototype.hasOwnProperty.call(delta, 'replacement')) return cloneJsonValue(delta.replacement) ?? delta.replacement ?? null;
@@ -305,14 +345,18 @@ function applyRawRequestDelta(previous, delta) {
   if (isPlainObject(delta.body)) {
     const body = isPlainObject(next.body) ? { ...next.body } : {};
     for (const [key, value] of Object.entries(delta.body)) {
-      if (key === 'messagesFrom' || key === 'messagesAppend' || key === 'messages') continue;
+      if (key === 'messagesFrom' || key === 'messagesAppend' || key === 'messages' || key === 'messagesKey') continue;
       body[key] = cloneJsonValue(value) ?? value;
     }
+    const messageKey = delta.body.messagesKey === 'messages' || delta.body.messagesKey === 'input'
+      ? delta.body.messagesKey
+      : (Array.isArray(body.messages) || Object.prototype.hasOwnProperty.call(delta.body, 'messages') ? 'messages' : 'input');
     if (Array.isArray(delta.body.messages)) {
-      body.messages = cloneJsonValue(delta.body.messages) || [];
+      body[messageKey] = cloneJsonValue(delta.body.messages) || [];
     } else if (Array.isArray(delta.body.messagesAppend)) {
-      const from = Number.isFinite(Number(delta.body.messagesFrom)) ? Number(delta.body.messagesFrom) : (Array.isArray(body.messages) ? body.messages.length : 0);
-      body.messages = (Array.isArray(body.messages) ? body.messages.slice(0, from) : []).concat(cloneJsonValue(delta.body.messagesAppend) || []);
+      const existing = Array.isArray(body[messageKey]) ? body[messageKey] : [];
+      const from = Number.isFinite(Number(delta.body.messagesFrom)) ? Number(delta.body.messagesFrom) : existing.length;
+      body[messageKey] = existing.slice(0, from).concat(cloneJsonValue(delta.body.messagesAppend) || []);
     }
     next.body = body;
   }
@@ -339,11 +383,14 @@ function buildRequestSnapshot(info = {}) {
 
 function buildRequestDelta(previous, next) {
   if (!previous) {
-    return {
+    const delta = {
       base: true,
       systemPrompt: next.systemPrompt || '',
       messages: Array.isArray(next.messages) ? next.messages : [],
     };
+    const rawRequestDelta = buildRawRequestDelta(null, next.rawRequest);
+    if (rawRequestDelta) delta.rawRequestDelta = rawRequestDelta;
+    return delta;
   }
   const delta = {};
   if ((next.systemPrompt || '') !== (previous.systemPrompt || '')) {
@@ -372,11 +419,15 @@ function applyRequestDelta(previous, delta = {}) {
     rawRequest: base.rawRequest ?? null,
   };
   if (delta.base) {
-    return {
+    const nextBase = {
       systemPrompt: delta.systemPrompt || '',
       messages: Array.isArray(delta.messages) ? delta.messages : [],
-      rawRequest: base.rawRequest ?? null,
+      rawRequest: null,
     };
+    if (Object.prototype.hasOwnProperty.call(delta, 'rawRequestDelta')) {
+      nextBase.rawRequest = applyRawRequestDelta(null, delta.rawRequestDelta);
+    }
+    return nextBase;
   }
   if (typeof delta.systemPrompt === 'string') next.systemPrompt = delta.systemPrompt;
   if (Array.isArray(delta.messages)) {
@@ -389,6 +440,13 @@ function applyRequestDelta(previous, delta = {}) {
   return next;
 }
 
+export function reconstructDebugRawRequest(baseRawRequest, requestDelta) {
+  if (!requestDelta || !Object.prototype.hasOwnProperty.call(requestDelta, 'rawRequestDelta')) {
+    return baseRawRequest ?? null;
+  }
+  return applyRawRequestDelta(baseRawRequest ?? null, requestDelta.rawRequestDelta);
+}
+
 function sessionRequestsDir(rootDir, sessionId) {
   if (sessionId) return join(rootDir, 'sessions', safeDirComponent(sessionId), 'debug', 'requests');
   return join(rootDir, 'debug', 'requests');
@@ -462,7 +520,7 @@ function expandTrace(trace) {
       ttfbMs: loop.ttfbMs || null,
       stopReason: loop.stopReason || null,
       at: loop.at || null,
-      rawRequest: snapshot.rawRequest ?? null,
+      rawRequest: null,
       rawResponse: loop.rawResponse ?? null,
       requestDelta: loop.requestDelta || {},
       requestBase: trace.baseRequest || null,
@@ -503,7 +561,7 @@ function traceToLegacyRows(trace) {
       tool_calls_json: JSON.stringify(loop.toolCalls || []),
       usage_json: JSON.stringify(u),
       ttfb_ms: loop.ttfbMs || null,
-      raw_request: typeof snapshot.rawRequest === 'string' ? snapshot.rawRequest : JSON.stringify(snapshot.rawRequest ?? null),
+      raw_request: null,
       raw_response: typeof loop.rawResponse === 'string' ? loop.rawResponse : JSON.stringify(loop.rawResponse ?? null),
       user_prompt: trace.userPrompt || '',
     };
@@ -674,8 +732,11 @@ export class DebugTrace {
     const snapshot = buildRequestSnapshot(info);
     const previousSnapshot = trace._lastSnapshot || this.#reconstructLastSnapshot(trace);
     if (!trace.baseRequest) {
-      const rawRequestBaseDelta = buildRawRequestDelta(null, snapshot.rawRequest);
-      trace.baseRequest = { ...snapshot, rawRequest: applyRawRequestDelta(null, rawRequestBaseDelta) };
+      trace.baseRequest = {
+        systemPrompt: snapshot.systemPrompt,
+        messages: Array.isArray(snapshot.messages) ? cloneJsonValue(snapshot.messages) : [],
+        rawRequest: null,
+      };
     }
     const loopIndex = (trace.loops || []).findIndex(l => l.turnRowId === turnId);
     const loop = {

package/yeaft/web-bridge.js

@@ -717,11 +717,33 @@ export function broadcastLanguageChange(language) {
 
 /** Query timeout in ms — abort if LLM doesn't respond within this window */
 const QUERY_TIMEOUT_MS = 120_000;
+const HIGH_REASONING_QUERY_TIMEOUT_MS = 300_000;
+
+function isHighReasoningEffort(effort) {
+  const value = typeof effort === 'string' ? effort.trim().toLowerCase() : '';
+  return value === 'high' || value === 'xhigh' || value === 'max';
+}
+
+function queryTimeoutMsForSessionConfig(config = null) {
+  return isHighReasoningEffort(config?.modelEffort) ? HIGH_REASONING_QUERY_TIMEOUT_MS : QUERY_TIMEOUT_MS;
+}
+
+function queryTimeoutMsForSession(sessionId = null) {
+  if (!sessionId || !session) return queryTimeoutMsForSessionConfig(session?.config);
+  try {
+    return queryTimeoutMsForSessionConfig(resolveSessionConfig(session.config, loadSessionConfig(liveConfigRoot(), sessionId)));
+  } catch {
+    return queryTimeoutMsForSessionConfig(session?.config);
+  }
+}
 
 /**
  * Secondary watchdog grace period (ms).
  *
- * After {@link QUERY_TIMEOUT_MS} of silence the per-VP `vpAbort` is fired.
+ * After the active query timeout of silence the per-VP `vpAbort` is fired.
+ * Normal turns use {@link QUERY_TIMEOUT_MS}; high-reasoning session turns use
+ * {@link HIGH_REASONING_QUERY_TIMEOUT_MS} because large tool-result arcs can
+ * legitimately spend longer before the provider emits the first SSE event.
  * That's enough on its own when adapters / tools cooperate with the
  * AbortSignal — the engine throws `AbortError`, runVpTurn's catch emits
  * `result{stopped:true}`, the driver `finally` emits `vp_typing_end`, and
@@ -741,7 +763,7 @@ const QUERY_TIMEOUT_MS = 120_000;
  *
  * The driver loop wraps `await runVpTurn(...)` in a Promise.race against
  * this grace-window timer. If runVpTurn doesn't return within
- * QUERY_TIMEOUT_MS + ESCALATE_AFTER_ABORT_MS, the driver forces its
+ * active query timeout + ESCALATE_AFTER_ABORT_MS, the driver forces its
  * `finally` block (vp_typing_end + group_message), emits a synthetic
  * `result{stopped:true}` so the frontend leaves its in-flight state,
  * and moves on. The hung tool promise leaks (JS lacks cooperative
@@ -4059,7 +4081,8 @@ function startSessionLoadInBackground({ sessionId = null, sessionMeta = null, pe
  */
 async function runVpTurnWithEscalation(args) {
   const { sessionId, vpId, turnId, threadId, thread } = args;
-  const deadlineMs = QUERY_TIMEOUT_MS + ESCALATE_AFTER_ABORT_MS;
+  const queryTimeoutMs = queryTimeoutMsForSession(sessionId);
+  const deadlineMs = queryTimeoutMs + ESCALATE_AFTER_ABORT_MS;
   await raceWithEscalation(runVpTurn(args), {
     deadlineMs,
     onEscalate: () => {
@@ -4213,14 +4236,15 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
     }
 
     let queryTimer = null;
+    const queryTimeoutMs = queryTimeoutMsForSession(sessionId);
     const resetQueryTimer = () => {
       if (queryTimer) clearTimeout(queryTimer);
       queryTimer = setTimeout(() => {
         if (!vpAbort.signal.aborted) {
-          console.error(`[Yeaft] query timeout after ${QUERY_TIMEOUT_MS / 1000}s of silence — aborting VP ${vpId}`);
+          console.error(`[Yeaft] query timeout after ${queryTimeoutMs / 1000}s of silence — aborting VP ${vpId}`);
           try { vpAbort.abort(); } catch { /* best-effort */ }
         }
-      }, QUERY_TIMEOUT_MS);
+      }, queryTimeoutMs);
     };
     resetQueryTimer();
 
@@ -6229,6 +6253,8 @@ export const __testHooks = {
   projectRuntimeCount() {
     return projectRuntimes.size;
   },
+  queryTimeoutMsForSessionConfig,
+  queryTimeoutMsForSession,
   seedQueuedVpTurn({ sessionId = 'session-test', vpId = 'vp-test', threadId = 'main', turnId = 'turn-test' } = {}) {
     const key = threadKey(sessionId, vpId, threadId);
     const inbox = vpInboxes.get(key) || [];