@yeaft/webchat-agent 1.0.458 → 1.0.460

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

@@ -4,10 +4,10 @@ import { CONFIG } from './config.js';
 import { verifyAgent } from './auth.js';
 
 import { encodeKey } from './encryption.js';
-import { agents, pendingAgentConnections } from './context.js';
+import { agents, pendingAgentConnections, takeAgentSettingsRequestsForAgent, webClients } from './context.js';
 import { agentInventoryDb, userDb } from './database.js';
 import {
-  parseMessage, broadcastAgentList, clearAgentDirCache
+  parseMessage, broadcastAgentList, clearAgentDirCache, sendToWebClient
 } from './ws-utils.js';
 import { handleAgentConversation } from './handlers/agent-conversation.js';
 import { handleAgentOutput } from './handlers/agent-output.js';
@@ -30,6 +30,40 @@ function buildAgentMapKey(ownerId, agentName) {
   return `${prefix}:${agentName}`;
 }
 
+function parseSemver(version) {
+  const match = String(version || '').trim().match(/^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/);
+  if (!match) return null;
+  return {
+    core: match.slice(1, 4).map(Number),
+    prerelease: match[4] ? match[4].split('.') : [],
+  };
+}
+
+export function isNewerAgentVersion(candidate, current) {
+  const next = parseSemver(candidate);
+  const installed = parseSemver(current);
+  if (!next || !installed) return false;
+  for (let index = 0; index < 3; index += 1) {
+    if (next.core[index] !== installed.core[index]) return next.core[index] > installed.core[index];
+  }
+  if (next.prerelease.length === 0 || installed.prerelease.length === 0) {
+    return next.prerelease.length === 0 && installed.prerelease.length > 0;
+  }
+  const length = Math.max(next.prerelease.length, installed.prerelease.length);
+  for (let index = 0; index < length; index += 1) {
+    const left = next.prerelease[index];
+    const right = installed.prerelease[index];
+    if (left === right) continue;
+    if (left === undefined || right === undefined) return right === undefined;
+    const leftNumeric = /^\d+$/.test(left);
+    const rightNumeric = /^\d+$/.test(right);
+    if (leftNumeric && rightNumeric) return Number(left) > Number(right);
+    if (leftNumeric !== rightNumeric) return !leftNumeric;
+    return left > right;
+  }
+  return false;
+}
+
 let nextAgentConnectionGeneration = 0;
 // Keep the latest generation as a tombstone while an older auth may still arrive.
 const latestAgentConnectionGenerations = new Map();
@@ -273,6 +307,21 @@ function handleAgentDisconnect(agentId, agentName, ws) {
   clearAgentDirCache(agentId);
   clearWorkbenchCorrelationsForAgent(agentId);
   clearBrowserRuntimeForAgent(agentId);
+  for (const pending of takeAgentSettingsRequestsForAgent(agentId)) {
+    const client = webClients.get(pending.clientId);
+    if (!client?.authenticated) continue;
+    const responseTypes = {
+      restart: 'restart_agent_ack', dream: 'dream_enabled_changed', upgrade: 'upgrade_agent_ack',
+      'plugins:load': 'yeaft_plugins', 'plugins:update': 'yeaft_plugins_updated',
+      'telemetry:load': 'telemetry_settings', 'telemetry:update': 'telemetry_settings_updated',
+    };
+    void sendToWebClient(client, {
+      type: responseTypes[pending.operation] || 'agent_request_error',
+      agentId,
+      requestId: pending.requestId,
+      error: 'Agent disconnected before completing the request.',
+    });
+  }
   // Phase 1: 清理同步超时
   if (agent._syncTimeout) {
     clearTimeout(agent._syncTimeout);
@@ -305,6 +354,13 @@ function completeAgentRegistration(ws, agentId, agentName, workDir, sessionKey,
   // agent and keep encrypting outbound (back-compat).
   const encryptOutbound = !effectiveCapabilities.includes('plaintext-ok');
 
+  const latestAgentVersion = process.env.AGENT_LATEST_VERSION || null;
+  // This environment value is only an optional push hint. It is not a registry
+  // query and must never claim an equal, older, or malformed version is newer.
+  const upgradeAvailable = isNewerAgentVersion(latestAgentVersion, agentVersion)
+    ? latestAgentVersion
+    : null;
+
   agents.set(agentId, {
     ws,
     name: agentName,
@@ -327,6 +383,7 @@ function completeAgentRegistration(ws, agentId, agentName, workDir, sessionKey,
     ownerId,
     ownerUsername,
     version: agentVersion,
+    upgradeAvailable,
     platform: agentPlatform,
     encryptOutbound
   });
@@ -362,9 +419,6 @@ function completeAgentRegistration(ws, agentId, agentName, workDir, sessionKey,
   });
 
   // Send registration (with session key only in production mode)
-  const latestAgentVersion = process.env.AGENT_LATEST_VERSION || null;
-  const upgradeAvailable = (latestAgentVersion && agentVersion && latestAgentVersion !== agentVersion) ? latestAgentVersion : null;
-
   ws.send(JSON.stringify({
     type: 'registered',
     agentId,

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

@@ -5,7 +5,12 @@ import { generateSkipAuthSession } from './auth.js';
 import { authenticateRequest } from './auth/request-auth.js';
 import { encodeKey } from './encryption.js';
 import { userDb } from './database.js';
-import { agents, clearYeaftDebugRequestsForClient, webClients } from './context.js';
+import {
+  agents,
+  clearAgentSettingsRequestsForClient,
+  clearYeaftDebugRequestsForClient,
+  webClients,
+} from './context.js';
 import {
   applyClientHello,
   BROWSER_RUNTIME_PROTOCOL,
@@ -178,6 +183,7 @@ export function handleWebConnection(ws, url, req = {}) {
       }
     }
     clearWorkCenterRequestsForClient(client);
+    clearAgentSettingsRequestsForClient(clientId);
     clearYeaftDebugRequestsForClient(clientId);
     const browserPeers = clearBrowserRuntimeForClient(client);
     for (const peer of browserPeers) {

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

@@ -44,20 +44,21 @@ export async function sendToWebClient(client, msg) {
 // to plaintext when the agent advertised the `plaintext-ok` capability.
 // Falls back to ciphertext for old agents that haven't.
 export async function sendToAgent(agent, msg) {
-  if (agent.ws.readyState !== WebSocket.OPEN) return;
+  if (!agent?.ws || agent.ws.readyState !== WebSocket.OPEN) return false;
 
   if (CONFIG.skipAuth || agent.encryptOutbound === false) {
     agent.ws.send(JSON.stringify(msg));
-    return;
+    return true;
   }
 
   if (!agent.sessionKey) {
     console.error('Cannot send to agent: missing session key in production mode');
     agent.ws.close(1008, 'Encryption required');
-    return;
+    return false;
   }
   const encrypted = await encrypt(msg, agent.sessionKey);
   agent.ws.send(JSON.stringify(encrypted));
+  return true;
 }
 
 // Parse incoming message (decrypt if needed)
@@ -171,6 +172,7 @@ export async function broadcastAgentList() {
           capabilities: agent.capabilities || ['terminal', 'file_editor', 'background_tasks'],
           ...(agent.capabilityMetadataProvided === true ? { capabilityMetadataProvided: true } : {}),
           version: agent.version || null,
+          upgradeAvailable: agent.upgradeAvailable || null,
           dreamEnabled: agent.dreamEnabled !== false,
           yeaftStatus: agent.yeaftStatus || null,
           proxyPorts: agent.proxyPorts || [],
@@ -374,9 +376,8 @@ export async function forwardToClients(agentId, conversationId, msg) {
 // 转发消息给指定 agent
 export async function forwardToAgent(agentId, msg) {
   const agent = agents.get(agentId);
-  if (agent) {
-    await sendToAgent(agent, msg);
-  }
+  if (!agent) return false;
+  return sendToAgent(agent, msg);
 }
 
 // 通过 agent name 查找 agent

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.458"}
+{"version":"1.0.460"}