@yeaft/webchat-agent 1.0.268 → 1.0.270

package/connection/index.js

@@ -4,7 +4,17 @@ import { sendToServer, parseMessage } from './buffer.js';
 import { startAgentHeartbeat, stopAgentHeartbeat, scheduleReconnect } from './heartbeat.js';
 import { handleMessage } from './message-router.js';
 
-export function connect() {
+export function resetConnectionTransport() {
+  ctx.sessionKey = null;
+  ctx.serverEncryptionRequired = true;
+  ctx.pendingAuthTempId = null;
+}
+
+export function connect(WebSocketImpl = WebSocket) {
+  // Transport negotiation is connection-scoped. Always start conservatively;
+  // only the registered frame from this socket may enable plaintext outbound.
+  resetConnectionTransport();
+
   // Don't include secret in URL - it will be sent via WebSocket message after connection.
   // instanceId is the stable local service identity; agentName is display-only.
   // Old configs without instanceId still use agentName for backward-compatible identity.
@@ -24,7 +34,7 @@ export function connect() {
     console.log(`Disallowed tools: ${ctx.CONFIG.disallowedTools.join(', ')}`);
   }
 
-  const socket = new WebSocket(url, {
+  const socket = new WebSocketImpl(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

package/connection/message-router.js

@@ -79,22 +79,24 @@ export async function applyLlmConfigUpdate(msg, dependencies = {}) {
   return response;
 }
 
+export function applyRegisteredTransport(msg) {
+  if (msg.sessionKey) {
+    ctx.sessionKey = decodeKey(msg.sessionKey);
+    console.log('Encryption enabled');
+  }
+
+  // New servers advertise plaintext acceptance. This mutation is scoped to
+  // the active connection because connect() restores conservative defaults.
+  if (msg.acceptPlaintext === true) {
+    ctx.serverEncryptionRequired = false;
+    console.log('[WS] Server accepts plaintext, disabling outbound encryption');
+  }
+}
+
 export async function handleMessage(msg) {
   switch (msg.type) {
     case 'registered':
-      if (msg.sessionKey) {
-        ctx.sessionKey = decodeKey(msg.sessionKey);
-        console.log('Encryption enabled');
-      }
-
-      // feat-ws-plaintext-negotiation: new server advertises that it
-      // will accept plaintext frames from us. Stop encrypting outbound.
-      // The receive path (parseMessage) stays unconditional so the old
-      // ciphertext that may already be in flight still decrypts.
-      if (msg.acceptPlaintext === true) {
-        ctx.serverEncryptionRequired = false;
-        console.log('[WS] Server accepts plaintext, disabling outbound encryption');
-      }
+      applyRegisteredTransport(msg);
 
       // 只保存基本配置。instanceId 是本地服务实例身份；agentName 只用于展示。
       ctx.saveConfig({

package/local-runtime/server/database.js

@@ -4,6 +4,7 @@ export { userDb } from './db/user-db.js';
 export { invitationDb } from './db/invitation-db.js';
 export { sessionDb } from './db/session-db.js';
 export { yeaftSessionDb } from './db/yeaft-session-db.js';
+export { sessionUiMetadataDb } from './db/session-ui-metadata-db.js';
 export { messageDb } from './db/message-db.js';
 export { userStatsDb } from './db/user-stats-db.js';
 export { expertDb } from './db/expert-db.js';

package/local-runtime/server/db/connection.js

@@ -227,6 +227,19 @@ const yeaftSessionsTable = `
 `;
 db.exec(yeaftSessionsTable);
 
+db.exec(`
+  CREATE TABLE IF NOT EXISTS session_ui_metadata (
+    user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    catalog_key TEXT NOT NULL,
+    pinned INTEGER NOT NULL DEFAULT 0,
+    sort_rank INTEGER,
+    updated_at INTEGER NOT NULL,
+    PRIMARY KEY (user_id, catalog_key)
+  );
+  CREATE INDEX IF NOT EXISTS idx_session_ui_metadata_user_sort
+    ON session_ui_metadata(user_id, pinned DESC, sort_rank ASC);
+`);
+
 try {
   const tableInfo = db.prepare(`PRAGMA table_info(yeaft_sessions)`).all();
   const idColumn = tableInfo.find(col => col && col.name === 'id');
@@ -538,6 +551,11 @@ export const stmts = {
     UPDATE sessions SET is_pinned = ?, updated_at = ? WHERE id = ?
   `),
 
+  updateSessionPinnedForRoute: db.prepare(`
+    UPDATE sessions SET is_pinned = ?, updated_at = ?
+    WHERE id = ? AND agent_id = ? AND (user_id = ? OR user_id IS NULL)
+  `),
+
   // fix-copilot-provider-persist: persist the conversation's code-agent
   // provider so it survives an agent process restart. Mirrors the pinned/
   // agent update shape. Only written when a non-default provider is known
@@ -577,6 +595,10 @@ export const stmts = {
     SELECT * FROM sessions WHERE user_id = ? AND agent_id = ? ORDER BY updated_at DESC LIMIT ?
   `),
 
+  hasSessionOwnedByUserAndAgent: db.prepare(`
+    SELECT 1 FROM sessions WHERE user_id = ? AND agent_id = ? LIMIT 1
+  `),
+
   getAllSessions: db.prepare(`
     SELECT * FROM sessions ORDER BY updated_at DESC LIMIT ?
   `),
@@ -593,6 +615,28 @@ export const stmts = {
     DELETE FROM sessions WHERE id = ?
   `),
 
+  upsertSessionUiMetadata: db.prepare(`
+    INSERT INTO session_ui_metadata (user_id, catalog_key, pinned, sort_rank, updated_at)
+    VALUES (?, ?, ?, ?, ?)
+    ON CONFLICT(user_id, catalog_key) DO UPDATE SET
+      pinned = excluded.pinned,
+      sort_rank = excluded.sort_rank,
+      updated_at = excluded.updated_at
+  `),
+
+  getSessionUiMetadata: db.prepare(`
+    SELECT * FROM session_ui_metadata WHERE user_id = ? AND catalog_key = ?
+  `),
+
+  getSessionUiMetadataByUser: db.prepare(`
+    SELECT * FROM session_ui_metadata WHERE user_id = ?
+    ORDER BY pinned DESC, sort_rank ASC, updated_at DESC
+  `),
+
+  deleteSessionUiMetadata: db.prepare(`
+    DELETE FROM session_ui_metadata WHERE user_id = ? AND catalog_key = ?
+  `),
+
   // Message 操作
   insertMessage: db.prepare(`
     INSERT INTO messages (session_id, role, content, message_type, tool_name, tool_input, created_at, metadata)
@@ -853,6 +897,10 @@ export const stmts = {
     SELECT * FROM yeaft_sessions WHERE id = ? ORDER BY updated_at DESC LIMIT 1
   `),
 
+  getYeaftSessionsById: db.prepare(`
+    SELECT * FROM yeaft_sessions WHERE id = ? ORDER BY updated_at DESC
+  `),
+
   getYeaftSessionForAgent: db.prepare(`
     SELECT * FROM yeaft_sessions WHERE id = ? AND user_id = ? AND agent_id = ?
   `),

package/local-runtime/server/db/session-db.js

@@ -96,6 +96,11 @@ export const sessionDb = {
     return stmts.getSessionsByUserAndAgent.all(userId, agentId, limit).map(mapRow);
   },
 
+  hasOwnedRoute(userId, agentId) {
+    if (!userId || !agentId) return false;
+    return !!stmts.hasSessionOwnedByUserAndAgent.get(userId, agentId);
+  },
+
   getAll(limit = 100) {
     return stmts.getAllSessions.all(limit).map(mapRow);
   },

package/local-runtime/server/db/session-ui-metadata-db.js

@@ -0,0 +1,78 @@
+import { stmts, transaction } from './connection.js';
+
+function mapRow(row) {
+  if (!row) return null;
+  return {
+    userId: row.user_id,
+    catalogKey: row.catalog_key,
+    pinned: row.pinned === 1,
+    sortRank: Number.isFinite(row.sort_rank) ? row.sort_rank : null,
+    updatedAt: row.updated_at,
+  };
+}
+
+export const sessionUiMetadataDb = {
+  upsert(userId, catalogKey, { pinned = false, sortRank = null } = {}) {
+    if (!userId || !catalogKey) return false;
+    stmts.upsertSessionUiMetadata.run(
+      userId,
+      catalogKey,
+      pinned ? 1 : 0,
+      Number.isFinite(sortRank) ? sortRank : null,
+      Date.now(),
+    );
+    return true;
+  },
+
+  get(userId, catalogKey) {
+    if (!userId || !catalogKey) return null;
+    return mapRow(stmts.getSessionUiMetadata.get(userId, catalogKey));
+  },
+
+  getByUser(userId) {
+    if (!userId) return [];
+    return stmts.getSessionUiMetadataByUser.all(userId).map(mapRow);
+  },
+
+  applyBatch(userId, updates) {
+    if (!userId || !Array.isArray(updates) || updates.length === 0) return false;
+    return transaction(() => {
+      const now = Date.now();
+      for (const update of updates) {
+        if (!update?.catalogKey) throw new Error('Catalog metadata update requires catalogKey');
+        stmts.upsertSessionUiMetadata.run(
+          userId,
+          update.catalogKey,
+          update.pinned === true ? 1 : 0,
+          Number.isFinite(update.sortRank) ? update.sortRank : null,
+          now,
+        );
+        if (update.runtimeProvider === 'yeaft') {
+          const result = stmts.setYeaftSessionPinnedForAgent.run(
+            update.pinned === true ? 1 : 0,
+            now,
+            update.sessionId,
+            userId,
+            update.agentId,
+          );
+          if (result.changes !== 1) throw new Error('Yeaft Session identity changed during metadata update');
+        } else if (update.runtimeProvider === 'claude-code' || update.runtimeProvider === 'copilot') {
+          const result = stmts.updateSessionPinnedForRoute.run(
+            update.pinned === true ? 1 : 0,
+            now,
+            update.sessionId,
+            update.agentId,
+            userId,
+          );
+          if (result.changes !== 1) throw new Error('Chat Session identity changed during metadata update');
+        }
+      }
+      return true;
+    })();
+  },
+
+  delete(userId, catalogKey) {
+    if (!userId || !catalogKey) return false;
+    return stmts.deleteSessionUiMetadata.run(userId, catalogKey).changes > 0;
+  },
+};

package/local-runtime/server/db/yeaft-session-db.js

@@ -19,7 +19,7 @@
  * or op=archive.
  */
 
-import { stmts } from './connection.js';
+import { stmts, transaction } from './connection.js';
 
 function safeJsonParse(s, fallback) {
   if (s == null || s === '') return fallback;
@@ -140,6 +140,11 @@ export const yeaftSessionDb = {
     return mapRow(stmts.getYeaftSession.get(id));
   },
 
+  getAllById(id) {
+    if (!id) return [];
+    return stmts.getYeaftSessionsById.all(id).map(mapRow);
+  },
+
   getForAgent(userId, agentId, id) {
     if (!userId || !agentId || !id) return null;
     return mapRow(stmts.getYeaftSessionForAgent.get(id, userId, agentId));
@@ -200,11 +205,14 @@ export const yeaftSessionDb = {
       ordered.push(id);
     }
     if (ordered.length === 0) return false;
-    const now = Date.now();
-    ordered.forEach((id, index) => {
-      stmts.setYeaftSessionSortOrder.run(index, now, id, userId, agentId);
-    });
-    return true;
+    return transaction(() => {
+      const now = Date.now();
+      ordered.forEach((id, index) => {
+        const result = stmts.setYeaftSessionSortOrder.run(index, now, id, userId, agentId);
+        if (result.changes !== 1) throw new Error('Yeaft Session identity changed during reorder');
+      });
+      return true;
+    })();
   },
 
   setOrderForUser(userId, sessions) {
@@ -227,11 +235,14 @@ export const yeaftSessionDb = {
       ordered.push({ agentId, sessionId });
     }
     if (ordered.length === 0) return false;
-    const now = Date.now();
-    ordered.forEach(({ agentId, sessionId }, index) => {
-      stmts.setYeaftSessionSortOrder.run(index, now, sessionId, userId, agentId);
-    });
-    return true;
+    return transaction(() => {
+      const now = Date.now();
+      ordered.forEach(({ agentId, sessionId }, index) => {
+        const result = stmts.setYeaftSessionSortOrder.run(index, now, sessionId, userId, agentId);
+        if (result.changes !== 1) throw new Error('Yeaft Session identity changed during reorder');
+      });
+      return true;
+    })();
   },
 
   /**

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

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 import { messageDb, yeaftSessionDb } from '../database.js';
-import { broadcastAgentList, forwardToClients, sendToAgent, sendToWebClient } from '../ws-utils.js';
+import { broadcastAgentList, broadcastSessionCatalog, forwardToClients, sendToAgent, sendToWebClient } from '../ws-utils.js';
 import { webClients, previewFiles } from '../context.js';
 import { CONFIG } from '../config.js';
 import { yeaftAssetStore } from '../yeaft-asset-store.js';
@@ -802,6 +802,7 @@ export async function handleAgentOutput(agentId, agent, msg) {
       // snapshot per connected client.
       const syncedEvent = syncYeaftSessionMetadata(agentId, agent, msg);
       const decoratedSessions = syncedEvent.sessions;
+      await broadcastSessionCatalog(agent.ownerId);
       // Relay verbatim to web (agentId stamped so the web sessions store
       // can merge per-agent rosters).
       for (const [, c] of webClients) {
@@ -866,6 +867,11 @@ export async function handleAgentOutput(agentId, agent, msg) {
       // sessions, and that response must carry persisted server-side pin
       // state before it hits the web store.
       const outboundMsg = syncYeaftSessionMetadata(agentId, agent, msg);
+      // CRUD acknowledgements are not authoritative catalog snapshots. The
+      // agent emits session_list_updated after mutations; broadcast only after
+      // that reconciliation so create/rename cannot briefly project stale data.
+      const catalogChanged = outboundMsg?.op === 'list';
+      if (catalogChanged) await broadcastSessionCatalog(agent.ownerId);
       for (const [, c] of webClients) {
         if (c.authenticated && (CONFIG.skipAuth || c.userId === agent.ownerId)) {
           await sendToWebClient(c, { ...outboundMsg, agentId: agentId });