dsh-live-browser 0.4.0 → 0.5.0

package/lib/skills.js

@@ -31,6 +31,7 @@ const BODY = `# 用内嵌浏览器完成任务
 - **敏感操作先问**：下单、付款、删除、发送消息、修改账号等不可撤销的动作，把 \`sensitive\` 设为 \`true\`，插件会请用户确认；用户拒绝时返回 \`executed:false\`，不要重试。
 - **登录由用户完成**：遇到扫码、短信验证码，让用户直接在面板里操作，你继续等待页面变化即可。
 - **面板没开时**：\`browser_status\` 会告诉你 \`attached:false\`，可调 \`browser_open_panel\`，或请用户点右侧栏的「浏览器」标签页。
+- **iframe 浏览器**：如果 \`browser_status\` 返回 \`mode: "iframe"\`，或页面对象的 \`kind\` 是 \`iframe\`，说明当前是 DSH Web 版的 iframe 浏览器，跨域限制导致插件无法注入脚本。不要反复重试点击/输入；直接把返回的 \`hint\` 告诉用户，并指导用户改用 DSH 桌面版的 webview 浏览器（关闭浏览器里的 DSH 页面 → 启动 DeepSeek Harness 桌面客户端 → 打开同一会话 → 点右侧栏「浏览器」）。
 
 ## 常见任务写法
 
@@ -54,7 +55,16 @@ export function registerSkills(ctx) {
   if (registry === undefined || typeof registry.register !== 'function') return
 
   ctx.effect(
-    () => registry.register({ name: NAME, description: DESCRIPTION, content: BODY }),
+    () =>
+      registry.register({
+        name: NAME,
+        description: DESCRIPTION,
+        // DSH 0.2.2's loader checks `source` when it reads a runtime skill; a
+        // definition with only `content` registers but fails on load with
+        // "source must be a string".
+        source: BODY,
+        content: BODY,
+      }),
     'dsh-live-browser: skill',
   )
 }

package/lib/tools.js

@@ -31,6 +31,19 @@ const SENSITIVE_PARAM = {
   },
 }
 
+/**
+ * User-facing guidance when the sidebar is the Web build's iframe browser.
+ *
+ * A cross-origin iframe cannot be scripted from the parent page. The Desktop
+ * build renders the same tab as an Electron <webview>, which this plugin can
+ * drive completely, so the correct answer is to send the user to Desktop.
+ */
+const IFRAME_HINT =
+  '当前右侧栏打开的是 Web 版 iframe 浏览器，页面与 DSH 跨域，浏览器同源策略禁止插件注入脚本，点击/输入/读取/执行脚本都无法工作。' +
+  '请改用 DSH 桌面版的 webview 浏览器：1) 关闭浏览器里的 DSH 页面（地址形如 http://127.0.0.1:54249）；' +
+  '2) 启动 DeepSeek Harness 桌面客户端（Windows 开始菜单里的 DeepSeek Harness，或 D:\\软件\\deepseekHARNESS\\DeepSeek Harness.exe）；' +
+  '3) 在桌面客户端打开同一个会话，点右侧栏「浏览器」标签页。桌面版浏览器是 Electron <webview>，browser_* 工具即可正常操作。'
+
 /**
  * Turn what a model or human typed into a navigable URL.
  *
@@ -153,7 +166,7 @@ export function registerBrowserTools(ctx, rawConfig, bridge, panelControl = {})
   register({
     name: 'browser_status',
     description:
-      '查看内嵌浏览器状态：右侧栏的浏览器面板是否打开、页面是否可操作。开始网页任务前先调用它确认环境。',
+      '查看内嵌浏览器状态：右侧栏的浏览器面板是否打开、页面是否可操作。开始网页任务前先调用它确认环境。如果返回 mode:"iframe"，说明当前是 Web 版 iframe 浏览器，插件无法注入脚本，请把 hint 原样告诉用户并指导其改用桌面版 webview 浏览器。',
     parameters: { type: 'object', properties: {}, additionalProperties: false },
     async execute(args, exec) {
       // `page` must stay JSON-clean: returning `undefined` makes DSH reject the
@@ -175,8 +188,21 @@ export function registerBrowserTools(ctx, rawConfig, bridge, panelControl = {})
       }
       const attached = page !== null || attachedFor(exec)
       if (!attached) pageError = undefined
+      // A Web-build iframe is attached and visible, but nothing can be injected
+      // into it. Say so up front instead of telling the caller the panel is
+      // ready and letting the next click fail with a generic browser error.
+      if (page?.kind === 'iframe') {
+        return {
+          attached: true,
+          mode: 'iframe',
+          actionRequired: 'switch-to-desktop-webview',
+          page,
+          hint: page.hint ?? IFRAME_HINT,
+        }
+      }
       return {
         attached,
+        ...(page?.kind === 'webview' ? { mode: 'webview' } : {}),
         page,
         ...(pageError === undefined ? {} : { pageError }),
         hint: attached
@@ -205,14 +231,51 @@ export function registerBrowserTools(ctx, rawConfig, bridge, panelControl = {})
       // panel may still be finishing a poll started for the previous chat.
       let attached = attachedFor(exec)
       let hasPage = false
+      let tabList = []
       try {
         const tabs = await run('tabs', {}, { panelWaitMs: attached ? 0 : 800, timeoutMs: 3000 }, exec)
         attached = true
-        hasPage = Array.isArray(tabs?.tabs) && tabs.tabs.length > 0
+        tabList = Array.isArray(tabs?.tabs) ? tabs.tabs : []
+        hasPage = tabList.length > 0
       } catch {
         // No panel, or it cannot answer: fall through to the opener below.
       }
-      if (hasPage) return { opened: false, reason: '面板已经打开' }
+      if (hasPage) {
+        const first = tabList[0]
+        if (first?.kind === 'iframe') {
+          return {
+            opened: false,
+            mode: 'iframe',
+            actionRequired: 'switch-to-desktop-webview',
+            reason: '当前右侧栏是 iframe 浏览器，插件无法注入脚本',
+            hint: first.hint ?? IFRAME_HINT,
+          }
+        }
+        return { opened: false, reason: '面板已经打开' }
+      }
+
+      // Preferred path: the client owns the sidebar and can open a tab in the
+      // requesting conversation even when the user is looking at another chat.
+      try {
+        const result = await run(
+          'openPanel',
+          { url: args.url },
+          { panelWaitMs: attached ? 0 : 800, timeoutMs: cfg.openPanelWaitMs + 3000 },
+          exec,
+        )
+        const ready = attachedFor(exec)
+        if (result?.opened === true && result?.hasPage === true) {
+          return {
+            opened: true,
+            attached: ready,
+            ...(ready ? {} : { hint: '侧边栏标签页已创建，但面板还没连上；请确认右侧栏可见后重试。' }),
+          }
+        }
+        // The client accepted the command but did not produce a page (for
+        // example an older client); fall through to the host opener/hint.
+      } catch {
+        // No client worker yet: fall through to the host opener / hint.
+      }
 
       // The sidebar service lives on the client, not here: `sidebarRight` is
       // declared with dsh.client.platform = web, so ctx.get() on the host side

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-live-browser",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "让 agent 操作 DSH 自带的侧边栏浏览器：真实 webview 渲染，注入命令层，可点击、输入、读取和滚动用户眼前那张页面；每个对话各自一页，并补齐标签页右键批量关闭。",
   "type": "module",
   "license": "MIT",