Fix legacy patch fields overriding explicit backgroundActivity and extract duplicated settings utilities

- Fix applyServerSettingsPatch: skip legacy-derived backgroundActivityPatch when
an explicit backgroundActivity object is present in the patch, preventing silent
override of new-style patches by legacy fields.
- Extract shared background activity utilities (BackgroundActivityOverridePatch,
durationToSeconds, normalizeIntervalSeconds, backgroundActivityOverrideSettings,
BackgroundPolicyTooltip) into backgroundActivityUtils.tsx to eliminate duplication
between SettingsPanels.tsx and SourceControlSettings.tsx.

Author: cursoragent

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,

apps/web/src/components/settings/SettingsPanels.tsx

@@ -1,7 +1,6 @@
 import{
 ArchiveIcon,
 ArchiveX,
-InfoIcon,
 LoaderIcon,
 PlusIcon,
 RefreshCwIcon,
@@ -106,6 +105,12 @@ import {
 SettingsSection,
 useRelativeTimeTick,
 }from"./settingsLayout";
+import{
+BackgroundPolicyTooltipasPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSeconds,
+}from"./backgroundActivityUtils";
 import{ProjectFavicon}from"../ProjectFavicon";
 import{useServerObservability,useServerProviders}from"../../rpc/serverState";
 
@@ -137,11 +142,6 @@ const BACKGROUND_ACTIVITY_PROFILE_LABELS: Record<BackgroundActivityProfile, stri
 };
 
 typeBackgroundActivityProfileOption=BackgroundActivityProfile|"advanced";
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
 
 constBACKGROUND_ACTIVITY_PROFILE_OPTION_LABELS: Record<BackgroundActivityProfileOption,string>={
  ...BACKGROUND_ACTIVITY_PROFILE_LABELS,
@@ -174,17 +174,6 @@ const BACKGROUND_ACTIVITY_BOOLEAN_OVERRIDES: ReadonlyArray<{
 {key: "pauseWhenOnBattery",label: "Pause on battery"},
 ];
 
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
 functionresolveBackgroundActivityProfileOption(settings: {
 readonlybackgroundActivity: BackgroundActivitySettings;
 }): BackgroundActivityProfileOption{
@@ -209,50 +198,6 @@ function backgroundActivityProfileSettings(profile: BackgroundActivityProfile) {
 };
 }
 
-functionbackgroundActivityOverrideSettings(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-){
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-}
-
-functionPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
-
 functionwithoutProviderInstanceKey<V>(
 record: Readonly<Record<ProviderInstanceId,V>>|undefined,
 key: ProviderInstanceId,

apps/web/src/components/settings/SourceControlSettings.tsx

@@ -1,9 +1,8 @@
-import{ChevronDownIcon,GitPullRequestIcon,InfoIcon,RefreshCwIcon}from"lucide-react";
+import{ChevronDownIcon,GitPullRequestIcon,RefreshCwIcon}from"lucide-react";
 import*asDurationfrom"effect/Duration";
 import*asOptionfrom"effect/Option";
 import{useState,typeReactNode}from"react";
 importtype{
-BackgroundActivitySettings,
 SourceControlProviderKind,
 SourceControlDiscoveryResult,
 SourceControlProviderAuth,
@@ -55,6 +54,12 @@ import {
 }from"../Icons";
 import{RedactedSensitiveText}from"./RedactedSensitiveText";
 import{SettingResetButton,SettingsPageContainer,SettingsSection}from"./settingsLayout";
+import{
+BackgroundPolicyTooltip,
+backgroundActivityOverrideSettings,
+durationToSeconds,
+normalizeIntervalSecondsasnormalizeFetchIntervalSeconds,
+}from"./backgroundActivityUtils";
 
 constEMPTY_DISCOVERY_RESULT: SourceControlDiscoveryResult={
 versionControlSystems: [],
@@ -75,43 +80,6 @@ const VCS_ICONS: Partial<Record<VcsDriverKind, Icon>> = {
 
 constSOURCE_CONTROL_SKELETON_ROWS=["primary","secondary"]asconst;
 constGIT_FETCH_INTERVAL_STEP_SECONDS=5;
-typeBackgroundActivityOverridePatch=Partial<{
-[KinkeyofBackgroundActivitySettings["overrides"]]:
-|BackgroundActivitySettings["overrides"][K]
-|undefined;
-}>;
-
-functiondurationToSeconds(duration: Duration.Duration): number{
-returnMath.round(Duration.toMillis(duration)/1_000);
-}
-
-functionnormalizeFetchIntervalSeconds(value: number|null): number{
-if(value===null||!Number.isFinite(value)){
-return0;
-}
-returnMath.max(0,Math.round(value));
-}
-
-functionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
-return(
-<Tooltip>
-<TooltipTrigger
-render={
-<button
-type="button"
-className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
-aria-label="Background policy details"
->
-<InfoIconclassName="size-3.5"/>
-</button>
-}
-/>
-<TooltipPopupside="top"className="max-w-72">
-{children}
-</TooltipPopup>
-</Tooltip>
-);
-}
 
 functionoptionLabel(value: Option.Option<string>): string|null{
 returnOption.getOrNull(value);
@@ -335,28 +303,6 @@ function GitFetchIntervalSettings() {
 );
 constcanResetFetchInterval=
 automaticGitFetchIntervalSeconds!==defaultAutomaticGitFetchIntervalSeconds;
-constbackgroundActivityOverrideSettings=(
-current: BackgroundActivitySettings,
-overrides: BackgroundActivityOverridePatch,
-)=>{
-constnextOverrides: BackgroundActivityOverridePatch={
- ...current.overrides,
- ...overrides,
-};
-for(const[key,value]ofObject.entries(nextOverrides)){
-if(value===undefined){
-deletenextOverrides[keyaskeyoftypeofnextOverrides];
-}
-}
-return{
-backgroundActivity: {
-schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current),
-overrides: nextOverridesasBackgroundActivitySettings["overrides"],
-},
-};
-};
 
 return(
 <divclassName="grid gap-3">

apps/web/src/components/settings/backgroundActivityUtils.tsx

@@ -0,0 +1,67 @@
+import{InfoIcon}from"lucide-react";
+import*asDurationfrom"effect/Duration";
+importtype{BackgroundActivitySettings}from"@t3tools/contracts";
+import{getBackgroundActivityBaseProfile}from"@t3tools/shared/backgroundActivitySettings";
+
+import{Tooltip,TooltipPopup,TooltipTrigger}from"../ui/tooltip";
+
+exporttypeBackgroundActivityOverridePatch=Partial<{
+[KinkeyofBackgroundActivitySettings["overrides"]]:
+|BackgroundActivitySettings["overrides"][K]
+|undefined;
+}>;
+
+exportfunctiondurationToSeconds(duration: Duration.Duration): number{
+returnMath.round(Duration.toMillis(duration)/1_000);
+}
+
+exportfunctionnormalizeIntervalSeconds(value: number|null): number{
+if(value===null||!Number.isFinite(value)){
+return0;
+}
+returnMath.max(0,Math.round(value));
+}
+
+exportfunctionbackgroundActivityOverrideSettings(
+current: BackgroundActivitySettings,
+overrides: BackgroundActivityOverridePatch,
+){
+constnextOverrides: BackgroundActivityOverridePatch={
+ ...current.overrides,
+ ...overrides,
+};
+for(const[key,value]ofObject.entries(nextOverrides)){
+if(value===undefined){
+deletenextOverrides[keyaskeyoftypeofnextOverrides];
+}
+}
+return{
+backgroundActivity: {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current),
+overrides: nextOverridesasBackgroundActivitySettings["overrides"],
+},
+};
+}
+
+exportfunctionBackgroundPolicyTooltip({ children }: {readonlychildren: string}){
+return(
+<Tooltip>
+<TooltipTrigger
+render={
+<button
+type="button"
+className="inline-flex size-5 items-center justify-center rounded-sm text-muted-foreground hover:text-foreground"
+aria-label="Background policy details"
+>
+<InfoIconclassName="size-3.5"/>
+</button>
+}
+/>
+<TooltipPopupside="top"className="max-w-72">
+{children}
+</TooltipPopup>
+</Tooltip>
+);
+}

packages/shared/src/serverSettings.ts

@@ -89,26 +89,28 @@ export function applyServerSettingsPatch(
  ...patchForMerge
 }=patch;
 constbackgroundActivityPatch=
-backgroundActivityProfile!==undefined
- ? {
-schemaVersion: 1asconst,
-profile: backgroundActivityProfile,
-overrides: {},
-}
- : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+backgroundActivity!==undefined
+ ? undefined
+ : backgroundActivityProfile!==undefined
  ? {
 schemaVersion: 1asconst,
-profile: "custom"asconst,
-baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
-overrides: {
- ...current.backgroundActivity.overrides,
- ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
- ...(providerHealthRefreshInterval!==undefined
- ? { providerHealthRefreshInterval }
- : {}),
-},
+profile: backgroundActivityProfile,
+overrides: {},
 }
- : undefined;
+ : automaticGitFetchInterval!==undefined||providerHealthRefreshInterval!==undefined
+ ? {
+schemaVersion: 1asconst,
+profile: "custom"asconst,
+baseProfile: getBackgroundActivityBaseProfile(current.backgroundActivity),
+overrides: {
+ ...current.backgroundActivity.overrides,
+ ...(automaticGitFetchInterval!==undefined ? { automaticGitFetchInterval } : {}),
+ ...(providerHealthRefreshInterval!==undefined
+ ? { providerHealthRefreshInterval }
+ : {}),
+},
+}
+ : undefined;
 constnext=deepMerge(current,patchForMerge);
 constnextWithReplacementsBase={
  ...next,