dsh-baton-host 0.4.0 → 0.5.1

package/README.md

@@ -6,11 +6,15 @@ DeepSeek Harness 插件，配合 [dsh-baton](https://github.com/JialaoLiu/dsh-ba
 
 ## Install / 安装
 
-Harness → Plugins / 插件 → Add plugin / 添加插件 → registry Official npm registry → `dsh-baton-host` → Install / 安装 → Enable now / 立即启用
+Harness → Plugins / 插件 → Add plugin / 添加插件 → `dsh-baton-host` → Install / 安装 → Enable now / 立即启用
 
-Update / 更新: uninstall, then add it again / 先卸载再重新添加. Keep it on the same version as `dsh-baton-mcp` / 版本与 `dsh-baton-mcp` 保持一致.
+That is the whole install: switched on, the plugin registers the dsh-baton MCP server (the `dsh-baton-mcp` package, installed with it) for Claude Code and Codex, user-wide, and Harness says so. New conversations then have the `dsh_*` tools. If it could not register, run `npx -y dsh-baton-mcp setup`. Details: [dsh-baton](https://github.com/JialaoLiu/dsh-baton#install-details).
 
-Then connect the MCP server / 然后接入 MCP 服务器: see [dsh-baton](https://github.com/JialaoLiu/dsh-baton#readme).
+装好就完成了：插件启用时会为 Claude Code 和 Codex 注册 dsh-baton MCP 服务器（`dsh-baton-mcp` 包，随插件一起安装），Harness 里会提示。新开的对话就有 `dsh_*` 工具。没能注册的话，运行 `npx -y dsh-baton-mcp setup`。详见 [dsh-baton](https://github.com/JialaoLiu/dsh-baton/blob/main/README.zh-CN.md#安装细节)。
+
+Update / 更新: uninstall, then add it again; the MCP server is updated with it / 先卸载再重新添加，MCP 服务器会一起更新.
+
+Remove / 卸载: uninstall, then `npx -y dsh-baton-mcp setup --remove` / 卸载插件后运行 `npx -y dsh-baton-mcp setup --remove`.
 
 ## Socket protocol / 套接字协议
 
@@ -32,7 +36,9 @@ Newline-delimited JSON: request `{"id", "method", "params"}`, reply `{"id", "res
 | `rename_workspace` | `workspace_id` or `path`, `title` |
 | `list_runs` | `limit?` |
 
-`DSH_BATON_SOCKET` / `DSH_BATON_HOME` in the Harness process environment move the socket.
+`DSH_BATON_SOCKET` / `DSH_BATON_HOME` in the Harness process environment move the socket. `DSH_BATON_AUTO_REGISTER=0` turns off the MCP registration.
+
+The Plugins page reads the registration outcome from `GET /dsh-baton/status` on the Harness web server.
 
 ## License
 

package/lib/client.js

@@ -1,5 +1,9 @@
-// dsh-baton-host, browser half: labels chat messages sent through dsh-baton with
-// their sender ("Sent by Claude from another chat"). The host half puts the sender
+// dsh-baton-host, browser half. Two jobs:
+//   - On the Plugins page: right after the plugin is switched on, and on its detail page,
+//     say whether the host half registered the MCP server for Claude Code and Codex
+//     (it serves the outcome at /dsh-baton/status).
+//   - In the chat: label messages sent through dsh-baton with their sender ("Sent by
+//     Claude from another chat"). The host half puts the sender
 // into the prompt's request id ("dsh-baton.<sender>.<uuid>"); the chat records it as
 // the user message's source.rpcId, so the label survives reloads with no extra state.
 //
@@ -14,7 +18,10 @@ window.__ModuleLoader__.load({
   id: 'dsh-baton-host',
   factory: (require) => {
     const module = { exports: {} }
-    const { createElement: h } = require('react')
+    const { createElement: h, useState, useEffect } = require('react')
+    // Harness's dialog and button; without them (an older or newer Harness), plain elements.
+    let ui = null
+    try { ui = require('@deepseek-ai/dsh-client-ui-primitives') } catch { /* fall back */ }
 
     const SLOT = 'conversation.chat.node'
     const KEYS = ['user', 'steering']
@@ -25,8 +32,124 @@ window.__ModuleLoader__.load({
     // Codex shows as ChatGPT, the way the ChatGPT app labels its own cross-chat messages.
     const NAMES = { claude: 'Claude', codex: 'ChatGPT' }
 
-    const zh = { sentFrom: '由 {name} 从另一个聊天发送' }
-    const en = { sentFrom: 'Sent by {name} from another chat' }
+    const PACKAGE = 'dsh-baton-host'
+    const SETUP = 'npx -y dsh-baton-mcp setup'
+
+    const zh = {
+      sentFrom: '由 {name} 从另一个聊天发送',
+      readyTitle: 'dsh-baton 已就绪',
+      failTitle: 'dsh-baton 还差一步',
+      pending: '正在为 Claude Code 和 Codex 注册 dsh-baton…',
+      ready: '已为 {clients} 注册 dsh-baton。在 Claude Code 或 Codex 里新开一个对话，就能用 dsh_* 工具。',
+      partial: '{clients} 没能注册：',
+      noNode: '没找到 Node.js 22.15 或更新版本。装好 Node.js 后，',
+      noClients: '没找到 Claude Code 或 Codex。装好之后，',
+      failed: '没能自动注册 MCP。',
+      runSetup: '请在终端运行 {cmd}。',
+      unknown: '如果新对话里没有 dsh_* 工具，请在终端运行 {cmd}。',
+      off: '已关闭自动注册（DSH_BATON_AUTO_REGISTER=0）。',
+      ok: '知道了',
+      status: 'MCP 注册',
+      registered: '已注册',
+      notInstalled: '未安装',
+      notRegistered: '未注册',
+      and: '和',
+    }
+    const en = {
+      sentFrom: 'Sent by {name} from another chat',
+      readyTitle: 'dsh-baton is ready',
+      failTitle: 'dsh-baton needs one more step',
+      pending: 'Registering dsh-baton for Claude Code and Codex…',
+      ready: 'dsh-baton is registered for {clients}. Start a new conversation in Claude Code or Codex to use the dsh_* tools.',
+      partial: 'Could not register for {clients}: ',
+      noNode: 'Node.js 22.15 or later was not found. Once it is installed, ',
+      noClients: 'Neither Claude Code nor Codex was found. Once one is installed, ',
+      failed: 'The MCP server could not be registered automatically. ',
+      runSetup: 'run {cmd} in a terminal.',
+      unknown: 'If new conversations have no dsh_* tools, run {cmd} in a terminal.',
+      off: 'Automatic registration is off (DSH_BATON_AUTO_REGISTER=0).',
+      ok: 'OK',
+      status: 'MCP registration',
+      registered: 'registered',
+      notInstalled: 'not installed',
+      notRegistered: 'not registered',
+      and: 'and',
+    }
+
+    // --- Plugins page ------------------------------------------------------------
+
+    const statusUrl = () => new URL('dsh-baton/status', document.baseURI).pathname
+    const REGISTERED = ['registered', 'unchanged', 'kept']
+
+    // The host half registers right after it starts, so poll until it says it is done.
+    function useRegistration() {
+      const [reg, setReg] = useState(null)
+      useEffect(() => {
+        let stopped = false
+        let tries = 0
+        const poll = async () => {
+          let next = null
+          try {
+            const res = await fetch(statusUrl(), { cache: 'no-store' })
+            if (res.ok) next = (await res.json()).registration
+          } catch { /* not served yet */ }
+          if (stopped) return
+          if (next && next.state !== 'pending') return setReg(next)
+          if (++tries >= 30) return setReg({ state: 'unknown' })
+          setTimeout(poll, 700)
+        }
+        poll()
+        return () => { stopped = true }
+      }, [])
+      return reg
+    }
+
+    // What to tell the user: [title or null, text]. null while the host is still working.
+    function describe(reg, t) {
+      if (!reg || reg.state === 'pending') return [null, t('pending')]
+      if (reg.state === 'off') return [t('readyTitle'), t('off')]
+      if (reg.state === 'unknown') return [t('readyTitle'), t('unknown', { cmd: SETUP })]
+      const clients = reg.clients ?? []
+      const done = clients.filter((c) => REGISTERED.includes(c.state)).map((c) => c.label)
+      const failed = clients.filter((c) => c.state === 'failed').map((c) => c.label)
+      const list = (names) => names.join(` ${t('and')} `)
+      const fix = (reg.error === 'no-node' ? t('noNode') : reg.error === 'no-clients' ? t('noClients') : '') + t('runSetup', { cmd: SETUP })
+      if (reg.ok) return [t('readyTitle'), t('ready', { clients: list(done) })]
+      if (done.length) return [t('failTitle'), `${t('ready', { clients: list(done) })} ${t('partial', { clients: list(failed) })}${fix}`]
+      return [t('failTitle'), (reg.error === 'no-node' || reg.error === 'no-clients' ? '' : t('failed')) + fix]
+    }
+
+    // Shown once, right after "Enable now".
+    function wrapActivation(t) {
+      return function DshBatonActivation({ onDismiss }) {
+        const [title, text] = describe(useRegistration(), t)
+        if (ui?.Modal && ui?.Button) {
+          return h(ui.Modal, {
+            open: true, title: title ?? t('readyTitle'), closeLabel: t('ok'), onClose: onDismiss,
+            footer: h(ui.Button, { variant: 'primary', 'data-modal-autofocus': true, onClick: onDismiss }, t('ok')),
+          }, h('p', null, text))
+        }
+        return h('div', { role: 'status', style: { margin: '12px 0', padding: 12, borderRadius: 8, border: '1px solid var(--dsw-alias-border-l3)', color: 'var(--dsw-alias-label-primary)' } },
+          title ? h('strong', null, title) : null,
+          h('p', { style: { margin: '6px 0' } }, text),
+          h('button', { type: 'button', onClick: onDismiss }, t('ok')))
+      }
+    }
+
+    // The plugin's detail page: one line per client.
+    function wrapDetails(t) {
+      return function DshBatonStatus({ view }) {
+        const reg = useRegistration()
+        if (view === 'summary') return null
+        const [, text] = describe(reg, t)
+        const word = (s) => (REGISTERED.includes(s) ? t('registered') : s === 'not-installed' ? t('notInstalled') : t('notRegistered'))
+        const rows = (reg?.clients ?? []).map((c) => `${c.label}: ${word(c.state)}`)
+        return h('div', { style: { display: 'flex', flexDirection: 'column', gap: 4, color: 'var(--dsw-alias-label-secondary)' } },
+          h('strong', { style: { color: 'var(--dsw-alias-label-primary)' } }, t('status')),
+          rows.length ? h('span', null, rows.join(' · ')) : null,
+          h('span', null, text))
+      }
+    }
 
     function senderOf(node) {
       const rpcId = node?.data?.source?.rpcId
@@ -92,6 +215,8 @@ window.__ModuleLoader__.load({
         // locale 'chat': the shipped renderer reads its strings through the `t` it is handed.
         for (const key of KEYS) yield ctx.slots.register({ name: SLOT, key, priority: PRIORITY, locale: 'chat' }, wrapperFor(ctx, key, t))
       })
+      ctx.slots.inject('plugins.bundle.activation', () => ctx.slots.register({ name: 'plugins.bundle.activation', key: PACKAGE, locale: NS }, wrapActivation(t)))
+      ctx.slots.inject('plugins.bundle.config', () => ctx.slots.register({ name: 'plugins.bundle.config', key: PACKAGE, locale: NS }, wrapDetails(t)))
     }
     return module.exports
   },

package/lib/index.js

@@ -10,7 +10,9 @@ import net from 'node:net'
 import os from 'node:os'
 import path from 'node:path'
 import crypto from 'node:crypto'
-import { socketEndpoint, batonHome, socketPath as socketPathSetting } from './socket.js'
+import { createRequire } from 'node:module'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+import { socketEndpoint, batonHome, setting, socketPath as socketPathSetting } from './socket.js'
 
 export const name = 'dsh-baton-host'
 export const inject = ['sessionController', 'workspaceRegistry']
@@ -85,6 +87,26 @@ function toolCallsOf(content) {
 
 const iso = (t) => (typeof t === 'number' ? new Date(t).toISOString() : t ?? null)
 
+// The MCP server package this plugin registers: the checkout or ~/.dsh-baton/app folder
+// this host folder sits in, else the dsh-baton-mcp package installed with the plugin.
+function serverRoot() {
+  const up = fileURLToPath(new URL('../../', import.meta.url))
+  if (fs.existsSync(path.join(up, 'src', 'register.mjs'))) return path.resolve(up)
+  try { return path.dirname(createRequire(import.meta.url).resolve('dsh-baton-mcp/package.json')) } catch { return null }
+}
+
+// The Harness install this process runs from, so its bundled Node (whose path changes
+// with every Harness update) is never registered.
+function harnessDir() {
+  const exe = process.execPath
+  const app = exe.match(/^(.*?\.app)(?=[\\/])/)
+  if (app) return app[1]
+  // Windows: the install folder, e.g. %LOCALAPPDATA%\Programs\DeepSeek Harness.
+  const i = exe.toLowerCase().indexOf('deepseek harness')
+  const end = i < 0 ? -1 : exe.slice(i).search(/[\\/]/)
+  return end > 0 ? exe.slice(0, i + end) : null
+}
+
 export function apply(ctx) {
   // This code runs inside the Harness host process: an uncaught error here can
   // take Harness down. Every event listener and timer goes through guard().
@@ -630,6 +652,40 @@ export function apply(ctx) {
   }
 
 
+  // --- MCP registration -----------------------------------------------------
+  // Switching the plugin on registers the dsh-baton MCP server for Claude Code and Codex,
+  // the same entries `dsh-baton setup` writes, so adding the plugin is the whole install.
+  // It runs again on every Harness start: a plugin update brings the server along, and an
+  // entry that is already right is left untouched. The Plugins page reads the outcome from
+  // GET /dsh-baton/status (lib/client.js). DSH_BATON_AUTO_REGISTER=0 turns it off.
+  let registration = { state: 'pending' }
+  if (setting('AUTO_REGISTER') !== '0') {
+    setImmediate(guard('register', async () => {
+      const root = serverRoot()
+      if (!root) { registration = { state: 'done', ok: false, error: 'no-server', clients: [] }; return }
+      const { autoRegister } = await import(pathToFileURL(path.join(root, 'src', 'register.mjs')).href)
+      const result = autoRegister({ root, harnessDir: harnessDir() })
+      registration = { state: 'done', ...result }
+      const summary = result.clients.map((c) => `${c.label}: ${c.state}${c.error ? ` (${c.error})` : ''}`).join(', ')
+      ctx.logger?.[result.ok ? 'info' : 'error']?.(`dsh-baton-host MCP registration: ${summary || result.error}`)
+    }))
+  } else {
+    registration = { state: 'off' }
+  }
+  if (typeof ctx.inject === 'function') {
+    ctx.inject(['webServer'], (web) => {
+      web.effect(() => web.webServer.register({
+        kind: 'exact',
+        path: '/dsh-baton/status',
+        handler: (request, response) => {
+          const { state, ok, error, version, clients = [] } = registration
+          response.writeHead(200, { 'content-type': 'application/json', 'cache-control': 'no-store' })
+          response.end(JSON.stringify({ version: VERSION, registration: { state, ok, error, version, clients: clients.map(({ id, label, state }) => ({ id, label, state })) } }))
+        },
+      }), 'dsh-baton-host status route')
+    })
+  }
+
   ctx.effect(() => {
     const sock = socketPath()
     let server = null

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-baton-host",
-  "version": "0.4.0",
-  "description": "DeepSeek Harness plugin for dsh-baton: takes the baton from Claude Code or Codex over a local, owner-only control socket, runs it in a specific session through the host's own session controller, and hands the result back when the turn is done.",
+  "version": "0.5.1",
+  "description": "DeepSeek Harness plugin for dsh-baton: adding it is the whole install. Switched on, it registers the dsh-baton MCP server for Claude Code and Codex, then takes the baton over a local, owner-only control socket, runs it in a specific session through the host's own session controller, and hands the result back when the turn is done.",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -19,6 +19,9 @@
     "README.md",
     "LICENSE"
   ],
+  "dependencies": {
+    "dsh-baton-mcp": "0.5.1"
+  },
   "license": "MIT",
   "dsh": {
     "manifestVersion": 1,
@@ -33,7 +36,8 @@
       "inject": [
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-renderer",
-        "@deepseek-ai/dsh-client-ui-chat"
+        "@deepseek-ai/dsh-client-ui-chat",
+        "@deepseek-ai/dsh-client-ui-primitives"
       ]
     }
   },