cursorconnect 0.1.6 → 0.1.7

package/bridge-runtime/dist/extract-page.js

@@ -523,7 +523,7 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
             const t = text.trim().replace(/\s+/g, ' ');
             if (!t || t.length > 100)
                 return undefined;
-            if (/will resume when|background work finishes|background shell|resuming when|paused while|waiting for background/i.test(t)) {
+            if (/will resume when|background work finishes|background shell|resuming when|paused while|waiting for background|waiting for \d+ command/i.test(t)) {
                 return t;
             }
             if (/^working\.?$/i.test(t))
@@ -543,10 +543,27 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 return undefined;
             return hit;
         }
+        function isUserFacingAssistantProse(text) {
+            const t = text.trim();
+            if (!t)
+                return false;
+            if (/^##\s+\S/m.test(t))
+                return true;
+            if (/^\*\*[^*]{2,}\*\*/m.test(t) && t.length >= 60)
+                return true;
+            const tableRows = t.match(/^\|[^\n]+\|$/gm);
+            if (tableRows && tableRows.length >= 2)
+                return true;
+            if (/^[-*]\s+\S/m.test(t) && t.length >= 100)
+                return true;
+            return false;
+        }
         function isAssistantReflectionText(text) {
             const t = text.trim().replace(/\s+/g, ' ');
             if (!t || isNoiseChatText(t))
                 return true;
+            if (isUserFacingAssistantProse(t))
+                return false;
             if (/^Thought\s*for\s*\d/i.test(t) && t.length < 160)
                 return true;
             if (/^(Exploring|Grepped|Searched|Listed|Read |Ran |Edited |Loading|Planning|Using image)/i.test(t)) {
@@ -555,10 +572,6 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
             const toolHits = t.match(/\b(Explored|Grepped|Searched|Listed|Read )\b/gi);
             if (toolHits && toolHits.length >= 2)
                 return true;
-            if (t.length > 160 &&
-                /\b(state\.messages|flat-index|mapKeyedChildren|humanEl|extract-page|userMessagesEquivalent)\b/i.test(t)) {
-                return true;
-            }
             return false;
         }
         function isMeaningfulAssistantText(text) {
@@ -659,14 +672,17 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 return true;
             return false;
         }
-        let flatOrder = 0;
+        let domSeqCounter = 0;
         flatEls.forEach((el) => {
             const idxRaw = el.getAttribute('data-flat-index') ?? '';
             const idxParsed = Number.parseInt(idxRaw, 10);
-            const flatIndex = Number.isFinite(idxParsed) ? idxParsed : flatOrder++;
+            const domSeq = domSeqCounter++;
+            // Sort/display: Cursor data-flat-index is the real timeline; domSeq only tie-breaks.
+            const attrFlatIndex = Number.isFinite(idxParsed) ? idxParsed : undefined;
+            const flatIndex = attrFlatIndex ?? domSeq;
             const role = el.getAttribute('data-message-role') ?? '';
             const kind = el.getAttribute('data-message-kind') ?? '';
-            const id = `${idxRaw || flatIndex}-${role || 'x'}-${kind || 'x'}`;
+            const id = `${attrFlatIndex ?? flatIndex}-${role || 'x'}-${kind || 'x'}`;
             if (isToolNoiseElement(el, kind)) {
                 recordDrop('tool', el);
                 return;
@@ -702,6 +718,7 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                     text: displayText,
                     images: images.length ? images : undefined,
                     flatIndex,
+                    domSeq,
                 });
                 messageDebug.extracted++;
                 return;
@@ -731,10 +748,10 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 text,
                 html: mdRoot.innerHTML || undefined,
                 flatIndex,
+                domSeq,
             });
             messageDebug.extracted++;
         });
-        messages.sort((a, b) => (a.flatIndex ?? 0) - (b.flatIndex ?? 0));
         function compareUserText(text) {
             return cleanUserText(text).replace(/\s+/g, ' ').trim();
         }
@@ -853,6 +870,30 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
             }
         }
         const pendingApprovals = [];
+        function isVisibleButton(btn) {
+            const st = getComputedStyle(btn);
+            if (st.display === 'none' || st.visibility === 'hidden' || Number(st.opacity) < 0.05) {
+                return false;
+            }
+            const r = btn.getBoundingClientRect();
+            return r.width >= 2 && r.height >= 2;
+        }
+        /** Real tool Accept/Run — only explicit approval row (not chat status / "Run in background"). */
+        function isToolApprovalButton(btn) {
+            return !!btn.closest('.ui-shell-tool-call__approval-row');
+        }
+        function isDeniedApprovalLabel(label) {
+            const t = label.trim().toLowerCase();
+            if (!t)
+                return true;
+            if (t === 'run in background' || t.includes('run in background'))
+                return true;
+            if (/waiting for \d+ command/.test(t))
+                return true;
+            if (/will resume when|background work finishes|background shell/.test(t))
+                return true;
+            return false;
+        }
         function isMenuTrigger(btn) {
             const p = btn.getAttribute('aria-haspopup');
             return p === 'menu' || p === 'true' || p === 'listbox';
@@ -922,7 +963,7 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 continue;
             const actions = [];
             const runBtn = row.querySelector('button.ui-shell-tool-call__run-btn');
-            if (runBtn && !isMenuTrigger(runBtn)) {
+            if (runBtn && isVisibleButton(runBtn) && !isMenuTrigger(runBtn)) {
                 actions.push({
                     label: cleanLabel(runBtn.textContent || '') || 'Run',
                     type: 'approve',
@@ -930,95 +971,25 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 });
             }
             const skipBtn = row.querySelector('button.ui-shell-tool-call__skip-btn');
-            if (skipBtn && !isMenuTrigger(skipBtn)) {
+            if (skipBtn && isVisibleButton(skipBtn) && !isMenuTrigger(skipBtn)) {
                 actions.push({
                     label: cleanLabel(skipBtn.textContent || '') || 'Skip',
                     type: 'reject',
                     selectorPath: buildSelectorPath(skipBtn),
                 });
             }
-            if (!actions.some((a) => a.type === 'approve'))
+            const approveAction = actions.find((a) => a.type === 'approve' || a.type === 'approve_all');
+            if (!approveAction || isDeniedApprovalLabel(approveAction.label))
                 continue;
             const cmd = card.querySelector('.ui-shell-tool-call__command')?.textContent?.trim();
+            if (cmd && isDeniedApprovalLabel(cmd))
+                continue;
             pendingApprovals.push({
                 id: `tool:${buildSelectorPath(card)}`,
                 description: (cmd || 'Pending approval').slice(0, 240),
                 actions,
             });
         }
-        if (pendingApprovals.length === 0) {
-            const approveBtns = [];
-            const rejectBtns = [];
-            const seenA = new Set();
-            const seenR = new Set();
-            for (const sel of approveSelectors) {
-                try {
-                    for (const btn of Array.from(container.querySelectorAll(sel))) {
-                        if (seenA.has(btn) || isMenuTrigger(btn))
-                            continue;
-                        const label = btn.textContent?.trim() || btn.getAttribute('aria-label') || '';
-                        if (label) {
-                            seenA.add(btn);
-                            approveBtns.push({ label, selector: buildSelectorPath(btn) });
-                        }
-                    }
-                }
-                catch {
-                    /* skip */
-                }
-            }
-            if (approveBtns.length === 0) {
-                for (const btn of Array.from(container.querySelectorAll('button'))) {
-                    if (seenA.has(btn) || isMenuTrigger(btn))
-                        continue;
-                    const text = `${btn.textContent || ''} ${btn.getAttribute('aria-label') || ''}`.toLowerCase();
-                    for (const pat of approveTextMatch) {
-                        if (text.includes(pat.toLowerCase())) {
-                            seenA.add(btn);
-                            approveBtns.push({
-                                label: btn.textContent?.trim() || pat,
-                                selector: buildSelectorPath(btn),
-                            });
-                            break;
-                        }
-                    }
-                }
-            }
-            for (const sel of rejectSelectors) {
-                try {
-                    for (const btn of Array.from(container.querySelectorAll(sel))) {
-                        if (seenR.has(btn) || isMenuTrigger(btn))
-                            continue;
-                        const label = btn.textContent?.trim() || btn.getAttribute('aria-label') || '';
-                        if (label) {
-                            seenR.add(btn);
-                            rejectBtns.push({ label, selector: buildSelectorPath(btn) });
-                        }
-                    }
-                }
-                catch {
-                    /* skip */
-                }
-            }
-            if (approveBtns.length > 0 || rejectBtns.length > 0) {
-                const actions = [];
-                for (const b of approveBtns) {
-                    actions.push({
-                        label: b.label,
-                        type: b.label.toLowerCase().includes('all') ? 'approve_all' : 'approve',
-                        selectorPath: b.selector,
-                    });
-                }
-                for (const b of rejectBtns) {
-                    actions.push({ label: b.label, type: 'reject', selectorPath: b.selector });
-                }
-                pendingApprovals.push({
-                    id: approveBtns.map((b) => b.label).join(','),
-                    description: approveBtns[0]?.label || 'Pending approval',
-                    actions,
-                });
-            }
-        }
         let activeTab = tabs.find((t) => t.active);
         if (!activeTab) {
             const headerTitle = document.querySelector('span.auxiliary-bar-chat-title')?.textContent?.trim() ?? '';

package/bridge-runtime/dist/history-limit.d.ts

@@ -0,0 +1,2 @@
+/** Default JSONL tail for `agents:history` / app `fetchAgentHistory` (keep in sync). */
+export declare const AGENT_HISTORY_DEFAULT_LIMIT = 80;

package/bridge-runtime/dist/history-limit.js

@@ -0,0 +1,2 @@
+/** Default JSONL tail for `agents:history` / app `fetchAgentHistory` (keep in sync). */
+export const AGENT_HISTORY_DEFAULT_LIMIT = 80;

package/bridge-runtime/dist/history-request.d.ts

@@ -0,0 +1,8 @@
+export interface HistoryRequestOpts {
+    limit?: number;
+    offset?: number;
+    /** Ensure at least N tail rows (raises effective limit, capped at 500). */
+    minMessages?: number;
+}
+/** Resolve socket/HTTP `agents:history` tail size. */
+export declare function resolveHistoryLimit(opts?: HistoryRequestOpts): number;

package/bridge-runtime/dist/history-request.js

@@ -0,0 +1,7 @@
+import { AGENT_HISTORY_DEFAULT_LIMIT } from './history-limit.js';
+/** Resolve socket/HTTP `agents:history` tail size. */
+export function resolveHistoryLimit(opts) {
+    const base = opts?.limit && opts.limit > 0 ? opts.limit : AGENT_HISTORY_DEFAULT_LIMIT;
+    const min = opts?.minMessages && opts.minMessages > 0 ? opts.minMessages : 0;
+    return Math.min(500, Math.max(base, min));
+}

package/bridge-runtime/dist/index.js

@@ -24,6 +24,7 @@ async function main() {
     const commandExecutor = new CommandExecutor(selectors);
     const cdpBridge = new CDPBridge(config);
     const jsonlIndex = new JsonlIndex(config.cursorProjectsDir);
+    jsonlIndex.setBridgeStateProvider(() => stateManager.getState());
     const messageDebugStore = new MessageDebugStore();
     const extractor = new DOMExtractor(selectors, (state, err) => {
         if (state?.messageDebug)

package/bridge-runtime/dist/jsonl-index.d.ts

@@ -1,24 +1,38 @@
 import { EventEmitter } from 'events';
-import type { AgentsIndex, HistoryMessage } from './types.js';
+import type { AgentsIndex, CursorState, HistoryMessage } from './types.js';
 export declare class JsonlIndex extends EventEmitter {
     private projectsDir;
     private debounceTimer;
     private subscribed;
     private mtimeByAgent;
     private pollTimer;
+    private readonly fileCache;
+    private readonly emitFileTimers;
+    private liveWatcher;
+    private liveWatchKey;
     /** Skip poll `agent:history` while serving explicit `agents:history` (avoids relay race). */
     readonly historyReplyInFlight: Set<string>;
+    private bridgeState;
     constructor(projectsDir: string);
+    setBridgeStateProvider(fn: () => Pick<CursorState, 'composerIdByTitle' | 'activeComposerId' | 'tabs'>): void;
+    private resolveOpts;
     start(): void;
     stop(): void;
-    subscribe(agentId: string, title?: string): void;
+    subscribe(agentId: string, title?: string, opts?: {
+        emitHistory?: boolean;
+    }): void;
     unsubscribe(agentId: string): void;
+    /** Immediate `change` on subscribed `.jsonl` (no awaitWriteFinish delay). */
+    private refreshLiveWatcher;
     getSubscribedAgents(): ReadonlyMap<string, {
         title?: string;
     }>;
     private pollSubscribed;
     private emitHistoryForAgent;
-    private emitHistoryForFile;
+    private scheduleEmitHistoryForFile;
+    private isLiveWatchedFile;
+    private loadMessagesForFile;
+    private emitHistoryForFileNow;
     private scheduleRebuild;
     rebuild(opts?: {
         broadcast?: boolean;
@@ -27,7 +41,11 @@ export declare class JsonlIndex extends EventEmitter {
     loadHistory(agentId: string, opts?: {
         title?: string;
         composerIdByTitle?: Record<string, string>;
+        activeComposerId?: string;
+        activeTabTitle?: string;
         limit?: number;
+        /** Skip newest `offset` rows before taking `limit` tail (0 = newest). */
+        offset?: number;
     }): Promise<{
         agentId: string;
         messages: HistoryMessage[];