@yeaft/webchat-agent 1.0.507 → 1.0.509

package/connection/message-router.js

@@ -393,7 +393,7 @@ export async function handleMessage(msg) {
     // LLM configuration (read/write this agent's ~/.yeaft/config.json)
     case 'get_llm_config': {
       const config = getLlmConfig(ctx.CONFIG?.yeaftDir);
-      sendToServer({ type: 'llm_config', ...config });
+      sendToServer({ type: 'llm_config', requestId: msg.requestId, ...config });
       break;
     }
 

package/local-runtime/server/handlers/agent-sync.js

@@ -299,6 +299,7 @@ export async function handleAgentSync(agentId, agent, msg) {
           await sendToWebClient(client, {
             type: 'llm_config',
             agentId,
+            requestId: msg.requestId,
             providers: msg.providers,
             primaryModel: msg.primaryModel,
             fastModel: msg.fastModel,

package/local-runtime/server/handlers/client-conversation.js

@@ -68,6 +68,25 @@ function emptyYeaftManagedSkillResult(error = null) {
   };
 }
 
+async function sendAskUserAgentUnavailable(client, msg, agentId) {
+  await sendToWebClient(client, {
+    type: 'yeaft_output',
+    agentId: agentId || null,
+    requestId: msg.requestId || null,
+    conversationId: msg.conversationId ?? null,
+    ...(msg.sessionId != null ? { sessionId: msg.sessionId } : {}),
+    ...(msg.vpId != null ? { vpId: msg.vpId } : {}),
+    ...(msg.turnId != null ? { turnId: msg.turnId } : {}),
+    ...(msg.threadId != null ? { threadId: msg.threadId } : {}),
+    event: {
+      type: 'ask_user_answer_rejected',
+      requestId: msg.requestId || null,
+      toolCallId: msg.toolCallId || null,
+      reason: 'agent_unavailable',
+    },
+  });
+}
+
 async function sendVpSnapshotError(client, msg, error) {
   await sendToWebClient(client, {
     type: 'yeaft_output',
@@ -1663,7 +1682,9 @@ export async function handleClientConversation(clientId, client, msg, checkAgent
           });
         }
         if (!relayAgentId) {
-          if (relayType === 'yeaft_fetch_tool_stats') {
+          if (relayType === 'yeaft_ask_user_answer') {
+            await sendAskUserAgentUnavailable(client, msg, relayAgentId);
+          } else if (relayType === 'yeaft_fetch_tool_stats') {
             await sendToWebClient(client, emptyYeaftToolStats('No agent selected.'));
           } else if (relayType === 'yeaft_dream_trigger') {
             await sendToWebClient(client, skippedYeaftDreamResult(msg, 'no-agent-selected'));
@@ -1678,7 +1699,9 @@ export async function handleClientConversation(clientId, client, msg, checkAgent
           return true; // swallow silently for legacy fire-and-forget messages
         }
         if (!await checkAgentAccess(relayAgentId)) {
-          if (relayType === 'yeaft_fetch_tool_stats') {
+          if (relayType === 'yeaft_ask_user_answer') {
+            await sendAskUserAgentUnavailable(client, msg, relayAgentId);
+          } else if (relayType === 'yeaft_fetch_tool_stats') {
             await sendToWebClient(client, emptyYeaftToolStats('Agent is not available.'));
           } else if (relayType === 'yeaft_dream_trigger') {
             await sendToWebClient(client, skippedYeaftDreamResult(msg, 'agent-not-available'));
@@ -1707,6 +1730,10 @@ export async function handleClientConversation(clientId, client, msg, checkAgent
         }
         const relayAgent = agents.get(relayAgentId);
         if (!relayAgent || relayAgent.ws?.readyState !== 1) {
+          if (relayType === 'yeaft_ask_user_answer') {
+            await sendAskUserAgentUnavailable(client, msg, relayAgentId);
+            return true;
+          }
           if (relayType === 'yeaft_fetch_tool_stats') {
             await sendToWebClient(client, emptyYeaftToolStats('Agent is offline.'));
             return true;
@@ -1728,6 +1755,15 @@ export async function handleClientConversation(clientId, client, msg, checkAgent
         // router is the authoritative consumer of the payload shape.
         const { agentId: _discard, ...rest } = msg;
         rest.type = relayType;
+        if (relayType === 'yeaft_ask_user_answer') {
+          rest._requestClientId = clientId;
+          let dispatched = false;
+          try {
+            dispatched = await forwardToAgent(relayAgentId, rest);
+          } catch { /* the submitting card needs a correlated failure, not a generic error */ }
+          if (!dispatched) await sendAskUserAgentUnavailable(client, msg, relayAgentId);
+          return true;
+        }
         // Direct catalog replies are request-scoped. Carry the browser client
         // identity through the Agent so another owner tab cannot accidentally
         // consume a response for this picker request.

package/local-runtime/server/handlers/client-misc.js

@@ -244,7 +244,7 @@ export async function handleClientMisc(clientId, client, msg, checkAgentAccess)
       const llmAgentId = msg.agentId || client.currentAgent;
       if (!llmAgentId) break;
       if (!await checkAgentAccess(llmAgentId)) break;
-      await forwardToAgent(llmAgentId, { type: 'get_llm_config' });
+      await forwardToAgent(llmAgentId, { type: 'get_llm_config', requestId: msg.requestId });
       break;
     }
 

package/local-runtime/server/handlers/client-workbench.js

@@ -50,6 +50,10 @@ async function denyWorkbenchRoute(client, msg) {
     error,
   });
   if (response) await sendToWebClient(client, response);
+  // History file-link previews are background requests, not failed chat turns.
+  // Their correlated result already terminates the request without polluting
+  // the conversation (or stopping an unrelated streaming answer).
+  if (msg?.type === 'resolve_file_references' && response) return;
   await sendToWebClient(client, { type: 'error', message: error });
 }
 
@@ -321,7 +325,9 @@ export async function handleClientWorkbench(clientId, client, msg, checkAgentAcc
         client,
         msg,
         resolved,
-        canonical: canonicalWorkbenchMessage(msg, { ...resolved, conversationId: fileConvId }),
+        canonical: canonicalWorkbenchMessage(msg, { ...resolved, conversationId: fileConvId }, {
+          canonicalWorkDir: !resolved.legacy && msg.type === 'resolve_file_references',
+        }),
       });
       break;
     }

package/local-runtime/server/workbench-route.js

@@ -97,6 +97,15 @@ function resolveYeaftRow(client, route) {
     || null;
 }
 
+// Resolve defaults only after Session ownership has been checked. An empty
+// legacy Session cwd inherits the Agent's advertised execution directory,
+// never the browser's cwd or the Server process cwd.
+function resolveSessionWorkDir(row, route) {
+  if (!row) return '';
+  return clean(route.runtimeProvider === 'yeaft' ? row.workDir : row.work_dir, 4096)
+    || clean(agents.get(route.agentId)?.workDir, 4096);
+}
+
 function resolveChatRow(client, route) {
   const row = sessionDb.get(route.sessionId);
   if (!row || row.agent_id !== route.agentId) return null;
@@ -131,7 +140,7 @@ export function currentWorkbenchWorkspaceGeneration({ route, userId, role }) {
     ? resolveYeaftRow(client, route)
     : resolveChatRow(client, route);
   if (!row || row.isArchived) return null;
-  const workDir = clean(route.runtimeProvider === 'yeaft' ? row.workDir : row.work_dir, 4096);
+  const workDir = resolveSessionWorkDir(row, route);
   if (!workDir) return '';
   return workbenchWorkspaceGeneration(workbenchRouteKey(route), workDir);
 }
@@ -175,9 +184,7 @@ export function resolveWorkbenchRequest(client, msg, targetAgentId, { allowMissi
     if (msg.conversationId === '_folder_picker') scope = 'files-folder-picker';
     else if (msg.conversationId === '_git_folder_picker') scope = 'git-folder-picker';
   }
-  const sessionWorkDir = clean(row
-    ? (route.runtimeProvider === 'yeaft' ? row.workDir : row.work_dir)
-    : '', 4096);
+  const sessionWorkDir = resolveSessionWorkDir(row, route);
   const workspaceGeneration = sessionWorkDir
     ? workbenchWorkspaceGeneration(routeKey, sessionWorkDir)
     : clean(msg.workbenchWorkspaceGeneration, 1600);

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.507"}
+{"version":"1.0.509"}