Skip to content

A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.

Keep the open turn on agentless earlier pages

Fei241168cf63e1d3c1
diff --git a/ds-bot/src/host/parts.js b/ds-bot/src/host/parts.js
index 4a5e2ce0..759124f0 100644
--- a/ds-bot/src/host/parts.js
+++ b/ds-bot/src/host/parts.js
@@ -1223,13 +1223,14 @@ export function install(rt) {
// Earlier parts of a Bot's own chat, newest page first, for the chat to show above
// the current part as one conversation.
const EARLIER_PAGE = 60
- function displayItems(partId, events, session) {
+ function displayItems(partId, events, session, seedTurn) {
const hidden = new Set(state.exchangeTurns[partId] ?? [])
const items = []
// The turn/start still in effect. A steered or queued user message stays in
// it; only another turn/start moves on. A later page does not repeat the
- // turn/start from the page before, so seed that turn when the projection has it.
- let turn = openTurnAt(ctx.get?.('sessionProjections'), session, events[0]?.seq)
+ // turn/start from the page before, so seed that turn when the projection has
+ // it — or when the caller walked the log back to it (no live session).
+ let turn = seedTurn ?? openTurnAt(ctx.get?.('sessionProjections'), session, events[0]?.seq)
const stamp = (event, item) => {
if (typeof event.seq === 'number' && Number.isInteger(event.seq)) item.seq = event.seq
if (turn !== undefined) item.turn = turn
@@ -1293,7 +1294,28 @@ export function install(rt) {
maxMessages: EARLIER_PAGE,
}, AbortSignal.timeout(HISTORY_TIMEOUT_MS))
const events = page.records.map(record => record.event)
- const items = displayItems(part.sessionId, events, agent?.session)
+ let seedTurn
+ if (agent === undefined) {
+ // Without the live session's projection, rows on a page that does not
+ // hold its own turn/start would lose their turn; walk back for it.
+ let before = events[0]?.seq
+ for (let depth = 0; Number.isInteger(before) && depth < 5 && seedTurn === undefined; depth += 1) {
+ const back = await ctx.sessionController.page({
+ address: { kind: 'session', sessionId: part.sessionId },
+ beforeSeq: before,
+ maxMessages: EARLIER_PAGE,
+ }, AbortSignal.timeout(HISTORY_TIMEOUT_MS))
+ const starts = back.records.map(record => record.event).filter(event => event.type === 'turn/start')
+ if (starts.length > 0) {
+ const last = starts.at(-1).data?.turn
+ if (Number.isInteger(last)) seedTurn = last
+ break
+ }
+ if (!back.hasMore) break
+ before = back.records[0]?.event?.seq
+ }
+ }
+ const items = displayItems(part.sessionId, events, agent?.session, seedTurn)
const more = page.hasMore && events.length > 0
// The line above a part's first message marks where it began.
if (!more && index > 0) items.unshift({ kind: 'divider', time: part.startedAt })
diff --git a/ds-bot/test/bot-messages.test.js b/ds-bot/test/bot-messages.test.js
index 41a52c69..9f77111e 100644
--- a/ds-bot/test/bot-messages.test.js
+++ b/ds-bot/test/bot-messages.test.js
@@ -718,6 +718,27 @@ test('an earlier part loads when its agent is gone', async () => {
assert.deepEqual(items.map(item => [item.kind, item.text]), [['user', 'still here']])
})
+// #537: a turn that spans a page boundary keeps its number on the newer page
+// even when the part's agent is gone (no live projection to seed it).
+test('an agentless part keeps the turn that opened on an older page', async () => {
+ const events = [{ seq: 1, type: 'turn/start', time: 1, data: { turn: 6 } }]
+ for (let seq = 2; seq <= 70; seq += 1) {
+ events.push({ seq, type: 'user/message', time: seq, data: { content: [{ type: 'text', text: `m${seq}` }], source: { kind: 'user' } } })
+ }
+ const rt = earlierParts([])
+ rt.ctx.sessionController.page = async ({ beforeSeq, maxMessages }) => {
+ let list = events.filter(event => !Number.isInteger(beforeSeq) || event.seq < beforeSeq)
+ const hasMore = list.length > maxMessages
+ if (hasMore) list = list.slice(-maxMessages)
+ return { records: list.map(event => ({ event })), hasMore }
+ }
+ rt.resolveAgent = async () => { throw Object.assign(new Error('Session unavailable'), { code: 'session/gone' }) }
+ const { items } = await rt.earlierPage('b2')
+ const first = items.find(item => item.kind !== 'divider')
+ assert.equal(first?.kind, 'user')
+ assert.equal(first?.turn, 6)
+})
+
test('each text block of a Bot message is an entry of its own, as each is a bubble of its own', async () => {
const rt = earlierParts([
{ type: 'assistant/message', seq: 1, time: 11, data: { turn: 1, message: { content: [{ type: 'text', text: 'First.' }, { type: 'tool-call', id: 'c1' }, { type: 'text', text: ' ' }, { type: 'text', text: 'Second.' }] } } },