@yeaft/webchat-agent 1.0.190 → 1.0.191

package/connection/index.js

@@ -24,7 +24,7 @@ export function connect() {
     console.log(`Disallowed tools: ${ctx.CONFIG.disallowedTools.join(', ')}`);
   }
 
-  ctx.ws = new WebSocket(url, {
+  const socket = new WebSocket(url, {
     // Match server's permessage-deflate config (bounded memory,
     // skip compression for small frames). The `ws` library handles
     // streaming compression so we no longer need the synchronous
@@ -35,15 +35,18 @@ export function connect() {
       threshold: 1024
     }
   });
+  ctx.ws = socket;
 
-  ctx.ws.on('open', () => {
+  socket.on('open', () => {
+    if (socket !== ctx.ws) return;
     console.log('Connected to server, waiting for auth challenge...');
     clearTimeout(ctx.reconnectTimer);
     // 启动 agent 端心跳: 每 25 秒发一次 ping 帧
     startAgentHeartbeat();
   });
 
-  ctx.ws.on('message', async (data) => {
+  socket.on('message', async (data) => {
+    if (socket !== ctx.ws) return;
     // 收到任何消息都说明连接活着
     ctx.lastPongAt = Date.now();
 
@@ -54,7 +57,7 @@ export function connect() {
         console.log('Received auth challenge, sending credentials...');
         ctx.pendingAuthTempId = msg.tempId;
         // Send authentication via WebSocket (not URL)
-        ctx.ws.send(JSON.stringify({
+        socket.send(JSON.stringify({
           type: 'auth',
           tempId: msg.tempId,
           secret: ctx.CONFIG.agentSecret,
@@ -68,6 +71,9 @@ export function connect() {
     }
 
     const msg = await parseMessage(data);
+    // Decryption can yield after a reconnect replaces this socket. Fence again
+    // before a stale command can mutate Agent-local config or runtime state.
+    if (socket !== ctx.ws) return;
     if (msg) {
       handleMessage(msg).catch(err => {
         console.error('[WS] handleMessage error:', err.message || err);
@@ -75,7 +81,8 @@ export function connect() {
     }
   });
 
-  ctx.ws.on('close', (code, reason) => {
+  socket.on('close', (code, reason) => {
+    if (socket !== ctx.ws) return;
     console.log(`Disconnected from server: ${code} ${reason}`);
     ctx.sessionKey = null;
     ctx.pendingAuthTempId = null;
@@ -89,7 +96,7 @@ export function connect() {
     scheduleReconnect(connect);
   });
 
-  ctx.ws.on('error', (err) => {
+  socket.on('error', (err) => {
     console.error('WebSocket error:', err.message);
   });
 }

package/connection/message-router.js

@@ -27,9 +27,10 @@ import { sendAgentMetricsSnapshot } from '../metrics.js';
 import { handleRestartAgent, handleUpgradeAgent } from './upgrade.js';
 import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getYeaftSettings, updateYeaftSettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../yeaft/config-api.js';
+import { loadConfig } from '../yeaft/config.js';
 import { discoverLlmModels } from '../llm-model-discovery.js';
 import { fetchModelsDev } from '../yeaft/llm/models-dev.js';
-import { handleYeaftSessionSend, handleYeaftAskUserAnswer, handleYeaftSubAgentPrompt, handleYeaftTaskCancel, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, handleYeaftSearchHistory, handleYeaftLoadHistoryWindow, 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, refreshLiveSessionConfig, handleYeaftLoadHistory, handleYeaftSearchHistory, handleYeaftLoadHistoryWindow, 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';
 
@@ -37,25 +38,43 @@ export async function applyLlmConfigUpdate(msg, dependencies = {}) {
   const updateConfig = dependencies.updateLlmConfig || updateLlmConfig;
   const broadcastLanguage = dependencies.broadcastLanguageChange || broadcastLanguageChange;
   const forceStatusRefresh = dependencies.forceRefreshYeaftStatus || forceRefreshYeaftStatus;
+  const refreshRuntimeConfig = dependencies.refreshLiveSessionConfig || refreshLiveSessionConfig;
+  const readConfig = dependencies.loadConfig || loadConfig;
   const send = dependencies.sendToServer || sendToServer;
   const yeaftDir = dependencies.yeaftDir ?? ctx.CONFIG?.yeaftDir;
   const incomingLanguage = typeof msg.config?.language === 'string' && msg.config.language
     ? msg.config.language
     : null;
+  let previousDefaultModel = null;
+  try {
+    const previousConfig = readConfig({ dir: yeaftDir });
+    previousDefaultModel = previousConfig?.primaryModel || previousConfig?.model || null;
+  } catch { /* updateLlmConfig will report the actual config error */ }
   const result = updateConfig(msg.config || {}, yeaftDir);
   if (!result.error && incomingLanguage) broadcastLanguage(result.language);
 
   let statusRefreshError = null;
   if (!result.error) {
     try {
-      const statusEvent = await forceStatusRefresh({ reason: 'llm_config_updated' });
-      statusRefreshError = statusEvent?.refreshError || null;
+      await refreshRuntimeConfig({ previousDefaultModel });
     } catch (err) {
       statusRefreshError = err?.message || String(err);
     }
+    try {
+      const statusEvent = await forceStatusRefresh({ reason: 'llm_config_updated' });
+      statusRefreshError = statusRefreshError || statusEvent?.refreshError || null;
+    } catch (err) {
+      statusRefreshError = statusRefreshError || err?.message || String(err);
+    }
   }
 
-  const response = { type: 'llm_config_updated', ...result, statusRefreshError };
+  const response = {
+    type: 'llm_config_updated',
+    ...result,
+    agentId: msg.agentId ?? null,
+    requestId: msg.requestId ?? null,
+    statusRefreshError,
+  };
   send(response);
   return response;
 }

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

@@ -614,6 +614,7 @@ export async function handleAgentOutput(agentId, agent, msg) {
         if (c.authenticated && (CONFIG.skipAuth || c.userId === agent.ownerId)) {
           await sendToWebClient(c, {
             type: 'yeaft_history_chunk',
+            agentId,
             conversationId: msg.conversationId,
             ...(msg.perfTraceId != null ? { perfTraceId: msg.perfTraceId } : {}),
             ...(msg.sessionId != null ? { sessionId: msg.sessionId } : {}),

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

@@ -301,12 +301,14 @@ export async function handleAgentSync(agentId, agent, msg) {
           await sendToWebClient(client, {
             type: 'llm_config_updated',
             agentId,
+            requestId: msg.requestId,
             providers: msg.providers,
             primaryModel: msg.primaryModel,
             fastModel: msg.fastModel,
             language: msg.language,
             agentConfig: msg.agentConfig,
             effectiveConfig: msg.effectiveConfig,
+            statusRefreshError: msg.statusRefreshError,
             error: msg.error
           });
         }

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

@@ -140,6 +140,8 @@ export async function handleClientMisc(clientId, client, msg, checkAgentAccess)
       if (!await checkAgentAccess(llmUpdateAgentId)) break;
       await forwardToAgent(llmUpdateAgentId, {
         type: 'update_llm_config',
+        agentId: llmUpdateAgentId,
+        requestId: msg.requestId,
         config: msg.config || {}
       });
       break;

package/local-runtime/server/ws-agent.js

@@ -39,8 +39,8 @@ export function handleAgentConnection(ws, url) {
 
     ws.on('message', async (data) => {
       const agent = agents.get(clientAgentId);
-      if (!agent) {
-        console.error(`[Agent] No agent found for id: ${clientAgentId}`);
+      if (!agent || agent.ws !== ws) {
+        if (!agent) console.error(`[Agent] No agent found for id: ${clientAgentId}`);
         return;
       }
       markAgentHeartbeatSeen(agent);
@@ -62,14 +62,14 @@ export function handleAgentConnection(ws, url) {
             bytes: data.length || 0,
           });
         }
-        handleAgentMessage(clientAgentId, msg);
+        handleAgentMessage(clientAgentId, msg, ws);
       } else {
         console.error(`[Agent] Failed to parse message from ${clientAgentId}`);
       }
     });
 
     ws.on('close', () => {
-      handleAgentDisconnect(clientAgentId, agentName);
+      handleAgentDisconnect(clientAgentId, agentName, ws);
     });
 
     ws.on('error', (err) => {
@@ -136,8 +136,8 @@ export function handleAgentConnection(ws, url) {
       // Already authenticated, handle normally
       if (!resolvedAgentId) return;
       const agent = agents.get(resolvedAgentId);
-      if (!agent) {
-        console.error(`[Agent] No agent found for id: ${resolvedAgentId}`);
+      if (!agent || agent.ws !== ws) {
+        if (!agent) console.error(`[Agent] No agent found for id: ${resolvedAgentId}`);
         return;
       }
       markAgentHeartbeatSeen(agent);
@@ -159,7 +159,7 @@ export function handleAgentConnection(ws, url) {
             bytes: data.length || 0,
           });
         }
-        handleAgentMessage(resolvedAgentId, msg);
+        handleAgentMessage(resolvedAgentId, msg, ws);
       } else {
         console.error(`[Agent] Failed to parse message from ${resolvedAgentId}`);
       }
@@ -174,7 +174,7 @@ export function handleAgentConnection(ws, url) {
     }
     // Use resolvedAgentId if auth completed, otherwise nothing to clean
     if (resolvedAgentId) {
-      handleAgentDisconnect(resolvedAgentId, agentName);
+      handleAgentDisconnect(resolvedAgentId, agentName, ws);
     }
   });
 
@@ -188,12 +188,13 @@ export function handleAgentConnection(ws, url) {
  * Conversations are persisted in DB and will be restored on reconnect via
  * get_agents (client-side recovery) and conversation_list (agent-side sync).
  */
-function handleAgentDisconnect(agentId, agentName) {
+function handleAgentDisconnect(agentId, agentName, ws) {
   const agent = agents.get(agentId);
+  if (!agent || agent.ws !== ws) return;
   // Phase 4: 清理目录缓存
   clearAgentDirCache(agentId);
   // Phase 1: 清理同步超时
-  if (agent?._syncTimeout) {
+  if (agent._syncTimeout) {
     clearTimeout(agent._syncTimeout);
   }
   // Remove agent entirely — eliminates zombie agents from broadcastAgentList
@@ -209,6 +210,7 @@ function completeAgentRegistration(ws, agentId, agentName, workDir, sessionKey,
   const proxyPorts = (existingAgent?.proxyPorts || []).map(p => ({ ...p, enabled: false }));
   const slashCommands = existingAgent?.slashCommands || [];
   const slashCommandDescriptions = existingAgent?.slashCommandDescriptions || {};
+  if (existingAgent?._syncTimeout) clearTimeout(existingAgent._syncTimeout);
 
   // 兼容旧版 agent：未上报 capabilities 时默认全部开启
   const effectiveCapabilities = capabilities.length > 0
@@ -244,7 +246,7 @@ function completeAgentRegistration(ws, agentId, agentName, workDir, sessionKey,
   // 同步超时保护：30 秒后强制 ready
   const syncTimeout = setTimeout(() => {
     const ag = agents.get(agentId);
-    if (ag && ag.status === 'syncing') {
+    if (ag?.ws === ws && ag.status === 'syncing') {
       console.warn(`[Sync] Agent ${agentName} sync timeout, forcing ready`);
       ag.status = 'ready';
       broadcastAgentList();
@@ -252,10 +254,14 @@ function completeAgentRegistration(ws, agentId, agentName, workDir, sessionKey,
   }, 30000);
   agents.get(agentId)._syncTimeout = syncTimeout;
 
+  if (existingAgent?.ws && existingAgent.ws !== ws) {
+    existingAgent.ws.close(1008, 'Superseded by a newer Agent connection');
+  }
+
   // 心跳响应处理 + latency 测量
   ws.on('pong', () => {
     const agent = agents.get(agentId);
-    if (agent) {
+    if (agent?.ws === ws) {
       markAgentHeartbeatSeen(agent);
       if (agent.pingSentAt) {
         agent.latency = Date.now() - agent.pingSentAt;
@@ -284,9 +290,9 @@ function completeAgentRegistration(ws, agentId, agentName, workDir, sessionKey,
   broadcastAgentList();
 }
 
-async function handleAgentMessage(agentId, msg) {
+async function handleAgentMessage(agentId, msg, ws) {
   const agent = agents.get(agentId);
-  if (!agent) return;
+  if (!agent || agent.ws !== ws) return;
 
   // Security: 需要 conversationId 的消息类型，验证该 conversation 属于此 agent.
   // The conversation-id check only authorizes Chat flows where the

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.190"}
+{"version":"1.0.191"}