A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.
fix: scope a Bot Session the creation path missed at the step's assemble
Fei24119448d73dfbd1
diff --git a/ds-bot/src/host/groups.js b/ds-bot/src/host/groups.jsindex 498f0433..df7c5e78 100644--- a/ds-bot/src/host/groups.js+++ b/ds-bot/src/host/groups.js@@ -1429,7 +1429,8 @@ export function install(rt) {if (options.sessionId === undefined || options.purpose !== undefined || rt.ownRequest(options)) return next()return (async function* relayOrPass() {await rt.load()- if (rt.roomOf(options.sessionId) === undefined) {+ const room = rt.roomOf(options.sessionId)+ if (room === undefined) {yield* next()return}@@ -1444,8 +1445,20 @@ export function install(rt) {yield { type: 'finish', reason: { kind: 'stop' } }return}- const id = `toolu_relay_${randomUUID().replace(/-/g, '')}`const declared = new Set((options.tools ?? []).map(tool => tool.name))+ // Neither relay path is declared, so a synthesized call could only fail+ // unseen. The assemble scope keeps this unreachable; if it is reached the+ // step ends with a line the user can read instead.+ if (!declared.has('group_relay') && !declared.has('run_code')) {+ rt.warn('ds-bot: group %s cannot relay: group_relay is not available in its Session', room.name)+ const text = 'This group could not pass the message on: its relay tool is not available. Restart DS Bot; if it keeps happening, report it.'+ yield { type: 'block-start', index: 0, blockType: 'text' }+ yield { type: 'text-delta', index: 0, text }+ yield { type: 'block-end', index: 0, block: { type: 'text', text } }+ yield { type: 'finish', reason: { kind: 'stop' } }+ return+ }+ const id = `toolu_relay_${randomUUID().replace(/-/g, '')}`// Only for a group made under the PTC preset, which can call nothing but run_code;// new group Sessions get the standard preset.const [name, args] = declared.has('run_code') && !declared.has('group_relay')diff --git a/ds-bot/src/host/tools.js b/ds-bot/src/host/tools.jsindex 814fda44..60168324 100644--- a/ds-bot/src/host/tools.js+++ b/ds-bot/src/host/tools.js@@ -780,8 +780,14 @@ export function install(rt) {}ctx.effect(() => () => { for (const id of scoped.keys()) unscope(id) }, 'ds-bot: scoped team tools')+ // A wanted Session whose Agent cannot take scoped tools yet is warned about+ // once; held.tools stays unset, so the next step's check tries again.+ const registerless = new WeakSet()+ // Returns the names this call registered, so a caller that missed the request's+ // tool list can add them to it.const shareBotTools = (agent) => {- if (agent === undefined) return+ const added = []+ if (agent === undefined) return addedconst id = agent.session?.idconst owns = rt.isBotSession(id)const relayOnly = !owns && rt.roomOf(id) !== undefined@@ -793,8 +799,14 @@ export function install(rt) {unscope(id)held = undefined}- if (!wanted || held?.tools === true) return- if (typeof agent.ctx?.tools?.register !== 'function') return+ if (!wanted || held?.tools === true) return added+ if (typeof agent.ctx?.tools?.register !== 'function') {+ if (!registerless.has(agent)) {+ registerless.add(agent)+ rt.warn('ds-bot: %s needs the team tools but its Agent cannot register them yet', id)+ }+ return added+ }const disposers = []const failed = []for (const def of rt.teamTools) {@@ -802,6 +814,7 @@ export function install(rt) {try {const dispose = agent.ctx.tools.register(def)if (typeof dispose === 'function') disposers.push(dispose)+ added.push(def.name)} catch (error) {// A tool another plugin already scoped onto this agent stays missing// rather than stopping the team; the rest still land.@@ -815,6 +828,7 @@ export function install(rt) {held.disposers.push(...disposers)scoped.set(id, held)if (failed.length > 0) rt.warn('ds-bot: team tools not served to %s: %s', id, failed.join('; '))+ return added}// The standard preset registers `subagent` (model selection) in each Agent's own@@ -870,8 +884,10 @@ export function install(rt) {// through ask_user instead, so it is taken out of their tool list, as are the goal// and delegation tools. The restricts are kept with the Session's scope, so they// lift with it.+ // Returns the team tool names shareBotTools registered on this call — empty+ // when the scope was already in place or the Session is not the team's.const hideBotUnusedTools = (agent) => {- shareBotTools(agent)+ const added = shareBotTools(agent)const id = agent?.session?.id// The shell shadows go with the scope, so a reload or a Session that leaves// the team lifts them like the rest, and the Agent can be scoped again.@@ -882,13 +898,14 @@ export function install(rt) {held.disposers.push(...shadows)scoped.set(id, held)}- if (agent === undefined || !rt.isBotSession(id)) return+ if (agent === undefined || !rt.isBotSession(id)) return addedconst held = scoped.get(id) ?? { relay: false, tools: false, restricted: false, filtered: false, disposers: [] }held.agent = agentscoped.set(id, held)filterBotAssembly(agent, held)- if (held.restricted === true || typeof agent.ctx?.tools?.restrict !== 'function') return+ if (held.restricted === true || typeof agent.ctx?.tools?.restrict !== 'function') return addedmaskHiddenTools(agent, held, new Set(ctx.tools.schemas(agent).map(schema => schema.name)))+ return added}// A new Bot, part, or group Session gets its Agent before ds-bot records it, so the// recording path resolves it again once the session is known as a Bot's; meanwhile@@ -909,6 +926,37 @@ export function install(rt) {}})+ // A live Agent the creation path missed — after a restart, agent/created may+ // run before this plugin's listeners are back — still gets its scope here,+ // before the step's request. The request's tool list is collected before this+ // waterfall, so names registered now are appended to it by hand (#826).+ ctx.on('system-prompt/assemble', async function scopeTeamTools(_assembly, context, next) {+ const agent = context.agent+ if (agent === undefined) return next()+ let added = []+ try {+ await rt.load()+ added = hideBotUnusedTools(agent)+ } catch (error) {+ rt.warn('ds-bot: scoping the tools of %s failed: %s', agent.session?.id ?? agent.id, error)+ }+ const assembled = await next()+ if (added.length === 0 || typeof ctx.tools?.schemas !== 'function') return assembled+ try {+ const present = new Set((assembled.tools ?? []).map(tool => tool.name))+ const fresh = []+ for (const schema of ctx.tools.schemas(agent)) {+ if (!added.includes(schema.name) || present.has(schema.name)) continue+ present.add(schema.name)+ fresh.push(schema)+ }+ return fresh.length === 0 ? assembled : { ...assembled, tools: [...(assembled.tools ?? []), ...fresh] }+ } catch (error) {+ rt.warn('ds-bot: listing the scoped tools of %s failed: %s', agent.session?.id ?? agent.id, error)+ return assembled+ }+ })+// The /goal command stays open in every Session, so a goal started in a Bot chat or a// group is blocked at once; DSH's round driver then starts no round for it.let goals = null