fix(team): avoid stale launch join mismatches
This commit is contained in:
parent
d3baf501f6
commit
2b96adda33
4 changed files with 99 additions and 7 deletions
|
|
@ -385,6 +385,7 @@ function mapOpenCodeLaunchDataToRuntimeResult(
|
||||||
fallbackLaunchState,
|
fallbackLaunchState,
|
||||||
bridgeMember?.sessionId,
|
bridgeMember?.sessionId,
|
||||||
bridgeMember?.runtimePid,
|
bridgeMember?.runtimePid,
|
||||||
|
bridgeMember != null,
|
||||||
[
|
[
|
||||||
...(bridgeMember
|
...(bridgeMember
|
||||||
? []
|
? []
|
||||||
|
|
@ -425,11 +426,13 @@ function mapBridgeMemberToRuntimeEvidence(
|
||||||
launchState: OpenCodeTeamMemberLaunchBridgeState,
|
launchState: OpenCodeTeamMemberLaunchBridgeState,
|
||||||
sessionId: string | undefined,
|
sessionId: string | undefined,
|
||||||
runtimePid: number | undefined,
|
runtimePid: number | undefined,
|
||||||
|
runtimeMaterialized: boolean,
|
||||||
diagnostics: string[]
|
diagnostics: string[]
|
||||||
): TeamRuntimeMemberLaunchEvidence {
|
): TeamRuntimeMemberLaunchEvidence {
|
||||||
const confirmed = launchState === 'confirmed_alive';
|
const confirmed = launchState === 'confirmed_alive';
|
||||||
const createdOrBlocked = launchState === 'created' || launchState === 'permission_blocked';
|
const createdOrBlocked = launchState === 'created' || launchState === 'permission_blocked';
|
||||||
const failed = launchState === 'failed';
|
const failed = launchState === 'failed';
|
||||||
|
const pendingRuntimeObserved = createdOrBlocked && runtimeMaterialized;
|
||||||
return {
|
return {
|
||||||
memberName,
|
memberName,
|
||||||
providerId: 'opencode',
|
providerId: 'opencode',
|
||||||
|
|
@ -438,8 +441,8 @@ function mapBridgeMemberToRuntimeEvidence(
|
||||||
: confirmed
|
: confirmed
|
||||||
? 'confirmed_alive'
|
? 'confirmed_alive'
|
||||||
: 'runtime_pending_bootstrap',
|
: 'runtime_pending_bootstrap',
|
||||||
agentToolAccepted: confirmed || createdOrBlocked,
|
agentToolAccepted: confirmed || pendingRuntimeObserved,
|
||||||
runtimeAlive: confirmed || createdOrBlocked,
|
runtimeAlive: confirmed || pendingRuntimeObserved,
|
||||||
bootstrapConfirmed: confirmed,
|
bootstrapConfirmed: confirmed,
|
||||||
hardFailure: failed,
|
hardFailure: failed,
|
||||||
hardFailureReason: failed ? 'OpenCode bridge reported member launch failure' : undefined,
|
hardFailureReason: failed ? 'OpenCode bridge reported member launch failure' : undefined,
|
||||||
|
|
|
||||||
|
|
@ -106,13 +106,19 @@ export function getLaunchJoinMilestonesFromMembers({
|
||||||
memberSpawnSnapshot?: Pick<MemberSpawnStatusesSnapshot, 'expectedMembers' | 'summary'>;
|
memberSpawnSnapshot?: Pick<MemberSpawnStatusesSnapshot, 'expectedMembers' | 'summary'>;
|
||||||
}): LaunchJoinMilestones {
|
}): LaunchJoinMilestones {
|
||||||
const teammates = members.filter((member) => !member.removedAt && !isLeadMember(member));
|
const teammates = members.filter((member) => !member.removedAt && !isLeadMember(member));
|
||||||
const activeTeammateNames = new Set(teammates.map((member) => member.name));
|
const activeTeammateNames = teammates.map((member) => member.name);
|
||||||
|
const activeTeammateNameSet = new Set(activeTeammateNames);
|
||||||
const teammateNames =
|
const teammateNames =
|
||||||
memberSpawnSnapshot?.expectedMembers?.length && memberSpawnSnapshot.expectedMembers.length > 0
|
memberSpawnSnapshot?.expectedMembers?.length && memberSpawnSnapshot.expectedMembers.length > 0
|
||||||
? memberSpawnSnapshot.expectedMembers.filter((memberName) =>
|
? Array.from(
|
||||||
activeTeammateNames.has(memberName)
|
new Set([
|
||||||
|
...memberSpawnSnapshot.expectedMembers.filter((memberName) =>
|
||||||
|
activeTeammateNameSet.has(memberName)
|
||||||
|
),
|
||||||
|
...activeTeammateNames,
|
||||||
|
])
|
||||||
)
|
)
|
||||||
: teammates.map((member) => member.name);
|
: activeTeammateNames;
|
||||||
const expectedTeammateCount = teammateNames.length;
|
const expectedTeammateCount = teammateNames.length;
|
||||||
const snapshotSummary = memberSpawnSnapshot?.summary;
|
const snapshotSummary = memberSpawnSnapshot?.summary;
|
||||||
const liveSummary = summarizeLiveLaunchJoinMilestones({
|
const liveSummary = summarizeLiveLaunchJoinMilestones({
|
||||||
|
|
@ -145,6 +151,8 @@ export function getLaunchJoinMilestonesFromMembers({
|
||||||
liveSummary.failedSpawnCount > snapshotMilestones.failedSpawnCount ||
|
liveSummary.failedSpawnCount > snapshotMilestones.failedSpawnCount ||
|
||||||
liveSummary.heartbeatConfirmedCount > snapshotMilestones.heartbeatConfirmedCount ||
|
liveSummary.heartbeatConfirmedCount > snapshotMilestones.heartbeatConfirmedCount ||
|
||||||
liveSummary.processOnlyAliveCount > snapshotMilestones.processOnlyAliveCount ||
|
liveSummary.processOnlyAliveCount > snapshotMilestones.processOnlyAliveCount ||
|
||||||
|
(snapshotMilestones.failedSpawnCount === 0 &&
|
||||||
|
liveSummary.pendingSpawnCount > snapshotMilestones.pendingSpawnCount) ||
|
||||||
liveAccountedFor > snapshotAccountedFor;
|
liveAccountedFor > snapshotAccountedFor;
|
||||||
|
|
||||||
return liveSummaryIsMoreAdvanced
|
return liveSummaryIsMoreAdvanced
|
||||||
|
|
|
||||||
|
|
@ -209,7 +209,8 @@ describe('OpenCodeTeamRuntimeAdapter', () => {
|
||||||
expect(result.members.bob).toMatchObject({
|
expect(result.members.bob).toMatchObject({
|
||||||
providerId: 'opencode',
|
providerId: 'opencode',
|
||||||
launchState: 'runtime_pending_bootstrap',
|
launchState: 'runtime_pending_bootstrap',
|
||||||
runtimeAlive: true,
|
runtimeAlive: false,
|
||||||
|
agentToolAccepted: false,
|
||||||
bootstrapConfirmed: false,
|
bootstrapConfirmed: false,
|
||||||
hardFailure: false,
|
hardFailure: false,
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -456,4 +456,84 @@ describe('buildTeamProvisioningPresentation', () => {
|
||||||
expect(presentation?.panelMessage).toBeNull();
|
expect(presentation?.panelMessage).toBeNull();
|
||||||
expect(presentation?.currentStepIndex).toBe(4);
|
expect(presentation?.currentStepIndex).toBe(4);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('keeps active teammates that are missing from persisted expectedMembers', () => {
|
||||||
|
const presentation = buildTeamProvisioningPresentation({
|
||||||
|
progress: {
|
||||||
|
runId: 'run-7',
|
||||||
|
teamName: 'codex-team',
|
||||||
|
state: 'ready',
|
||||||
|
startedAt: '2026-04-13T10:00:00.000Z',
|
||||||
|
updatedAt: '2026-04-13T10:00:08.000Z',
|
||||||
|
message: 'Launch completed',
|
||||||
|
messageSeverity: undefined,
|
||||||
|
pid: 4321,
|
||||||
|
cliLogsTail: '',
|
||||||
|
assistantOutput: '',
|
||||||
|
},
|
||||||
|
members: [
|
||||||
|
{
|
||||||
|
name: 'team-lead',
|
||||||
|
agentType: 'team-lead',
|
||||||
|
status: 'active',
|
||||||
|
currentTaskId: null,
|
||||||
|
taskCount: 0,
|
||||||
|
lastActiveAt: null,
|
||||||
|
messageCount: 0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'alice',
|
||||||
|
agentType: 'reviewer',
|
||||||
|
status: 'active',
|
||||||
|
currentTaskId: null,
|
||||||
|
taskCount: 0,
|
||||||
|
lastActiveAt: null,
|
||||||
|
messageCount: 0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'bob',
|
||||||
|
agentType: 'developer',
|
||||||
|
status: 'unknown',
|
||||||
|
currentTaskId: null,
|
||||||
|
taskCount: 0,
|
||||||
|
lastActiveAt: null,
|
||||||
|
messageCount: 0,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
memberSpawnStatuses: {
|
||||||
|
alice: {
|
||||||
|
status: 'online',
|
||||||
|
launchState: 'confirmed_alive',
|
||||||
|
updatedAt: '2026-04-13T10:00:07.000Z',
|
||||||
|
runtimeAlive: true,
|
||||||
|
bootstrapConfirmed: true,
|
||||||
|
hardFailure: false,
|
||||||
|
agentToolAccepted: true,
|
||||||
|
},
|
||||||
|
bob: {
|
||||||
|
status: 'waiting',
|
||||||
|
launchState: 'starting',
|
||||||
|
updatedAt: '2026-04-13T10:00:07.000Z',
|
||||||
|
runtimeAlive: false,
|
||||||
|
bootstrapConfirmed: false,
|
||||||
|
hardFailure: false,
|
||||||
|
agentToolAccepted: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
memberSpawnSnapshot: {
|
||||||
|
expectedMembers: ['alice'],
|
||||||
|
summary: {
|
||||||
|
confirmedCount: 1,
|
||||||
|
pendingCount: 0,
|
||||||
|
failedCount: 0,
|
||||||
|
runtimeAlivePendingCount: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(presentation?.compactTitle).toBe('Finishing launch');
|
||||||
|
expect(presentation?.compactDetail).toBe('1 teammate still joining');
|
||||||
|
expect(presentation?.panelMessage).toBe('1 teammate still joining');
|
||||||
|
expect(presentation?.currentStepIndex).toBe(2);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue