dsh-baton-host 0.6.5 → 0.6.7

package/lib/client.js

@@ -152,11 +152,12 @@ window.__ModuleLoader__.load({
       }
     }
 
-    function senderOf(node) {
-      const rpcId = node?.data?.source?.rpcId
+    function senderFrom(source) {
+      const rpcId = source?.rpcId
       const m = typeof rpcId === 'string' ? RPC_RE.exec(rpcId) : null
       return m ? m[1] : null
     }
+    const senderOf = (node) => senderFrom(node?.data?.source)
     const nameOf = (sender) => NAMES[sender] ?? sender.charAt(0).toUpperCase() + sender.slice(1)
 
     // Sender marks, drawn in the label's text colour like ChatGPT's own "sent from another chat" line.
@@ -198,24 +199,44 @@ window.__ModuleLoader__.load({
       function DshBatonUserMessage(props) {
         const Inner = shipped(ctx, key, DshBatonUserMessage)
         if (!Inner) return null
+        // Harness 0.2.2 hands each renderer the chain renderer of its own registration; a wrapper
+        // has none to pass on, so the shipped renderer gets one that draws nothing.
+        const inner = h(Inner, props.renderSlotChain ? props : { ...props, renderSlotChain: () => null })
         const sender = senderOf(props.node)
-        if (!sender) return h(Inner, props)
+        if (!sender) return inner
         return h('div', { style: { display: 'flex', flexDirection: 'column' } },
           h(Label, { sender, text: t('sentFrom', { name: nameOf(sender) }) }),
-          h(Inner, props))
+          inner)
       }
       return DshBatonUserMessage
     }
 
+    // Harness 0.2.2 and later: the chat declares a seat above each user message (BEFORE) and
+    // hands it the message's source, so the label sits there and the user renderer is left alone.
+    // Steering messages do not get that seat, so they keep the wrapper.
+    const BEFORE = 'conversation.chat.user.before'
+    const seatsBefore = (e) => e?.options?.key === 'user' && !!(e.children?.[BEFORE] ?? e.options?.children?.[BEFORE])
+    function beforeLabel(t) {
+      return function DshBatonSender({ matched }) {
+        return h(Label, { sender: matched, text: t('sentFrom', { name: nameOf(matched) }) })
+      }
+    }
+
     module.exports.name = 'dsh-baton-host'
     module.exports.inject = ['slots', 'locale']
     module.exports.apply = function apply(ctx) {
       ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'dsh-baton: dictionaries')
       const t = ctx.locale.bind(NS)
       ctx.slots.inject(SLOT, function* () {
+        const seated = ctx.slots.entries(SLOT).some(seatsBefore)
         // 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))
+        for (const key of KEYS) {
+          if (key === 'user' && seated) continue
+          yield ctx.slots.register({ name: SLOT, key, priority: PRIORITY, locale: 'chat' }, wrapperFor(ctx, key, t))
+        }
       })
+      // Runs only in a Harness that declares the seat; older ones never declare it.
+      ctx.slots.inject(BEFORE, () => ctx.slots.register({ name: BEFORE, select: ({ source }) => senderFrom(source) }, beforeLabel(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)))
     }

package/lib/index.js

@@ -523,7 +523,7 @@ export function apply(ctx) {
     const ids = new Set(pending.map((m) => m?.source?.rpcId))
     const gone = waiting.filter((r) => !ids.has(r.requestId))
     if (!gone.length) return []
-    const log = await controller.inspect(sessionId, signal()).catch(() => null)
+    const log = await sessionLog(sessionId).catch(() => null)
     if (!Array.isArray(log?.events)) return []
     const delivered = new Set(log.events.filter((e) => e.type === 'user/message').map((e) => e.data?.source?.rpcId))
     return gone.filter((r) => !delivered.has(r.requestId) && !r.sawPrompt)
@@ -739,8 +739,32 @@ export function apply(ctx) {
     return out
   }
 
+  // A session's whole event log and its folder. Harness up to 0.2.1 has sessionController.inspect;
+  // 0.2.2 replaced it with paged history (events): the newest page first, beforeSeq walks back,
+  // throughSeq pins every page to the same cut. The folder then comes from the session list.
+  async function sessionLog(sessionId) {
+    if (typeof controller.inspect === 'function') return controller.inspect(sessionId, signal())
+    if (typeof controller.events !== 'function') throw new Error('This DeepSeek Harness version cannot read a session log.')
+    const address = { kind: 'session', sessionId }
+    const pages = []
+    let throughSeq
+    let beforeSeq
+    for (;;) {
+      const page = await controller.events({ address, maxMessages: 500, ...(throughSeq === undefined ? {} : { throughSeq }), ...(beforeSeq === undefined ? {} : { beforeSeq }) }, signal())
+      throughSeq ??= page.cursor
+      const events = (page.records ?? []).filter((r) => r?.type === 'event' && r.event).map((r) => r.event)
+      pages.unshift(events)
+      if (!page.hasMore || !events.length || events[0].seq === beforeSeq) break
+      beforeSeq = events[0].seq
+    }
+    const seen = new Set()
+    const events = pages.flat().filter((e) => (seen.has(e.seq) ? false : (seen.add(e.seq), true)))
+    const { items } = await controller.list({}, signal())
+    return { meta: { cwd: items.find((it) => it.sessionId === sessionId)?.cwd ?? null }, events }
+  }
+
   async function readSession({ session_id, last = 10 }) {
-    const { meta, events } = await controller.inspect(session_id, signal())
+    const { meta, events } = await sessionLog(session_id)
     const messages = []
     let title = null
     for (const e of events) {
@@ -900,7 +924,7 @@ export function apply(ctx) {
       // the events so far, to tell whether one came during the read.
       followedUntil.set(session_id, Date.now() + 60_000)
       const gen = eventGen.get(session_id) ?? 0
-      const [goal, log] = await Promise.all([goalOf(session_id), controller.inspect(session_id, signal())])
+      const [goal, log] = await Promise.all([goalOf(session_id), sessionLog(session_id)])
       const { ended, running, runningSince } = turnsOf(log?.events)
       // A first call counts from the start of the round under way, so what it already wrote is
       // reported; one that comes after the goal stopped, from the start of the last round.
@@ -989,7 +1013,7 @@ export function apply(ctx) {
   // A session at a glance, for a client that holds only its id: what it is doing, its goal
   // and the reply of its last turn.
   async function sessionStatus({ session_id }) {
-    const [act, goal, log] = await Promise.all([activity({ session_id }), goalOf(session_id), controller.inspect(session_id, signal()).catch(() => null)])
+    const [act, goal, log] = await Promise.all([activity({ session_id }), goalOf(session_id), sessionLog(session_id).catch(() => null)])
     const { ended, running } = turnsOf(log?.events)
     const question = questions.get(session_id)
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-baton-host",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "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",
@@ -20,7 +20,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "dsh-baton-mcp": "0.6.5"
+    "dsh-baton-mcp": "0.6.7"
   },
   "license": "MIT",
   "dsh": {