A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.
Archive a Session made for a Bot that went away meanwhile
Fei2411ea452b23f161
diff --git a/ds-bot/src/host/groups.js b/ds-bot/src/host/groups.jsindex 9f636fd5..e77ae53b 100644--- a/ds-bot/src/host/groups.js+++ b/ds-bot/src/host/groups.js@@ -125,6 +125,15 @@ export function install(rt) {return { id: known, brief: undefined }}const id = await rt.createSession(`${member.name} · ${room.name}`, { dir: rt.workDirOf({ botId: member.id, roomId: room.id }) })+ // While the Session was made the member may have left or been deleted, the group been+ // deleted, or another turn made the member's Session first: the new one is not kept.+ // Undefined means the member is gone from the group.+ const gone = rt.roomOf(room.id) !== room || !room.members.includes(member.id) || rt.botOf(member.id) === undefined+ if (gone || room.sessions?.[member.id] !== undefined) {+ void ctx.workspaceRegistry.archiveSession(id, { stopActivity: true })+ .catch(error => rt.warn('ds-bot: unused group Session of %s in %s not archived: %s', member.name, room.name, error))+ return gone ? undefined : groupSessionFor(room, member)+ }room.sessions[member.id] = idrt.groupOwners.set(id, { botId: member.id, roomId: room.id })delete room.seen[member.id]@@ -354,6 +363,11 @@ export function install(rt) {round.replies.push({ kind: 'failed', botId: member.id, name: member.name, color: member.color, code: 'SESSION', text: String(error?.message ?? error).slice(0, 300), time: Date.now() })continue}+ if (session === undefined) {+ round.speaking = null+ slot.status = 'left'+ continue+ }const prompt = roomPrompt(room, member, round)round.shown?.push(member.id)const text = session.brief === undefined ? prompt : `${session.brief}\n\n${prompt}`diff --git a/ds-bot/src/host/parts.js b/ds-bot/src/host/parts.jsindex f20643eb..7476482c 100644--- a/ds-bot/src/host/parts.js+++ b/ds-bot/src/host/parts.js@@ -773,6 +773,15 @@ export function install(rt) {}await rt.applyPermission(bot, freshId, room).catch(error => rt.warn('ds-bot: permission for the fresh part of %s not applied: %s', bot.name, error))+ // The fresh part took several awaits: a Bot or group deleted meanwhile, a member that+ // left, or a part that is no longer the current one gets no fresh part.+ const current = room !== undefined ? room.sessions?.[bot.id] : rt.chatOf(bot.id)+ const gone = rt.botOf(bot.id) === undefined || (room !== undefined && (rt.roomOf(room.id) !== room || !room.members.includes(bot.id)))+ if (gone || current !== agent.id) {+ await ctx.workspaceRegistry.archiveSession(freshId, { stopActivity: true })+ .catch(error => rt.warn('ds-bot: unused fresh part of %s not archived: %s', bot.name, error))+ return+ }const segment = { sessionId: agent.id, endedAt: Date.now(), ...(tokens !== undefined ? { tokens } : {}), ...noted }if (room !== undefined) {room.segments ??= {}diff --git a/ds-bot/test/rounds.test.js b/ds-bot/test/rounds.test.jsindex 495826dc..8342899b 100644--- a/ds-bot/test/rounds.test.js+++ b/ds-bot/test/rounds.test.js@@ -347,3 +347,38 @@ test('a message sent between rounds still opens a full round', async (t) => {const result = JSON.parse(await running)assert.deepEqual(result.replies.map(reply => reply.name ?? 'User'), ['Chief', 'Writer'])})++// A member deleted while its group Session is made sits the round out; the Session it was+// getting belongs to no one, so it is archived instead of left over.+test('a member deleted while its group Session is made is left out, and the Session is not kept', async (t) => {+ const { call, emit, userMessage, relay, answer, stop, sent, ctx, rt } = start()+ t.after(stop)+ const room = await team(call, sent)+ const writer = rt.state.rooms[room.id].members.find(id => !rt.isMain(id))+ const archived = []+ ctx.workspaceRegistry.archiveSession = async (sessionId) => { archived.push(sessionId) }+ await emit(room.id, userMessage('Start'))+ const running = relay(room.id, 'relay')+ const first = await turnFor(sent)++ let release+ const gate = new Promise(resolve => { release = resolve })+ let made+ const making = new Promise(resolve => { made = resolve })+ const create = ctx.sessionController.create+ ctx.sessionController.create = async (options) => {+ const result = await create(options)+ made(result.sessionId)+ await gate+ return result+ }+ await answer(first.sessionId, first.message.source.exchangeId, 'Chief here.', 1)+ const sessionId = await making+ assert.equal((await call('delete-bot', { id: writer })).ok, true)+ release()++ const result = JSON.parse(await running)+ assert.deepEqual(result.replies.map(reply => [reply.kind ?? 'reply', reply.name]), [['reply', 'Chief']])+ assert.ok(archived.includes(sessionId))+ assert.equal(rt.state.rooms[room.id].sessions?.[writer], undefined)+})diff --git a/ds-bot/test/work-dir.test.js b/ds-bot/test/work-dir.test.jsindex 8cb98a1e..dcb54557 100644--- a/ds-bot/test/work-dir.test.js+++ b/ds-bot/test/work-dir.test.js@@ -443,3 +443,30 @@ test('a Bot the Main Bot creates runs on its creator\'s model unless one is nameassert.equal(await env.tool('create_bot', { name: 'Tester', role: 'Test', instructions: 'Test', model: 'official/pro' }, 'a'), 'Created Tester. It is greeting the user now.')assert.equal(made('Tester').model, 'official/pro')})++// A fresh part takes several awaits; a Bot deleted meanwhile must not leave it behind.+test('a Bot deleted while its chat moves to a new folder leaves no fresh part behind', async (t) => {+ const { ctx, call, agentOf, project, state, stop } = await start()+ t.after(stop)+ const archived = []+ ctx.workspaceRegistry.archiveSession = async (sessionId) => { archived.push(sessionId) }+ let release+ const gate = new Promise(resolve => { release = resolve })+ let made+ const making = new Promise(resolve => { made = resolve })+ const create = ctx.sessionController.create+ ctx.sessionController.create = async (options) => {+ const result = await create(options)+ made(result.sessionId)+ await gate+ return result+ }+ assert.equal((await call('update-bot', { id: 'b', workDir: project })).ok, true)+ const fresh = await making+ assert.equal((await call('delete-bot', { id: 'b' })).ok, true)+ release()+ await until(() => archived.includes(fresh))+ await settle()+ assert.equal(state().bots.b, undefined)+ assert.equal(handoffOf(agentOf(fresh)), undefined)+})