dsh-site-bridge 0.7.2 → 0.7.5

package/extension/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "default_locale": "en",
   "name": "__MSG_appName__",
-  "version": "0.7.2",
+  "version": "0.7.5",
   "description": "__MSG_appDesc__",
   "minimum_chrome_version": "116",
   "permissions": [

package/extension/popup.js

@@ -206,12 +206,23 @@ async function currentBrowserTab() {
     { active: true, currentWindow: true }
   ]
   for (const scope of scopes) {
+    let tabs = []
     try {
-      const tabs = await chrome.tabs.query(scope)
-      if (!Array.isArray(tabs) || tabs.length === 0) continue
-      return tabs.find((tab) => scheme(tab) === 'web') ?? tabs[0]
+      tabs = await chrome.tabs.query(scope)
     } catch {
-      // try the next scope
+      continue
+    }
+    if (!Array.isArray(tabs) || tabs.length === 0) continue
+    const ordered = [...tabs.filter((tab) => scheme(tab) === 'web'), ...tabs.filter((tab) => scheme(tab) !== 'web')]
+    for (const tab of ordered) {
+      // Ask Chrome whether this tab is readable at all: tabs in app windows of
+      // other extensions are listed but cannot be touched.
+      try {
+        await chrome.tabs.get(tab.id)
+        return tab
+      } catch {
+        // not ours to read — try the next candidate
+      }
     }
   }
   return null

package/extension/sw.js

@@ -15,7 +15,7 @@
  * host, which redacts and never writes it to disk.
  */
 
-const EXT_VERSION = '0.1.0'
+const EXT_VERSION = chrome.runtime.getManifest().version
 const NET_CAP = 600
 // Bodies are kept up to this size in the worker, then marked as truncated.
 // Raise it per machine with chrome.storage.local.set({ maxBodyChars }): the
@@ -254,7 +254,11 @@ async function attach(tabId, attachedBy = 'agent') {
     await evt('active', { tabId })
     return existing.target
   }
-  await chrome.debugger.attach({ tabId }, '1.3')
+  try {
+    await chrome.debugger.attach({ tabId }, '1.3')
+  } catch (error) {
+    throw new Error(`chrome.debugger.attach отказал: ${String(error?.message ?? error)}`)
+  }
   await chrome.debugger.sendCommand({ tabId }, 'Network.enable', {
     maxTotalBufferSize: 64_000_000,
     maxResourceBufferSize: 16_000_000,
@@ -297,7 +301,11 @@ async function claimTab(tabId, attachedBy = 'agent') {
   } catch (error) {
     // Chrome refuses to read pages of other extensions and its own service
     // pages; say that in words a person can act on.
-    throw new Error(`эту вкладку нельзя подключить: ${String(error?.message ?? error)}`)
+    const detail = String(error?.message ?? error)
+    const hint = /chrome-extension:\/\//.test(detail)
+      ? ' Похоже, вкладка открыта в окне-приложении другого расширения — откройте её как обычную вкладку.'
+      : ''
+    throw new Error(`эту вкладку нельзя подключить: ${detail}${hint}`)
   }
   if (!/^https?:|^file:/.test(tab.url ?? '')) {
     const scheme = String(tab.url ?? '').split(':')[0] || 'неизвестная схема'
@@ -1502,17 +1510,26 @@ async function dispatch(op, args) {
       return { ok: true, version: EXT_VERSION }
     case 'tabs.list': {
       const tabs = await chrome.tabs.query({})
+      // Window type explains why a tab can be listed but not read: app windows
+      // belong to another extension, and Chrome refuses access to them.
+      const windows = await chrome.windows.getAll({}).catch(() => [])
+      const windowType = new Map(windows.map((window) => [window.id, window.type ?? 'normal']))
       const list = tabs
         .filter((tab) => /^https?:|^file:/.test(tab.url ?? ''))
-        .map((tab) => ({
-          id: tab.id,
-          title: tab.title,
-          url: tab.url,
-          active: tab.active,
-          windowId: tab.windowId,
-          attached: state.sessions.has(tab.id),
-          target: tab.id === state.activeTabId
-        }))
+        .map((tab) => {
+          const type = windowType.get(tab.windowId) ?? 'unknown'
+          return {
+            id: tab.id,
+            title: tab.title,
+            url: tab.url,
+            active: tab.active,
+            windowId: tab.windowId,
+            windowType: type,
+            readable: type === 'normal',
+            attached: state.sessions.has(tab.id),
+            target: tab.id === state.activeTabId
+          }
+        })
       await evt('tabs', { tabs: list })
       return { tabs: list }
     }

package/lib/index.js

@@ -332,10 +332,10 @@ export function apply(ctx, config) {
         }
         const result = await instance.enqueue('tabs.list', {}, { timeout: 20000 })
         const tabs = Array.isArray(result?.tabs) ? result.tabs : []
-        const lines = tabs.map(
-          (tab) =>
-            `${tab.target ? '*' : tab.attached ? '+' : ' '} [${tab.id}] ${tab.title || '(без названия)'} — ${tab.url}`
-        )
+        const lines = tabs.map((tab) => {
+          const window = tab.windowType && tab.windowType !== 'normal' ? ` [окно: ${tab.windowType}, недоступно]` : ''
+          return `${tab.target ? '*' : tab.attached ? '+' : ' '} [${tab.id}] ${tab.title || '(без названия)'} — ${tab.url}${window}`
+        })
         return ok(
           tabs.length === 0
             ? 'Нет доступных вкладок (нужны http(s)/file://).'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-site-bridge",
-  "version": "0.7.2",
+  "version": "0.7.5",
   "description": "Chrome/Edge MV3 bridge for DeepSeek Harness: capture page markup (DOM, styles, selectors) and BFF traffic (xhr/fetch with headers and bodies) into a workspace snapshot bundle, drive the page with trusted CDP input, and verify injected scripts. Authorization never leaves the browser and is never written to disk.",
   "icon": "./icon.svg",
   "type": "module",