dsh-baton-host 0.6.3 → 0.6.4-next.0

package/lib/client.js

@@ -54,8 +54,6 @@ window.__ModuleLoader__.load({
       notInstalled: '未安装',
       notRegistered: '未注册',
       and: '和',
-      hookTitle: 'Codex 还差一步',
-      hookText: '打开 Codex → Settings → Hooks，信任 Stop 钩子“dsh-baton: waiting for the Harness run”。信任后，Codex 等 DeepSeek 时不再消耗额度。',
     }
     const en = {
       sentFrom: 'Sent by {name} from another chat',
@@ -76,8 +74,6 @@ window.__ModuleLoader__.load({
       notInstalled: 'not installed',
       notRegistered: 'not registered',
       and: 'and',
-      hookTitle: 'One more step for Codex',
-      hookText: 'Open Codex → Settings → Hooks and trust the Stop hook “dsh-baton: waiting for the Harness run”. Once trusted, Codex no longer uses your quota while it waits for DeepSeek.',
     }
 
     // --- Plugins page ------------------------------------------------------------
@@ -98,12 +94,7 @@ window.__ModuleLoader__.load({
             if (res.ok) next = (await res.json()).registration
           } catch { /* not served yet */ }
           if (stopped) return
-          if (next && next.state !== 'pending') {
-            setReg(next)
-            // Waiting for the user to trust the Codex hook: look again, so the note goes once they do.
-            if (untrusted(next)) setTimeout(poll, 4000)
-            return
-          }
+          if (next && next.state !== 'pending') return setReg(next)
           if (++tries >= 30) return setReg({ state: 'unknown' })
           setTimeout(poll, 700)
         }
@@ -113,30 +104,6 @@ window.__ModuleLoader__.load({
       return reg
     }
 
-    const untrusted = (reg) => Boolean(reg?.codexHook?.installed && !reg.codexHook.trusted)
-
-    // Codex runs dsh-baton's Stop hook only once the user trusts it in Codex; until then
-    // Codex spends model requests while it waits. Shown until they do, in Harness's accent.
-    function TrustNote({ reg, t }) {
-      if (!untrusted(reg)) return null
-      const accent = 'var(--dsw-alias-state-business-primary)'
-      return h('div', {
-        role: 'note', 'data-dsh-baton-trust': '',
-        style: {
-          display: 'flex', gap: 10, alignItems: 'flex-start', marginTop: 8, padding: '10px 12px', borderRadius: 8,
-          background: `color-mix(in srgb, ${accent} 7%, transparent)`,
-          border: `1px solid color-mix(in srgb, ${accent} 22%, transparent)`,
-          color: 'var(--dsw-alias-label-secondary)', fontSize: 13, lineHeight: '20px', textAlign: 'start',
-        },
-      },
-      h('svg', { width: 16, height: 16, viewBox: '0 0 16 16', fill: 'none', 'aria-hidden': true, style: { flex: 'none', marginTop: 2, color: accent } },
-        h('path', { d: 'M8 1.75 2.75 3.9v3.6c0 3.1 2.2 5.6 5.25 6.75 3.05-1.15 5.25-3.65 5.25-6.75V3.9z', stroke: 'currentColor', strokeWidth: 1.3, strokeLinejoin: 'round' }),
-        h('path', { d: 'm5.6 8.1 1.7 1.7 3.2-3.4', stroke: 'currentColor', strokeWidth: 1.3, strokeLinecap: 'round', strokeLinejoin: 'round' })),
-      h('div', null,
-        h('div', { style: { color: 'var(--dsw-alias-label-primary)', fontWeight: 600 } }, t('hookTitle')),
-        h('div', null, t('hookText'))))
-    }
-
     // 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')]
@@ -161,12 +128,11 @@ window.__ModuleLoader__.load({
           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), h(TrustNote, { reg, t }))
+          }, 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(TrustNote, { reg, t }),
           h('button', { type: 'button', onClick: onDismiss }, t('ok')))
       }
     }
@@ -182,8 +148,7 @@ window.__ModuleLoader__.load({
         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),
-          h(TrustNote, { reg, t }))
+          h('span', null, text))
       }
     }
 

package/lib/index.js

@@ -88,11 +88,21 @@ 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.
+// this host folder sits in, else the dsh-baton-mcp package installed with the plugin. That
+// one must be this plugin's own version (its exact dependency): a copy of another version
+// left nested in the plugin folder (pnpm moves a link: plugin's folder in on uninstall) is
+// not installed over ~/.dsh-baton/app.
 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 }
+  // Looked up from here (a nested copy first), then from the folder the plugin is installed in.
+  for (const from of [import.meta.url, pathToFileURL(path.join(fileURLToPath(new URL('../../', import.meta.url)), 'x.js')).href]) {
+    try {
+      const pkg = createRequire(from).resolve('dsh-baton-mcp/package.json')
+      if (JSON.parse(fs.readFileSync(pkg, 'utf8')).version === VERSION) return path.dirname(pkg)
+    } catch { /* not there */ }
+  }
+  return null
 }
 
 // The Harness install this process runs from, so its bundled Node (whose path changes
@@ -134,6 +144,8 @@ export function apply(ctx) {
   let settings = null
   // Harness's default-model service (see defaultModel()), when this Harness has one.
   let defaultModelService = null
+  // Harness's DeepSeek account service, when this Harness has one: read for the balance.
+  let accountService = null
   const runs = new Map() // runId -> run
   let stopping = false // set when the plugin unloads: release every wait()
   const waiters = new Map() // runId -> Set<resolve>
@@ -834,6 +846,30 @@ export function apply(ctx) {
     return { model: shownModel(await sessionModel(sessionId)), source: isNew ? 'default' : 'session' }
   }
 
+  // --- balance ------------------------------------------------------------------
+  // A run on the DeepSeek account with no balance fails within a second, and clients
+  // tended to send it again and again. So the send is refused up front when Harness's
+  // account service says every wallet is empty. Anything else (not signed in, an API key
+  // provider, the read failing) lets the send go ahead. A balance that was there is
+  // trusted for a minute.
+  const ACCOUNT_PROVIDER = 'deepseek-account'
+  const BALANCE_TTL_MS = 60_000
+  let balanceSeen = 0
+  async function emptyBalance() {
+    if (!accountService || typeof accountService.getBalance !== 'function' || Date.now() - balanceSeen < BALANCE_TTL_MS) return null
+    try {
+      const client = { version: VERSION, locale: 'en', timezoneOffsetSeconds: -new Date().getTimezoneOffset() * 60 }
+      const b = await Promise.race([accountService.getBalance(client), new Promise((resolve) => setTimeout(resolve, 5000, null))])
+      if (b?.status !== 'ready') return null
+      const wallets = [...(b.value ?? []), ...(b.bonusWallets ?? [])]
+      if (wallets.some((w) => Number(w.balance) > 0)) { balanceSeen = Date.now(); return null }
+      return wallets.map((w) => `${w.currency} ${w.balance}`).join(', ') || 'none'
+    } catch (error) {
+      logError('read balance', error)
+      return null
+    }
+  }
+
   async function send({ message, session_id, cwd, workspace_id, mode: asked, sender, model, reasoning_effort }) {
     if (!message || !message.trim()) throw new Error('message is required')
     if (asked != null && asked !== 'followup' && asked !== 'steer') throw new Error('mode must be followup or steer')
@@ -860,6 +896,13 @@ export function apply(ctx) {
     const chosen = await applyModel(sessionId, plan, isNew).catch((error) => {
       throw new Error(`${isNew ? `Session ${sessionId} was created, but no message was sent: ` : 'No message was sent: '}the model could not be set (${error?.message ?? error})`)
     })
+    // A session that never picked a model runs on Harness's default.
+    let provider = chosen.model?.provider
+    if (!provider) try { provider = defaultModel()?.currentSelection?.()?.provider } catch { /* unknown: no check */ }
+    if (provider === ACCOUNT_PROVIDER) {
+      const empty = await emptyBalance()
+      if (empty) throw new Error(`${isNew ? `Session ${sessionId} was created, but no message was sent` : 'No message was sent'}: the DeepSeek account has no balance left (${empty}), so the run would fail at once. Do not send again until the user has topped up (Harness → Settings → Account, or platform.deepseek.com).`)
+    }
     const ahead = activeRunsFor(sessionId).map((r) => r.id)
     const run = {
       id: `hrun-${Date.now().toString(36)}-${crypto.randomBytes(3).toString('hex')}`,
@@ -1061,21 +1104,17 @@ export function apply(ctx) {
   // 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' }
-  // Whether Codex's Stop hook is trusted yet: read on each status request, so the Plugins
-  // page notices the user trusting it in Codex.
-  let hookStatus = null
   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, harnessRuntime, codexHookStatus } = await import(pathToFileURL(path.join(root, 'src', 'register.mjs')).href)
-      hookStatus = codexHookStatus ?? null
+      const { autoRegister, harnessRuntime } = await import(pathToFileURL(path.join(root, 'src', 'register.mjs')).href)
       // Inside the desktop app, its own binary can stand in for a missing Node.js.
       const fallback = process.versions.electron && harnessRuntime ? harnessRuntime(process.execPath) : null
       const result = autoRegister({ root, harnessDir: harnessDir(), fallback })
       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}${result.codexHook ? `; Codex Stop hook: ${result.codexHook}` : ''}`)
+      ctx.logger?.[result.ok ? 'info' : 'error']?.(`dsh-baton-host MCP registration: ${summary || result.error}${result.codexHook && result.codexHook !== 'none' ? `; old Codex Stop hook: ${result.codexHook}` : ''}`)
     }))
   } else {
     registration = { state: 'off' }
@@ -1085,6 +1124,10 @@ export function apply(ctx) {
       settings = child.settings
       child.effect(() => () => { if (settings === child.settings) settings = null }, 'dsh-baton-host settings')
     })
+    ctx.inject(['accountController'], (child) => {
+      accountService = child.accountController
+      child.effect(() => () => { if (accountService === child.accountController) accountService = null }, 'dsh-baton-host account')
+    })
     ctx.inject(['agentDefaultModel'], (child) => {
       defaultModelService = child.agentDefaultModel
       child.effect(() => () => { if (defaultModelService === child.agentDefaultModel) defaultModelService = null }, 'dsh-baton-host default model')
@@ -1096,9 +1139,7 @@ export function apply(ctx) {
         handler: (request, response) => {
           const { state, ok, error, version, runtime, clients = [] } = registration
           response.writeHead(200, { 'content-type': 'application/json', 'cache-control': 'no-store' })
-          let codexHook = null
-          try { codexHook = hookStatus?.() ?? null } catch { /* config unreadable: say nothing */ }
-          response.end(JSON.stringify({ version: VERSION, registration: { state, ok, error, version, runtime, clients: clients.map(({ id, label, state }) => ({ id, label, state })), codexHook } }))
+          response.end(JSON.stringify({ version: VERSION, registration: { state, ok, error, version, runtime, clients: clients.map(({ id, label, state }) => ({ id, label, state })) } }))
         },
       }), 'dsh-baton-host status route')
     })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-baton-host",
-  "version": "0.6.3",
-  "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.",
+  "version": "0.6.4-next.0",
+  "description": "DeepSeek Harness plugin for dsh-baton: hand coding tasks from Claude Code or Codex to DeepSeek Harness on your machine. Adding it is the whole install: it registers the dsh-baton MCP server for Claude Code and Codex, runs each task live in the Harness window, wakes the main agent when the run ends and hands back the changed files, the project's own test results and a requirement-by-requirement checklist.",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -20,7 +20,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "dsh-baton-mcp": "0.6.3"
+    "dsh-baton-mcp": "0.6.4-next.0"
   },
   "license": "MIT",
   "dsh": {