chore: merge dev into hosted web branch

Author: 777genius

scripts/ci/source-file-size-baseline.json

@@ -128,7 +128,7 @@
     "src/renderer/components/team/messages/MessagesPanel.tsx": 1722,
     "src/renderer/components/team/ProvisioningProgressBlock.tsx": 862,
     "src/renderer/components/team/review/CodeMirrorDiffView.tsx": 975,
-    "src/renderer/components/team/TeamDetailView.tsx": 3838,
+    "src/renderer/components/team/TeamDetailView.tsx": 3831,
     "src/renderer/components/team/TeamListView.tsx": 1568,
     "src/renderer/components/team/useTeamChangesSummaries.ts": 826,
     "src/renderer/components/ui/MentionableTextarea.tsx": 1433,

scripts/ci/source-file-size-legacy.json

@@ -125,7 +125,7 @@
   "src/renderer/components/team/messages/MessagesPanel.tsx": 1722,
   "src/renderer/components/team/ProvisioningProgressBlock.tsx": 862,
   "src/renderer/components/team/review/CodeMirrorDiffView.tsx": 975,
-  "src/renderer/components/team/TeamDetailView.tsx": 3838,
+  "src/renderer/components/team/TeamDetailView.tsx": 3831,
   "src/renderer/components/team/TeamListView.tsx": 1568,
   "src/renderer/components/team/useTeamChangesSummaries.ts": 826,
   "src/renderer/components/ui/MentionableTextarea.tsx": 1433,

src/features/localization/renderer/locales/en/team.json

@@ -238,6 +238,7 @@
       "description": "Description",
       "name": "Name"
     },
+    "leadRestartWarning": "Saving will restart the lead to apply model or effort changes. Teammate processes will keep running.",
     "memberRestartWarning": "Saving will restart this teammate to apply role, workflow, worktree isolation, provider, model, effort, or MCP access changes.",
     "notices": {
       "liveRenameBlocked": "Live save is blocked because existing teammates were renamed. Revert those identity changes or stop the team first.",

src/features/localization/renderer/resources.d.ts

@@ -3864,6 +3864,7 @@ export default interface Resources {
         description: 'Description';
         name: 'Name';
       };
+      leadRestartWarning: 'Saving will restart the lead to apply model or effort changes. Teammate processes will keep running.';
       memberRestartWarning: 'Saving will restart this teammate to apply role, workflow, worktree isolation, provider, model, effort, or MCP access changes.';
       notices: {
         liveRenameBlocked: 'Live save is blocked because existing teammates were renamed. Revert those identity changes or stop the team first.';

src/features/team-provisioning/contracts/memberSettings.ts

@@ -47,19 +47,29 @@ export type UpdateMemberSettingsEffect =
   | 'no_changes'
   | 'persisted_only'
   | 'member_restart_started'
+  | 'lead_restart_started'
+  | 'lead_restart_rolled_back'
   | 'opencode_lane_restart_started'
   | 'team_relaunch_required'
   | 'recovery_required';
 
-export interface UpdateMemberSettingsRequest {
+interface UpdateMemberSettingsRequestBase {
   commandId: string;
   idempotencyKey: string;
   teamName: string;
   memberName: string;
   expectedFingerprint: string;
-  settings: EditableMemberSettings;
 }
 
+export type UpdateMemberSettingsRequest = UpdateMemberSettingsRequestBase &
+  (
+    | { targetKind: 'member'; settings: EditableMemberSettings }
+    | {
+        targetKind: 'lead';
+        leadRuntime: Pick<EditableMemberSettings, 'model' | 'effort'>;
+      }
+  );
+
 export type UpdateMemberSettingsResult =
   | {
       outcome: 'completed';

src/features/team-provisioning/core/application/ports/UpdateMemberSettingsPorts.ts

@@ -25,6 +25,22 @@ export class MemberSettingsMutationBusyError extends Error {
   }
 }
 
+export class MemberSettingsLifecycleFailedError extends Error {
+  constructor(
+    message: string,
+    readonly lifecycleRestored: boolean,
+    readonly cause?: unknown
+  ) {
+    super(message);
+    this.name = 'MemberSettingsLifecycleFailedError';
+  }
+}
+
+export type MemberSettingsLifecycleAdmission =
+  | { outcome: 'ready'; token?: unknown }
+  | { outcome: 'busy' }
+  | { outcome: 'relaunch_required' };
+
 export interface MemberSettingsMutationGatePort {
   runExclusive<T>(teamName: string, operation: () => Promise<T>): Promise<T>;
 }
@@ -57,11 +73,18 @@ export type MemberSettingsLifecycleEffect = Exclude<
 >;
 
 export interface MemberSettingsLifecyclePort {
+  assess(input: {
+    teamName: string;
+    before: MemberSettingsTargetSnapshot;
+    proposed: MemberSettingsTargetSnapshot;
+    action: Exclude<MemberSettingsLifecycleAction, 'none'>;
+  }): Promise<MemberSettingsLifecycleAdmission>;
   applyEffect(input: {
     teamName: string;
     before: MemberSettingsTargetSnapshot;
     after: MemberSettingsTargetSnapshot;
     action: Exclude<MemberSettingsLifecycleAction, 'none'>;
+    admission: Extract<MemberSettingsLifecycleAdmission, { outcome: 'ready' }>;
   }): Promise<MemberSettingsLifecycleEffect>;
   restore(input: {
     teamName: string;

src/features/team-provisioning/core/application/use-cases/UpdateMemberSettingsUseCase.ts

@@ -1,9 +1,11 @@
 import {
   createMemberSettingsFingerprint,
+  isCanonicalLeadTarget,
   normalizeEditableMemberSettings,
   selectMemberSettingsLifecycleAction,
 } from '../../domain/memberSettingsPolicy';
 import {
+  MemberSettingsLifecycleFailedError,
   MemberSettingsMutationBusyError,
   MemberSettingsPersistenceFailedError,
 } from '../ports/UpdateMemberSettingsPorts';
@@ -52,7 +54,22 @@ export class UpdateMemberSettingsUseCase {
           };
         }
 
-        const normalizedSettings = normalizeEditableMemberSettings(request.settings);
+        const targetIsLead = isCanonicalLeadTarget(current);
+        if (request.targetKind === 'lead' && !targetIsLead) {
+          return {
+            outcome: 'target_conflict',
+            memberName: current.name,
+            expectedFingerprint: request.expectedFingerprint,
+            actualFingerprint,
+            reason: 'target_changed',
+            replayed: false,
+          };
+        }
+        const normalizedSettings = normalizeEditableMemberSettings(
+          request.targetKind === 'lead'
+            ? { ...current.settings, ...request.leadRuntime }
+            : request.settings
+        );
         const proposed = { ...current, settings: normalizedSettings };
         const proposedFingerprint = createMemberSettingsFingerprint(proposed);
         if (proposedFingerprint === actualFingerprint) {
@@ -66,7 +83,10 @@ export class UpdateMemberSettingsUseCase {
           };
         }
 
-        const action = selectMemberSettingsLifecycleAction(current, proposed);
+        const action =
+          targetIsLead && request.targetKind === 'member'
+            ? 'require_team_relaunch'
+            : selectMemberSettingsLifecycleAction(current, proposed);
         if (action === 'require_team_relaunch') {
           return {
             outcome: 'completed',
@@ -78,6 +98,34 @@ export class UpdateMemberSettingsUseCase {
           };
         }
 
+        let admission: Awaited<ReturnType<MemberSettingsLifecyclePort['assess']>> | null = null;
+        if (action !== 'none') {
+          admission = await this.dependencies.lifecycle.assess({
+            teamName: request.teamName,
+            before: current,
+            proposed,
+            action,
+          });
+          if (admission.outcome === 'busy') {
+            return {
+              outcome: 'busy',
+              teamName: request.teamName,
+              memberName: current.name,
+              replayed: false,
+            };
+          }
+          if (admission.outcome === 'relaunch_required') {
+            return {
+              outcome: 'completed',
+              effect: 'team_relaunch_required',
+              memberName: current.name,
+              previousFingerprint: actualFingerprint,
+              currentFingerprint: actualFingerprint,
+              replayed: false,
+            };
+          }
+        }
+
         let applied;
         try {
           applied = await this.dependencies.repository.applyTarget({
@@ -137,13 +185,17 @@ export class UpdateMemberSettingsUseCase {
             replayed: false,
           };
         }
+        if (admission?.outcome !== 'ready') {
+          throw new Error('Member settings lifecycle admission was not retained');
+        }
 
         try {
           const effect = await this.dependencies.lifecycle.applyEffect({
             teamName: request.teamName,
             before: current,
             after,
             action,
+            admission,
           });
           return {
             outcome: 'completed',
@@ -155,7 +207,8 @@ export class UpdateMemberSettingsUseCase {
           };
         } catch (error) {
           let persistenceRestored = false;
-          let lifecycleRestored = false;
+          let lifecycleRestored =
+            error instanceof MemberSettingsLifecycleFailedError && error.lifecycleRestored;
           try {
             persistenceRestored = await this.dependencies.repository.restoreTarget({
               teamName: request.teamName,
@@ -167,7 +220,7 @@ export class UpdateMemberSettingsUseCase {
           } catch {
             persistenceRestored = false;
           }
-          if (persistenceRestored) {
+          if (persistenceRestored && !lifecycleRestored) {
             try {
               lifecycleRestored = await this.dependencies.lifecycle.restore({
                 teamName: request.teamName,
@@ -180,6 +233,26 @@ export class UpdateMemberSettingsUseCase {
             }
           }
 
+          if (
+            persistenceRestored &&
+            lifecycleRestored &&
+            action === 'restart_lead' &&
+            current.teamIsAlive
+          ) {
+            return {
+              outcome: 'completed',
+              effect: 'lead_restart_rolled_back',
+              memberName: current.name,
+              previousFingerprint: actualFingerprint,
+              currentFingerprint: actualFingerprint,
+              replayed: false,
+              recovery: {
+                persistenceRestored: true,
+                lifecycleRestored: true,
+                cause: errorMessage(error),
+              },
+            };
+          }
           if (persistenceRestored && lifecycleRestored) {
             throw error;
           }

src/features/team-provisioning/core/domain/memberSettingsPolicy.ts

@@ -26,6 +26,7 @@ export interface MemberSettingsTargetSnapshot {
 
 export type MemberSettingsLifecycleAction =
   | 'none'
+  | 'restart_lead'
   | 'restart_member'
   | 'restart_opencode_lane'
   | 'require_team_relaunch';
@@ -105,9 +106,38 @@ export function selectMemberSettingsLifecycleAction(
   const hasReservedLeadRole = proposed.settings.role
     ? isReservedLeadRole(proposed.settings.role)
     : false;
-  if (isCanonicalLeadTarget(before) || isCanonicalLeadTarget(proposed) || hasReservedLeadRole) {
+  const isLead = isCanonicalLeadTarget(before) || isCanonicalLeadTarget(proposed);
+  if (!isLead && hasReservedLeadRole) {
     return 'require_team_relaunch';
   }
+  if (isLead) {
+    const beforeSettings = normalizeEditableMemberSettings(before.settings);
+    const proposedSettings = normalizeEditableMemberSettings(proposed.settings);
+    const lockedSettingsChanged = (
+      [
+        'role',
+        'workflow',
+        'isolation',
+        'providerId',
+        'providerBackendId',
+        'fastMode',
+        'mcpPolicy',
+      ] as const
+    ).some(
+      (field) => JSON.stringify(beforeSettings[field]) !== JSON.stringify(proposedSettings[field])
+    );
+    if (lockedSettingsChanged) return 'require_team_relaunch';
+    if (!before.teamIsAlive) return 'restart_lead';
+    if (
+      before.leadProviderId === 'opencode' ||
+      (before.leadProviderId !== 'anthropic' &&
+        before.leadProviderId !== 'codex' &&
+        before.leadProviderId !== 'gemini')
+    ) {
+      return 'require_team_relaunch';
+    }
+    return 'restart_lead';
+  }
   if (!before.teamIsAlive) {
     return 'none';
   }