cursorconnect 0.1.10 → 0.1.12

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

@@ -1,7 +1,7 @@
 /**
  * Runs inside Cursor renderer — must be self-contained.
  */
-export function extractionFunction(containerSelectors, tabSelectors, inputSelectors, approveSelectors, approveTextMatch, rejectSelectors, rejectTextMatch) {
+export function extractionFunction(containerSelectors, tabSelectors, editorAuxiliaryTabSelectors, inputSelectors, approveSelectors, approveTextMatch, rejectSelectors, rejectTextMatch) {
     function findFirst(sels) {
         for (const sel of sels) {
             try {
@@ -340,11 +340,33 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                     /while dragging, use the arrow keys/i.test(text));
             }
             function removePathFor(el) {
-                const btn = el.querySelector('button[aria-label="Remove"]');
-                if (!btn)
-                    return undefined;
-                const path = buildSelectorPath(btn);
-                return path || undefined;
+                const legacy = el.querySelector('button[aria-label="Remove"]');
+                if (legacy) {
+                    const path = buildSelectorPath(legacy);
+                    if (path)
+                        return path;
+                }
+                const removeAction = el.querySelector('[data-queue-action="remove"]');
+                if (removeAction) {
+                    const clickTarget = removeAction.closest('button') ||
+                        removeAction.querySelector('button, .anysphere-icon-button') ||
+                        removeAction;
+                    const path = buildSelectorPath(clickTarget);
+                    if (path)
+                        return path;
+                }
+                const trashIcon = el.querySelector('.codicon-trashcan');
+                if (trashIcon) {
+                    const clickTarget = trashIcon.closest('button') ||
+                        trashIcon.closest('.anysphere-icon-button') ||
+                        trashIcon.parentElement;
+                    if (clickTarget) {
+                        const path = buildSelectorPath(clickTarget);
+                        if (path)
+                            return path;
+                    }
+                }
+                return undefined;
             }
             function extractQueuedRowText(row) {
                 const textRoot = row.querySelector('[class*="ui-tray-row"]') ||
@@ -352,7 +374,7 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                     row;
                 const clone = textRoot.cloneNode(true);
                 clone
-                    .querySelectorAll('img, button, [class*="icon"], [aria-hidden="true"], [class*="image-pill"]')
+                    .querySelectorAll('img, button, .anysphere-icon-button, [class*="queue-item-actions"], [class*="icon"], [aria-hidden="true"], [class*="image-pill"]')
                     .forEach((el) => el.remove());
                 return (clone.textContent || '').trim().replace(/\s+/g, ' ');
             }
@@ -421,6 +443,7 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 items.push({ id: `q-line-${idx}-${items.length}`, text: t });
             }
             const itemSelectors = [
+                '.composer-toolbar-queue-item',
                 '[class*="ui-tray--queued"] [class*="queue-sortable-row"]',
                 '[class*="ui-tray--queued"] [class*="ui-tray-row"]',
                 '[class*="queue-sortable-row"]',
@@ -811,6 +834,92 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
             t = t.replace(/\d+\s*(?:s|m|h|d|w)\b/gi, '').replace(/\d+[smhdw]$/i, '').trim();
             return t.slice(0, 120);
         }
+        /** Tab title from auxiliary bar (aria-label is usually the full name). */
+        function cleanAuxiliaryTabTitle(raw, fromAriaLabel) {
+            let t = raw.trim().replace(/\s+/g, ' ');
+            t = t.replace(/\d+\s*(?:s|m|h|d|w)\b/gi, '').replace(/\d+[smhdw]$/i, '').trim();
+            t = t.replace(/⌘[A-Z0-9]+$/i, '').trim();
+            // VS Code puts editor-group context in aria-label, not on the visible tab chip.
+            t = t.replace(/,\s*Chat Editors:\s*Editor Group\s*\d+\s*$/i, '').trim();
+            if (!fromAriaLabel) {
+                // Status suffix at end only — do not use /i on "Running" (would strip "running" in "Bot running on…").
+                t = t.replace(/\s+(?:Edited|Thinking|Grepping|Running)\s*$/i, '').trim();
+                t = t.replace(/\+\d[\d\-·\s\w]*(?:Files?|File)\d*\w*$/i, '').trim();
+            }
+            return t.slice(0, 120);
+        }
+        function pickAuxiliaryTabTitle(aria, visible) {
+            const cleanedAria = aria ? cleanAuxiliaryTabTitle(aria, true) : '';
+            const cleanedVisible = visible ? cleanAuxiliaryTabTitle(visible, false) : '';
+            if (cleanedAria && cleanedVisible) {
+                if (cleanedVisible.length > cleanedAria.length)
+                    return cleanedVisible;
+                if (cleanedAria.startsWith(cleanedVisible) ||
+                    cleanedVisible.length < Math.min(cleanedAria.length, 10)) {
+                    return cleanedAria;
+                }
+                return cleanedAria.length >= cleanedVisible.length ? cleanedAria : cleanedVisible;
+            }
+            return cleanedAria || cleanedVisible;
+        }
+        function isEditorAuxiliaryLayout() {
+            if (document.querySelector('[class*="agent-panel"]'))
+                return false;
+            return !!document.querySelector('#workbench\\.parts\\.auxiliarybar');
+        }
+        function extractEditorAuxiliaryTabs() {
+            if (!isEditorAuxiliaryLayout())
+                return [];
+            const composerBar = document.querySelector('div.composer-bar.editor[data-composer-id]') ||
+                document.querySelector('.composer-bar[data-composer-id]') ||
+                document.querySelector('div.composer-bar.editor, .composer-bar');
+            const activeComposerId = composerBar?.getAttribute('data-composer-id') ||
+                composerBar?.closest('[data-composer-id]')?.getAttribute('data-composer-id') ||
+                '';
+            const tabEls = [];
+            for (const sel of editorAuxiliaryTabSelectors) {
+                try {
+                    document.querySelectorAll(sel).forEach((el) => tabEls.push(el));
+                }
+                catch {
+                    /* skip */
+                }
+                if (tabEls.length)
+                    break;
+            }
+            if (!tabEls.length)
+                return [];
+            const out = [];
+            tabEls.forEach((cell, i) => {
+                const aria = cell.getAttribute('aria-label')?.trim() ?? '';
+                const visible = (cell.textContent || '').trim().replace(/\s+/g, ' ');
+                const title = pickAuxiliaryTabTitle(aria, visible);
+                if (!title || /^(new agent|marketplace)$/i.test(title))
+                    return;
+                const active = cell.classList.contains('active') ||
+                    cell.classList.contains('selected') ||
+                    cell.getAttribute('aria-selected') === 'true';
+                const resourceName = cell.getAttribute('data-resource-name')?.trim() || '';
+                let composerId = cell.getAttribute('data-composer-id') ||
+                    cell.closest('[data-composer-id]')?.getAttribute('data-composer-id') ||
+                    '';
+                if (active && activeComposerId)
+                    composerId = activeComposerId;
+                else if (!composerId && resourceName.length >= 32) {
+                    composerId = resourceName;
+                    if (activeComposerId && activeComposerId.toLowerCase().startsWith(resourceName.toLowerCase())) {
+                        composerId = activeComposerId;
+                    }
+                }
+                out.push({
+                    id: composerId || `aux-tab-${i}`,
+                    composerId: composerId || undefined,
+                    title,
+                    active,
+                });
+            });
+            return out;
+        }
         function readAgentBtnMeta(btn) {
             const title = cleanSidebarTitle(btn);
             if (!title || /^more$/i.test(title) || /^less$/i.test(title))
@@ -827,8 +936,12 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
             return { title, composerId, active, isWorking, hasUnread, needsAttention };
         }
         const tabs = [];
+        const editorAuxTabs = extractEditorAuxiliaryTabs();
+        if (editorAuxTabs.length > 0) {
+            tabs.push(...editorAuxTabs);
+        }
         const glassTabs = document.querySelectorAll('.glass-sidebar-agent-list-container li.ui-sidebar-menu-item > div.glass-sidebar-agent-menu-btn');
-        if (glassTabs.length > 0) {
+        if (tabs.length === 0 && glassTabs.length > 0) {
             glassTabs.forEach((cell, i) => {
                 const meta = readAgentBtnMeta(cell);
                 if (!meta)
@@ -844,7 +957,7 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 });
             });
         }
-        else {
+        else if (tabs.length === 0) {
             for (const sel of tabSelectors) {
                 document.querySelectorAll(sel).forEach((cell, i) => {
                     const title = cell.getAttribute('aria-label') ??
@@ -1025,28 +1138,56 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
                 r,
             ].filter((el) => Boolean(el));
         }
-        /** Active generation — Stop in composer (not stale loading dots in the thread). */
-        function detectAgentWorking(root) {
-            const stopSel = 'button[data-state="stop"], button[aria-label="Stop generation"], button[aria-label*="Stop"], a.codicon-debug-stop, [class*="stop-button"]';
-            const sendSel = 'button[data-state="submit"], button.ui-prompt-input-submit-button[data-state="submit"], button[aria-label*="Send"]';
-            for (const scope of composerScopes(root)) {
-                const stopBtn = scope.querySelector(stopSel);
-                if (stopBtn) {
-                    const disabled = stopBtn.hasAttribute('disabled') ||
-                        stopBtn.getAttribute('aria-disabled') === 'true';
-                    if (!disabled)
-                        return true;
-                }
-            }
-            for (const scope of composerScopes(root)) {
-                const sendBtn = scope.querySelector(sendSel);
-                if (sendBtn && sendBtn.getAttribute('data-state') !== 'stop') {
-                    const disabled = sendBtn.hasAttribute('disabled') ||
-                        sendBtn.getAttribute('aria-disabled') === 'true';
-                    if (!disabled)
-                        return false;
+        /** Keep in sync with bridge/src/generation-stop-dom.ts */
+        function findGenerationStopButton() {
+            const scopes = [
+                document.querySelector('[class*="agent-panel"]'),
+                document.querySelector('.composer-bar'),
+                document.querySelector('[class*="composer-bar"]'),
+                document,
+            ].filter((el) => Boolean(el));
+            const sels = [
+                'button.ui-prompt-input-submit-button[data-state="stop"]',
+                'button[aria-label="Stop generation"]',
+                'button.ui-prompt-input-submit-button[aria-label="Stop generation"]',
+                'button[data-state="stop"]',
+                '.composer-button-area .anysphere-icon-button:has(.codicon-debug-stop)',
+                '.send-with-mode .anysphere-icon-button:has(.codicon-debug-stop)',
+            ];
+            for (const scope of scopes) {
+                for (const sel of sels) {
+                    try {
+                        const hit = scope.querySelector(sel);
+                        if (!hit)
+                            continue;
+                        const btn = hit.classList.contains('codicon-debug-stop')
+                            ? hit.closest('.anysphere-icon-button, button, [role="button"], a') || hit
+                            : hit;
+                        const st = getComputedStyle(btn);
+                        if (st.display === 'none' || st.visibility === 'hidden' || Number(st.opacity) < 0.05) {
+                            continue;
+                        }
+                        const r = btn.getBoundingClientRect();
+                        if (r.width < 2 || r.height < 2)
+                            continue;
+                        if (btn.closest('.ui-shell-tool-call'))
+                            continue;
+                        const aria = (btn.getAttribute('aria-label') || '').trim().toLowerCase();
+                        if (aria === 'stop command')
+                            continue;
+                        return btn;
+                    }
+                    catch {
+                        /* skip */
+                    }
                 }
             }
+            return null;
+        }
+        /** Active generation — Stop in composer (not shell «Stop command» in tool rows). */
+        function detectAgentWorking(root) {
+            if (findGenerationStopButton())
+                return true;
             const title = document.querySelector('span.auxiliary-bar-chat-title')?.textContent?.trim() || '';
             if (/generat|working|thinking|running|в работе/i.test(title) && !/waiting|approval/i.test(title)) {
                 return true;
@@ -1100,6 +1241,10 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
             agentStatus = 'background_shell';
             agentStatusMessage = backgroundStatusText;
         }
+        const activeListTab = tabs.find((t) => t.active);
+        if (activeListTab) {
+            activeListTab.isWorking = hasActiveGeneration;
+        }
         let contextPercent;
         let terminalCount;
         for (const el of Array.from(document.querySelectorAll('button, span, div'))) {
@@ -1266,5 +1411,7 @@ export function extractionFunction(containerSelectors, tabSelectors, inputSelect
     }
 }
 export async function extractPageState(client, selectors) {
-    return (await client.callFunction(extractionFunction, selectors.chatContainer.strategies, selectors.chatTabList.strategies, selectors.chatInput.strategies, selectors.approveButton.strategies, selectors.approveButton.textMatch ?? [], selectors.rejectButton.strategies, selectors.rejectButton.textMatch ?? []));
+    return (await client.callFunction(extractionFunction, selectors.chatContainer.strategies, selectors.chatTabList.strategies, selectors.editorAuxiliaryTabList?.strategies ?? [
+        '#workbench\\.parts\\.auxiliarybar div.tab[role="tab"]',
+    ], selectors.chatInput.strategies, selectors.approveButton.strategies, selectors.approveButton.textMatch ?? [], selectors.rejectButton.strategies, selectors.rejectButton.textMatch ?? []));
 }

package/bridge-runtime/dist/generation-stop-dom.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Find / click agent **generation** stop (not shell «Stop command»).
+ * Single entry for CDP callFunction — helpers must live inside this function.
+ */
+export declare function generationStopDomAction(action: 'has' | 'click'): boolean;

package/bridge-runtime/dist/generation-stop-dom.js

@@ -0,0 +1,67 @@
+/**
+ * Find / click agent **generation** stop (not shell «Stop command»).
+ * Single entry for CDP callFunction — helpers must live inside this function.
+ */
+export function generationStopDomAction(action) {
+    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;
+    }
+    function resolveStopClickTarget(el) {
+        if (!el)
+            return null;
+        if (el.classList.contains('codicon-debug-stop')) {
+            return el.closest('.anysphere-icon-button, button, [role="button"], a') || el;
+        }
+        return el;
+    }
+    function findGenerationStopButton() {
+        const selectors = [
+            'button.ui-prompt-input-submit-button[data-state="stop"]',
+            'button[aria-label="Stop generation"]',
+            'button.ui-prompt-input-submit-button[aria-label="Stop generation"]',
+            'button[data-state="stop"]',
+            '.composer-button-area .anysphere-icon-button:has(.codicon-debug-stop)',
+            '.send-with-mode .anysphere-icon-button:has(.codicon-debug-stop)',
+        ];
+        const scopes = [
+            document.querySelector('[class*="agent-panel"]'),
+            document.querySelector('.composer-bar'),
+            document.querySelector('[class*="composer-bar"]'),
+            document,
+        ].filter((el) => Boolean(el));
+        for (const scope of scopes) {
+            for (const sel of selectors) {
+                try {
+                    const hit = scope.querySelector(sel);
+                    const btn = resolveStopClickTarget(hit);
+                    if (!btn || !isVisibleButton(btn))
+                        continue;
+                    if (btn.closest('.ui-shell-tool-call'))
+                        continue;
+                    const aria = (btn.getAttribute('aria-label') || '').trim().toLowerCase();
+                    if (aria === 'stop command')
+                        continue;
+                    return btn;
+                }
+                catch {
+                    /* skip */
+                }
+            }
+        }
+        return null;
+    }
+    const btn = findGenerationStopButton();
+    if (action === 'has')
+        return !!btn;
+    if (!btn)
+        return false;
+    const target = resolveStopClickTarget(btn) || btn;
+    target.scrollIntoView({ block: 'center' });
+    target.click();
+    return true;
+}

package/bridge-runtime/dist/index.js

@@ -8,6 +8,7 @@ import { WindowMonitor } from './window-monitor.js';
 import { Relay } from './relay.js';
 import { MessageDebugStore } from './message-debug-store.js';
 import { connectorClientVersion } from './connector-client-version.js';
+import { installEditorListSync } from './editor-list-sync.js';
 import { installKeepAwakeShutdown, startKeepAwake } from './keep-awake.js';
 async function main() {
     const config = loadConfig();
@@ -30,6 +31,7 @@ async function main() {
     }
     console.log(`Projects: ${config.cursorProjectsDir}`);
     const stateManager = new StateManager(config.debounceMs);
+    installEditorListSync(stateManager);
     const commandExecutor = new CommandExecutor(selectors);
     const cdpBridge = new CDPBridge(config);
     const jsonlIndex = new JsonlIndex(config.cursorProjectsDir);

package/bridge-runtime/dist/queue-remove-dom.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Remove a deferred-queue row in the composer (Editor toolbar or Agents tray).
+ * Used via CDP callFunction — helpers must stay inside this function.
+ */
+export declare function queueRemoveDomAction(action: 'remove', opts: {
+    text?: string;
+    selectorPath?: string;
+}): {
+    ok: boolean;
+    reason?: string;
+};

package/bridge-runtime/dist/queue-remove-dom.js

@@ -0,0 +1,88 @@
+/**
+ * Remove a deferred-queue row in the composer (Editor toolbar or Agents tray).
+ * Used via CDP callFunction — helpers must stay inside this function.
+ */
+export function queueRemoveDomAction(action, opts) {
+    function normText(s) {
+        return s.trim().replace(/\s+/g, ' ').toLowerCase();
+    }
+    function clickRemoveButton(btn) {
+        const el = btn;
+        el.scrollIntoView({ block: 'center', behavior: 'instant' });
+        el.dispatchEvent(new MouseEvent('mousedown', { bubbles: true, cancelable: true }));
+        el.dispatchEvent(new MouseEvent('mouseup', { bubbles: true, cancelable: true }));
+        el.click();
+    }
+    function findRemoveButton(row) {
+        const legacy = row.querySelector('button[aria-label="Remove"]');
+        if (legacy)
+            return legacy;
+        const removeAction = row.querySelector('[data-queue-action="remove"]');
+        if (removeAction) {
+            return (removeAction.closest('button') ||
+                removeAction.querySelector('button, .anysphere-icon-button') ||
+                removeAction);
+        }
+        const trash = row.querySelector('.codicon-trashcan');
+        if (trash) {
+            return (trash.closest('button') ||
+                trash.closest('.anysphere-icon-button') ||
+                trash.parentElement);
+        }
+        return null;
+    }
+    const rowSelectors = [
+        '.composer-toolbar-queue-item',
+        '[class*="ui-tray--queued"] [class*="queue-sortable-row"]',
+        '[class*="ui-tray--queued"] [class*="ui-tray-row"]',
+        '[class*="queue-sortable-row"]',
+        '[class*="ui-tray-row"]',
+    ];
+    function rowsInScope() {
+        const input = document.querySelector(".composer-bar [contenteditable='true'], [contenteditable='true']");
+        const scope = input?.closest('[class*="agent-panel"]') ||
+            input?.closest('[class*="composer-panel"]') ||
+            input?.closest('.composer-bar, [class*="composer-bar"]') ||
+            document.querySelector('#composer-toolbar-section') ||
+            document.body;
+        const out = [];
+        for (const sel of rowSelectors) {
+            scope.querySelectorAll(sel).forEach((row) => {
+                if (!out.includes(row))
+                    out.push(row);
+            });
+        }
+        return out;
+    }
+    if (action !== 'remove')
+        return { ok: false, reason: 'unknown action' };
+    const want = normText(opts.text ?? '');
+    const snippet = want.slice(0, 48);
+    if (snippet.length >= 4) {
+        for (const row of rowsInScope()) {
+            const rowText = normText(row.textContent || '');
+            const rowSnippet = rowText.slice(0, 48);
+            if (!rowText.includes(snippet) && !rowSnippet.includes(snippet.slice(0, 24))) {
+                continue;
+            }
+            const btn = findRemoveButton(row);
+            if (!btn)
+                return { ok: false, reason: 'remove button not found' };
+            clickRemoveButton(btn);
+            return { ok: true };
+        }
+    }
+    const path = opts.selectorPath?.trim();
+    if (path) {
+        const el = document.querySelector(path);
+        if (!el)
+            return { ok: false, reason: 'selector not found' };
+        const row = el.closest('.composer-toolbar-queue-item, [class*="queue-sortable-row"], [class*="ui-tray-row"]');
+        const btn = row ? findRemoveButton(row) : el;
+        if (!btn)
+            return { ok: false, reason: 'remove target not found' };
+        clickRemoveButton(btn);
+        return { ok: true };
+    }
+    return { ok: false, reason: want ? 'queue row not found' : 'no text or selector' };
+}

package/bridge-runtime/dist/relay-upstream.js

@@ -40,6 +40,7 @@ export class RelayUpstream {
                 code: identity.pairingCode,
                 clientToken: identity.clientToken,
                 expiresAt: identity.pairingCodeExpiresAt,
+                machineLabel: identity.machineLabel,
             });
         }
     }
@@ -57,6 +58,7 @@ export class RelayUpstream {
                 roomId: this.config.relayRoomId,
                 clientKind: 'connector',
                 clientVersion: connectorClientVersion(),
+                machineLabel: loadPairingIdentity()?.machineLabel ?? '',
             },
         });
         this.socket.on('connect', () => {

package/bridge-runtime/dist/relay.js

@@ -1211,7 +1211,16 @@ export class Relay {
         }
         this.refreshAgentsIndex(true);
     }
-    async trySwitchWindowForAgent(agentId) {
+    async trySwitchWindowForAgent(agentId, windowId) {
+        await this.cdpBridge.refreshWindows();
+        if (windowId) {
+            const win = this.cdpBridge.windows.find((w) => w.id === windowId);
+            if (win && win.id !== this.cdpBridge.activeTargetId) {
+                await this.cdpBridge.switchWindow(win.id);
+                console.log(`[relay] CDP → editor window "${win.title}" (${windowId.slice(0, 8)})`);
+            }
+            return;
+        }
         const projectDir = this.jsonlIndex.findProjectDirForAgent(agentId);
         if (!projectDir)
             return;
@@ -1222,7 +1231,6 @@ export class Relay {
         const repoName = repoSlug.replace(/-/g, ' ').toLowerCase();
         if (!repoName)
             return;
-        await this.cdpBridge.refreshWindows();
         const match = this.cdpBridge.windows.find((w) => {
             const t = w.title.toLowerCase();
             return t.includes(repoName) || repoName.split(' ').every((wrd) => t.includes(wrd));
@@ -1316,17 +1324,29 @@ export class Relay {
             this.domExtractor.pollNow();
             return;
         }
+        if (payload.agentId &&
+            (payload.type === 'remove_queued' ||
+                payload.type === 'send_message' ||
+                payload.type === 'stop_agent' ||
+                payload.type === 'focus_agent')) {
+            await this.trySwitchWindowForAgent(payload.agentId, payload.windowId);
+        }
         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,
-                agentStatusMessage: undefined,
-                composerDraft: undefined,
-                composerDraftImages: undefined,
-            });
+        if ((payload.type === 'stop_agent' ||
+            payload.type === 'remove_queued' ||
+            payload.type === 'focus_agent') &&
+            result.ok) {
+            if (payload.type === 'stop_agent') {
+                suppressAgentCompletionPush();
+                this.stateManager.patchNow({
+                    agentWorking: false,
+                    agentStatus: undefined,
+                    agentStatusMessage: undefined,
+                    composerDraft: undefined,
+                    composerDraftImages: undefined,
+                });
+            }
             this.domExtractor.pollNow();
         }
     }
@@ -1410,13 +1430,13 @@ export class Relay {
             this.jsonlIndex.historyReplyInFlight.delete(agentId);
         }
     }
-    async runAgentsSubscribe({ agentId, title, focus, }) {
+    async runAgentsSubscribe({ agentId, title, focus, windowId, }) {
         if (!agentId)
             return;
         const alreadySubscribed = this.jsonlIndex.getSubscribedAgents().has(agentId);
         this.jsonlIndex.subscribe(agentId, title, { emitHistory: !alreadySubscribed });
         this.stateManager.patchNow({ lastError: undefined });
-        await this.trySwitchWindowForAgent(agentId);
+        await this.trySwitchWindowForAgent(agentId, windowId);
         if (focus === false) {
             void this.refreshDomChatOnSubscribe(agentId, title, { clear: !alreadySubscribed });
             return;
@@ -1486,10 +1506,10 @@ export class Relay {
             this.refreshLentaPendingPatch();
         }
     }
-    async runAgentsFocus({ agentId, title }, reply) {
+    async runAgentsFocus({ agentId, title, windowId, }, reply) {
         if (!agentId)
             return;
-        await this.trySwitchWindowForAgent(agentId);
+        await this.trySwitchWindowForAgent(agentId, windowId);
         const result = await this.commandExecutor.execute({
             id: `focus-${Date.now()}`,
             type: 'focus_agent',

package/bridge-runtime/dist/state-manager.d.ts

@@ -7,7 +7,7 @@ export declare class StateManager extends EventEmitter {
     private pendingPatch;
     constructor(debounceMs: number);
     getState(): CursorState;
-    onExtraction(partial: CursorState | null, error?: string): void;
+    onExtraction(partial: Partial<CursorState> | null, error?: string): void;
     onConnectionChanged(connected: boolean): void;
     updateWindows(windows: CursorWindow[], activeWindowId: string): void;
     updateWindowSnapshots(snapshots: WindowSnapshot[]): void;

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

@@ -6,6 +6,8 @@ export interface SelectorConfig {
     chatContainer: SelectorGroup;
     chatInput: SelectorGroup;
     chatTabList: SelectorGroup;
+    /** Editor: open agent chats in auxiliary bar tab strip (not agents sidebar). */
+    editorAuxiliaryTabList?: SelectorGroup;
     newChatButton: SelectorGroup;
     modeDropdown: SelectorGroup;
     modelDropdown: SelectorGroup;
@@ -135,11 +137,14 @@ export interface PendingApproval {
     description: string;
     actions: ApprovalAction[];
 }
+export type CursorWindowKind = 'editor' | 'agents';
 export interface CursorWindow {
     id: string;
     title: string;
     workspace?: string;
     wsUrl?: string;
+    /** `agents` = dedicated Cursor Agents window; `editor` = code editor + auxiliary bar. */
+    kind?: CursorWindowKind;
 }
 export interface WindowSnapshot {
     windowId: string;
@@ -148,8 +153,12 @@ export interface WindowSnapshot {
     messageCount: number;
     lastPreview?: string;
     agentStatus?: string;
+    /** DOM: active chat generating (composer Stop / status line). */
+    agentWorking?: boolean;
     pendingApprovals: number;
     updatedAt: number;
+    tabs?: ChatTab[];
+    kind?: CursorWindowKind;
 }
 export interface CursorState {
     connected: boolean;
@@ -191,6 +200,10 @@ export interface CursorState {
     lastError?: string;
     /** Cursor sidebar: repos + chats in DOM order (mirrors desktop UI). */
     sidebarRepos?: RepoGroup[];
+    /** Editor mode: open editor windows as folders, tabs as chats (see `cursorListMode`). */
+    editorRepos?: RepoGroup[];
+    /** Which chat list layout the app should show (`editor` vs agents window). */
+    cursorListMode?: 'editor' | 'agents-window';
     /** Last DOM poll: extract/filter counters (sync debug). */
     messageDebug?: MessageExtractDebug;
     /** Composer input draft (contenteditable), when non-empty. */
@@ -205,6 +218,7 @@ export interface CommandPayload {
     type: CommandType;
     text?: string;
     tabTitle?: string;
+    /** Editor CDP window id (from chat route / agents:index). */
     windowId?: string;
     agentId?: string;
     selectorPath?: string;