@ljwei-stak/dsh-model-route-bot 0.66.3 → 0.67.0

package/modules/bot-runtime/product-overlay/patches/src/host/store.js.patch

@@ -0,0 +1,68 @@
+--- a/src/host/store.js
++++ b/src/host/store.js
+@@ -430,6 +430,8 @@
+   const roomOwners = new Map()
+   /** @type {Map<string, {botId?:string, roomId?:string}>} */
+   const pastOwners = new Map()
++  /** @type {Map<string, string>} */
++  const threadOwners = new Map()
+   const chatOf = botId => botOf(botId)?.sessionId ?? botId
+   const sessionOfRoom = room => (room === undefined ? undefined : room.sessionId ?? room.id)
+   const indexSessions = () => {
+@@ -437,9 +439,23 @@
+     groupOwners.clear()
+     roomOwners.clear()
+     pastOwners.clear()
++    threadOwners.clear()
+     for (const bot of Object.values(state.bots)) {
+       for (const segment of bot.segments ?? []) pastOwners.set(segment.sessionId, { botId: bot.id })
+       chatOwners.set(chatOf(bot.id), bot.id)
++      // A live thread Session is another own chat of the same Bot: it speaks
++      // with the Bot's identity, prompt, tools and money, so it sits in
++      // chatOwners beside the Bot's default chat. chatOf() stays the default
++      // chat, which is a different thing from any one thread. An archived
++      // thread keeps its history readable and gains no authority.
++      for (const thread of bot.threads ?? []) {
++        if (thread?.sessionId === undefined) continue
++        if (thread.archivedAt === undefined || thread.archivedAt === null) {
++          if (chatOwners.has(thread.sessionId)) { warn('ds-bot: thread Session %s is owned already; it keeps its first owner', thread.sessionId); continue }
++          chatOwners.set(thread.sessionId, bot.id)
++          threadOwners.set(thread.sessionId, bot.id)
++        } else pastOwners.set(thread.sessionId, { botId: bot.id, threadId: thread.threadId })
++      }
+     }
+     for (const room of Object.values(state.rooms)) {
+       const sessionId = sessionOfRoom(room)
+@@ -461,6 +477,22 @@
+   const selfOf = id => chatOwners.get(id) ?? groupOwners.get(id)?.botId ?? pastOwners.get(id)?.botId
+   // A Session where the Bot speaks now, as opposed to an archived segment.
+   const isBotSession = id => chatOwners.has(id) || groupOwners.has(id)
++  // Threads: several independent own chats under one Bot. threadsOf() is the
++  // read-only record list, threadOf() the live owner of one Session, and
++  // sessionsOfBot() every Session that speaks for a Bot.
++  const threadsOf = botId => (botOf(botId)?.threads ?? []).map(thread => ({ ...thread }))
++  const threadOf = sessionId => {
++    if (typeof sessionId !== 'string') return undefined
++    for (const bot of Object.values(state.bots)) {
++      for (const thread of bot.threads ?? []) {
++        if (thread.sessionId !== sessionId) continue
++        return thread.archivedAt === undefined || thread.archivedAt === null ? { botId: bot.id, threadId: thread.threadId } : undefined
++      }
++    }
++    return undefined
++  }
++  const threadSessionOf = (botId, threadId) => threadsOf(botId).find(thread => thread.threadId === threadId)?.sessionId
++  const sessionsOfBot = botId => [...new Set([botId, chatOf(botId), ...(botOf(botId)?.segments ?? []).map(segment => segment.sessionId), ...threadsOf(botId).map(thread => thread.sessionId), ...groupSessionsOf(botId)])]
+   const groupSessionsOf = botId => Object.values(state.rooms).map(room => room.sessions?.[botId]).filter(Boolean)
+   const dropGroupSession = (room, botId) => {
+     if (room.memberDirs !== undefined) delete room.memberDirs[botId]
+@@ -506,7 +538,8 @@
+   Object.assign(rt, {
+     state, load, save, refresh, readOnly, own,
+     botOf, roomOf, isMain, chatOf, sessionOfRoom, selfOf, isBotSession,
+-    chatOwners, groupOwners, roomOwners, pastOwners,
++    chatOwners, groupOwners, roomOwners, pastOwners, threadOwners,
++    threadsOf, threadOf, threadSessionOf, sessionsOfBot,
+     groupSessionsOf, dropGroupSession, retireGroupSession, findBot, findRooms, isAdminOf,
+   })
+ }

package/modules/bot-runtime/product-overlay/patches/src/host/usage.js.patch

@@ -0,0 +1,11 @@
+--- a/src/host/usage.js
++++ b/src/host/usage.js
+@@ -304,7 +304,7 @@
+     const owners = new Map()
+     const botOwner = bot => ({ owner: bot.id, name: bot.name })
+     for (const bot of Object.values(state.bots)) {
+-      for (const sessionId of [bot.id, rt.chatOf(bot.id), ...(bot.segments ?? []).map(segment => segment.sessionId)]) owners.set(sessionId, botOwner(bot))
++      for (const sessionId of rt.sessionsOfBot(bot.id)) owners.set(sessionId, botOwner(bot))
+     }
+     for (const room of Object.values(state.rooms)) {
+       for (const sessionId of [rt.sessionOfRoom(room), ...(room.parts ?? []).map(segment => segment.sessionId)].filter(Boolean)) owners.set(sessionId, { owner: `room:${room.id}`, name: room.name })

package/modules/bot-runtime/read-model.mjs

@@ -7,19 +7,32 @@ const missing = {
   botBindings: blocked('宿主尚未提供 Bot 执行绑定投影。', '接入 Bot 设置服务后，可在这里查看和配置每个 Bot 的模型、工作区与资金范围。'),
   fundingAccounts: blocked('宿主尚未提供资金账户目录投影。', '接入资金账户服务后，可在这里按 provider 配置本地限额策略。'),
   tasks: blocked('宿主尚未提供统一任务服务的只读投影。', '接入 Task Service 后，可在这里跟踪、取消或核对任务。'),
+  threads: blocked('宿主尚未提供 Bot 线程目录投影。', '接入 Bot 线程服务后，可在这里为同一个 Bot 建立多条独立会话。'),
   machines: blocked('尚未接入远程电脑目录。', '安装并配对同版本 remote-computer-agent，然后在机器目录中登记。'),
+  webPanels: blocked('宿主尚未提供固定网页面板目录。', '接入固定网页面板存储后，可在这里把常用网页固定在侧栏。'),
   usage: blocked('宿主尚未提供统一费用与预占投影。', '接入唯一 MR 资金库的只读投影；已有 Token 用量仍可在 DS 用量页查看。'),
 }
 const ACTIONS = new Set([
-  'task.inspect', 'task.cancel', 'task.retry', 'task.reconcile', 'task.plan.submit', 'task.plan.cancel', 'usage.resolve',
-  'binding.save', 'funding.account.save', 'machine.secret', 'machine.pair', 'machine.bind', 'machine.probe',
+  'ui.namespace',
+  'nativeActivity.list',
+  'botProfile.inspect', 'botProfile.save',
+  'independentChat.send', 'independentChat.inspect', 'independentChat.cancel', 'independentChat.view', 'independentChat.messages',
+  'independentChat.newConversation',
+  'task.inspect', 'task.attention', 'task.cancel', 'task.retry', 'task.reconcile', 'task.plan.submit', 'task.plan.cancel', 'usage.resolve',
+  'threads.readModel', 'threads.list', 'threads.create', 'threads.rename', 'threads.switch', 'threads.open', 'threads.archive', 'threads.unarchive', 'threads.ensure', 'threads.recover', 'threads.reconcile',
+  'webPanels.list', 'webPanels.probe', 'webPanels.save', 'webPanels.remove', 'webPanels.order',
+  'notifications.readModel', 'notifications.list', 'notifications.read', 'notifications.markAll',
+  'data.catalog', 'data.load', 'data.describe', 'data.sql', 'data.show', 'data.page', 'data.export', 'data.remove', 'data.cancel',
+  'binding.inspect', 'binding.save', 'funding.account.save', 'machine.secret', 'machine.pair', 'machine.pair.invite', 'machine.bind', 'machine.probe',
   'machine.revoke', 'machine.reconcile', 'machine.artifact', 'machine.desktop.view', 'machine.desktop.act',
   'machine.desktop.open', 'machine.desktop.renew', 'machine.desktop.close',
+  'machine.desktop.poll', 'machine.desktop.send',
   'library.list', 'library.read', 'library.write', 'library.upload', 'library.download', 'library.remove', 'library.mkdir', 'library.search',
   'routine.list', 'routine.run', 'routine.save', 'routine.remove', 'routine.history', 'routine.cancel', 'routine.resolve', 'roles.list',
   'botRoutingInspect', 'botRoutingDecide', 'botRouting.dispatch', 'botRouting.save', 'botRouting.status',
   'botRuntimeStatus', 'botRuntimeMove', 'botRuntimeHistory', 'botRuntimeMessage',
 ])
+const READ_ONLY_ACTIONS = new Set(['independentChat.inspect', 'independentChat.view', 'independentChat.messages', 'nativeActivity.list'])
 const plain = value => value && typeof value === 'object' && !Array.isArray(value)
 const error = (code, message) => Object.assign(new Error(message), { code })
 const desktopClientOrigin = request => {
@@ -63,6 +76,7 @@ export function createProductReadModel({ runtime, lifecycle, providers = {}, act
         lifecycle: lifecycle.status(),
         readOnly: runtime.readOnly() ?? null,
         bots: Object.values(state.bots).map(bot => ({ id: bot.id, name: bot.name, role: bot.role ?? '', model: bot.model ?? null,
+          appliedModel: typeof bot.appliedModel === 'string' ? bot.appliedModel : null,
           sessionId: runtime.chatOf(bot.id), workDir: bot.workDir ?? null, main: state.mainBotIds?.includes(bot.id) ?? false })),
         mainBotId: state.mainBotIds?.[0] ?? null,
         ...Object.fromEntries(values),
@@ -76,9 +90,10 @@ export function createProductReadModel({ runtime, lifecycle, providers = {}, act
         throw error('INVALID_PRODUCT_ACTION', '未知或格式无效的操作。')
       }
       if (typeof actions[request.action] !== 'function') throw error('PRODUCT_ACTION_UNAVAILABLE', '此宿主尚未接入该操作，请查看页面中的接入说明。')
-      if (runtime.readOnly() !== undefined) throw error('PRODUCT_READ_ONLY', runtime.readOnly())
+      const readOnlyReason = runtime.readOnly()
+      if (readOnlyReason !== undefined && !READ_ONLY_ACTIONS.has(request.action)) throw error('PRODUCT_READ_ONLY', readOnlyReason)
       // context belongs to authorizeRequest(), never to the JSON request.
-      return actions[request.action](request.payload, context)
+      return actions[request.action](request.payload, readOnlyReason !== undefined ? { ...context, readOnly: true } : context)
     },
   })
 }

package/modules/bot-runtime/vendor/ds-bot/src/client/details-drawer.js

@@ -195,13 +195,20 @@ function GroupOverview({ room, roster, actions, usage, useWork, openSettings })
 
 export function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) {
   const owner = roster.byId[sessionId]
-  const part = owner ? currentPart(owner) : sessionId
+  // A thread Session is its own part: the drawer shows that thread's
+  // transcript, stats, questions and usage, while everything Bot-scoped
+  // (settings, model, folder, memory, computer) stays the Bot's — a thread has
+  // no authority of its own.
+  const thread = roster.threadsById?.[sessionId]
+  const threadName = typeof thread?.name === 'string' ? thread.name.trim() : ''
+  const part = thread ? (thread.sessionId ?? sessionId) : (owner ? currentPart(owner) : sessionId)
   const isMainBot = isMainOf(roster, owner?.id)
   const [tab, setTab] = useState('details')
   const room = roster.roomsById[sessionId]
   // The info pane swaps its overview for the Bot or group settings view in place.
   const [view, setView] = useState(startTab === 'settings' && (owner || room) ? 'settings' : 'overview')
-  const [editing, setEditing] = useState(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId])))
+  // A thread is named in the thread directory, never by renaming its Bot here.
+  const [editing, setEditing] = useState(Boolean(startRenaming && thread === undefined && (roster.byId[sessionId] || roster.roomsById[sessionId])))
   const [draftName, setDraftName] = useState(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : ''))
   const [copied, setCopied] = useState(false)
   const [error, setError] = useState('')
@@ -219,7 +226,7 @@ export function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, ro
   const running = useSessionStatus(map => map.get(part)?.running === true)
   const doing = useActivity(map => map[bot?.id ?? sessionId])
   const transcript = useSessions(list => transcriptOf(list, part, bot?.name ?? room?.name ?? t('Bot'), roster.exchangeTurns[part]))
-  const usage = useSessions(list => usageOf(list, [part, ...(bot?.parts ?? room?.parts ?? [])]))
+  const usage = useSessions(list => usageOf(list, [part, ...(thread === undefined ? (bot?.parts ?? room?.parts ?? []) : [])]))
   const run = promise => Promise.resolve(promise)
     .then(() => { setError(''); return true })
     .catch(failure => { setError(failure?.message ?? String(failure)); return false })
@@ -281,8 +288,11 @@ export function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, ro
             onChange: event => setDraftName(event.target.value), onBlur: saveName,
             onKeyDown: (event) => { if (event.key === 'Enter') void saveName(); if (event.key === 'Escape') { event.stopPropagation(); setEditing(false) } },
           })
-        : h('button', { type: 'button', className: 'bt-drawer-name', 'aria-label': t('Rename {name}', { name: current }), title: t('Rename'), onClick: () => { setDraftName(room && !room.named ? '' : current); setEditing(true) } }, current),
-      subtitle ? h('span', { className: 'bt-drawer-role' }, subtitle) : null),
+        : thread !== undefined
+          ? h('span', { className: 'bt-drawer-name', 'data-thread': '' }, current)
+          : h('button', { type: 'button', className: 'bt-drawer-name', 'aria-label': t('Rename {name}', { name: current }), title: t('Rename'), onClick: () => { setDraftName(room && !room.named ? '' : current); setEditing(true) } }, current),
+      subtitle ? h('span', { className: 'bt-drawer-role' }, subtitle) : null,
+      threadName ? h('span', { className: 'bt-drawer-role', 'data-thread': threadName }, threadName) : null),
     tabs.length > 1 ? h('div', { key: 'tabs', ref: glide.box, className: 'bt-tabs', role: 'tablist', 'data-move': side },
       h('span', { ref: glide.thumb, className: 'bt-thumb', 'aria-hidden': true }),
       tabs.map(key => h('button', { key, type: 'button', role: 'tab', className: 'bt-tab', 'aria-selected': tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key])))) : null,

package/modules/bot-runtime/vendor/ds-bot/src/client/header.js

@@ -72,6 +72,11 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus
   const doing = useActivity(map => map[owner])
   const bot = roster.byId[sessionId]
   const room = roster.roomsById[sessionId]
+  // A thread is another own chat of this Bot: the header keeps naming the Bot,
+  // because that is who is speaking, and adds the thread so the owner can tell
+  // two contexts of the same Bot apart at a glance.
+  const thread = roster.threadsById?.[sessionId]
+  const threadName = typeof thread?.name === 'string' ? thread.name.trim() : ''
   const goal = room?.goal
   const goalCompose = useUi(state => state.goalCompose === sessionId)
   const goalOpen = useUi(state => state.goalOpen === sessionId)
@@ -116,7 +121,7 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus
   }, [showGoal])
   const pill = h('button', {
     type: 'button', className: 'bt-pill', 'aria-expanded': away ? undefined : detailsOpen, 'data-memory': memoryNotice ? 'updated' : undefined,
-    'aria-label': away ? t('Back to chat') : memoryNotice ? t('Memory updated. Open {name}\'s memory', { name: roster.byId[changed]?.name ?? name }) : t('View conversation details'),
+    'aria-label': away ? t('Back to chat') : memoryNotice ? t('Memory updated. Open {name}\'s memory', { name: roster.byId[changed]?.name ?? name }) : threadName ? `${t('View conversation details')} · ${threadName}` : t('View conversation details'),
     title: away ? name : undefined,
     onClick: () => (away ? selectView('chat') : memoryNotice ? actions.openMemory(changed) : actions.toggleDetails(sessionId)),
   },
@@ -127,6 +132,7 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus
         h('span', { className: 'bt-pill-goal' }, h('span', { className: 'bt-pill-ico', 'aria-hidden': true }, h(GoalIcon)), h('span', { className: 'bt-pill-title' }, view.title)),
         h('span', { className: 'bt-pill-name' }, name))
       : h('span', { className: 'bt-pill-name' }, away ? t('Back to chat') : bot?.name ?? room?.name ?? (title || t('New chat'))),
+    threadName ? h('span', { className: 'bt-swap' }, threadName) : null,
     goalShown && view?.number !== undefined ? h('span', { className: 'bt-pill-count' }, `${view.number}/${view.count}`) : null,
     h(MemoryNotice, { shown: memoryNotice }),
     h('span', { className: 'bt-pill-go', 'aria-hidden': true }, h(GoArrow)))
@@ -134,7 +140,8 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus
     showGoal ? h(GoalIsland, { room, goal, view, open: goalOpen, composing: goalCompose, roomWork, roster, actions, pill }) : pill,
     h('span', { className: 'bt-sr', role: 'status' }, memoryNotice ? t('Memory updated') : ''),
     h(NewMessagePills, { key: sessionId, sessionId, useSessions, useUi, useTurnClock }),
-    h(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, useWork, actions }))
+    h(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, useWork, actions }),
+    typeof actions.conversationAddon === 'function' ? h(actions.conversationAddon, { sessionId, bot, room, roster, actions, running }) : null)
 }
 
 // New-message pills. "N new messages ↓" takes Back to bottom's place when

package/modules/bot-runtime/vendor/ds-bot/src/client/index.js

@@ -199,7 +199,7 @@ export function apply(ctx) {
     for (const id of pendingAdopt.keys()) {
       if (roster.getSnapshot().agentOf[id] !== undefined || listed[id] === undefined) pendingAdopt.delete(id)
     }
-    for (const id of [...value.bots.map(currentPart), ...value.rooms.map(room => room.sessionId ?? room.id)]) {
+    for (const id of [...value.bots.map(currentPart), ...value.rooms.map(room => room.sessionId ?? room.id), ...(value.bots ?? []).flatMap(bot => (bot.threads ?? []).map(thread => thread.sessionId))]) {
       if (refreshed.has(id)) continue
       refreshed.add(id)
       void Promise.resolve(ctx.sessions.refreshProjections?.(id)).catch(quietly('refresh projections'))
@@ -407,6 +407,13 @@ export function apply(ctx) {
   // A Bot id or a group chat id, or any part of either's chat, opens the current part.
   const partFor = (id) => {
     const snapshot = roster.getSnapshot()
+    // A thread Session, or a thread id, opens its own Session: it is not the
+    // Bot's default chat, and opening it is never redirected there. The thread
+    // is resolved before the Bot, because a thread Session also resolves to its
+    // Bot in `byId` — every other Bot surface needs that, and this one line
+    // keeps the two from being confused.
+    const thread = snapshot.threadsById?.[id]
+    if (thread !== undefined) return thread.sessionId ?? id
     const bot = snapshot.byId[id]
     if (bot !== undefined) return currentPart(bot)
     const room = snapshot.roomsById[id]
@@ -437,7 +444,7 @@ export function apply(ctx) {
     const snapshot = roster.getSnapshot()
     if (!snapshot.ready || !snapshot.mainBotId) return
     const main = mainView()
-    if (main !== undefined && snapshot.byId[main] === undefined && snapshot.roomsById[main] === undefined) {
+    if (main !== undefined && snapshot.byId[main] === undefined && snapshot.roomsById[main] === undefined && snapshot.threadsById?.[main] === undefined) {
       actions.openSession(snapshot.mainBotId)
     }
   }

package/modules/bot-runtime/vendor/ds-bot/src/client/learning-card.js

@@ -1,7 +1,7 @@
 import { createElement as h, useId, useMemo, useRef, useState } from 'react'
 import { useTurnFacts } from './btw.js'
 import { editLines, lineDiff, proposalPlacement } from './learning-card-model.js'
-import { currentPart } from './text.js'
+import { isOwnChatOf } from './sources.js'
 import { t } from './i18n.js'
 import { CheckIcon, MemoryIcon, PencilIcon } from './icons.js'
 import { spring, SPRING_TAP } from './motion.js'
@@ -106,7 +106,7 @@ function LearningProposals({ turn, dock, sessionId, useRoster, actions }) {
   const facts = useTurnFacts(sessionId, actions)
   const [failed, setFailed] = useState({})
   const bot = roster.byId?.[sessionId]
-  if (!bot || currentPart(bot) !== sessionId) return null
+  if (!bot || !isOwnChatOf(bot, sessionId)) return null
   const proposals = roster.learning?.[bot.id] ?? []
   const visible = [...proposals]
   for (const entry of Object.values(failed)) {

package/modules/bot-runtime/vendor/ds-bot/src/client/model-menu.js

@@ -1,6 +1,6 @@
 import { createElement as h, Fragment, useEffect, useLayoutEffect, useRef, useState, useSyncExternalStore } from 'react'
 import { createPortal } from 'react-dom'
-import { currentPart } from './text.js'
+import { isOwnChatOf } from './sources.js'
 import { CheckIcon, SlidersIcon } from './icons.js'
 import { BotMark } from './mark.js'
 import { KeyIcon, MaskedInput } from './secret-card.js'
@@ -202,9 +202,11 @@ export function ModelChoiceDock({ sessionId, useRoster, actions }) {
   const bot = roster.byId[sessionId]
   const [busy, setBusy] = useState('')
   const [error, setError] = useState('')
-  const shown = Boolean(bot) && currentPart(bot) === sessionId && roster.ready
+  // A thread is another own chat of the same Bot, so the Bot's model choice
+  // belongs to it exactly as it belongs to the default chat.
+  const shown = Boolean(bot) && isOwnChatOf(bot, sessionId) && roster.ready
   useEffect(() => { if (shown) void actions.refreshModels?.() }, [shown, sessionId])
-  if (!bot || currentPart(bot) !== sessionId || !roster.ready) return null
+  if (!bot || !isOwnChatOf(bot, sessionId) || !roster.ready) return null
   const models = roster.models ?? []
   // A model whose provider has no API key fails every turn, so it is no choice.
   const usable = models.filter(model => !model.needsKey)

package/modules/bot-runtime/vendor/ds-bot/src/client/secret-card.js

@@ -5,11 +5,11 @@
 import { createElement as h, useEffect, useId, useRef, useState } from 'react'
 import { CheckIcon, CloseIcon, TrashIcon } from './icons.js'
 import { BotAvatar, BotMark } from './mark.js'
-import { contentText, currentPart } from './text.js'
+import { contentText } from './text.js'
 import { dateLocale, t } from './i18n.js'
 import { SPRING_POP, SPRING_SHAPE, spring } from './motion.js'
 import { useDockHold } from './card-hold.js'
-import { heldCardKey } from './sources.js'
+import { heldCardKey, isOwnChatOf } from './sources.js'
 import { CellEmpty } from './cell-empty.js'
 
 const MIN_VALUE = 4
@@ -178,7 +178,7 @@ export function SecretDock({ sessionId, useRoster, useCards, useHeldCards, actio
   const shown = useCards?.(state => state[sessionId]) ?? NONE
   const held = useHeldCards?.(state => state[sessionId]) ?? NONE
   const bot = roster.byId[sessionId]
-  if (!bot || currentPart(bot) !== sessionId) return null
+  if (!bot || !isOwnChatOf(bot, sessionId)) return null
   const drawn = entry => entry.callId && entry.sessionId === sessionId && shown[entry.callId] > 0 && !(held[heldCardKey('secret', entry.id)] > 0)
   const waiting = (roster.secretRequests?.[bot.id] ?? []).filter(entry => entry.status === 'pending' && !drawn(entry))
   if (waiting.length === 0) return null

package/modules/bot-runtime/vendor/ds-bot/src/client/sources.js

@@ -16,7 +16,7 @@ export function createSource(initial) {
   }
 }
 
-export const EMPTY_ROSTER = { revision: -1, mainBotId: null, mainBotIds: [], bots: [], rooms: [], agents: [], exchangeTurns: {}, questions: {}, btwCards: {}, sideChats: {}, learning: {}, secrets: [], capabilities: [], capabilityStatuses: {}, secretRequests: {}, models: [], defaultModel: null, modelsKey: null, prefs: {}, byId: {}, roomsById: {}, agentsById: {}, agentOf: {}, ready: false }
+export const EMPTY_ROSTER = { revision: -1, mainBotId: null, mainBotIds: [], bots: [], rooms: [], agents: [], exchangeTurns: {}, questions: {}, btwCards: {}, sideChats: {}, learning: {}, secrets: [], capabilities: [], capabilityStatuses: {}, secretRequests: {}, models: [], defaultModel: null, modelsKey: null, prefs: {}, byId: {}, roomsById: {}, agentsById: {}, agentOf: {}, threadsById: {}, ready: false }
 // Any Main Bot holds the Main Bot powers; `mainBotId`, the first one, is the sidebar tile.
 export const isMainOf = (roster, id) => id !== undefined && (roster.mainBotIds ?? []).includes(id)
 
@@ -28,6 +28,21 @@ export function indexRoster(value) {
   for (const bot of value.bots) {
     for (const id of [...(bot.parts ?? []), bot.sessionId ?? bot.id, bot.id]) byId[id] = bot
   }
+  // A thread is another own chat of its Bot, and it is indexed twice on
+  // purpose. `threadsById` holds the thread itself — its own Session, its name,
+  // its archive — so opening one opens the thread and never the Bot's default
+  // chat. Its Session also resolves to its Bot in `byId`, so every surface that
+  // asks "whose chat is this?" (the header, the composer's extra menu, the
+  // details drawer, and with it the model, memory, computer, voice and
+  // attachment controls) keeps the Bot instead of going blank inside a thread.
+  // A thread never takes a Bot's own chat identity: a Session the Bot already
+  // owns stays the Bot's.
+  const threadsById = {}
+  for (const bot of value.bots) for (const thread of bot.threads ?? []) {
+    if (thread.sessionId !== undefined) threadsById[thread.sessionId] = { botId: bot.id, ...thread }
+    if (thread.threadId !== undefined) threadsById[thread.threadId] = { botId: bot.id, ...thread }
+    if (thread.sessionId !== undefined && byId[thread.sessionId] === undefined) byId[thread.sessionId] = bot
+  }
   const roomsById = {}
   // A group's own Session is a chain of parts like a Bot's chat: `room.id` is its
   // first part's id and `sessionId` its current one; every part id finds the room.
@@ -41,9 +56,17 @@ export function indexRoster(value) {
     agentsById[agent.id] = agent
     for (const sessionId of agent.sessions ?? []) agentOf[sessionId] = agent.id
   }
-  return { ...value, agents: value.agents ?? [], byId, roomsById, agentsById, agentOf, ready: true }
+  return { ...value, agents: value.agents ?? [], byId, roomsById, agentsById, agentOf, threadsById, ready: true }
 }
 
+// Whether a Session is one of this Bot's own chats: its current part, or one of
+// its threads' Sessions. A thread is another own chat of the same Bot, so the
+// Bot-scoped surfaces (model choice, memory learning, secret requests, turn
+// errors) belong to it exactly as they belong to the default chat. Earlier
+// parts are deliberately not included: they keep the behaviour they had.
+export const isOwnChatOf = (bot, sessionId) => bot !== undefined && bot !== null && typeof sessionId === 'string'
+  && ((bot.sessionId ?? bot.id) === sessionId || (bot.threads ?? []).some(thread => thread.sessionId === sessionId))
+
 // Whether a main-view Session id belongs to the team's DSH Agent: the conversation
 // group then stays withdrawn while the shell keeps the sidebar. Before the roster
 // arrives, the ids cached from the last pull answer.

package/modules/bot-runtime/vendor/ds-bot/src/client/turn-error.js

@@ -1,9 +1,10 @@
 import { createElement as h, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
-import { currentPart, isHiddenTurn } from './text.js'
+import { isHiddenTurn } from './text.js'
 import { CheckIcon, CopyIcon } from './icons.js'
 import { ModelKeyCard, manageModels } from './model-menu.js'
 import { knownFailure } from './diagnostics.js'
 import { hostText, t } from './i18n.js'
+import { isOwnChatOf } from './sources.js'
 
 // -------------------------------------------------------------------------
 // A failed turn in a Bot's chat: what went wrong and what the user can do about it,
@@ -157,7 +158,7 @@ export function FailureCell({ node, sessionId, useRoster, useTurnClock, actions
   const provider = blocked?.provider ?? providerOf(bot, roster)
   const text = failureText(data.code, { name: bot?.name ?? t('This Bot'), provider: providerName(roster, provider), status: blocked?.status })
   const facts = failureFacts(data, blocked)
-  const current = bot !== undefined && currentPart(bot) === sessionId && !later
+  const current = bot !== undefined && isOwnChatOf(bot, sessionId) && !later
   // The key route never takes the account's credential, so a sign-in alone leaves the Bot
   // failing; it moves onto the account route. With no account model listed yet, the
   // user picks one.

package/modules/bot-runtime/vendor/ds-bot/src/host/channel.js

@@ -43,8 +43,16 @@ export function install(rt) {
     // `sessionId` is the Bot's current own-chat part; `parts` its earlier ones.
     // `waiting`: the Bot holds its greeting until the user picks its model or fixes
     // what failed it. `blocked`: the facts of a failure only the user can fix (turns.js).
-    bots: Object.values(state.bots).map(({ segments, kickoff, ...bot }) => ({
-      ...bot, sessionId: rt.chatOf(bot.id), parts: (segments ?? []).map(segment => segment.sessionId), ...(kickoff ? { waiting: true } : {}),
+    bots: Object.values(state.bots).map(({ segments, threads, kickoff, ...bot }) => ({
+      ...bot, sessionId: rt.chatOf(bot.id), parts: (segments ?? []).map(segment => segment.sessionId),
+      // `sessionId` stays the default chat; `threads` are the Bot's other own
+      // chats, each with its own Session. An archived thread keeps its id and
+      // its history and opens read-only.
+      threads: (threads ?? []).map(thread => ({ threadId: thread.threadId, sessionId: thread.sessionId,
+        ...(thread.name === undefined ? {} : { name: thread.name }),
+        ...(thread.createdAt === undefined ? {} : { createdAt: thread.createdAt }),
+        ...(thread.archivedAt === undefined || thread.archivedAt === null ? {} : { archivedAt: thread.archivedAt }) })),
+      ...(kickoff ? { waiting: true } : {}),
     })),
     // `sessionId` is the group's own Session's current part, `ownParts` its earlier
     // ones; `parts` the members' hidden group Sessions and their earlier segments,
@@ -435,6 +443,7 @@ export function install(rt) {
           await rt.load()
           const past = rt.pastOwners.get(body.sessionId)
           const sessionId = rt.botOf(body.sessionId) ? rt.chatOf(body.sessionId) : past && past.roomId === undefined ? rt.chatOf(past.botId) : body.sessionId
+          if (past?.threadId !== undefined) return fail('This thread is archived; open it again to write in it', 'bot/archived')
           const question = rt.own(state.questions, sessionId)
           if (question === undefined || question.id !== body.questionId) return fail('This question is no longer open', 'bot/stale')
           const reply = questionReply(question, body.answer)
@@ -458,6 +467,7 @@ export function install(rt) {
           await rt.load()
           const past = rt.pastOwners.get(body.sessionId)
           const sessionId = rt.botOf(body.sessionId) ? rt.chatOf(body.sessionId) : past && past.roomId === undefined ? rt.chatOf(past.botId) : body.sessionId
+          if (past?.threadId !== undefined) return fail('This thread is archived; open it again to write in it', 'bot/archived')
           const pending = rt.own(state.views, sessionId)
           if (pending === undefined || pending.id !== body.viewId) return fail('This view is no longer open', 'bot/stale')
           const checked = validateViewAnswer(pending.view, body.action, body.values)
@@ -485,6 +495,8 @@ export function install(rt) {
           // A Bot id, a group chat's id, or an earlier part of either means the
           // current part.
           const past = rt.pastOwners.get(body.sessionId)
+          // An archived thread keeps its history but takes no new input.
+          if (past?.threadId !== undefined) return fail('This thread is archived; open it again to write in it', 'bot/archived')
           const room = rt.roomOf(body.sessionId)
           const sessionId = rt.botOf(body.sessionId) ? rt.chatOf(body.sessionId)
             : room !== undefined ? rt.sessionOfRoom(room)

package/modules/bot-runtime/vendor/ds-bot/src/host/memory.js

@@ -866,7 +866,7 @@ export function install(rt) {
   // A deleted Bot's memory moves to the archive, whole.
   function archiveBotMemory(botId) {
     const bot = rt.botOf(botId)
-    for (const sessionId of [botId, rt.chatOf(botId), ...(bot?.segments ?? []).map(segment => segment.sessionId), ...rt.groupSessionsOf(botId)]) renewMemory(sessionId)
+    for (const sessionId of rt.sessionsOfBot(botId)) renewMemory(sessionId)
     summaries.delete(botId)
     news.delete(botId)
     return queued(async () => {

package/modules/bot-runtime/vendor/ds-bot/src/host/models.js

@@ -244,6 +244,13 @@ export function install(rt) {
       await selectSessionModel(sessionId, route)
         .catch(error => rt.warn('ds-bot: model for %s in a group not applied: %s', bot.name, error))
     }
+    // A thread follows its Bot's model, as a group Session does.
+    for (const sessionId of rt.threadsOf(bot.id).map(thread => thread.sessionId)) {
+      const applied = sessionSelections.get(sessionId)
+      if (!force && applied !== undefined && sameSelection(applied, route)) continue
+      await selectSessionModel(sessionId, route)
+        .catch(error => rt.warn('ds-bot: model for a thread of %s not applied: %s', bot.name, error))
+    }
     if (!ownChanged) return ref
     bot.appliedModel = ref
     if (effort === undefined) delete bot.appliedEffort

package/modules/bot-runtime/vendor/ds-bot/src/host/parts.js

@@ -446,6 +446,12 @@ export function install(rt) {
     const header = session.requestHeader()
     const route = header?.config
     if (!route?.provider || !route?.model) throw new Error('the Session has not called a model yet')
+    // The Host's prepared auxiliary stream binds one adapter generation for this note and
+    // admits the money against that same generation. A Host that has not wired it refuses
+    // the note here, rather than re-resolving the route at dispatch the way a bare stream
+    // does.
+    const auxiliary = ctx.get('botAuxiliaryModelStream')
+    if (typeof auxiliary !== 'function') throw new Error('the Host has no prepared auxiliary model stream')
     const messages = session.deriveMessages()
     const base = folder ? FOLDER_PROMPT : HANDOFF_PROMPT
     let retry
@@ -453,7 +459,7 @@ export function install(rt) {
     for (let attempt = 1; attempt <= NOTE_ATTEMPTS; attempt += 1) {
       const prompt = retry === undefined ? base : `${base}\n\n${retry}`
       const assembler = new BlockAssembler()
-      for await (const chunk of ctx.llm.stream({
+      for await (const chunk of auxiliary.stream({
         provider: route.provider,
         model: route.model,
         ...(route.reasoningEffort ? { reasoningEffort: route.reasoningEffort } : {}),
@@ -515,6 +521,12 @@ export function install(rt) {
     const session = agent.session
     const route = session.requestHeader()?.config
     if (!route?.provider || !route?.model) throw new Error('the Session has not called a model yet')
+    // The Host's prepared auxiliary stream binds one adapter generation for this checkpoint,
+    // so the summary is written by the generation the accounting admitted. A Host that has
+    // not wired it refuses the checkpoint instead of pricing one generation and streaming
+    // another.
+    const auxiliary = ctx.get('botAuxiliaryModelStream')
+    if (typeof auxiliary !== 'function') throw new Error('the Host has no prepared auxiliary model stream')
     // The results list grows with the work, so the checkpoint may write as much as one
     // of the Bot's own replies.
     const maxTokens = route.maxTokens
@@ -522,7 +534,7 @@ export function install(rt) {
     const tail = checkpointTail(head, session.deriveMessages())
     const prompt = tail.length === 0 ? CHECKPOINT_PROMPT : `${CHECKPOINT_PROMPT}\n\n${checkpointTailNote(tail)}`
     const assembler = new BlockAssembler()
-    for await (const chunk of ctx.llm.stream({
+    for await (const chunk of auxiliary.stream({
       provider: route.provider,
       model: route.model,
       ...(route.reasoningEffort ? { reasoningEffort: route.reasoningEffort } : {}),
@@ -571,21 +583,22 @@ export function install(rt) {
       lines.push({ who: line.who, text: line.who === 'you' || line.who === 'user' ? line.text.replace(/^(?:You|User): /, '') : line.text })
       if (lines.length >= STEWARD_LINES) break
     }
-    const info = await ctx.llm.resolveModelInfo(route.provider, route.model).catch(() => undefined)
-    // The decision needs no long thinking.
-    const off = info?.reasoning?.efforts?.some(effort => effort.id === 'off')
+    // The decision needs no long thinking. Whether this model can be asked to think less
+    // is decided from the generation this very call prepares, not from a read of whatever
+    // registration happens to be current now.
+    const auxiliary = ctx.get('botAuxiliaryModelStream')
+    if (typeof auxiliary !== 'function') throw new Error('the Host has no prepared auxiliary model stream')
     const assembler = new BlockAssembler()
-    for await (const chunk of ctx.llm.stream({
+    for await (const chunk of auxiliary.stream({
       provider: route.provider,
       model: route.model,
-      ...(off ? { reasoningEffort: 'off' } : {}),
       system: STEWARD_SYSTEM,
       messages: rt.tagUsage([{ role: 'user', content: [{ type: 'text', text: stewardRequest({ lines, midTurn, checkpoints: checkpointCount(session.deriveMessages()), group }) }] }], { sessionId: agent.id, kind: 'compaction' }),
       maxTokens: STEWARD_MAX_TOKENS,
       sessionId: session.id,
       purpose: 'compaction',
       signal: AbortSignal.timeout(STEWARD_TIMEOUT_MS),
-    })) assembler.push(chunk)
+    }, { controls: auxiliary.reasoningOff })) assembler.push(chunk)
     const finish = assembler.finish
     if (finish.kind === 'error' || finish.kind === 'aborted') throw new Error(finish.failure?.message ?? finish.kind)
     return parseDecision(assembler.blocks().filter(block => block.type === 'text').map(block => block.text).join('\n'))
@@ -732,7 +745,10 @@ export function install(rt) {
 
   const placeOf = (sessionId) => {
     const botId = rt.chatOwners.get(sessionId)
-    if (botId !== undefined) return { botId }
+    // A thread is not a part chain: it keeps its own Session for as long as it
+    // lives, so the steward neither condenses it nor hands its input on to the
+    // Bot's default chat.
+    if (botId !== undefined) return rt.threadOf(sessionId) === undefined ? { botId } : undefined
     const owner = rt.groupOwners.get(sessionId)
     if (owner !== undefined) return { botId: owner.botId, roomId: owner.roomId }
     const roomId = rt.roomOwners.get(sessionId)
@@ -1234,6 +1250,7 @@ export function install(rt) {
   // past it.
   async function checkContext(agent) {
     if (switches.has(agent.id) || freshParts.has(agent.id) || checking.has(agent.id) || readOnly()) return
+    if (placeOf(agent.id) === undefined) return
     if (lastTurnEnd(agent)?.data?.reason?.kind === 'error') return
     const lines = await contextLines(agent.session)
     const tokens = tokensOf(agent.session)

package/modules/bot-runtime/vendor/ds-bot/src/host/privacy.js

@@ -30,7 +30,7 @@ export function install(rt) {
   const privateBots = () => Object.values(state.bots).filter(bot => bot.private === true)
   // Deleting a private Bot does not make the files and memory it leaves behind public.
   const protectedBots = () => [...new Map([...(state.privateArchives ?? []), ...privateBots()].map(bot => [bot.id, bot])).values()]
-  const sessionsOf = bot => [...new Set([bot.id, ...(bot.sessionIds ?? [rt.chatOf(bot.id), ...(bot.segments ?? []).map(segment => segment.sessionId), ...rt.groupSessionsOf(bot.id)])])]
+  const sessionsOf = bot => [...new Set([bot.id, ...(bot.sessionIds ?? [rt.sessionsOfBot(bot.id)])])]
   const dataRoots = () => [rt.dshHome, rt.home, process.env.DS_BOT_USER_DSH_HOME?.trim()].filter(Boolean)
 
   // A path as it is and as the file system resolves it, folded for comparing. realBeyond