@yeaft/webchat-agent 1.0.67 → 1.0.69

package/connection/message-router.js

@@ -38,7 +38,7 @@ import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getYeaftSettings, updateYeaftSettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../yeaft/config-api.js';
 import { discoverLlmModels } from '../llm-model-discovery.js';
 import { fetchModelsDev } from '../yeaft/llm/models-dev.js';
-import { handleYeaftSessionSend, handleYeaftSubAgentPrompt, handleYeaftTaskCancel, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, 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 } from '../yeaft/web-bridge.js';
+import { handleYeaftSessionSend, handleYeaftSubAgentPrompt, handleYeaftTaskCancel, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, 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, refreshYeaftStatus } from '../yeaft/status-cache.js';
 
 export async function handleMessage(msg) {
@@ -68,6 +68,8 @@ export async function handleMessage(msg) {
         reconnectInterval: ctx.CONFIG.reconnectInterval
         // 不保存 agentSecret 到配置文件（安全考虑）
       });
+      ctx.AGENT_ID = msg.agentId;
+      ctx.agentId = msg.agentId;
       console.log(`Registered as agent: ${msg.agentId} (name: ${ctx.CONFIG.agentName})`);
 
       // Check server-pushed upgrade notification
@@ -100,8 +102,12 @@ export async function handleMessage(msg) {
         sendToServer({ type: 'mcp_servers_list', servers: ctx.mcpServers });
       }
 
-      // ★ Preload slash commands for immediate skill availability in new sessions
-      preloadSlashCommands().catch(() => {});
+      // ★ Preload slash commands for immediate skill availability in new sessions.
+      // Load Claude/CLI commands first; Yeaft skill preload merges into that
+      // cache instead of making Claude Chat think the Yeaft-only list is final.
+      preloadSlashCommands()
+        .catch(() => {})
+        .finally(() => { preloadYeaftSkillSlashCommands(); });
       break;
 
     case 'create_conversation':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "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/web-bridge.js

@@ -724,6 +724,11 @@ const ESCALATE_AFTER_ABORT_MS = 15_000;
 /** Virtual conversationId for the Yeaft session */
 let yeaftConversationId = null;
 
+/** Last agent-level Yeaft slash command payload. Replayed after the web side
+ *  creates/replaces the virtual Yeaft conversation id so `/` autocomplete never
+ *  falls back to built-ins while full Session metadata is still loading. */
+let lastYeaftSlashCommandSnapshot = null;
+
 /** task-334-followup-batch-b: stored unsubscribe fn from VP subscribe,
  *  called on session reset to prevent stale subscriber leaks. */
 let _vpUnsubscribe = null;
@@ -920,7 +925,10 @@ function loadVisibleGroupHistoryPage(store, sessionId, limit, beforeSeq = null)
 }
 
 function ensureYeaftConversationId() {
-  if (!yeaftConversationId) yeaftConversationId = `yeaft-${Date.now()}`;
+  if (!yeaftConversationId) {
+    yeaftConversationId = `yeaft-${Date.now()}`;
+    replayCachedSkillSlashCommandsToYeaftConversation();
+  }
   return yeaftConversationId;
 }
 
@@ -1807,6 +1815,8 @@ export async function __testResetVpState() {
   sessionContexts.clear();
   vpCurrentTodos.clear();
   threadClassifier = defaultClassifyThread;
+  yeaftConversationId = null;
+  lastYeaftSlashCommandSnapshot = null;
   // Per-group compact in-flight + pending state lives on the session's
   // Compactor. Clear it so a follow-on test doesn't see ghost in-flight
   // promises from a prior run.
@@ -1880,6 +1890,39 @@ export function buildMergedSkillSlashCommands(skillManagers = []) {
   return { commands: [...new Set(commands)].sort((a, b) => a.localeCompare(b)), descriptions };
 }
 
+function sendSkillSlashCommandsUpdate({ conversationId, slashCommands, slashCommandDescriptions }) {
+  sendToServer({
+    type: 'slash_commands_update',
+    agentId: ctx.AGENT_ID || ctx.agentId || null,
+    conversationId,
+    slashCommands,
+    slashCommandDescriptions,
+  });
+}
+
+function replayCachedSkillSlashCommandsToYeaftConversation() {
+  if (!yeaftConversationId || !lastYeaftSlashCommandSnapshot) return;
+  sendSkillSlashCommandsUpdate({
+    conversationId: yeaftConversationId,
+    slashCommands: lastYeaftSlashCommandSnapshot.slashCommands,
+    slashCommandDescriptions: lastYeaftSlashCommandSnapshot.slashCommandDescriptions,
+  });
+}
+
+export function preloadYeaftSkillSlashCommands() {
+  const yeaftDir = ctx.CONFIG?.yeaftDir || DEFAULT_YEAFT_DIR;
+  const roots = [process.cwd()];
+  const configuredWorkDir = typeof ctx.CONFIG?.workDir === 'string' ? ctx.CONFIG.workDir.trim() : '';
+  if (configuredWorkDir && configuredWorkDir !== process.cwd()) roots.push(configuredWorkDir);
+  const skillManager = createSkillManager(yeaftDir, roots.join(delimiter));
+  broadcastSkillSlashCommands({ skillManager });
+  return {
+    skills: skillManager.size,
+    slashCommands: ctx.slashCommands,
+    slashCommandDescriptions: ctx.slashCommandDescriptions,
+  };
+}
+
 function broadcastSkillSlashCommands(sessionLike, extraSkillManagers = []) {
   const managers = [sessionLike?.skillManager, ...extraSkillManagers].filter(Boolean);
   const { commands, descriptions } = buildMergedSkillSlashCommands(managers);
@@ -1894,9 +1937,8 @@ function broadcastSkillSlashCommands(sessionLike, extraSkillManagers = []) {
   Object.assign(slashCommandDescriptions, descriptions);
   ctx.slashCommands = slashCommands;
   ctx.slashCommandDescriptions = slashCommandDescriptions;
-  sendToServer({
-    type: 'slash_commands_update',
-    agentId: ctx.AGENT_ID || ctx.agentId || null,
+  lastYeaftSlashCommandSnapshot = { slashCommands, slashCommandDescriptions };
+  sendSkillSlashCommandsUpdate({
     conversationId: yeaftConversationId || '__preload__',
     slashCommands,
     slashCommandDescriptions,
@@ -5917,6 +5959,12 @@ export const __testHooks = {
     session = nextSession || null;
     sessionLoadPromise = null;
   },
+  ensureYeaftConversationIdForTest() {
+    return ensureYeaftConversationId();
+  },
+  preloadYeaftSkillSlashCommandsForTest() {
+    return broadcastSkillSlashCommands(session);
+  },
   resetAbortState() {
     turnAbortCtrls.clear();
     turnAbortMeta.clear();