@yeaft/webchat-agent 1.0.640 → 1.0.642

package/connection/message-router.js

@@ -30,7 +30,7 @@ import { getLlmConfig, updateLlmConfig, getYeaftSettings, updateYeaftSettings, g
 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, refreshLiveSessionConfig, handleYeaftLoadHistory, handleYeaftLoadHistoryOutline, handleYeaftSearchHistory, handleYeaftLoadHistoryWindow, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftProjectContextSync, handleYeaftProjectMutation, handleYeaftCreateSession, handleYeaftCopySession, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftScanWorkdirSessions, handleYeaftRestoreSession, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, handleYeaftMcpList, handleYeaftMcpAdd, handleYeaftMcpRemove, handleYeaftMcpReload, handleYeaftPluginCatalog, handleYeaftManagedSkill, ensureSessionLoaded, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager, broadcastYeaftVpSnapshotEager, preloadYeaftSkillSlashCommands } from '../yeaft/web-bridge.js';
+import { handleYeaftSessionSend, handleYeaftAskUserAnswer, handleYeaftSubAgentPrompt, handleYeaftTaskCancel, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, refreshLiveSessionConfig, handleYeaftLoadHistory, handleYeaftLoadHistoryOutline, handleYeaftSearchHistory, handleYeaftLoadHistoryWindow, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftProjectContextSync, handleYeaftProjectMutation, handleYeaftCreateSession, handleYeaftCopySession, handleYeaftMergeSessions, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftScanWorkdirSessions, handleYeaftRestoreSession, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, handleYeaftMcpList, handleYeaftMcpAdd, handleYeaftMcpRemove, handleYeaftMcpReload, handleYeaftPluginCatalog, handleYeaftManagedSkill, ensureSessionLoaded, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager, broadcastYeaftVpSnapshotEager, preloadYeaftSkillSlashCommands } from '../yeaft/web-bridge.js';
 import { startYeaftStatusRefresh, forceRefreshYeaftStatus } from '../yeaft/status-cache.js';
 import { handleWorkCenterRequest } from '../yeaft/work-center/bridge.js';
 import { handlePersonRequest } from '../yeaft/person/bridge.js';
@@ -793,6 +793,9 @@ export async function handleMessage(msg) {
     case 'yeaft_copy_session':
       handleYeaftCopySession(msg);
       break;
+    case 'yeaft_merge_sessions':
+      handleYeaftMergeSessions(msg);
+      break;
     case 'yeaft_rename_group':
     case 'unify_rename_group':
     case 'yeaft_rename_session':

package/index.js

@@ -178,7 +178,7 @@ async function detectCapabilities() {
   // agent build can speak plaintext WS frames. New servers see this and
   // flip `agent.encryptOutbound = false`, stopping outbound encryption
   // to this peer. Old servers ignore the unknown capability token.
-  const capabilities = ['background_tasks', 'file_editor', 'ping_session', 'plaintext-ok', 'workbench_session_routes', 'workbench_request_correlation', 'workbench_terminal_cleanup_fence', 'workbench_file_content_chunks', 'workbench_video_stream', 'session_history_search', 'session_history_outline', 'session_history_window_prefetch', 'session_fork_from_turn', 'file_reference_resolution', 'response_image_preview', 'yeaft_plugins', 'yeaft_managed_skills', 'settings_request_correlation', 'work_center_feature_settings'];
+  const capabilities = ['background_tasks', 'file_editor', 'ping_session', 'plaintext-ok', 'workbench_session_routes', 'workbench_request_correlation', 'workbench_terminal_cleanup_fence', 'workbench_file_content_chunks', 'workbench_video_stream', 'session_history_search', 'session_history_outline', 'session_history_window_prefetch', 'session_fork_from_turn', 'session_fork_while_running', 'session_merge', 'file_reference_resolution', 'response_image_preview', 'yeaft_plugins', 'yeaft_managed_skills', 'settings_request_correlation', 'work_center_feature_settings'];
   capabilities.push('digital_person', getAgentUpgradeCapability());
   if (ctx.CONFIG?.workCenterEnabled === true) {
     capabilities.push('work_center', 'work_center_message_v2', 'work_center_workbench');

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

@@ -91,12 +91,14 @@ function syncYeaftSessionMetadata(agentId, agent, event) {
     }
     return { ...event, sessions: decorateYeaftSessionsWithPinned(agentId, event.sessions) };
   }
-  // A fork is a new Session on the same Agent, not a new Project. Resolve
+  // A fork/merge is a new Session on the same Agent, not a new Project. Resolve
   // membership here (never from browser/Agent project metadata) before the
   // successful acknowledgement can focus the new Session in the browser.
-  if (event.ok && ownerId && op === 'copy' && event.sourceSessionId && event.session?.id) {
+  if (event.ok && ownerId && (op === 'copy' || op === 'merge') && event.sourceSessionId && event.session?.id) {
     try {
-      if (event.sourceSessionId === event.session.id) throw new Error('Fork must have a new Session identity');
+      if (event.sourceSessionId === event.session.id || event.otherSessionId === event.session.id) {
+        throw new Error('Fork/merge must have a new Session identity');
+      }
       transaction(() => {
         // Replayed acknowledgements must not undo a later user Project move.
         if (yeaftSessionDb.getForAgent(ownerId, agentId, event.session.id)) return;
@@ -104,13 +106,13 @@ function syncYeaftSessionMetadata(agentId, agent, event) {
         yeaftProjectDb.inheritSessionProject(ownerId, agentId, event.sourceSessionId, event.session.id);
       })();
     } catch (e) {
-      console.warn('[Server] Fork Project inheritance failed:', e?.message || e);
+      console.warn('[Server] Session Project inheritance failed:', e?.message || e);
       return {
         ...event,
         ok: false,
         error: {
           code: 'project_inheritance_failed',
-          message: `Fork ${event.session.id} was created, but its Project could not be saved.`,
+          message: `${op === 'merge' ? 'Merged Session' : 'Fork'} ${event.session.id} was created, but its Project could not be saved.`,
         },
       };
     }

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

@@ -1624,6 +1624,53 @@ export async function handleClientConversation(clientId, client, msg, checkAgent
       break;
     }
 
+    case 'yeaft_merge_sessions':
+    case 'unify_merge_sessions': {
+      const mergeAgentId = msg.agentId || client.currentAgent || null;
+      const reject = async (code, message) => sendToWebClient(client, {
+        type: 'session_crud_result', op: 'merge', ok: false,
+        requestId: msg.requestId ?? null,
+        agentId: mergeAgentId,
+        sourceSessionId: msg.sessionId ?? null,
+        otherSessionId: msg.otherSessionId ?? null,
+        error: { code, message },
+      });
+      // Use the shared ACL directly: checkAgentAccess emits an uncorrelated
+      // error, which would leave the browser's pending merge waiting forever.
+      const accessError = resolveAgentAccessError(mergeAgentId, client.userId, client.role);
+      if (accessError) {
+        await reject(accessError === 'Agent access denied' ? 'agent_access_denied' : 'agent_unavailable', accessError);
+        break;
+      }
+      if (!agents.get(mergeAgentId)?.capabilities?.includes('session_merge')) {
+        await reject('session_merge_unsupported', 'The selected Agent does not support merging Sessions.');
+        break;
+      }
+      if (typeof msg.sessionId !== 'string' || !msg.sessionId.trim()
+          || typeof msg.otherSessionId !== 'string' || !msg.otherSessionId.trim()
+          || msg.sessionId === msg.otherSessionId) {
+        await reject('invalid_merge_source', 'Select two different Sessions on the same Agent.');
+        break;
+      }
+      if (!CONFIG.skipAuth && (!yeaftSessionDb.getForAgent(client.userId, mergeAgentId, msg.sessionId)
+          || !yeaftSessionDb.getForAgent(client.userId, mergeAgentId, msg.otherSessionId))) {
+        await reject('agent_access_denied', 'Both Sessions must belong to the selected Agent and current user.');
+        break;
+      }
+      // Session ids are scoped to this one Agent; no cross-Agent lookup or
+      // fallback is allowed even if another Agent has an identically named id.
+      let dispatched = false;
+      try {
+        dispatched = await forwardToAgent(mergeAgentId, {
+          type: 'yeaft_merge_sessions', requestId: msg.requestId,
+          sessionId: msg.sessionId, otherSessionId: msg.otherSessionId,
+          ...(msg.name !== undefined ? { name: msg.name } : {}),
+        });
+      } catch { /* Report a correlated dispatch failure below. */ }
+      if (!dispatched) await reject('agent_unavailable', 'Agent is unavailable; Sessions were not merged.');
+      break;
+    }
+
     case 'yeaft_merge_thread':
     case 'unify_merge_thread': {
       const mergeAgentId = msg.agentId || client.currentAgent;

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.640"}
+{"version":"1.0.642"}