fix(team): keep removed roster authoritative on relaunch

Author: 777genius

src/main/services/team/provisioning/TeamProvisioningConfigFacade.ts

@@ -38,6 +38,7 @@ import type {
   TeamConfig,
   TeamCreateRequest,
   TeamLaunchRequest,
+  TeamMember,
   TeamProviderId,
 } from '@shared/types';
 
@@ -50,10 +51,15 @@ export interface TeamProvisioningConfigFacadeInboxReader {
   listInboxNames(teamName: string): Promise<string[]>;
 }
 
+export interface TeamProvisioningConfigFacadeMembersMetaStore
+  extends TeamProvisioningConfigMaintenanceMembersMetaStore {
+  getMeta(teamName: string): Promise<{ members: TeamMember[] } | null>;
+}
+
 export interface TeamProvisioningConfigFacadeOptions {
   configReader: TeamProvisioningConfigFacadeReader;
   inboxReader: TeamProvisioningConfigFacadeInboxReader;
-  membersMetaStore: TeamProvisioningConfigMaintenanceMembersMetaStore;
+  membersMetaStore: TeamProvisioningConfigFacadeMembersMetaStore;
   launchStateStore: {
     read(teamName: string): Promise<unknown>;
   };

src/main/services/team/provisioning/TeamProvisioningLaunchExpectedMembers.ts

@@ -22,7 +22,7 @@ export interface ResolveLaunchExpectedMembersInput {
 export interface TeamProvisioningLaunchExpectedMembersPorts {
   readLaunchState(teamName: string): Promise<unknown>;
   readBootstrapLaunchSnapshot(teamName: string): Promise<unknown>;
-  getMembers(teamName: string): Promise<TeamMember[]>;
+  getMeta(teamName: string): Promise<{ members: TeamMember[] } | null>;
   listInboxNames(teamName: string): Promise<string[]>;
   warn(message: string): void;
 }
@@ -54,13 +54,12 @@ export async function probeLaunchCompatibility(
   ]);
 
   try {
-    const metaMembers = await ports.getMembers(teamName);
-    const members = buildLaunchMembersFromMeta(metaMembers);
-    if (members.length > 0) {
+    const meta = await ports.getMeta(teamName);
+    if (meta) {
       return {
         level: 'ready',
         rosterSource: 'members-meta',
-        members,
+        members: buildLaunchMembersFromMeta(meta.members),
         warnings: [],
         blockers: [],
       };

src/main/services/team/provisioning/TeamProvisioningLaunchExpectedMembersPortsFactory.ts

@@ -7,7 +7,7 @@ export interface TeamProvisioningLaunchExpectedMembersPortsFactoryDeps {
   };
   readBootstrapLaunchSnapshot(teamName: string): Promise<unknown>;
   membersMetaStore: {
-    getMembers(teamName: string): Promise<TeamMember[]>;
+    getMeta(teamName: string): Promise<{ members: TeamMember[] } | null>;
   };
   inboxReader: {
     listInboxNames(teamName: string): Promise<string[]>;
@@ -23,7 +23,7 @@ export function createTeamProvisioningLaunchExpectedMembersPorts(
   return {
     readLaunchState: (teamName) => deps.launchStateStore.read(teamName),
     readBootstrapLaunchSnapshot: (teamName) => deps.readBootstrapLaunchSnapshot(teamName),
-    getMembers: (teamName) => deps.membersMetaStore.getMembers(teamName),
+    getMeta: (teamName) => deps.membersMetaStore.getMeta(teamName),
     listInboxNames: (teamName) => deps.inboxReader.listInboxNames(teamName),
     warn: (message) => deps.logger.warn(message),
   };

src/main/services/team/provisioning/TeamProvisioningServiceMemberLifecycleFacade.ts

@@ -15,7 +15,6 @@ import {
   createNodeAppendDirectProcessRuntimeEventUseCasePorts,
 } from './TeamProvisioningAppendDirectProcessRuntimeEventUseCase';
 import { type TeamProvisioningCompatibilityDelegation } from './TeamProvisioningCompatibilityFacade';
-import { buildLaunchMembersFromMeta } from './TeamProvisioningConfigMaterialization';
 import { type TeamProvisioningCreateDeterministicSpawnFlowBoundary } from './TeamProvisioningCreateDeterministicSpawnFlowPortsFactory';
 import { type ProvisioningEnvResolution } from './TeamProvisioningEnvBuilder';
 import { type TeamProvisioningIdlePromptInjectionBoundary } from './TeamProvisioningIdlePromptInjectionPortsFactory';
@@ -147,27 +146,6 @@ function preserveProvisioningRemovalTombstones(store: TeamMembersMetaStore): Tea
   });
 }
 
-function preserveAuthoritativeMembersMetaResolution(
-  facade: TeamProvisioningServiceComposition['configFacade'],
-  store: TeamMembersMetaStore
-): void {
-  const fallback = facade.resolveLaunchExpectedMembers.bind(facade);
-  facade.resolveLaunchExpectedMembers = async (teamName, configRaw, leadProviderId) => {
-    try {
-      const meta = await store.getMeta(teamName);
-      if (meta) {
-        return {
-          members: buildLaunchMembersFromMeta(meta.members),
-          source: 'members-meta',
-        };
-      }
-    } catch {
-      // The extracted resolver owns warning and fallback behavior for unreadable metadata.
-    }
-    return fallback(teamName, configRaw, leadProviderId);
-  };
-}
-
 /** Owns lifecycle host construction and launch-preparation adaptation. */
 export abstract class TeamProvisioningServiceMemberLifecycleFacade extends TeamProvisioningServiceRuntimeStateFacade {
   async runLiveRosterMutation(teamName: string, mutation: () => Promise<void>): Promise<void> {
@@ -392,7 +370,6 @@ export abstract class TeamProvisioningServiceMemberLifecycleFacade extends TeamP
     const membersMetaStore = preserveProvisioningRemovalTombstones(service.membersMetaStore);
     service.membersMetaStore = membersMetaStore;
     createTeamProvisioningServiceComposition(this);
-    preserveAuthoritativeMembersMetaResolution(this.configFacade, membersMetaStore);
     this.preserveAtomicOpenCodeRuntimePreparation();
     this.staleAnthropicApiKeyHelperCleanupRetryOwner.start();
   }

src/main/services/team/provisioning/__tests__/TeamProvisioningConfigFacade.test.ts

@@ -30,6 +30,7 @@ describe('TeamProvisioningConfigFacade', () => {
     const writeMembers = vi.fn(async () => undefined);
     const { facade } = createFacade({
       membersMetaStore: {
+        getMeta: vi.fn(async () => null),
         getMembers: vi.fn(async () => []),
         writeMembers,
       },
@@ -72,6 +73,7 @@ function createFacade(overrides: Partial<TeamProvisioningConfigFacadeOptions> =
       listInboxNames: vi.fn(async () => []),
     },
     membersMetaStore: {
+      getMeta: vi.fn(async () => null),
       getMembers: vi.fn(async () => []),
       writeMembers: vi.fn(async (_teamName: string, _members: TeamMember[]) => undefined),
     },

src/main/services/team/provisioning/__tests__/TeamProvisioningLaunchDeterministicSetupFlow.test.ts

@@ -101,7 +101,7 @@ function createPorts(
     launchExpectedMembersPorts: {
       readLaunchState: vi.fn(async () => null),
       readBootstrapLaunchSnapshot: vi.fn(async () => null),
-      getMembers: vi.fn(async () => members),
+      getMeta: vi.fn(async () => ({ members })),
       listInboxNames: vi.fn(async () => []),
       warn: vi.fn(),
     },
@@ -168,7 +168,7 @@ describe('TeamProvisioningLaunchDeterministicSetupFlow', () => {
     });
 
     expect(ports.deleteProvisioningRunByTeam).toHaveBeenCalledWith('demo');
-    expect(ports.launchExpectedMembersPorts.getMembers).not.toHaveBeenCalled();
+    expect(ports.launchExpectedMembersPorts.getMeta).not.toHaveBeenCalled();
     expect(ports.normalizeTeamConfigForLaunch).not.toHaveBeenCalled();
   });
 

src/main/services/team/provisioning/__tests__/TeamProvisioningLaunchExpectedMembers.test.ts

@@ -13,7 +13,9 @@ function makePorts(
   return {
     readLaunchState: vi.fn<(teamName: string) => Promise<unknown>>(async () => null),
     readBootstrapLaunchSnapshot: vi.fn<(teamName: string) => Promise<unknown>>(async () => null),
-    getMembers: vi.fn<(teamName: string) => Promise<TeamMember[]>>(async () => []),
+    getMeta: vi.fn<(teamName: string) => Promise<{ members: TeamMember[] } | null>>(async () =>
+      null
+    ),
     listInboxNames: vi.fn<(teamName: string) => Promise<string[]>>(async () => []),
     warn: vi.fn<(message: string) => void>(),
     ...overrides,
@@ -33,10 +35,12 @@ describe('team provisioning launch expected members', () => {
     const ports = makePorts({
       readLaunchState,
       readBootstrapLaunchSnapshot,
-      getMembers: vi.fn<(teamName: string) => Promise<TeamMember[]>>(async () => [
-        { name: 'team-lead', agentType: 'team-lead' },
-        { name: 'Alice', role: 'Engineer', model: 'claude-sonnet-4-20250514' },
-      ]),
+      getMeta: vi.fn<(teamName: string) => Promise<{ members: TeamMember[] } | null>>(async () => ({
+        members: [
+          { name: 'team-lead', agentType: 'team-lead' },
+          { name: 'Alice', role: 'Engineer', model: 'claude-sonnet-4-20250514' },
+        ],
+      })),
       listInboxNames: vi.fn<(teamName: string) => Promise<string[]>>(async () => ['Bob']),
     });
 
@@ -81,6 +85,30 @@ describe('team provisioning launch expected members', () => {
     });
   });
 
+  it.each<{ label: string; members: TeamMember[] }>([
+    { label: 'empty', members: [] },
+    {
+      label: 'tombstone-only',
+      members: [{ name: 'Alice', role: 'Engineer', removedAt: 123 }],
+    },
+  ])('treats valid $label members.meta as authoritative over stale inboxes', async ({ members }) => {
+    const listInboxNames = vi.fn<(teamName: string) => Promise<string[]>>(async () => ['Alice']);
+
+    const result = await resolveLaunchExpectedMembers(
+      {
+        teamName: 'team-a',
+        configRaw: JSON.stringify({ members: [{ name: 'Alice', role: 'Engineer' }] }),
+      },
+      makePorts({
+        getMeta: vi.fn(async () => ({ members })),
+        listInboxNames,
+      })
+    );
+
+    expect(result).toEqual({ source: 'members-meta', members: [] });
+    expect(listInboxNames).not.toHaveBeenCalled();
+  });
+
   it('falls back to config members when members.meta and inboxes are empty', async () => {
     const result = await resolveLaunchExpectedMembers(
       {

src/main/services/team/provisioning/__tests__/TeamProvisioningLaunchExpectedMembersPortsFactory.test.ts

@@ -19,7 +19,7 @@ describe('team provisioning launch expected members ports factory', () => {
       },
       readBootstrapLaunchSnapshot: vi.fn(async () => bootstrapSnapshot),
       membersMetaStore: {
-        getMembers: vi.fn(async () => members),
+        getMeta: vi.fn(async () => ({ members })),
       },
       inboxReader: {
         listInboxNames: vi.fn(async () => inboxNames),
@@ -30,13 +30,13 @@ describe('team provisioning launch expected members ports factory', () => {
 
     await expect(ports.readLaunchState('alpha')).resolves.toBe(launchSnapshot);
     await expect(ports.readBootstrapLaunchSnapshot('alpha')).resolves.toBe(bootstrapSnapshot);
-    await expect(ports.getMembers('alpha')).resolves.toBe(members);
+    await expect(ports.getMeta('alpha')).resolves.toEqual({ members });
     await expect(ports.listInboxNames('alpha')).resolves.toBe(inboxNames);
     ports.warn('[alpha] warning');
 
     expect(deps.launchStateStore.read).toHaveBeenCalledWith('alpha');
     expect(deps.readBootstrapLaunchSnapshot).toHaveBeenCalledWith('alpha');
-    expect(deps.membersMetaStore.getMembers).toHaveBeenCalledWith('alpha');
+    expect(deps.membersMetaStore.getMeta).toHaveBeenCalledWith('alpha');
     expect(deps.inboxReader.listInboxNames).toHaveBeenCalledWith('alpha');
     expect(deps.logger.warn).toHaveBeenCalledWith('[alpha] warning');
   });
@@ -51,7 +51,7 @@ function makeDeps(
     },
     readBootstrapLaunchSnapshot: vi.fn(async () => null),
     membersMetaStore: {
-      getMembers: vi.fn(async () => []),
+      getMeta: vi.fn(async () => null),
     },
     inboxReader: {
       listInboxNames: vi.fn(async () => []),