@myassis/gateway 1.0.85 → 1.0.87

package/dist/services/session/SessionStore.js

@@ -141,11 +141,36 @@ class SessionStore {
         return rows.map(row => this.rowToSessionData(row));
     }
     // ========== Message Operations ==========
+    /**
+     * 取下一个消息行版本号。
+     *
+     * 刷新（insert / update）都要取新号，因此 seq 是「行版本」而不是「插入序号」：
+     * 助手消息在一轮里会被反复更新，只有每次都抬号，断线重连的终端才能
+     * 靠「seq > 本地游标」把被改过的消息也拉回来。
+     *
+     * 刷号器单独持久化（message_seq 表），不用 MAX(seq)+1：
+     * 删掉最后一条消息后 MAX 会回退，号被重用，已经看过该 seq 的终端就会
+     * 永久错过新消息。
+     *
+     * 注意排序仍用 created_at：seq 只作为变更游标，抬号不得改变消息在界面上的位置。
+     */
+    nextSeq() {
+        // 用 UPDATE ... RETURNING 一步完成自增与读取：
+        // 每个 Session 都新建一个 SessionStore（各自一个到同一文件的连接），
+        // 先 UPDATE 再 SELECT 在连接间不原子，会发出重复的 seq。
+        const row = this.db.prepare('UPDATE message_seq SET value = value + 1 WHERE id = 1 RETURNING value').get();
+        return row?.value ?? 1;
+    }
+    /** 当前最大消息行版本号（终端用作同步游标基准） */
+    getMaxMessageSeq() {
+        const row = this.db.prepare('SELECT value FROM message_seq WHERE id = 1').get();
+        return row?.value ?? 0;
+    }
     insertMessage(sessionId, msg) {
         this.db.prepare(`
-      INSERT INTO messages (id, session_id, role, content, attachments, tool_calls, created_at, updated_at, model_name, feedback)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(msg.id, sessionId, msg.role, msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.createdAt, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null);
+      INSERT INTO messages (id, session_id, role, content, attachments, tool_calls, created_at, updated_at, model_name, feedback, seq)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(msg.id, sessionId, msg.role, msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.createdAt, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null, this.nextSeq());
     }
     /**
      * 写入或更新消息（按 id 幂等）。
@@ -159,32 +184,33 @@ class SessionStore {
      */
     upsertMessage(sessionId, msg) {
         this.db.prepare(`
-      INSERT INTO messages (id, session_id, role, content, attachments, tool_calls, created_at, updated_at, model_name, feedback)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO messages (id, session_id, role, content, attachments, tool_calls, created_at, updated_at, model_name, feedback, seq)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(id) DO UPDATE SET
         content = excluded.content,
         attachments = excluded.attachments,
         tool_calls = excluded.tool_calls,
         updated_at = excluded.updated_at,
         model_name = excluded.model_name,
-        feedback = excluded.feedback
-    `).run(msg.id, sessionId, msg.role, msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.createdAt, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null);
+        feedback = excluded.feedback,
+        seq = excluded.seq
+    `).run(msg.id, sessionId, msg.role, msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.createdAt, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null, this.nextSeq());
     }
     insertMessages(sessionId, messages) {
         const stmt = this.db.prepare(`
-      INSERT INTO messages (id, session_id, role, content, attachments,  tool_calls,created_at, updated_at, model_name, feedback)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO messages (id, session_id, role, content, attachments,  tool_calls,created_at, updated_at, model_name, feedback, seq)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
         for (const msg of messages) {
-            stmt.run(msg.id, sessionId, msg.role, msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.createdAt, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null);
+            stmt.run(msg.id, sessionId, msg.role, msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.createdAt, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null, this.nextSeq());
         }
     }
     updateMessage(sessionId, msg) {
         this.db.prepare(`
       UPDATE messages 
-      SET content = ?, attachments = ?, tool_calls = ?,  updated_at = ?, model_name = ?, feedback = ?
+      SET content = ?, attachments = ?, tool_calls = ?,  updated_at = ?, model_name = ?, feedback = ?, seq = ?
       WHERE id = ? AND session_id = ?
-    `).run(msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null, msg.id, sessionId);
+    `).run(msg.content, JSON.stringify(msg.attachments || []), msg.toolCalls ? JSON.stringify(msg.toolCalls) : null, msg.updatedAt || msg.createdAt, msg.modelName || null, msg.feedback || null, this.nextSeq(), msg.id, sessionId);
     }
     deleteMessage(messageId) {
         this.db.prepare('DELETE FROM messages WHERE id = ?').run(messageId);
@@ -194,7 +220,29 @@ class SessionStore {
     }
     findMessagesBySessionId(sessionId) {
         const rows = this.db.prepare('SELECT * FROM messages WHERE session_id = ? ORDER BY created_at ASC').all(sessionId);
-        return rows.map(row => ({
+        return rows.map(row => this.rowToMessage(row));
+    }
+    /**
+     * 取会话内 seq 大于 sinceSeq 的消息（新增与被修改的都在内）。
+     *
+     * 终端断线重连后报上自己的游标，只拉缺失的部分，不必全量重拉。
+     */
+    findMessagesChangedSince(sessionId, sinceSeq) {
+        const rows = this.db.prepare('SELECT * FROM messages WHERE session_id = ? AND seq > ? ORDER BY seq ASC').all(sessionId, sinceSeq);
+        return rows.map(row => this.rowToMessage(row));
+    }
+    /**
+     * 取会话内全部消息 id（按展示顺序）。
+     *
+     * 删除不会留下带 seq 的行，光靠增量查询发现不了「离线期间被删掉的消息」，
+     * 因此同步时一并返回 id 列表让终端剪除多余消息。
+     */
+    findMessageIdsBySessionId(sessionId) {
+        const rows = this.db.prepare('SELECT id FROM messages WHERE session_id = ? ORDER BY created_at ASC').all(sessionId);
+        return rows.map(row => row.id);
+    }
+    rowToMessage(row) {
+        return {
             id: row.id,
             sessionId: row.session_id,
             role: row.role,
@@ -204,8 +252,9 @@ class SessionStore {
             createdAt: row.created_at,
             updatedAt: row.updated_at,
             modelName: row.model_name,
-            feedback: row.feedback || undefined
-        }));
+            feedback: row.feedback || undefined,
+            seq: row.seq ?? undefined
+        };
     }
     rowToSessionData(row) {
         return {

package/migrations/016_add_message_seq.sql

@@ -0,0 +1,27 @@
+-- 为消息表增加全局单调递增的 seq，用于多终端增量同步。
+--
+-- 原先消息只按 created_at 排序，没有单调游标：WebSocket 断线重连
+-- （退避最长 30s）期间丢的事件无法补拉，各终端会永久分歧。
+-- 有了 seq，终端只需报上自己看到的最大 seq 就能拉回缺失部分。
+ALTER TABLE messages ADD COLUMN seq INTEGER;
+
+-- 存量数据按 created_at（同时间再按 id）回填，保证与原有展示顺序一致
+UPDATE messages SET seq = (
+  SELECT COUNT(*) FROM messages m2
+  WHERE m2.created_at < messages.created_at
+     OR (m2.created_at = messages.created_at AND m2.id <= messages.id)
+) WHERE seq IS NULL;
+
+CREATE INDEX IF NOT EXISTS idx_messages_seq ON messages(seq);
+CREATE INDEX IF NOT EXISTS idx_messages_session_seq ON messages(session_id, seq);
+
+-- seq 发号器单独持久化：不能用 MAX(seq)+1 发号，
+-- 删除最后一条消息后号会被重用，已经看到该 seq 的终端就会永久错过新消息。
+CREATE TABLE IF NOT EXISTS message_seq (
+  id INTEGER PRIMARY KEY,
+  value INTEGER NOT NULL
+);
+
+INSERT INTO message_seq (id, value)
+SELECT 1, IFNULL((SELECT MAX(seq) FROM messages), 0)
+WHERE NOT EXISTS (SELECT 1 FROM message_seq WHERE id = 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.85",
+  "version": "1.0.87",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {