Skip to content

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

Mount Bot capabilities per Agent and keep shared ones safe

Fei2411c946eab46e42
diff --git a/README.md b/README.md
index 1d4bbd88..dab1da4d 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ DS Bot has group chats. A group chat is a great way to get several bots to work
### Capabilities
-Settings → **Capabilities** is a shared library of MCP servers, skills and packs. Add a capability to a Bot in its settings; it is available from that Bot's next message in its own chat and group chats. A local MCP command that a Bot adds needs your approval before it can run.
+Settings → **Capabilities** is a shared library of MCP servers, skills and packs. Add a capability to a Bot in its settings; it is available from that Bot's next message in its own chat and group chats. A local MCP command that a Bot adds needs your approval before it can run. While other Bots use a capability, only you or a Main Bot can change or delete it.
### Usage
diff --git a/README.zh.md b/README.zh.md
index 0d01c006..191f9034 100644
--- a/README.zh.md
+++ b/README.zh.md
@@ -64,7 +64,7 @@ ds bot 拥有群聊功能。群聊是非常好的多 bot 协作方式,但它
### 能力
-设置 → **能力** 是团队共享的 MCP 服务、技能和能力包列表。在 Bot 设置中启用能力后,从该 Bot 下一条消息开始生效,也适用于它参与的群聊。Bot 添加的本地 MCP 命令需要你先批准才能运行。
+设置 → **能力** 是团队共享的 MCP 服务、技能和能力包列表。在 Bot 设置中启用能力后,从该 Bot 下一条消息开始生效,也适用于它参与的群聊。Bot 添加的本地 MCP 命令需要你先批准才能运行。有其他 Bot 在用的能力,只有你或主 Bot 能修改、删除。
### 用量
diff --git a/ds-bot/client.js b/ds-bot/client.js
index 9ea8d50a..89eb16e6 100644
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@ -7081,12 +7081,7 @@ function BotCapabilitiesCard({ bot, roster, actions, run, Card: Card2, SwitchRow
label: item.name,
hint: attached.has(item.name) ? statusText(statuses[item.name]) : void 0,
on: attached.has(item.name),
- onChange: (enabled) => {
- const next = new Set(attached);
- if (enabled) next.add(item.name);
- else next.delete(item.name);
- void run(actions.setBotCapabilities(bot.id, [...next]));
- }
+ onChange: (enabled) => void run(actions.setBotCapability(bot.id, item.name, enabled))
}))
);
}
@@ -13394,7 +13389,7 @@ function apply(ctx) {
saveCapability: (capability) => after(call("capability-save", capability)),
deleteCapability: (name) => after(call("capability-delete", { name })),
approveCapability: (name) => after(call("capability-approve", { name })),
- setBotCapabilities: (botId, capabilities) => after(call("bot-capabilities", { botId, capabilities })),
+ setBotCapability: (botId, name, attached) => after(call("bot-capability", { botId, name, attached })),
schedules: () => call("schedules"),
scheduleCreate: (task) => call("schedule-create", task),
scheduleDelete: (sessionId, id) => call("schedule-delete", { sessionId, id }),
diff --git a/ds-bot/src/client/capability-settings.js b/ds-bot/src/client/capability-settings.js
index 6a75aa9d..d572cd91 100644
--- a/ds-bot/src/client/capability-settings.js
+++ b/ds-bot/src/client/capability-settings.js
@@ -161,11 +161,6 @@ export function BotCapabilitiesCard({ bot, roster, actions, run, Card, SwitchRow
label: item.name,
hint: attached.has(item.name) ? statusText(statuses[item.name]) : undefined,
on: attached.has(item.name),
- onChange: enabled => {
- const next = new Set(attached)
- if (enabled) next.add(item.name)
- else next.delete(item.name)
- void run(actions.setBotCapabilities(bot.id, [...next]))
- },
+ onChange: enabled => void run(actions.setBotCapability(bot.id, item.name, enabled)),
})))
}
diff --git a/ds-bot/src/client/index.js b/ds-bot/src/client/index.js
index 09aef417..f91b3a96 100644
--- a/ds-bot/src/client/index.js
+++ b/ds-bot/src/client/index.js
@@ -557,7 +557,7 @@ export function apply(ctx) {
saveCapability: capability => after(call('capability-save', capability)),
deleteCapability: name => after(call('capability-delete', { name })),
approveCapability: name => after(call('capability-approve', { name })),
- setBotCapabilities: (botId, capabilities) => after(call('bot-capabilities', { botId, capabilities })),
+ setBotCapability: (botId, name, attached) => after(call('bot-capability', { botId, name, attached })),
schedules: () => call('schedules'),
scheduleCreate: task => call('schedule-create', task),
scheduleDelete: (sessionId, id) => call('schedule-delete', { sessionId, id }),
diff --git a/ds-bot/src/host/capabilities.js b/ds-bot/src/host/capabilities.js
index 5c9c0748..de5f272e 100644
--- a/ds-bot/src/host/capabilities.js
+++ b/ds-bot/src/host/capabilities.js
@@ -49,12 +49,17 @@ const stringMap = (value, label) => {
export function install(rt) {
const { ctx, state } = rt
const agents = new Map()
- const mounts = new WeakMap()
+ // Mounted fibers live in each Agent's own context, so they outlive this plugin unless
+ // its cleanup disposes them; a strong map keeps them reachable for that.
+ const mounts = new Map()
+ // One reconcile chain per Agent: a slow MCP server holds up only its own Agent.
+ const chains = new WeakMap()
+ const queued = new WeakSet()
const sessionStatuses = new Map()
let pluginPromise
- let queue = Promise.resolve()
let scheduled = null
- let loadingSecrets = false
+ let loadingSecrets = 0
+ let stopped = false
const library = () => state.capabilities.items
const ensureLibrary = () => {
@@ -67,13 +72,21 @@ export function install(rt) {
if (readOnly !== undefined) throw new Error(readOnly)
}
const allowedToEdit = (item, botId) => rt.isMain(botId) || item.createdBy === botId
+ const usedByOthers = (name, botId) => Object.values(state.bots).some(bot => bot.id !== botId
+ && (bot.capabilities ?? []).some(attached => attached === name
+ || (library()[attached]?.kind === 'pack' && (library()[attached].items ?? []).includes(name))))
+ // A creator that is not a Main Bot could otherwise rewrite what a Main Bot runs.
+ const editCheck = (item, botId, verb) => {
+ if (!allowedToEdit(item, botId)) throw new Error(`Only ${item.createdBy ? 'its creator or a Main Bot' : 'a Main Bot'} can ${verb} ${item.name}.`)
+ if (!rt.isMain(botId) && usedByOthers(item.name, botId)) throw new Error(`Another Bot uses ${item.name}, so only a Main Bot can ${verb} it.`)
+ }
const itemInput = (body, { botId, ui }) => {
const name = validateCapabilityName(body.name)
const kind = body.kind
if (!['mcp', 'skill', 'pack'].includes(kind)) throw new Error('Choose an MCP server, skill, or pack.')
const items = ensureLibrary()
const previous = items[name]
- if (previous && !ui && !allowedToEdit(previous, botId)) throw new Error(`Only ${previous.createdBy ? 'its creator or a Main Bot' : 'a Main Bot'} can change ${name}.`)
+ if (previous && !ui) editCheck(previous, botId, 'change')
if (previous && previous.kind !== kind) throw new Error('A capability cannot change its kind. Delete it and save a new one.')
const now = Date.now()
const item = {
@@ -128,7 +141,7 @@ export function install(rt) {
const items = ensureLibrary()
const item = items[String(name ?? '')]
if (!item) throw new Error(`No capability named ${name}.`)
- if (!ui && !allowedToEdit(item, botId)) throw new Error(`Only its creator or a Main Bot can delete ${name}.`)
+ if (!ui) editCheck(item, botId, 'delete')
delete items[item.name]
for (const pack of Object.values(items)) if (pack.kind === 'pack') pack.items = (pack.items ?? []).filter(child => child !== item.name)
for (const bot of Object.values(state.bots)) bot.capabilities = (bot.capabilities ?? []).filter(attached => attached !== item.name)
@@ -145,19 +158,21 @@ export function install(rt) {
if (target.id !== caller.id && !rt.isMain(callerId)) throw new Error('Only a Main Bot can change another Bot’s capabilities.')
const item = ensureLibrary()[String(name ?? '')]
if (!item) throw new Error(`No capability named ${name}.`)
- target.capabilities ??= []
- const wasEmpty = target.capabilities.length === 0
- if (endpoint === 'attach') {
- if (!target.capabilities.includes(item.name)) target.capabilities.push(item.name)
- } else {
- target.capabilities = target.capabilities.filter(attached => attached !== item.name)
- }
+ await setAttached(target, item.name, endpoint === 'attach')
+ return { bot: target.name, attached: endpoint === 'attach' }
+ }
+ // Changes one name against the saved list, so two quick changes both land.
+ const setAttached = async (bot, name, attached) => {
+ bot.capabilities ??= []
+ const wasEmpty = bot.capabilities.length === 0
+ if (attached && !bot.capabilities.includes(name)) bot.capabilities.push(name)
+ if (!attached) bot.capabilities = bot.capabilities.filter(entry => entry !== name)
await rt.save()
- if (endpoint === 'attach' && wasEmpty && target.capabilities.length > 0) {
- await trackBotAgents(target)
+ if (wasEmpty && bot.capabilities.length > 0) {
+ await trackBotAgents(bot)
void scheduleReconcile()
}
- return { bot: target.name, attached: endpoint === 'attach' }
+ return bot.capabilities
}
const statusSet = (botId, itemName, sessionId, status) => {
@@ -251,123 +266,151 @@ export function install(rt) {
const disposeMount = async mount => {
if (mount?.fiber) await Promise.resolve().then(() => mount.fiber.dispose()).catch(() => {})
}
+ const mountOne = async (agent, bot, agentMounts, name) => {
+ const sessionId = agent.session.id
+ const item = library()[name]
+ const drop = async () => {
+ await disposeMount(agentMounts.get(name))
+ agentMounts.delete(name)
+ }
+ if (item.kind === 'mcp' && item.transport === 'stdio' && item.approved !== true) {
+ await drop()
+ statusSet(bot.id, name, sessionId, { state: 'needs-approval' })
+ return
+ }
+ let config
+ try {
+ config = configFor(item, bot.id)
+ } catch (error) {
+ await drop()
+ statusSet(bot.id, name, sessionId, { state: 'error', error: rt.redactSecrets(error.message).slice(0, 300) })
+ return
+ }
+ const key = `${name}:${createHash('sha256').update(JSON.stringify(config)).digest('hex')}`
+ if (agentMounts.get(name)?.key === key) return
+ await drop()
+ statusSet(bot.id, name, sessionId, { state: 'connecting' })
+ try {
+ const plugin = item.kind === 'skill'
+ ? {
+ name: `ds-bot-capability-skill-${name}`,
+ inject: ['skills'],
+ apply(c) {
+ c.effect(() => c.skills.register({ name: config.name, description: config.description, source: 'runtime', content: config.content }))
+ },
+ }
+ : await loadMcpPlugin()
+ if (stopped) return
+ const fiber = item.kind === 'skill' ? agent.ctx.plugin(plugin) : agent.ctx.plugin(plugin, config)
+ agentMounts.set(name, { key, fiber })
+ await fiber.await()
+ if (stopped || agents.get(sessionId)?.deref() !== agent) return
+ statusSet(bot.id, name, sessionId, { state: 'ready' })
+ } catch (error) {
+ await drop()
+ const message = rt.redactSecrets([error, error?.cause].filter(Boolean).map(part => String(part?.message ?? part)).join(': ') || 'Connection failed').slice(0, 300)
+ statusSet(bot.id, name, sessionId, { state: 'error', error: message })
+ }
+ }
const reconcileAgent = async (agent, bot) => {
const sessionId = agent.session.id
+ const desired = bot ? expandCapabilityNames(bot.capabilities, library()) : new Set()
const agentMounts = mounts.get(agent) ?? new Map()
- mounts.set(agent, agentMounts)
- const desired = expandCapabilityNames(bot.capabilities, library())
- for (const name of sessionStatuses.get(bot.id)?.keys() ?? []) {
- if (!desired.has(name)) clearStatus(bot.id, name, sessionId)
+ if (desired.size > 0) mounts.set(agent, agentMounts)
+ if (bot) {
+ for (const name of sessionStatuses.get(bot.id)?.keys() ?? []) {
+ if (!desired.has(name)) clearStatus(bot.id, name, sessionId)
+ }
+ } else {
+ clearSession(sessionId)
}
for (const [name, mount] of agentMounts) {
if (desired.has(name)) continue
await disposeMount(mount)
agentMounts.delete(name)
}
- for (const name of desired) {
- const item = library()[name]
- if (item.kind === 'mcp' && item.transport === 'stdio' && item.approved !== true) {
- await disposeMount(agentMounts.get(name))
- agentMounts.delete(name)
- statusSet(bot.id, name, sessionId, { state: 'needs-approval' })
- continue
- }
- let config
- try {
- config = configFor(item, bot.id)
- } catch (error) {
- await disposeMount(agentMounts.get(name))
- agentMounts.delete(name)
- statusSet(bot.id, name, sessionId, { state: 'error', error: rt.redactSecrets(error.message).slice(0, 300) })
- continue
- }
- const key = `${name}:${createHash('sha256').update(JSON.stringify(config)).digest('hex')}`
- const current = agentMounts.get(name)
- if (current?.key === key) continue
- await disposeMount(current)
- statusSet(bot.id, name, sessionId, { state: 'connecting' })
- try {
- const fiber = item.kind === 'skill'
- ? agent.ctx.plugin({
- name: `ds-bot-capability-skill-${name}`,
- inject: ['skills'],
- apply(c) {
- c.effect(() => c.skills.register({ name: config.name, description: config.description, source: 'runtime', content: config.content }))
- },
- })
- : agent.ctx.plugin(await loadMcpPlugin(), config)
- agentMounts.set(name, { key, fiber })
- await fiber.await()
- if (agents.get(sessionId)?.deref() !== agent) continue
- statusSet(bot.id, name, sessionId, { state: 'ready' })
- } catch (error) {
- await disposeMount(agentMounts.get(name))
- agentMounts.delete(name)
- const message = rt.redactSecrets([error, error?.cause].filter(Boolean).map(part => String(part?.message ?? part)).join(': ') || 'Connection failed').slice(0, 300)
- statusSet(bot.id, name, sessionId, { state: 'error', error: message })
- }
- }
+ await Promise.all([...desired].map(name => mountOne(agent, bot, agentMounts, name)))
+ if (agentMounts.size === 0 && mounts.get(agent) === agentMounts) mounts.delete(agent)
}
- async function reconcile() {
+ const botOfSession = sessionId => (rt.isBotSession(sessionId) ? rt.botOf(rt.selfOf(sessionId)) : undefined)
+ // At most one run waits behind the running one; it reads the latest state when it starts.
+ const reconcileOne = agent => {
+ if (queued.has(agent)) return chains.get(agent)
+ queued.add(agent)
+ const run = (chains.get(agent) ?? Promise.resolve()).then(async () => {
+ queued.delete(agent)
+ const sessionId = agent.session.id
+ if (stopped || agents.get(sessionId)?.deref() !== agent) return
+ await reconcileAgent(agent, botOfSession(sessionId))
+ }).catch(error => rt.warn('ds-bot: capability reconcile for %s failed: %s', agent.session?.id, error))
+ chains.set(agent, run)
+ return run
+ }
+ const loadInputs = async () => {
await rt.load()
- loadingSecrets = true
+ loadingSecrets += 1
try {
await rt.loadSecrets()
} finally {
- loadingSecrets = false
+ loadingSecrets -= 1
}
+ }
+ async function reconcile() {
+ if (stopped) return
+ await loadInputs()
+ const runs = []
for (const [sessionId, reference] of agents) {
const agent = reference.deref()
- if (!agent) {
- agents.delete(sessionId)
- clearSession(sessionId)
- continue
- }
- if (!rt.isBotSession(sessionId)) {
- clearSession(sessionId)
+ if (agent) {
+ runs.push(reconcileOne(agent))
continue
}
- const bot = rt.botOf(rt.selfOf(sessionId))
- if (!bot) {
- clearSession(sessionId)
- continue
- }
- try {
- await reconcileAgent(agent, bot)
- } catch (error) {
- rt.warn('ds-bot: capability reconcile for %s failed: %s', sessionId, error)
- }
+ agents.delete(sessionId)
+ clearSession(sessionId)
}
+ await Promise.all(runs)
}
const scheduleReconcile = () => {
if (!scheduled) {
scheduled = new Promise(resolve => queueMicrotask(() => {
- const current = queue = queue.then(reconcile).catch(error => rt.warn('ds-bot: capability reconcile failed: %s', error))
scheduled = null
- resolve(current)
+ resolve(reconcile().catch(error => rt.warn('ds-bot: capability reconcile failed: %s', error)))
}))
}
return scheduled
}
+ // A run that outlasts the limit goes on in the background, and later requests for the
+ // same Agent do not wait for it again.
+ const stalled = new WeakSet()
+ const prepare = async (agent, sessionId) => {
+ const run = loadInputs().then(() => reconcileOne(agent)).then(() => true, error => {
+ rt.warn('ds-bot: capability mount for %s failed: %s', sessionId, error)
+ return true
+ })
+ if (stalled.has(agent)) return
+ const timeoutMs = rt.capabilityEnsureTimeoutMs ?? ENSURE_TIMEOUT_MS
+ let timer
+ const completed = await Promise.race([run, new Promise(resolve => { timer = setTimeout(resolve, timeoutMs, false) })])
+ clearTimeout(timer)
+ if (completed) return
+ stalled.add(agent)
+ void run.then(() => stalled.delete(agent))
+ rt.warn('ds-bot: capability mount for %s did not finish within %dms; continuing', sessionId, timeoutMs)
+ }
async function ensureCapabilities(sessionId) {
await rt.load()
- if (!rt.isBotSession(sessionId)) return
- const bot = rt.botOf(rt.selfOf(sessionId))
- if (!bot || (bot.capabilities ?? []).length === 0) return
+ const bot = botOfSession(sessionId)
+ if (!bot) return
+ if ((bot.capabilities ?? []).length === 0 && !mounts.get(agents.get(sessionId)?.deref())?.size) return
+ let agent
try {
- trackAgent(await rt.resolveAgent(sessionId))
+ agent = await rt.resolveAgent(sessionId)
} catch (error) {
rt.warn('ds-bot: capability Agent for %s could not be resolved: %s', sessionId, rt.redactSecrets(String(error)))
return
}
- const timeoutMs = rt.capabilityEnsureTimeoutMs ?? ENSURE_TIMEOUT_MS
- let timer
- const completed = await Promise.race([
- scheduleReconcile().then(() => true),
- new Promise(resolve => { timer = setTimeout(() => resolve(false), timeoutMs) }),
- ])
- clearTimeout(timer)
- if (!completed) rt.warn('ds-bot: capability mount for %s did not finish within %dms; continuing', sessionId, timeoutMs)
+ trackAgent(agent)
+ await prepare(agent, sessionId)
}
const trackAgent = agent => {
const sessionId = agent?.session?.id
@@ -418,36 +461,34 @@ export function install(rt) {
await rt.save()
return item
}
- if (endpoint === 'bot-capabilities') {
+ if (endpoint === 'bot-capability') {
await rt.load()
writeCheck()
const bot = rt.botOf(String(body.botId ?? ''))
if (!bot) throw new Error('Unknown Bot')
- if (!Array.isArray(body.capabilities) || body.capabilities.some(name => typeof name !== 'string' || !library()[name])) throw new Error('Choose saved capabilities.')
- const wasEmpty = (bot.capabilities ?? []).length === 0
- bot.capabilities = [...new Set(body.capabilities)]
- await rt.save()
- if (wasEmpty && bot.capabilities.length > 0) {
- await trackBotAgents(bot)
- void scheduleReconcile()
- }
- return bot.capabilities
+ const name = String(body.name ?? '')
+ if (!library()[name]) throw new Error(`No capability named ${name}.`)
+ return setAttached(bot, name, body.attached === true)
}
throw new Error('Unknown capability operation.')
}
const secretsChanged = rt.secretsChanged
rt.secretsChanged = () => {
secretsChanged?.()
- if (!loadingSecrets) void scheduleReconcile()
+ if (loadingSecrets === 0) void scheduleReconcile()
}
rt.capabilitiesStateSaved = () => { void scheduleReconcile() }
- ctx.on('agent/pre-step', async function ensureCapabilitiesBeforeStep({ agent }, next) {
- await ensureCapabilities(agent.session.id)
- return next()
- })
- ctx.on('agent/created', ({ agent }) => {
+ // Creation waits for these listeners, so a new Agent's first request already has its
+ // tools and skill catalog. agent/pre-step is too late: a step assembles its tools first.
+ ctx.on('agent/created', async function prepareCapabilities({ agent }) {
trackAgent(agent)
- void rt.load().then(scheduleReconcile).catch(error => rt.warn('ds-bot: capability load failed: %s', error))
+ try {
+ await rt.load()
+ const bot = botOfSession(agent.session.id)
+ if ((bot?.capabilities ?? []).length > 0) await prepare(agent, agent.session.id)
+ } catch (error) {
+ rt.warn('ds-bot: capability load failed: %s', error)
+ }
})
ctx.effect(() => {
void rt.load().then(async () => {
@@ -456,7 +497,14 @@ export function install(rt) {
}
await scheduleReconcile()
}).catch(error => rt.warn('ds-bot: capability startup failed: %s', error))
- return () => { agents.clear() }
+ return async () => {
+ stopped = true
+ const live = [...mounts.values()]
+ mounts.clear()
+ agents.clear()
+ sessionStatuses.clear()
+ await Promise.all(live.flatMap(agentMounts => [...agentMounts.values()].map(disposeMount)))
+ }
}, 'ds-bot: capabilities')
Object.assign(rt, {
capabilitySave,
diff --git a/ds-bot/src/host/channel.js b/ds-bot/src/host/channel.js
index 251636a0..62b2b29a 100644
--- a/ds-bot/src/host/channel.js
+++ b/ds-bot/src/host/channel.js
@@ -229,7 +229,7 @@ export function install(rt) {
case 'capability-save':
case 'capability-delete':
case 'capability-approve':
- case 'bot-capabilities':
+ case 'bot-capability':
await rt.load()
return ok(await rt.capabilityEndpoint(endpoint, body))
case 'schedules':
diff --git a/ds-bot/test/capabilities.test.js b/ds-bot/test/capabilities.test.js
index 99c5d725..8ef5feb9 100644
--- a/ds-bot/test/capabilities.test.js
+++ b/ds-bot/test/capabilities.test.js
@@ -28,6 +28,7 @@ const team = () => ({
revision: 1,
})
const mcp = (name, command = 'node') => ({ name, kind: 'mcp', description: 'Echo service', transport: 'stdio', command, args: [], env: {} })
+const created = env => env.ctx.listeners.get('agent/created').find(listener => listener.name === 'prepareCapabilities')
function testAgent(id, mounts, skillsBySession, { awaitMount = async () => {} } = {}) {
const disposers = []
@@ -215,13 +216,48 @@ test('startup and empty-to-nonempty attachments track existing Bot Agents', asyn
assert.deepEqual(env.mounts.map(mount => mount.sessionId), ['chief', 'room-chief'])
await env.rt.changeCapabilityAttachment('attach', { name: 'echo' }, 'worker')
- await env.rt.capabilityEndpoint('bot-capabilities', { botId: 'helper', capabilities: ['echo'] })
+ await env.rt.capabilityEndpoint('bot-capability', { botId: 'helper', name: 'echo', attached: true })
await env.rt.scheduleCapabilitiesReconcile()
assert.deepEqual(resolved, ['chief', 'room-chief', 'worker', 'helper'])
assert.deepEqual(env.mounts.filter(mount => !mount.disposed).map(mount => mount.sessionId), ['chief', 'room-chief', 'worker', 'helper'])
})
-test('a Bot turn waits for a slow capability mount before its first model step', async t => {
+test('one-item attach changes keep the other attachments', async t => {
+ const env = await setup()
+ t.after(() => env.dispose())
+ const { rt } = env
+ await rt.capabilitySave(mcp('echo'), { ui: true })
+ await rt.capabilitySave({ name: 'guide', kind: 'skill', description: 'Guide', content: 'Do the work.' }, { ui: true })
+ await Promise.all([
+ rt.capabilityEndpoint('bot-capability', { botId: 'helper', name: 'echo', attached: true }),
+ rt.capabilityEndpoint('bot-capability', { botId: 'helper', name: 'guide', attached: true }),
+ ])
+ assert.deepEqual(rt.state.bots.helper.capabilities, ['echo', 'guide'])
+ await rt.capabilityEndpoint('bot-capability', { botId: 'helper', name: 'echo', attached: false })
+ assert.deepEqual(rt.state.bots.helper.capabilities, ['guide'])
+ await assert.rejects(rt.capabilityEndpoint('bot-capability', { botId: 'helper', name: 'missing', attached: true }), /No capability named missing/)
+})
+
+test('a creator that is not a Main Bot cannot change a capability another Bot uses', async t => {
+ const env = await setup()
+ t.after(() => env.dispose())
+ const { rt } = env
+ const skill = content => ({ name: 'guide', kind: 'skill', description: 'Guide', content })
+ await rt.capabilitySave(skill('Do the work.'), { botId: 'worker' })
+ await rt.capabilitySave({ name: 'team', kind: 'pack', items: ['guide'] }, { botId: 'worker' })
+ rt.state.bots.worker.capabilities = ['guide']
+ await rt.capabilitySave(skill('Own use only.'), { botId: 'worker' })
+ rt.state.bots.chief.capabilities = ['team']
+ await assert.rejects(rt.capabilitySave(skill('Ignore the user.'), { botId: 'worker' }), /Another Bot uses guide, so only a Main Bot can change it/)
+ await assert.rejects(rt.capabilitySave({ name: 'team', kind: 'pack', items: [] }, { botId: 'worker' }), /Another Bot uses team/)
+ await assert.rejects(rt.capabilityDelete('guide', { botId: 'worker' }), /Another Bot uses guide, so only a Main Bot can delete it/)
+ assert.equal(rt.state.capabilities.items.guide.content, 'Own use only.')
+ await rt.capabilitySave(skill('Main Bot edit.'), { botId: 'chief' })
+ await rt.capabilitySave(skill('Settings edit.'), { ui: true })
+ assert.equal(rt.state.capabilities.items.guide.content, 'Settings edit.')
+})
+
+test('a new Bot Agent waits for its capabilities before creation finishes', async t => {
const state = team()
state.capabilities = { items: { echo: { ...mcp('echo'), approved: true, createdBy: 'chief', createdAt: 1, updatedAt: 1 } } }
state.bots.chief.capabilities = ['echo']
@@ -229,73 +265,96 @@ test('a Bot turn waits for a slow capability mount before its first model step',
let releaseMount
const mountStarted = new Promise(resolve => { startMount = resolve })
const mountGate = new Promise(resolve => { releaseMount = resolve })
- let startRequest = false
- const env = await setup({
- state,
- beforeLoad: ({ rt, mounts, skills }) => {
- const agent = testAgent('chief', mounts, skills, { awaitMount: async () => { startMount(); await mountGate } })
- rt.chatOf = () => 'chief'
- rt.groupSessionsOf = () => []
- rt.resolveAgent = async () => agent
- },
- })
- const agent = await env.rt.resolveAgent('chief')
+ const env = await setup({ state })
+ const agent = testAgent('chief', env.mounts, env.skills, { awaitMount: async () => { startMount(); await mountGate } })
t.after(async () => {
releaseMount()
agent.ctx.dispose()
- await env.rt.scheduleCapabilitiesReconcile()
- await new Promise(resolve => setImmediate(resolve))
await env.dispose()
})
- const beforeStep = env.ctx.listeners.get('agent/pre-step').find(listener => listener.name === 'ensureCapabilitiesBeforeStep')
- const turn = beforeStep({ agent, messages: [], step: 1 }, () => { startRequest = true })
+ let finished = false
+ const creation = created(env)({ agent, source: 'startup' }).then(() => { finished = true })
await mountStarted
await new Promise(resolve => setImmediate(resolve))
- assert.equal(startRequest, false)
+ assert.equal(finished, false)
releaseMount()
- await turn
- assert.equal(startRequest, true)
+ await creation
assert.equal(env.rt.capabilityStatusesView().chief.echo.state, 'ready')
})
-test('a hung capability mount releases the Bot turn after its readiness timeout', async t => {
+test('a hung mount releases the message after the limit and does not hold up other Bots', async t => {
const state = team()
- state.capabilities = { items: { echo: { ...mcp('echo'), approved: true, createdBy: 'chief', createdAt: 1, updatedAt: 1 } } }
- state.bots.chief.capabilities = ['echo']
+ state.capabilities = {
+ items: {
+ slow: { ...mcp('slow'), approved: true, createdBy: 'chief', createdAt: 1, updatedAt: 1 },
+ echo: { ...mcp('echo'), approved: true, createdBy: 'chief', createdAt: 1, updatedAt: 1 },
+ },
+ }
+ state.bots.chief.capabilities = ['slow', 'echo']
+ state.bots.worker.capabilities = ['echo']
const warnings = []
let startMount
let releaseMount
const mountStarted = new Promise(resolve => { startMount = resolve })
const mountGate = new Promise(resolve => { releaseMount = resolve })
- let startRequest = false
+ const hang = async record => {
+ if (record.config.serverName !== 'slow') return
+ startMount()
+ await mountGate
+ }
const env = await setup({
state,
- beforeLoad: ({ ctx, rt, mounts, skills }) => {
+ beforeLoad: ({ ctx, rt }) => {
ctx.logger.warn = (...args) => warnings.push(args.join(' '))
- const agent = testAgent('chief', mounts, skills, { awaitMount: async () => { startMount(); await mountGate } })
- rt.chatOf = () => 'chief'
- rt.groupSessionsOf = () => []
- rt.resolveAgent = async () => agent
- rt.capabilityEnsureTimeoutMs = 10
+ rt.capabilityEnsureTimeoutMs = 20
},
})
- const agent = await env.rt.resolveAgent('chief')
+ const chief = testAgent('chief', env.mounts, env.skills, { awaitMount: hang })
+ const worker = testAgent('worker', env.mounts, env.skills, { awaitMount: hang })
+ env.rt.resolveAgent = async sessionId => ({ chief, worker })[sessionId]
t.after(async () => {
releaseMount()
- agent.ctx.dispose()
- await env.rt.scheduleCapabilitiesReconcile()
- await new Promise(resolve => setImmediate(resolve))
+ chief.ctx.dispose()
+ worker.ctx.dispose()
await env.dispose()
})
- const beforeStep = env.ctx.listeners.get('agent/pre-step').find(listener => listener.name === 'ensureCapabilitiesBeforeStep')
- const turn = beforeStep({ agent, messages: [], step: 1 }, () => { startRequest = true })
+ const timeouts = name => warnings.filter(line => line.includes(`capability mount for ${name} did not finish within 20ms; continuing`)).length
+ await env.rt.ensureCapabilities('chief')
await mountStarted
- await turn
- assert.equal(startRequest, true)
- assert.equal(env.rt.capabilityStatusesView().chief.echo.state, 'connecting')
- assert.match(warnings.join('\n'), /capability mount for chief did not finish within 10ms; continuing/)
+ assert.equal(timeouts('chief'), 1)
+ assert.equal(env.rt.capabilityStatusesView().chief.slow.state, 'connecting')
+ assert.equal(env.rt.capabilityStatusesView().chief.echo.state, 'ready')
+ await env.rt.ensureCapabilities('chief')
+ await env.rt.ensureCapabilities('worker')
+ assert.equal(timeouts('chief'), 1)
+ assert.equal(timeouts('worker'), 0)
+ assert.equal(env.rt.capabilityStatusesView().worker.echo.state, 'ready')
releaseMount()
await env.rt.scheduleCapabilitiesReconcile()
+ assert.equal(env.rt.capabilityStatusesView().chief.slow.state, 'ready')
+})
+
+test('unloading the plugin disposes every capability mount', async t => {
+ const state = team()
+ state.capabilities = {
+ items: {
+ echo: { ...mcp('echo'), approved: true, createdBy: 'chief', createdAt: 1, updatedAt: 1 },
+ guide: { name: 'guide', kind: 'skill', description: 'Guide', content: 'Do the work.', createdBy: 'chief', createdAt: 1, updatedAt: 1 },
+ },
+ }
+ state.bots.chief.capabilities = ['echo', 'guide']
+ const env = await setup({ state })
+ t.after(() => env.dispose())
+ const chief = testAgent('chief', env.mounts, env.skills)
+ await created(env)({ agent: chief, source: 'startup' })
+ assert.equal(env.mounts.length, 2)
+ assert.equal(env.skills.get('chief').has('guide'), true)
+ env.ctx.dispose()
+ await new Promise(resolve => setImmediate(resolve))
+ assert.deepEqual(env.mounts.map(mount => mount.disposed), [true, true])
+ assert.equal(env.skills.get('chief').has('guide'), false)
+ await env.rt.scheduleCapabilitiesReconcile()
+ assert.equal(env.mounts.length, 2)
})
test('unset capability statuses are omitted from the view and tool listing', async t => {
@@ -333,7 +392,7 @@ test('mounts agent-only MCP and skills, remounts changed config, resolves scoped
for (const agent of [chief, room, worker, dsh]) ctx.emit('agent/created', { agent })
await rt.scheduleCapabilitiesReconcile()
assert.equal(mounts.filter(mount => mount.plugin === mcpPlugin).length, 2)
- assert.equal(mounts.find(mount => mount.config.serverName === 'echo').config.headers.Authorization, 'Bearer fake-secret-value')
+ assert.equal(mounts.find(mount => mount.config?.serverName === 'echo').config.headers.Authorization, 'Bearer fake-secret-value')
assert.equal(skills.get('chief').has('guide'), true)
assert.deepEqual(mounts.filter(mount => mount.plugin === mcpPlugin).map(mount => mount.sessionId), ['chief', 'room-chief'])
assert.equal(JSON.stringify(rt.state.capabilities).includes('fake-secret-value'), false)
@@ -345,7 +404,7 @@ test('mounts agent-only MCP and skills, remounts changed config, resolves scoped
await rt.capabilityEndpoint('capability-approve', { name: 'blocked' })
await rt.scheduleCapabilitiesReconcile()
assert.equal(mounts.some(mount => mount.config?.serverName === 'blocked' && mount.sessionId === 'worker'), true)
- const first = mounts.find(mount => mount.config.serverName === 'echo')
+ const first = mounts.find(mount => mount.config?.serverName === 'echo')
const firstSkill = mounts.find(mount => mount.sessionId === 'chief' && mount.plugin.inject?.includes('skills'))
await rt.capabilitySave({ ...mcp('echo'), transport: 'streamable-http', url: 'https://example.test/mcp', headers: { Authorization: 'Bearer changed' } }, { botId: 'chief' })
await rt.capabilitySave({ name: 'guide', kind: 'skill', description: 'How to work', content: 'Changed capability marker.' }, { botId: 'chief' })
diff --git a/ds-bot/test/install.test.js b/ds-bot/test/install.test.js
index 800aba55..247f0ede 100644
--- a/ds-bot/test/install.test.js
+++ b/ds-bot/test/install.test.js
@@ -86,7 +86,6 @@ test('apply registers listeners, tools, and effects in a fixed order', (t) => {
'on llm/stream',
'effect ds-bot: load secrets',
'effect ds-bot: connectors',
- 'on agent/pre-step',
'on agent/created',
'effect ds-bot: capabilities',
'effect ds-bot: usage ledger',