dsh-site-bridge 0.7.0 → 0.7.4

package/extension/_locales/en/messages.json

@@ -149,5 +149,8 @@
   },
   "disconnectTab": {
     "message": "Disconnect this tab"
+  },
+  "notClaimable": {
+    "message": "This page cannot be attached: Chrome does not allow service pages or other extensions' pages"
   }
 }

package/extension/_locales/ru/messages.json

@@ -149,5 +149,8 @@
   },
   "disconnectTab": {
     "message": "Отключить эту вкладку"
+  },
+  "notClaimable": {
+    "message": "Эту страницу нельзя подключить: Chrome не даёт доступ к служебным страницам и страницам других расширений"
   }
 }

package/extension/_locales/zh_CN/messages.json

@@ -149,5 +149,8 @@
   },
   "disconnectTab": {
     "message": "断开此标签页"
+  },
+  "notClaimable": {
+    "message": "无法连接此页面：Chrome 不允许访问服务页面或其他扩展的页面"
   }
 }

package/extension/manifest.json

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

package/extension/popup.js

@@ -138,10 +138,17 @@ function render(status) {
 
   // Nothing to claim once a tab is bound: the action would be a no-op.
   const selfAttached = selfTabId != null && targets.some((item) => item.id === selfTabId)
+  // Service pages (chrome://, other extensions, the Web Store) cannot be driven;
+  // do not offer a button that Chrome will refuse.
+  const claimable = selfTabUrl == null || /^(https?|file):/.test(selfTabUrl)
   claim.hidden = targets.length > 0
-  claim.disabled = !connected || targets.length > 0
+  claim.disabled = !connected || !claimable || targets.length > 0
+  claim.title = claimable ? '' : t('notClaimable')
   claim.textContent = t('connectTab')
-  $('claim-more').hidden = targets.length === 0 || selfAttached
+  const claimMore = $('claim-more')
+  claimMore.hidden = targets.length === 0 || selfAttached
+  claimMore.disabled = !connected || !claimable
+  claimMore.title = claimable ? t('attachAnother') : t('notClaimable')
 
   const pick = $('pick')
   pick.classList.toggle('active', status.picking === true)
@@ -170,12 +177,14 @@ function render(status) {
 // Which tab this popup is open on: attaching that tab again is a no-op, so the
 // attach button is only offered when the current tab is not attached yet.
 let selfTabId = null
+let selfTabUrl = null
 
 async function refresh() {
   try {
     if (chrome.tabs?.query) {
-      const [tab] = await chrome.tabs.query({ active: true, currentWindow: true })
+      const tab = await currentBrowserTab()
       selfTabId = tab?.id ?? null
+      selfTabUrl = tab?.url ?? null
     }
     render(await send({ type: 'status' }))
   } catch {
@@ -183,6 +192,42 @@ async function refresh() {
   }
 }
 
+/**
+ * The browser tab this popup belongs to. `currentWindow` from a popup can point
+ * at the popup's own extension page, and Chrome refuses to read other
+ * extensions' pages, so prefer a real http(s)/file tab from the focused window.
+ */
+async function currentBrowserTab() {
+  const scheme = (tab) => (/^(https?|file):/.test(String(tab?.url ?? '')) ? 'web' : 'other')
+  const scopes = [
+    { active: true, lastFocusedWindow: true, windowType: 'normal' },
+    { active: true, windowType: 'normal' },
+    { active: true, lastFocusedWindow: true },
+    { active: true, currentWindow: true }
+  ]
+  for (const scope of scopes) {
+    let tabs = []
+    try {
+      tabs = await chrome.tabs.query(scope)
+    } catch {
+      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
+}
+
 /* Autosave: a complete pair is stored as soon as it appears, no button. */
 let saveTimer = null
 
@@ -262,7 +307,7 @@ $('import-file').addEventListener('change', async (event) => {
 async function attachCurrentTab() {
   let tabId = null
   try {
-    const [tab] = await chrome.tabs.query({ active: true, currentWindow: true })
+    const tab = await currentBrowserTab()
     tabId = tab?.id ?? null
   } catch {
     tabId = 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
@@ -284,13 +284,30 @@ async function claimTab(tabId, attachedBy = 'agent') {
   // caller that only knows "this tab" cannot silently pass NaN.
   let id = Number(tabId)
   if (!Number.isFinite(id)) {
-    const [active] = await chrome.tabs.query({ active: true, lastFocusedWindow: true })
+    const candidates = await chrome.tabs
+      .query({ active: true, lastFocusedWindow: true, windowType: 'normal' })
+      .catch(() => [])
+    const active = candidates.find((tab) => /^(https?|file):/.test(tab.url ?? '')) ?? candidates[0]
     id = active?.id
   }
   if (!Number.isFinite(id)) throw new Error('no tab to claim: pass tabId or open a page first')
-  const tab = await chrome.tabs.get(id)
+  let tab = null
+  try {
+    tab = await chrome.tabs.get(id)
+  } catch (error) {
+    // Chrome refuses to read pages of other extensions and its own service
+    // pages; say that in words a person can act on.
+    const detail = String(error?.message ?? error)
+    const hint = /chrome-extension:\/\//.test(detail)
+      ? ' Похоже, вкладка открыта в окне-приложении другого расширения — откройте её как обычную вкладку.'
+      : ''
+    throw new Error(`эту вкладку нельзя подключить: ${detail}${hint}`)
+  }
   if (!/^https?:|^file:/.test(tab.url ?? '')) {
-    throw new Error(`cannot drive ${tab.url || 'this tab'}: only http(s) and file:// pages are supported`)
+    const scheme = String(tab.url ?? '').split(':')[0] || 'неизвестная схема'
+    throw new Error(
+      `эту страницу нельзя подключить (${scheme}:): Chrome не даёт доступ к служебным страницам и страницам других расширений. Откройте обычный сайт http(s) или file://`
+    )
   }
   return attach(id, attachedBy)
 }
@@ -1489,17 +1506,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.0",
+  "version": "0.7.4",
   "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",