dsh-inner-browser-use 0.34.95 → 0.34.97

package/client.js

@@ -68,6 +68,10 @@ window.__ModuleLoader__.load({
       '.dshib-side-key:hover{background:var(--dsw-alias-bg-subtle);color:var(--dsw-alias-label-primary)}',
       '.dshib-side-url{flex:1 1 auto;min-width:0;border:1px solid transparent;border-radius:6px;background:var(--dsw-alias-bg-subtle);padding:4px 8px;font:inherit;font-size:12px;color:var(--dsw-alias-label-secondary);outline:none}',
       '.dshib-side-url:focus{border-color:var(--dsw-alias-border-strong);color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-base)}',
+      '.dshib-side-wins{flex:none;display:flex;gap:4px;padding:4px 6px;overflow-x:auto;border-bottom:1px solid var(--dsw-alias-separator)}',
+      '.dshib-side-win{flex:0 1 auto;min-width:0;max-width:180px;display:inline-flex;align-items:center;gap:4px;border:0;border-radius:6px;padding:2px 8px;background:transparent;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px;cursor:pointer}',
+      '.dshib-side-win[data-on="1"]{background:var(--dsw-alias-bg-subtle);color:var(--dsw-alias-label-primary)}',
+      '.dshib-side-win > span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
       '.dshib-side-stage{flex:1 1 auto;position:relative;min-width:0;min-height:0;display:flex;align-items:center;justify-content:center;overflow:hidden;background:var(--dsw-alias-bg-base);outline:none;cursor:default}',
       '.dshib-side-frame{display:block;user-select:none;-webkit-user-drag:none;cursor:default}',
       '.dshib-side-ime{position:absolute;width:1px;height:1px;padding:0;margin:0;border:0;resize:none;overflow:hidden;opacity:0;pointer-events:none}',
@@ -115,7 +119,7 @@ window.__ModuleLoader__.load({
               return ''
             }
           }
-          const closeHere = (sessionId) => {
+          const closeHere = (sessionId, byPerson = false) => {
             /* A tab the person closed is not a tab they want back on return. */
             try {
               void fetch(`${ROUTE}/sidecar/forget?session=${encodeURIComponent(sessionId)}`, { method: 'POST' }) // ui-copy-ignore
@@ -132,6 +136,11 @@ window.__ModuleLoader__.load({
               const kind = String(record?.kind ?? record?.record?.kind ?? '')
               const id = String(record?.id ?? record?.record?.id ?? '')
               if (kind !== SIDE_KIND && id !== SIDE_ID) continue
+              /* The person's close arrives from the tab strip: the host is
+                 already taking that tab down, and closing it again here races
+                 the host and can leave the tab half closed. Forgetting the ask
+                 is what this path owes. */
+              if (byPerson) continue
               try {
                 if (typeof record?.close === 'function') record.close()
                 else if (typeof surface?.closeIn === 'function') surface.closeIn(sessionId, id)
@@ -172,7 +181,7 @@ window.__ModuleLoader__.load({
                the keepalive put the mirror back a few seconds later — a tab
                the person closed that would not stay closed. Every close path
                ends here. */
-            onClose: (_tab, where) => closeHere(String(where?.sessionId ?? mountedOf())),
+            onClose: (_tab, where) => closeHere(String(where?.sessionId ?? mountedOf()), true),
           })))
           disposers.push(scope.slots.inject(SLOT, () => scope.slots.register({
             name: SLOT, // ui-copy-ignore
@@ -349,6 +358,9 @@ window.__ModuleLoader__.load({
       const [draft, setDraft] = React.useState('')
       const [editing, setEditing] = React.useState(false)
       const [size, setSize] = React.useState({ w: 0, h: 0 })
+      /* The browser's own windows, this chat's only: a second window a site
+         opened is a row here, not a second tab in the column. */
+      const [wins, setWins] = React.useState([])
       const stage = React.useRef(null)
       /* Which chat owns the mirror, as the sidecar host records it. // ui-copy-ignore
          Empty until
@@ -521,6 +533,44 @@ window.__ModuleLoader__.load({
         return () => observer.disconnect()
       }, [])
 
+      /* The picture carries the page, not the window list: ask for the list on
+         a slow clock, and after a switch. */
+      const [winsTick, setWinsTick] = React.useState(0)
+      React.useEffect(() => {
+        if (mine !== true) return undefined
+        let alive = true
+        const chat = String(props.sessionId ?? '')
+        const load = () => {
+          fetch(`${ROUTE}/sidecar/tabs?session=${encodeURIComponent(chat)}`) // ui-copy-ignore
+            .then((reply) => (reply.ok === true ? reply.json() : null))
+            .then((info) => {
+              if (alive === false || info?.ok !== true || Array.isArray(info.tabs) !== true) return
+              setWins(info.tabs)
+            })
+            .catch(() => {})
+        }
+        load()
+        const clock = setInterval(load, 2500)
+        return () => {
+          alive = false
+          clearInterval(clock)
+        }
+      }, [mine, props.sessionId, winsTick])
+
+      const switchWin = (at) => {
+        fetch(`${ROUTE}/sidecar/tabs`, { // ui-copy-ignore
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ session: String(props.sessionId ?? ''), op: 'use', index: at }), // ui-copy-ignore
+        })
+          .then((reply) => (reply.ok === true ? reply.json() : null))
+          .then((info) => {
+            if (info?.ok === true && Array.isArray(info.tabs) === true) setWins(info.tabs)
+            setWinsTick((n) => n + 1)
+          })
+          .catch(() => {})
+      }
+
       const scale = size.w > 0 && size.h > 0 ? Math.min(size.w / view.w, size.h / view.h) : 0
       const padX = (size.w - view.w * scale) / 2
       const padY = (size.h - view.h * scale) / 2
@@ -548,7 +598,16 @@ window.__ModuleLoader__.load({
           })
             .then((answer) => (answer.ok === true ? answer.json() : { ok: false }))
             .then((said) => {
-              if (!live || said?.ok === true || tries >= 5) return
+              if (!live) return
+              /* The browser answers with the shape it actually took: drawing
+                 the picture at that size fills the pane even when the page
+                 refused the exact one asked for. */
+              const took = said?.view ?? null
+              if (said?.ok === true && took !== null && Number(took.width) > 0 && Number(took.height) > 0) {
+                setView({ w: Math.round(Number(took.width)), h: Math.round(Number(took.height)) })
+                return
+              }
+              if (said?.ok === true || tries >= 5) return
               tries += 1
               timer = setTimeout(send, 400)
             })
@@ -716,6 +775,17 @@ window.__ModuleLoader__.load({
               goto()
             },
           })),
+        ...(wins.length > 1
+          ? [h('div', { className: 'dshib-side-wins' },
+            ...wins.map((win) => h('button', {
+              key: `${win.index}:${win.url}`,
+              className: 'dshib-side-win',
+              type: 'button', // ui-copy-ignore
+              'data-on': win.current === true ? '1' : '0',
+              title: win.url,
+              onClick: () => switchWin(win.index),
+            }, h('span', null, String(win.title ?? '') || String(win.url ?? '')))))]
+          : []),
         h('div', {
           className: 'dshib-side-stage',
           ref: stage,

package/index.js

@@ -562,7 +562,10 @@ export function apply(ctx) {
         return
       }
       try {
-        const page = sidecar.page
+        /* The shape belongs to the page this chat is actually looking at: a
+           chat driving a tab of its own must not resize the browser's base
+           page and keep a letterboxed picture. */
+        const page = sidecar.pageFor(actor) ?? sidecar.page
         if (page === null || page === undefined) {
           json(409, { ok: false, text: 'the browser is not open' }) // ui-copy-ignore
           return
@@ -661,6 +664,44 @@ export function apply(ctx) {
       return
     }
 
+    if (path === '/sidecar/tabs' && req.method === 'GET') {
+      /* This chat's windows only: another chat's pages never enter this list. */
+      const who = acting({ session: url.searchParams.get('session') })
+      if (who === '') return
+      try {
+        const tabs = await sidecar.windowsFor(who)
+        json(200, { ok: true, tabs, ...(url.searchParams.get('session') === '' ? { session: who } : {}) })
+      } catch (error) {
+        json(500, { ok: false, text: String(error?.message ?? error) })
+      }
+      return
+    }
+
+    if (path === '/sidecar/tabs' && req.method === 'POST') {
+      let body
+      try {
+        body = JSON.parse(await readBody(req))
+      } catch {
+        json(400, { ok: false, text: 'bad frame' })
+        return
+      }
+      const actor = acting(body)
+      if (actor === '') return
+      try {
+        const at = Number(body.index ?? -1)
+        if (body.op === 'close') {
+          await sidecar.closeTab(at, actor)
+        } else {
+          await sidecar.useTab(at, actor)
+        }
+        const tabs = await sidecar.windowsFor(actor)
+        json(200, { ok: true, tabs })
+      } catch (error) {
+        json(500, { ok: false, text: String(error?.message ?? error) })
+      }
+      return
+    }
+
     if (path === '/sidecar/forget' && req.method === 'POST') {
       /* Closing the tab is an answer: coming back should not reopen it. Only the
          chat that holds the mirror may withdraw its own ask. */
@@ -789,6 +830,7 @@ export function apply(ctx) {
         '',
         '只有人明确说要看网页/用浏览器时才开始：「用网页端 / 在浏览器里 / 打开某个网站 / 上 ChatGPT 生成 / 帮我在这个页面点…」。人只给了链接、没说要用浏览器时，先用 `web_fetch` 或 envoy 读；读不到（登录墙、空壳、要交互）就说明原因再问一句，不要自己开。',
         '不要用它：读公开文章、单个链接正文、文档、搜索结果摘要、GitHub 仓库或 PR 页面——这些能用 `web_fetch` / envoy 读就不用浏览器；一打开就是一个后台 Chrome 进程加一个页签，会话多了很占内存。',
+        '也不要用它做连通性、可达性、服务是否起来的检查：那是一个 HTTP 请求的事，`web_fetch` 或 `curl` 就够，开浏览器只会多一个进程和一栏画面。只有「这一步必须在真实浏览器里点/填/登录」才轮到它。',
         '人点名之后不问、不另起外部 Chrome；画面留在本会话右栏，做完保留，不主动关。',
         '先接着用已有的页：`browser_view`（拿编号控件与可见文字）→ `browser_click` / `browser_type` → 再 `browser_view` 直到出现要的结果；页面要等就重复读，不 sleep。`browser_open` 只用于没有页、要换新地址、或要明确刷新；同一个地址不要反复重开。',
         '页面很长、只想确认某句话/按钮在哪时用 `browser_find`，别整页读。要读长文（文章、文档、issue、论坛帖）用 `browser_read`：它回 Markdown，只花几十分之一的 token，链接可点；要动手点、填表才用 `browser_view` 拿编号。',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-inner-browser-use",
-  "version": "0.34.95",
+  "version": "0.34.97",
   "description": "An agent-owned Chromium sidecar mirrored into the DeepSeek Harness right column: the agent drives it, the person watches and can take the mouse, and logins survive restarts.",
   "type": "module",
   "main": "index.js",

package/sidecar.js

@@ -1962,6 +1962,10 @@ export class Sidecar {
     /* One tab per chat: a second chat opening an address gets a tab of its
        own, so neither can navigate the other's page away. */
     this.pages = new Map()
+    /* Every tab a chat has driven, so its column can offer its own windows
+       back after it switches away: a tab the chat left is still its own, and a
+       tab nobody claimed belongs to no column at all. */
+    this.claims = new Map()
     /* Tabs left behind by an earlier plugin load are closed once, on the first
        call that finds this browser: a profile used for weeks otherwise keeps a
        renderer per chat that ever opened it. */
@@ -2048,6 +2052,41 @@ export class Sidecar {
    * @param {string} session - chat id, empty for the default tab.
    * @returns {SidecarPage | null} the tab, if the browser is up.
    */
+  /**
+   * Remember that a tab belongs to a chat: switching away from it keeps it in
+   * that chat's window list, and no other chat can see it.
+   * @param {string} session - chat that drove the tab. // ui-copy-ignore
+   * @param {string} targetId - the browser target.
+   */
+  claim(session, targetId) {
+    const who = String(session ?? '')
+    const target = String(targetId ?? '')
+    if (who === '' || target === '') return
+    let set = this.claims.get(who)
+    if (set === undefined) {
+      set = new Set()
+      this.claims.set(who, set)
+    }
+    /* A chat cannot hold an unbounded list: the oldest tab it left falls off. */
+    if (set.size >= 12 && set.has(target) !== true) {
+      const first = set.values().next()
+      if (first.done !== true) set.delete(first.value)
+    }
+    set.add(target)
+  }
+
+  /**
+   * Forget a tab a chat no longer has.
+   * @param {string} session - chat that owned it. // ui-copy-ignore
+   * @param {string} targetId - the browser target.
+   */
+  unclaim(session, targetId) {
+    const set = this.claims.get(String(session ?? ''))
+    if (set === undefined) return
+    set.delete(String(targetId ?? ''))
+    if (set.size === 0) this.claims.delete(String(session ?? ''))
+  }
+
   pageFor(session) {
     const id = String(session ?? '')
     if (id === '') return this.page
@@ -2265,6 +2304,7 @@ export class Sidecar {
     await cdp.ready
     const page = await this.bind(await new SidecarPage(cdp, this.profile, port, () => this.holding()).start()) // ui-copy-ignore
     this.pages.set(id, page)
+    this.claim(id, page.targetId)
     this.touch()
     this.rememberTab(id, address)
     return page
@@ -2603,6 +2643,39 @@ export class Sidecar {
     return page === null ? [] : page.tabs()
   }
 
+  /**
+   * The windows this chat may see: the browser's own pages minus the ones other
+   * chats are driving. A chat's column shows its own windows, never a
+   * neighbour's.
+   * @param {string} session - chat asking.
+   * @returns {Promise<Array<{title: string, url: string, current: boolean, index: number}>>} its windows.
+   */
+  async windowsFor(session) {
+    const list = await this.tabs(session)
+    const page = this.pageFor(session) ?? this.page
+    const foreign = new Set(typeof page?.siblings === 'function' ? page.siblings().map(String) : [])
+    const who = String(session ?? '')
+    const claimed = this.claims.get(who) ?? new Set()
+    /* Tabs the browser no longer has must not linger in a chat's list. */
+    if (claimed.size > 0) {
+      const live = new Set(list.map((row) => String(row.targetId)))
+      for (const id of [...claimed]) if (live.has(id) !== true) claimed.delete(id)
+      if (claimed.size === 0) this.claims.delete(who)
+    }
+    const shown = []
+    for (let at = 0; at < list.length; at += 1) {
+      const row = list[at]
+      if (foreign.has(String(row.targetId))) continue
+      /* A tab nobody in this chat drove is not this chat's window: a page
+         opened behind the browser's back belongs to no column. */
+      if (row.current !== true && claimed.has(String(row.targetId)) !== true) continue
+      /* The index is the browser's own row, not this shorter list's: switching
+         goes back through `tabs()` unfiltered. */
+      shown.push({ title: String(row.title ?? ''), url: String(row.url ?? ''), current: row.current === true, index: at })
+    }
+    return shown
+  }
+
   /**
    * Move the mirror to another tab, leaving the old one open where it was.
    * @param {number} index - a row from `tabs()`.
@@ -2644,6 +2717,7 @@ export class Sidecar {
       await cdp.ready
       const page = await this.bind(await new SidecarPage(cdp, this.profile, mine.port, () => this.holding()).start()) // ui-copy-ignore
       this.pages.set(String(session), page)
+      this.claim(session, tab.targetId)
       mine.cdp.send('Page.stopScreencast').catch(() => {})
       mine.cdp.close()
       await page.cast()
@@ -2679,6 +2753,7 @@ export class Sidecar {
       alone = other < 0
       if (!alone) await this.useTab(other, session)
     }
+    this.unclaim(session, tab.targetId)
     if (port > 0) await fetch(`http://127.0.0.1:${port}/json/close/${tab.targetId}`, { signal: AbortSignal.timeout(1000) }).catch(() => {}) // ui-copy-ignore
     if (alone && mine !== null) {
       /* The chat still needs somewhere to go: a fresh tab in the same browser. */

package/tools.js

@@ -1776,7 +1776,7 @@ export function sidecarTools(sidecar, refs, host = {}) { // ui-copy-ignore
   return [
     {
       name: 'browser_open', // ui-copy-ignore
-      description: 'Start (or reuse) the background browser — a real Chrome with its own persistent profile — and open a URL in it. It is not the host\'s own browser tab: this Chrome runs on its own and only its picture is mirrored into this chat\'s right column, so it keeps working while the person looks elsewhere. Logins survive restarts.',
+      description: 'Start (or reuse) the background browser — a real Chrome with its own persistent profile — and open a URL in it. It is not the host\'s own browser tab: this Chrome runs on its own and only its picture is mirrored into this chat\'s right column, so it keeps working while the person looks elsewhere. Logins survive restarts. Use it only when the person explicitly asked for a browser this turn; reading a URL, a document or checking whether a site answers is `web_fetch`\'s job, not this one.',
       parameters: {
         type: 'object', // ui-copy-ignore
         properties: {