cursorconnect 0.1.6 → 0.1.8

package/bridge-runtime/dist/relay.js

@@ -4,14 +4,24 @@ import { randomBytes, timingSafeEqual } from 'crypto';
 import { basename } from 'path';
 import { readAllowedMediaFile, resolveMediaPathParam } from './media-path.js';
 import { Server as SocketServer } from 'socket.io';
+import { resolveJsonlFilePath } from './agent-title-match.js';
 import { ChatDisplayStore } from './chat-display-store.js';
+import { resolveHistoryLimit } from './history-request.js';
 import { filterClientDisplayList, prepareChatMessagesForDisplay, } from './chat-display.js';
-import { isChatSyncedWithCursor } from './chat-sync.js';
+import { isKeepAwakeActive } from './keep-awake.js';
+function sleepMs(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 import { mergeSidebarWithJsonl } from './sidebar-merge.js';
 import { transcribeAudioBuffer } from './openai-transcribe.js';
 import { extensionForMime, saveUploadedImage } from './image-upload-store.js';
+import { AgentCompletionPush, suppressAgentCompletionPush } from './agent-completion-push.js';
 import { RelayUpstream } from './relay-upstream.js';
 import { bridgePipelineLog, bridgePipelineReportLines, bridgePipelineSnapshot, } from './history-pipeline-log.js';
+import { DEBUG_CHATS_PAGE_HTML } from './debug-chats-page.js';
+import { isChatHistoryFromJsonl } from './chat-history-mode.js';
+import { isChatSyncedWithCursor } from './chat-sync.js';
+import { readJsonlLiveSnapshot } from './jsonl-live-debug.js';
 export class Relay {
     stateManager;
     commandExecutor;
@@ -30,7 +40,16 @@ export class Relay {
     io;
     tokens = new Set();
     upstream = null;
+    agentCompletionPush = null;
+    pendingPushPayloads = [];
     chatDisplay = new ChatDisplayStore();
+    /** Raw JSONL row count last sent per agent (live `append` emits). */
+    lastEmittedJsonlRows = new Map();
+    /** Last display tail pushed to app — re-emit when user/assistant tail changes. */
+    lastEmittedLentaSig = new Map();
+    /** Display bubble count last sent — block regression 214→74 style wipes on phone. */
+    lastEmittedHistLen = new Map();
+    domOverlayTimer = null;
     constructor(config, stateManager, commandExecutor, cdpBridge, jsonlIndex, messageDebugStore, domExtractor) {
         this.stateManager = stateManager;
         this.commandExecutor = commandExecutor;
@@ -53,11 +72,35 @@ export class Relay {
             else {
                 this.upstream = new RelayUpstream(this.config, (event, ...args) => {
                     this.handleRemoteClientEvent(event, ...args);
-                });
+                }, () => this.flushPendingPushPayloads());
+                this.agentCompletionPush = new AgentCompletionPush((payload) => this.emitAgentCompletedPush(payload), () => this.lastJsonlIndex);
                 this.upstream.connect();
             }
         }
     }
+    emitAgentCompletedPush(payload) {
+        if (this.upstream?.connected) {
+            this.upstream.emit('push:agent-completed', payload);
+            return;
+        }
+        this.pendingPushPayloads.push(payload);
+        console.warn(`[agent-completion-push] queued for relay (${this.pendingPushPayloads.length}) upstream disconnected`);
+    }
+    flushPendingPushPayloads() {
+        if (!this.upstream?.connected || !this.pendingPushPayloads.length)
+            return;
+        const byAgent = new Map();
+        for (const payload of this.pendingPushPayloads.splice(0)) {
+            byAgent.set(payload.agentId, payload);
+        }
+        for (const payload of byAgent.values()) {
+            this.upstream.emit('push:agent-completed', payload);
+        }
+        console.log(`[agent-completion-push] flushed ${byAgent.size} queued push(es) to relay`);
+    }
+    observeAgentCompletionForPush() {
+        this.agentCompletionPush?.observe(this.stateManager.getState());
+    }
     listen() {
         return new Promise((resolve) => {
             this.httpServer.listen(this.config.serverPort, this.config.serverHost, () => {
@@ -69,6 +112,157 @@ export class Relay {
     get authEnabled() {
         return this.config.webappPassword.length > 0;
     }
+    /** Read-only view of in-memory bridge state (no writes to stores). */
+    readOnlyChatSnapshot() {
+        const state = this.stateManager.getState();
+        const subscribed = [...this.jsonlIndex.getSubscribedAgents().entries()].map(([agentId, meta]) => ({ agentId, title: meta.title }));
+        const displayCache = {};
+        const cacheIds = new Set([
+            ...subscribed.map((s) => s.agentId),
+            ...(state.activeComposerId ? [state.activeComposerId] : []),
+        ]);
+        const domTranscript = {};
+        for (const agentId of cacheIds) {
+            const dom = this.chatDisplay.getDomTranscript(agentId);
+            if (dom.length)
+                domTranscript[agentId] = dom;
+            const jsonl = this.chatDisplay.getJsonlHistory(agentId);
+            if (jsonl.length)
+                displayCache[agentId] = jsonl;
+        }
+        return {
+            at: Date.now(),
+            health: { cdp: this.cdpBridge.getClient()?.isConnected() ?? false },
+            cursor: {
+                activeComposerId: state.activeComposerId,
+                activeChatTitle: state.activeChatTitle,
+                updatedAt: state.updatedAt,
+                lastError: state.lastError,
+                tabs: state.tabs,
+                composerIdByTitle: state.composerIdByTitle,
+                domMessageCount: state.messages.length,
+                domMessages: state.messages,
+            },
+            domExtractDebug: {
+                latest: this.messageDebugStore.latest(),
+                ringSize: this.messageDebugStore.list().length,
+            },
+            subscribed,
+            displayCache,
+            chatHistoryJsonl: isChatHistoryFromJsonl(),
+            domTranscript,
+        };
+    }
+    /** Push JSONL file updates to every subscribed route id (e.g. sidebar-0) for that composer. */
+    syncJsonlToSubscribedAgents(fileAgentId, messages, totalMessages) {
+        const state = this.stateManager.getState();
+        const activeTab = state.tabs.find((t) => t.active);
+        const targets = new Set([fileAgentId]);
+        for (const [subId, meta] of this.jsonlIndex.getSubscribedAgents()) {
+            const path = resolveJsonlFilePath(this.config.cursorProjectsDir, subId, {
+                title: meta.title,
+                composerIdByTitle: state.composerIdByTitle,
+                activeComposerId: state.activeComposerId,
+                activeTabTitle: activeTab?.title,
+            });
+            if (path && basename(path, '.jsonl') === fileAgentId)
+                targets.add(subId);
+        }
+        for (const agentId of targets) {
+            this.emitJsonlLiveForAgent(agentId, messages, totalMessages);
+        }
+    }
+    /** JSONL baseline + DOM rows not yet in file (`liveMessages`). */
+    lentaSnapshot(agentId, totalMessages) {
+        const historyMessages = this.chatDisplay.getJsonlHistory(agentId);
+        const liveMessages = this.chatDisplay.getDomLive(agentId);
+        const source = liveMessages.length ? 'hybrid' : 'jsonl';
+        return {
+            historyMessages,
+            liveMessages,
+            messages: [...historyMessages, ...liveMessages],
+            totalMessages: totalMessages ?? historyMessages.length,
+            source: source,
+        };
+    }
+    emitLentaForAgent(agentId, opts) {
+        const snap = this.lentaSnapshot(agentId, opts.totalMessages);
+        const historyOut = opts.historyPayload ?? snap.historyMessages;
+        if (!historyOut.length && !snap.liveMessages.length)
+            return;
+        this.emitAgentMessages(agentId, historyOut, snap.liveMessages, snap.source, opts.totalMessages, opts.seq, opts.append);
+    }
+    lentaTailSignature(messages) {
+        return messages
+            .slice(-4)
+            .map((m) => `${m.role}:${m.id ?? ''}:${(m.text ?? '').length}:${(m.text ?? '').slice(-48)}`)
+            .join('|');
+    }
+    /** Live JSONL → `agent:messages` for subscribed chats (phone lenta). */
+    emitJsonlLiveForAgent(agentId, rows, totalMessages) {
+        const prevTotal = this.lastEmittedJsonlRows.get(agentId) ?? 0;
+        const prevSig = this.lastEmittedLentaSig.get(agentId);
+        this.chatDisplay.setJsonlBaseline(agentId, rows);
+        this.lastEmittedJsonlRows.set(agentId, totalMessages);
+        const historyMessages = this.chatDisplay.getJsonlHistory(agentId);
+        if (!historyMessages.length && !this.chatDisplay.getDomLive(agentId).length)
+            return;
+        if (!this.jsonlIndex.getSubscribedAgents().has(agentId))
+            return;
+        const sig = this.lentaTailSignature(historyMessages);
+        const totalGrew = totalMessages > prevTotal;
+        if (!totalGrew && sig === prevSig && prevSig)
+            return;
+        const histLen = historyMessages.length;
+        const prevHistLen = this.lastEmittedHistLen.get(agentId) ?? 0;
+        if (prevHistLen > 24 && histLen < prevHistLen - 12) {
+            bridgePipelineLog({
+                dir: 'internal',
+                event: 'agent:messages:SKIP_REGRESSION',
+                agentId,
+                msgs: histLen,
+                detail: `prev=${prevHistLen} total=${totalMessages}`,
+            });
+            return;
+        }
+        this.lastEmittedLentaSig.set(agentId, sig);
+        this.lastEmittedHistLen.set(agentId, Math.max(prevHistLen, histLen));
+        this.emitLentaForAgent(agentId, {
+            totalMessages,
+            seq: this.nextHistorySeq(agentId),
+        });
+    }
+    scheduleDomOverlayEmit() {
+        if (this.domOverlayTimer)
+            clearTimeout(this.domOverlayTimer);
+        this.domOverlayTimer = setTimeout(() => {
+            this.domOverlayTimer = null;
+            this.emitDomOverlayForSyncedSubscribers();
+        }, 120);
+    }
+    /** DOM poll while agent works — overlay until the same turn lands in JSONL. */
+    emitDomOverlayForSyncedSubscribers() {
+        const state = this.stateManager.getState();
+        if (!state.messages?.length)
+            return;
+        const domRows = this.prepareStateMessages(state.messages);
+        for (const [subId, meta] of this.jsonlIndex.getSubscribedAgents()) {
+            if (!isChatSyncedWithCursor(subId, meta.title, state))
+                continue;
+            this.chatDisplay.mergeLiveForAgent(subId, domRows);
+            const snap = this.lentaSnapshot(subId, this.lastEmittedJsonlRows.get(subId) ?? undefined);
+            if (!snap.liveMessages.length && !state.agentWorking)
+                continue;
+            this.lastEmittedLentaSig.delete(subId);
+            this.emitLentaForAgent(subId, {
+                totalMessages: snap.totalMessages,
+                seq: this.nextHistorySeq(subId),
+            });
+        }
+    }
+    agentMessagesSnapshot(agentId, totalMessages) {
+        return this.lentaSnapshot(agentId, totalMessages);
+    }
     checkMediaAuth(req) {
         if (!this.authEnabled)
             return true;
@@ -80,7 +274,14 @@ export class Relay {
     }
     setupHttp() {
         this.app.get('/health', (_req, res) => {
-            res.json({ ok: true, cdp: this.cdpBridge.getClient()?.isConnected() ?? false });
+            res.json({
+                ok: true,
+                cdp: this.cdpBridge.getClient()?.isConnected() ?? false,
+                keepAwake: isKeepAwakeActive(),
+                debugChats: '/debug/chats',
+                debugSnapshot: '/debug/chat-snapshot',
+                debugJsonlLive: '/debug/jsonl-live',
+            });
         });
         this.app.get('/debug/messages', (_req, res) => {
             const state = this.stateManager.getState();
@@ -92,6 +293,62 @@ export class Relay {
                 lastError: state.lastError,
             });
         });
+        this.app.get('/debug/chats', (_req, res) => {
+            res.type('html').send(DEBUG_CHATS_PAGE_HTML);
+        });
+        this.app.get('/debug/chat-snapshot', (_req, res) => {
+            res.json(this.readOnlyChatSnapshot());
+        });
+        this.app.get('/debug/jsonl-live', async (req, res) => {
+            if (!this.checkMediaAuth(req)) {
+                res.status(401).json({ error: 'Unauthorized' });
+                return;
+            }
+            const agentId = String(req.query.agentId ?? '').trim();
+            if (!agentId) {
+                res.status(400).json({ error: 'agentId required' });
+                return;
+            }
+            const title = typeof req.query.title === 'string' ? req.query.title.trim() : undefined;
+            const afterRaw = Number(req.query.afterLine ?? 0);
+            const tailRaw = Number(req.query.tail ?? 0);
+            const afterLine = Number.isFinite(afterRaw) && afterRaw > 0 ? Math.floor(afterRaw) : 0;
+            const tail = afterLine > 0
+                ? 0
+                : Number.isFinite(tailRaw) && tailRaw > 0
+                    ? Math.min(500, Math.floor(tailRaw))
+                    : 80;
+            const state = this.stateManager.getState();
+            const activeTab = state.tabs.find((t) => t.active);
+            const filePath = resolveJsonlFilePath(this.config.cursorProjectsDir, agentId, {
+                title,
+                composerIdByTitle: state.composerIdByTitle,
+                activeComposerId: state.activeComposerId,
+                activeTabTitle: activeTab?.title,
+            });
+            if (!filePath) {
+                res.json({
+                    agentId,
+                    filePath: null,
+                    fileSize: 0,
+                    totalLines: 0,
+                    updatedAt: Date.now(),
+                    rows: [],
+                });
+                return;
+            }
+            try {
+                const snap = await readJsonlLiveSnapshot(filePath, agentId, {
+                    afterLine,
+                    tail,
+                    maxNew: 96,
+                });
+                res.json(snap);
+            }
+            catch (err) {
+                res.status(500).json({ error: err.message });
+            }
+        });
         this.app.get('/api/agents/index', async (req, res) => {
             if (!this.checkMediaAuth(req)) {
                 res.status(401).json({ error: 'Unauthorized' });
@@ -125,7 +382,13 @@ export class Relay {
             const agentId = String(req.query.agentId ?? '').trim();
             const title = typeof req.query.title === 'string' ? req.query.title.trim() : undefined;
             const limitRaw = Number(req.query.limit ?? 0);
-            const limit = Number.isFinite(limitRaw) && limitRaw > 0 ? limitRaw : undefined;
+            const minRaw = Number(req.query.minMessages ?? 0);
+            const limit = resolveHistoryLimit({
+                limit: Number.isFinite(limitRaw) && limitRaw > 0 ? limitRaw : undefined,
+                minMessages: Number.isFinite(minRaw) && minRaw > 0 ? minRaw : undefined,
+            });
+            const offsetRaw = Number(req.query.offset ?? 0);
+            const offset = Number.isFinite(offsetRaw) && offsetRaw > 0 ? offsetRaw : undefined;
             const requestId = typeof req.query.requestId === 'string' ? req.query.requestId.trim() : undefined;
             if (!agentId) {
                 res.status(400).json({ error: 'agentId required' });
@@ -139,13 +402,26 @@ export class Relay {
                 detail: `limit=${limit ?? 'all'} title=${title?.slice(0, 32) ?? '-'}`,
             });
             try {
-                const history = await this.jsonlIndex.loadHistory(agentId, {
+                const full = await this.jsonlIndex.loadHistory(agentId, {
                     title,
                     composerIdByTitle: this.stateManager.getState().composerIdByTitle,
-                    limit,
+                    offset,
                 });
-                const messages = this.chatDisplay.applyHistory(agentId, history.messages);
-                const body = { ...history, messages, requestId, updatedAt: Date.now() };
+                this.chatDisplay.setJsonlBaseline(agentId, full.messages);
+                const history = limit > 0 && full.messages.length > limit
+                    ? { ...full, messages: full.messages.slice(-limit) }
+                    : full;
+                if (!isChatHistoryFromJsonl()) {
+                    res.json({
+                        agentId,
+                        ...this.agentMessagesSnapshot(agentId, full.totalMessages),
+                        requestId,
+                        updatedAt: Date.now(),
+                    });
+                    return;
+                }
+                const snap = this.agentMessagesSnapshot(agentId, history.totalMessages);
+                const body = { ...history, ...snap, requestId, updatedAt: Date.now() };
                 const bytes = JSON.stringify(body).length;
                 bridgePipelineLog({
                     dir: 'out',
@@ -196,7 +472,7 @@ export class Relay {
             res.setHeader('Cache-Control', 'private, max-age=3600');
             res.send(file.data);
         });
-        this.app.post('/api/upload-image', express.json({ limit: '12mb' }), async (req, res) => {
+        this.app.post('/api/upload-image', express.json({ limit: '20mb' }), async (req, res) => {
             if (!this.checkMediaAuth(req)) {
                 res.status(401).json({ error: 'Unauthorized' });
                 return;
@@ -235,7 +511,7 @@ export class Relay {
                 res.status(500).json({ error: err.message });
             }
         });
-        this.app.post('/api/transcribe', express.json({ limit: '12mb' }), async (req, res) => {
+        this.app.post('/api/transcribe', express.json({ limit: '20mb' }), async (req, res) => {
             if (!this.checkMediaAuth(req)) {
                 res.status(401).json({ error: 'Unauthorized' });
                 return;
@@ -243,7 +519,7 @@ export class Relay {
             const apiKey = this.config.openaiApiKey;
             if (!apiKey) {
                 res.status(503).json({
-                    error: 'OPENAI_API_KEY not set on Cursor Connect Mac (add to bridge/.env)',
+                    error: 'Голосовой ввод недоступен: задайте OPENAI_API_KEY в bridge/.env (локальный режим без relay)',
                 });
                 return;
             }
@@ -307,6 +583,16 @@ export class Relay {
         this.io.on('connection', (socket) => this.onConnect(socket));
     }
     broadcast(event, payload) {
+        if (event === 'agent:messages') {
+            const p = payload;
+            bridgePipelineLog({
+                dir: 'out',
+                event: 'broadcast:agent:messages',
+                agentId: p?.agentId,
+                msgs: p?.historyMessages?.length ?? 0,
+                detail: `live=${p?.liveMessages?.length ?? 0} append=${!!p?.append} seq=${p?.seq ?? '-'} upstream=${this.upstream?.connected ?? false}`,
+            });
+        }
         if (event === 'agents:history' || event === 'agent:history') {
             const h = payload;
             const bytes = JSON.stringify(payload ?? {}).length;
@@ -323,13 +609,28 @@ export class Relay {
         this.io.emit(event, payload);
         this.upstream?.emit(event, payload);
     }
-    prepareStateMessages(raw, patch) {
-        const state = { ...this.stateManager.getState(), ...patch };
-        for (const [agentId, meta] of this.jsonlIndex.getSubscribedAgents()) {
-            if (isChatSyncedWithCursor(agentId, meta.title, state)) {
-                return this.chatDisplay.mergeLiveForAgent(agentId, raw);
-            }
-        }
+    historySeqByAgent = new Map();
+    nextHistorySeq(agentId) {
+        const n = (this.historySeqByAgent.get(agentId) ?? 0) + 1;
+        this.historySeqByAgent.set(agentId, n);
+        return n;
+    }
+    emitAgentMessages(agentId, historyMessages, liveMessages, source, totalMessages, seq, append = false) {
+        const outSeq = seq ?? this.nextHistorySeq(agentId);
+        const messages = [...historyMessages, ...liveMessages];
+        this.broadcast('agent:messages', {
+            agentId,
+            historyMessages,
+            liveMessages,
+            messages,
+            totalMessages: totalMessages ?? messages.length,
+            source,
+            updatedAt: Date.now(),
+            seq: outSeq,
+            append: append || undefined,
+        });
+    }
+    prepareStateMessages(raw) {
         return filterClientDisplayList(prepareChatMessagesForDisplay(raw));
     }
     withDisplayState(payload) {
@@ -337,16 +638,21 @@ export class Relay {
             return payload;
         return {
             ...payload,
-            messages: this.prepareStateMessages(payload.messages, payload),
+            messages: this.prepareStateMessages(payload.messages),
         };
     }
     wireEvents() {
         this.stateManager.on('state:full', (state) => {
             this.broadcast('state:full', this.withDisplayState(state));
             this.emitAgentsIndex();
+            this.observeAgentCompletionForPush();
         });
         this.stateManager.on('state:patch', (patch) => {
             this.broadcast('state:patch', this.withDisplayState(patch));
+            this.observeAgentCompletionForPush();
+            if (patch.messages?.length) {
+                this.scheduleDomOverlayEmit();
+            }
             if (patch.sidebarRepos || patch.composerIdByTitle) {
                 const key = JSON.stringify([patch.sidebarRepos, patch.composerIdByTitle]);
                 if (key !== this.lastSidebarIndexKey) {
@@ -363,11 +669,24 @@ export class Relay {
             this.lastJsonlIndex = index;
             this.emitAgentsIndex();
         });
+        this.jsonlIndex.on('agent:jsonl:updated', (payload) => {
+            const total = payload.totalMessages ?? payload.messages.length;
+            this.syncJsonlToSubscribedAgents(payload.agentId, payload.messages, total);
+        });
         this.jsonlIndex.on('agent:history', (history) => {
-            const messages = this.chatDisplay.applyHistory(history.agentId, history.messages, {
-                mergeWithCache: true,
-            });
-            this.broadcast('agent:history', { ...history, messages });
+            const total = history.totalMessages ?? history.messages.length;
+            this.emitJsonlLiveForAgent(history.agentId, history.messages, total);
+            if (isChatHistoryFromJsonl()) {
+                const snap = this.agentMessagesSnapshot(history.agentId, total);
+                this.broadcast('agent:history', {
+                    ...history,
+                    historyMessages: snap.historyMessages,
+                    liveMessages: snap.liveMessages,
+                    messages: snap.messages,
+                    seq: this.historySeqByAgent.get(history.agentId),
+                    totalMessages: total,
+                });
+            }
         });
     }
     emitAgentsIndex(force = false) {
@@ -517,6 +836,7 @@ export class Relay {
         const result = await this.commandExecutor.execute(payload);
         reply('command:result', result);
         if (payload.type === 'stop_agent' && result.ok) {
+            suppressAgentCompletionPush();
             this.stateManager.patchNow({
                 agentWorking: false,
                 agentStatus: undefined,
@@ -527,10 +847,10 @@ export class Relay {
             this.domExtractor.pollNow();
         }
     }
-    async runAgentsHistory({ agentId, title, requestId, limit, }, reply) {
+    async runAgentsHistory({ agentId, title, requestId, limit, offset, minMessages, }, reply) {
         const t0 = Date.now();
         const viaUpstream = this.upstream?.connected ?? false;
-        const socketLimit = limit && limit > 0 ? limit : 15;
+        const socketLimit = resolveHistoryLimit({ limit, minMessages });
         console.log(`[relay] agents:history req agentId=${agentId} title=${title?.slice(0, 48) ?? '-'} limit=${socketLimit} rid=${requestId ?? '-'} upstream=${viaUpstream}`);
         this.jsonlIndex.historyReplyInFlight.add(agentId);
         bridgePipelineLog({
@@ -541,14 +861,30 @@ export class Relay {
             detail: `limit=${socketLimit} title=${title?.slice(0, 32) ?? '-'} upstream=${viaUpstream}`,
         });
         try {
-            const history = await this.jsonlIndex.loadHistory(agentId, {
+            const full = await this.jsonlIndex.loadHistory(agentId, {
                 title,
                 composerIdByTitle: this.stateManager.getState().composerIdByTitle,
-                limit: socketLimit,
+                offset,
             });
-            const messages = this.chatDisplay.applyHistory(agentId, history.messages);
+            this.emitJsonlLiveForAgent(agentId, full.messages, full.totalMessages);
+            const snap = this.agentMessagesSnapshot(agentId, full.totalMessages);
+            if (!isChatHistoryFromJsonl()) {
+                const seq = this.historySeqByAgent.get(agentId) ?? this.nextHistorySeq(agentId);
+                const ms = Date.now() - t0;
+                console.log(`[relay] agents:history jsonl agentId=${agentId} hist=${snap.historyMessages.length} total=${full.totalMessages} ms=${ms} rid=${requestId ?? '-'}`);
+                reply('agents:history', {
+                    agentId,
+                    ...snap,
+                    totalMessages: full.totalMessages,
+                    requestId,
+                    updatedAt: Date.now(),
+                    seq,
+                });
+                return;
+            }
+            const history = full;
             const ms = Date.now() - t0;
-            const bytes = JSON.stringify(messages).length;
+            const bytes = JSON.stringify(snap.messages).length;
             console.log(`[relay] agents:history ok agentId=${history.agentId} msgs=${history.messages?.length ?? 0}/${history.totalMessages ?? '?'} bytes=${bytes} ms=${ms} rid=${requestId ?? '-'}`);
             bridgePipelineLog({
                 dir: 'out',
@@ -559,11 +895,15 @@ export class Relay {
                 msgs: history.messages?.length ?? 0,
                 detail: `total=${history.totalMessages ?? '?'} ms=${ms}`,
             });
+            const seq = this.nextHistorySeq(history.agentId);
             reply('agents:history', {
                 ...history,
-                messages,
+                historyMessages: snap.historyMessages,
+                liveMessages: snap.liveMessages,
+                messages: snap.messages,
                 requestId,
                 updatedAt: Date.now(),
+                seq,
             });
         }
         catch (err) {
@@ -590,11 +930,14 @@ export class Relay {
     async runAgentsSubscribe({ agentId, title, focus, }) {
         if (!agentId)
             return;
-        this.jsonlIndex.subscribe(agentId, title);
+        const alreadySubscribed = this.jsonlIndex.getSubscribedAgents().has(agentId);
+        this.jsonlIndex.subscribe(agentId, title, { emitHistory: !alreadySubscribed });
         this.stateManager.patchNow({ lastError: undefined });
         await this.trySwitchWindowForAgent(agentId);
-        if (focus === false)
+        if (focus === false) {
+            void this.refreshDomChatOnSubscribe(agentId, title, { clear: !alreadySubscribed });
             return;
+        }
         const result = await this.commandExecutor.execute({
             id: `subscribe-focus-${Date.now()}`,
             type: 'focus_agent',
@@ -604,11 +947,37 @@ export class Relay {
         if (!result.ok) {
             console.warn('[relay] subscribe focus (non-fatal):', result.error);
         }
+        void this.refreshDomChatOnSubscribe(agentId, title, { clear: !alreadySubscribed });
+    }
+    /** Открытие чата: JSONL baseline + focus/scroll (DOM poll только для state: working/approve). */
+    async refreshDomChatOnSubscribe(agentId, title, opts) {
+        try {
+            if (opts?.clear !== false) {
+                this.chatDisplay.clearAgent(agentId);
+                this.lastEmittedJsonlRows.delete(agentId);
+                this.lastEmittedLentaSig.delete(agentId);
+                this.lastEmittedHistLen.delete(agentId);
+            }
+            const history = await this.jsonlIndex.loadHistory(agentId, {
+                title,
+                composerIdByTitle: this.stateManager.getState().composerIdByTitle,
+            });
+            this.lastEmittedLentaSig.delete(agentId);
+            this.emitJsonlLiveForAgent(agentId, history.messages, history.totalMessages);
+            await this.commandExecutor.scrollChatToBottom();
+            this.domExtractor.pollNow();
+        }
+        catch (err) {
+            console.warn('[relay] refreshDomChatOnSubscribe (non-fatal):', err.message);
+        }
     }
     runAgentsUnsubscribe({ agentId }) {
         if (agentId) {
             this.jsonlIndex.unsubscribe(agentId);
             this.chatDisplay.clearAgent(agentId);
+            this.lastEmittedJsonlRows.delete(agentId);
+            this.lastEmittedLentaSig.delete(agentId);
+            this.lastEmittedHistLen.delete(agentId);
         }
     }
     async runAgentsFocus({ agentId, title }, reply) {

package/bridge-runtime/dist/types.d.ts

@@ -33,6 +33,10 @@ export interface ServerConfig {
     relayUrl: string;
     relayToken: string;
     relayRoomId: string;
+    /** macOS: prevent system sleep while bridge runs (`KEEP_AWAKE=0` to disable). */
+    keepAwakeEnabled: boolean;
+    /** Periodic upstream ping when `relayUrl` set; `0` = off. */
+    relayKeepaliveMs: number;
     /** Client token from ~/.cursorconnect/identity.json (relay room pairing). */
     pairingClientToken?: string;
 }
@@ -90,7 +94,10 @@ export interface ChatMessage {
     html?: string;
     /** Absolute path or URL from DOM `image-pill-img` (served via GET /media/file). */
     images?: string[];
+    /** Cursor `data-flat-index` when present; else extract sequence. */
     flatIndex?: number;
+    /** Document order within one DOM extract (tie-break when flatIndex ties). */
+    domSeq?: number;
 }
 /** Per-poll DOM extract stats — why rows were skipped (for missing-message debug). */
 export interface MessageExtractDebug {
@@ -247,5 +254,23 @@ export interface AgentHistory {
     updatedAt?: number;
     requestId?: string;
     totalMessages?: number;
+    /** Monotonic per agentId — stale snapshots should be ignored. */
+    seq?: number;
+}
+/** Per-agent chat lenta (JSONL). `state.messages` in state:patch is DOM/debug only. */
+export interface AgentMessagesPayload {
+    agentId: string;
+    /** JSONL archive tail (history). When `append`, only new display rows since last emit. */
+    historyMessages: ChatMessage[];
+    /** Legacy field; always `[]` — lenta is JSONL-only. */
+    liveMessages: ChatMessage[];
+    /** Same as historyMessages (debug). */
+    messages: ChatMessage[];
+    totalMessages?: number;
+    source: 'dom' | 'jsonl' | 'hybrid';
+    updatedAt: number;
+    seq: number;
+    /** Live JSONL stream: merge `historyMessages` into client state (small payload). */
+    append?: boolean;
 }
 export type ExtractedPageState = Omit<CursorState, 'connected' | 'windows' | 'activeWindowId' | 'windowSnapshots' | 'updatedAt'>;

package/bridge-runtime/selectors.json

@@ -47,12 +47,11 @@
     "strategies": [
       "button.ui-shell-tool-call__run-btn",
       "button.ui-shell-tool-call__allowlist-button",
-      "button[aria-label*='Accept']",
-      "button[aria-label*='Approve']",
-      "button[aria-label*='Run']",
-      "button[aria-label*='Allow']"
+      ".ui-shell-tool-call__approval-row button[aria-label*='Accept']",
+      ".ui-shell-tool-call__approval-row button[aria-label*='Approve']",
+      ".ui-shell-tool-call__approval-row button[aria-label*='Allow']"
     ],
-    "textMatch": ["Accept", "Approve", "Run", "Allow", "Accept All"]
+    "textMatch": ["Accept", "Approve", "Allow", "Accept All"]
   },
   "rejectButton": {
     "strategies": [