@nanmicoder/dsh-agent-teams 0.1.22 → 0.1.24-rc.1

package/lib/mailbox.js

@@ -1,6 +1,7 @@
 import { join } from 'node:path';
 import { acknowledgeMailbox, CAPTAIN_KEY, discardMailboxMessages, findTeamByCaptain, readMailbox, readUnreadMailbox, readTeam, sanitizeKey, withTeamLock } from "./state.js";
 import { sessionOwnEvents } from "./harness-compat.js";
+import { leadIdentityOfAsync, sessionLeadsTeamAsync } from "./lineage.js";
 const PREFIX = 'AgentTeams inbox receipt: ';
 export function isCurrentMail(team, message) {
     if (message.discardedAt !== undefined)
@@ -75,26 +76,35 @@ export function installMailboxAdmission(ctx, stateDir) {
         }));
         const redundantSettlements = new Set();
         if (successfulSettlements.size > 0) {
-            const owned = await findTeamByCaptain(root, payload.agent.id);
-            if (owned !== undefined)
-                await withTeamLock(`team:${root}:${owned.id}`, async () => {
-                    const team = await readTeam(root, owned.id);
-                    if (team?.captainSessionId !== payload.agent.id || team.halted)
-                        return;
-                    const reports = await readMailbox(root, team.id, CAPTAIN_KEY);
-                    for (const member of team.members) {
-                        if (!successfulSettlements.has(member.id) || member.status === 'removed' || member.stopping)
-                            continue;
-                        const tasks = team.tasks.filter(task => task.assignee === member.name);
-                        if (tasks.some(task => task.status === 'claimed' || task.status === 'in_progress'))
-                            continue;
-                        const latest = tasks.filter(task => (task.attempt ?? 0) > 0 || task.status === 'completed').sort((a, b) => b.updatedAt - a.updatedAt)[0];
-                        if (latest?.status === 'completed' && reports.some(report => report.from === member.name && report.ts >= latest.updatedAt
-                            && report.discardedAt === undefined && (report.deliveredAt !== undefined || report.readAt !== undefined))) {
-                            redundantSettlements.add(member.id);
+            // Narrow containment: only AgentTeams state reads degrade silently.
+            try {
+                const owned = await findTeamByCaptain(root, payload.agent.id, await leadIdentityOfAsync(ctx, payload.agent.session));
+                if (owned !== undefined)
+                    await withTeamLock(`team:${root}:${owned.id}`, async () => {
+                        const team = await readTeam(root, owned.id);
+                        if (team === undefined || !(await sessionLeadsTeamAsync(ctx, team, payload.agent.id)) || team.halted)
+                            return;
+                        const reports = await readMailbox(root, team.id, CAPTAIN_KEY);
+                        for (const member of team.members) {
+                            if (!successfulSettlements.has(member.id) || member.status === 'removed' || member.stopping)
+                                continue;
+                            const tasks = team.tasks.filter(task => task.assignee === member.name);
+                            if (tasks.some(task => task.status === 'claimed' || task.status === 'in_progress'))
+                                continue;
+                            const latest = tasks.filter(task => (task.attempt ?? 0) > 0 || task.status === 'completed').sort((a, b) => b.updatedAt - a.updatedAt)[0];
+                            if (latest?.status === 'completed' && reports.some(report => report.from === member.name && report.ts >= latest.updatedAt
+                                && report.discardedAt === undefined && (report.deliveredAt !== undefined || report.readAt !== undefined))) {
+                                redundantSettlements.add(member.id);
+                            }
                         }
-                    }
-                });
+                    });
+            }
+            catch (error) {
+                // A corrupt AgentTeams state file (e.g. an invalid team.json) must never
+                // hold the host's step admission hostage: degrade to plain admission.
+                ctx.logger?.warn(`agent-teams: mailbox admission degraded to plain pass-through for agent ${payload.agent.id}: could not read team state under ${root} (a team.json may be corrupt or unreadable): ${String(error)}`);
+                return decision;
+            }
         }
         const batches = new Map();
         const inputs = decision.messages.map(input => {
@@ -116,27 +126,42 @@ export function installMailboxAdmission(ctx, stateDir) {
         // One read/acknowledgement per recipient per step, even for a large burst.
         for (const batch of batches.values()) {
             const { receipt } = batch;
-            await withTeamLock(`team:${root}:${receipt.teamId}`, async () => {
-                const team = await readTeam(root, receipt.teamId);
-                if (team === undefined)
-                    return;
-                const recipientId = receipt.recipient === CAPTAIN_KEY ? team.captainSessionId
-                    : team.members.find(member => member.name === receipt.recipient && member.status !== 'removed' && member.stopping !== true)?.id;
-                if (recipientId !== payload.agent.id)
-                    return;
-                const selected = (await readMailbox(root, team.id, receipt.recipient)).filter(message => batch.ids.has(message.id));
-                const current = selected.filter(message => message.readAt === undefined && isCurrentMail(team, message));
-                await discardMailboxMessages(root, team.id, receipt.recipient, selected.filter(message => !isCurrentMail(team, message)).map(message => message.id));
-                await acknowledgeMailbox(root, team.id, receipt.recipient, current.map(message => message.id));
-                batch.current = new Map(current.map(message => [message.id, message]));
-            });
+            try {
+                await withTeamLock(`team:${root}:${receipt.teamId}`, async () => {
+                    const team = await readTeam(root, receipt.teamId);
+                    if (team === undefined)
+                        return;
+                    // Captain mail is admitted for any lead session of the team: after a
+                    // fork the human reads it in the fork while members still address the
+                    // recorded captain. Acknowledging marks it read for both.
+                    const isCaptainRecipient = receipt.recipient === CAPTAIN_KEY
+                        && await sessionLeadsTeamAsync(ctx, team, payload.agent.id);
+                    const recipientId = receipt.recipient === CAPTAIN_KEY ? team.captainSessionId
+                        : team.members.find(member => member.name === receipt.recipient && member.status !== 'removed' && member.stopping !== true)?.id;
+                    if (!isCaptainRecipient && recipientId !== payload.agent.id)
+                        return;
+                    const selected = (await readMailbox(root, team.id, receipt.recipient)).filter(message => batch.ids.has(message.id));
+                    const current = selected.filter(message => message.readAt === undefined && isCurrentMail(team, message));
+                    await discardMailboxMessages(root, team.id, receipt.recipient, selected.filter(message => !isCurrentMail(team, message)).map(message => message.id));
+                    await acknowledgeMailbox(root, team.id, receipt.recipient, current.map(message => message.id));
+                    batch.current = new Map(current.map(message => [message.id, message]));
+                });
+            }
+            catch (error) {
+                // Narrow containment, per team: the messages of this batch are not
+                // acked (the teamId/recipient above identify the unread mail), but the
+                // receipt inputs still pass through untouched instead of holding the
+                // host's step admission hostage.
+                batch.failed = true;
+                ctx.logger?.warn(`agent-teams: mailbox admission degraded to plain pass-through for agent ${payload.agent.id}: could not read team "${receipt.teamId}" (state under ${root} may be corrupt or unreadable, recipient ${receipt.recipient} mail left unacked): ${String(error)}`);
+            }
         }
         const admitted = [];
         for (const { input, receipt, batch } of inputs) {
             if (input.source?.kind === 'subagent-settled' && redundantSettlements.has(input.source.senderSessionId)
                 && input.source.summary === `Background subagent ${input.source.senderSessionId} finished and will do no further work unless you send it more.`)
                 continue;
-            if (receipt === undefined || batch === undefined) {
+            if (receipt === undefined || batch === undefined || batch.failed === true) {
                 admitted.push(input);
                 continue;
             }