Skip to content

Commit aa8f39e

Browse files
authored
feat(app): auto-sync cloud providers (anomalyco#1509)
Keep workspace-managed providers aligned with the active cloud org on sign-in, launch, background sync, and Cloud settings open while declaring the sync interval in one place. Co-authored-by: src-opn <[email protected]>
1 parent 307c8bc commit aa8f39e

6 files changed

Lines changed: 258 additions & 9 deletions

File tree

‎apps/app/src/app/app.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,7 @@ export default function App() {
979979
connectCloudProvider,
980980
removeCloudProvider,
981981
disconnectProvider,
982+
runCloudProviderSync,
982983
ensureProjectProviderDisabledState,
983984
openProviderAuthModal: openProviderAuthModalInternal,
984985
closeProviderAuthModal,
@@ -2192,6 +2193,7 @@ export default function App() {
21922193
openProviderAuthModal,
21932194
disconnectProvider,
21942195
removeCloudProvider,
2196+
runCloudProviderSync,
21952197
closeProviderAuthModal,
21962198
startProviderAuth,
21972199
completeProviderAuthOAuth,
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const CLOUD_SYNC_INTERVAL_MS = 5 * 60 * 1000;

‎apps/app/src/app/components/den-settings-panel.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ type DenSettingsPanelProps = {
5656
refreshCloudOrgProviders: (options?: { force?: boolean }) => Promise<DenOrgLlmProvider[]>;
5757
connectCloudProvider: (cloudProviderId: string) => Promise<string | void>;
5858
removeCloudProvider: (cloudProviderId: string) => Promise<string | void>;
59+
runCloudProviderSync: (reason: "sign_in" | "app_launch" | "interval" | "settings_cloud_opened") => Promise<void>;
5960
};
6061

6162
type CloudSkillHubRow = {
@@ -821,6 +822,11 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
821822
void refreshProviders(true);
822823
});
823824

825+
createEffect(() => {
826+
if (!user() || !activeOrgId().trim()) return;
827+
void props.runCloudProviderSync("settings_cloud_opened");
828+
});
829+
824830
createEffect(() => {
825831
const handler = (event: Event) => {
826832
const customEvent = event as CustomEvent<DenSessionUpdatedDetail>;

‎apps/app/src/app/context/providers/store.ts‎

Lines changed: 245 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ import {
88
isDesktopProviderBlocked,
99
type DesktopAppRestrictionChecker,
1010
} from "../../cloud/desktop-app-restrictions";
11+
import { CLOUD_SYNC_INTERVAL_MS } from "../../cloud/sync/constants";
1112
import { createDenClient, readDenSettings, type DenOrgLlmProvider, type DenOrgLlmProviderConnection } from "../../lib/den";
13+
import {
14+
denSessionUpdatedEvent,
15+
denSettingsChangedEvent,
16+
type DenSessionUpdatedDetail,
17+
} from "../../lib/den-session-events";
1218
import { unwrap, waitForHealthy } from "../../lib/opencode";
1319
import {
1420
readOpencodeConfig,
@@ -28,6 +34,8 @@ import {
2834

2935
type ProviderReturnFocusTarget = "none" | "composer";
3036

37+
type CloudProviderSyncReason = "sign_in" | "app_launch" | "interval" | "settings_cloud_opened";
38+
3139
export type ProviderAuthMethod = {
3240
type: "oauth" | "api" | "cloud";
3341
label: string;
@@ -78,17 +86,24 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
7886
createSignal<ProviderReturnFocusTarget>("none");
7987
const [cloudOrgProviders, setCloudOrgProviders] = createSignal<DenOrgLlmProvider[]>([]);
8088
const [importedCloudProviders, setImportedCloudProviders] = createSignal<Record<string, CloudImportedProvider>>({});
89+
const [denSettingsVersion, setDenSettingsVersion] = createSignal(0);
8190

8291
let cloudOrgProvidersLoadKey = "";
8392
let cloudOrgProvidersInFlightKey = "";
8493
let cloudOrgProvidersInFlight: Promise<DenOrgLlmProvider[]> | null = null;
94+
let cloudProviderSyncInFlight: Promise<void> | null = null;
95+
let cloudProviderSyncQueuedReason: CloudProviderSyncReason | null = null;
96+
let cloudProviderSyncContextKey = "";
8597

8698
const getStringList = (value: unknown) =>
8799
Array.isArray(value)
88100
? value.filter((entry): entry is string => typeof entry === "string" && entry.trim().length > 0)
89101
: [];
90102

91103
const getCloudProviderEnv = (config: Record<string, unknown>) => getStringList(config.env);
104+
const sortStrings = (values: string[]) => [...values].sort();
105+
const sameStringList = (a: string[], b: string[]) =>
106+
a.length === b.length && a.every((value, index) => value === b[index]);
92107

93108
const buildCloudProviderMethod = (provider: DenOrgLlmProvider): ProviderAuthMethod => ({
94109
type: "cloud",
@@ -423,6 +438,12 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
423438
.filter(Boolean)
424439
.sort();
425440

441+
const logCloudProviderSyncError = (reason: CloudProviderSyncReason, error: unknown) => {
442+
const message = describeProviderError(error, "Cloud provider sync failed.");
443+
console.warn(`[cloud-provider-sync:${reason}] ${message}`);
444+
return message;
445+
};
446+
426447
const formatConfigWithCloudProvider = (
427448
raw: string,
428449
provider: DenOrgLlmProviderConnection,
@@ -558,6 +579,40 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
558579
].join("::");
559580
};
560581

582+
const getCloudProviderSyncContextKey = () => {
583+
const settings = readDenSettings();
584+
return [
585+
settings.baseUrl,
586+
settings.apiBaseUrl ?? "",
587+
settings.activeOrgId?.trim() ?? "",
588+
settings.authToken?.trim() ?? "",
589+
options.selectedWorkspaceDisplay().workspaceType,
590+
options.selectedWorkspaceRoot().trim(),
591+
options.runtimeWorkspaceId() ?? "",
592+
options.client() ? "connected" : "disconnected",
593+
].join("::");
594+
};
595+
596+
const hasCloudProviderSyncPrerequisites = () => {
597+
const settings = readDenSettings();
598+
const workspaceTarget = options.selectedWorkspaceRoot().trim() || options.runtimeWorkspaceId() || "";
599+
return Boolean(
600+
options.client() &&
601+
settings.authToken?.trim() &&
602+
settings.activeOrgId?.trim() &&
603+
workspaceTarget,
604+
);
605+
};
606+
607+
const isCloudProviderOutOfSync = (
608+
provider: DenOrgLlmProvider,
609+
importedProvider: CloudImportedProvider,
610+
) =>
611+
importedProvider.providerId !== provider.providerId ||
612+
(importedProvider.source ?? null) !== provider.source ||
613+
(importedProvider.updatedAt ?? null) !== (provider.updatedAt ?? null) ||
614+
!sameStringList(importedProvider.modelIds, sortStrings(provider.models.map((model) => model.id)));
615+
561616
const refreshCloudOrgProviders = async (optionsArg?: { force?: boolean }) => {
562617
const settings = readDenSettings();
563618
const loadKey = getCloudOrgProvidersKey();
@@ -611,17 +666,34 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
611666
return;
612667
}
613668

614-
const handleDenSessionUpdate = () => {
669+
const handleDenSessionUpdate = (event: Event) => {
615670
cloudOrgProvidersLoadKey = "";
616671
cloudOrgProvidersInFlightKey = "";
617672
cloudOrgProvidersInFlight = null;
618673
setCloudOrgProviders([]);
619674
setProviderAuthMethods({});
675+
setDenSettingsVersion((value) => value + 1);
676+
677+
const detail = (event as CustomEvent<DenSessionUpdatedDetail>).detail;
678+
if (detail?.status === "success") {
679+
void runCloudProviderSync("sign_in");
680+
}
620681
};
621682

622-
window.addEventListener("openwork-den-session-updated", handleDenSessionUpdate as EventListener);
683+
const handleDenSettingsChanged = () => {
684+
cloudOrgProvidersLoadKey = "";
685+
cloudOrgProvidersInFlightKey = "";
686+
cloudOrgProvidersInFlight = null;
687+
setCloudOrgProviders([]);
688+
setProviderAuthMethods({});
689+
setDenSettingsVersion((value) => value + 1);
690+
};
691+
692+
window.addEventListener(denSessionUpdatedEvent, handleDenSessionUpdate as EventListener);
693+
window.addEventListener(denSettingsChangedEvent, handleDenSettingsChanged as EventListener);
623694
onCleanup(() => {
624-
window.removeEventListener("openwork-den-session-updated", handleDenSessionUpdate as EventListener);
695+
window.removeEventListener(denSessionUpdatedEvent, handleDenSessionUpdate as EventListener);
696+
window.removeEventListener(denSettingsChangedEvent, handleDenSettingsChanged as EventListener);
625697
});
626698
});
627699

@@ -631,6 +703,43 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
631703
void refreshImportedCloudProviders();
632704
});
633705

706+
createEffect(() => {
707+
denSettingsVersion();
708+
void options.selectedWorkspaceRoot();
709+
void options.runtimeWorkspaceId();
710+
void options.client();
711+
712+
if (!hasCloudProviderSyncPrerequisites()) {
713+
cloudProviderSyncContextKey = "";
714+
return;
715+
}
716+
717+
const nextKey = getCloudProviderSyncContextKey();
718+
if (nextKey === cloudProviderSyncContextKey) {
719+
return;
720+
}
721+
722+
cloudProviderSyncContextKey = nextKey;
723+
void runCloudProviderSync("app_launch");
724+
});
725+
726+
createEffect(() => {
727+
if (typeof window === "undefined") {
728+
return;
729+
}
730+
731+
const interval = window.setInterval(() => {
732+
if (!hasCloudProviderSyncPrerequisites()) {
733+
return;
734+
}
735+
void runCloudProviderSync("interval");
736+
}, CLOUD_SYNC_INTERVAL_MS);
737+
738+
onCleanup(() => {
739+
window.clearInterval(interval);
740+
});
741+
});
742+
634743
const applyProviderListState = (value: ProviderListResponse) => {
635744
options.setProviders(value.all ?? []);
636745
options.setProviderDefaults(value.default ?? {});
@@ -1042,8 +1151,13 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
10421151
}
10431152
}
10441153

1045-
async function connectCloudProvider(cloudProviderId: string) {
1046-
setProviderAuthError(null);
1154+
async function connectCloudProviderInternal(
1155+
cloudProviderId: string,
1156+
optionsArg?: { silent?: boolean },
1157+
) {
1158+
if (!optionsArg?.silent) {
1159+
setProviderAuthError(null);
1160+
}
10471161
const c = options.client();
10481162
if (!c) {
10491163
throw new Error(t("providers.not_connected"));
@@ -1122,13 +1236,24 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
11221236
return `${t("status.connected")} ${provider.name}`;
11231237
} catch (error) {
11241238
const message = describeProviderError(error, "Failed to connect organization provider.");
1125-
setProviderAuthError(message);
1239+
if (!optionsArg?.silent) {
1240+
setProviderAuthError(message);
1241+
}
11261242
throw error instanceof Error ? error : new Error(message);
11271243
}
11281244
}
11291245

1130-
async function removeCloudProvider(cloudProviderId: string) {
1131-
setProviderAuthError(null);
1246+
async function connectCloudProvider(cloudProviderId: string) {
1247+
return await connectCloudProviderInternal(cloudProviderId);
1248+
}
1249+
1250+
async function removeCloudProviderInternal(
1251+
cloudProviderId: string,
1252+
optionsArg?: { silent?: boolean },
1253+
) {
1254+
if (!optionsArg?.silent) {
1255+
setProviderAuthError(null);
1256+
}
11321257
const imported = importedCloudProviders()[cloudProviderId];
11331258
if (!imported) {
11341259
throw new Error("This cloud provider has not been imported into the workspace.");
@@ -1159,11 +1284,121 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
11591284
return `${t("providers.disconnected_prefix")} ${imported.name}`;
11601285
} catch (error) {
11611286
const message = describeProviderError(error, t("providers.disconnect_failed"));
1162-
setProviderAuthError(message);
1287+
if (!optionsArg?.silent) {
1288+
setProviderAuthError(message);
1289+
}
11631290
throw error instanceof Error ? error : new Error(message);
11641291
}
11651292
}
11661293

1294+
async function removeCloudProvider(cloudProviderId: string) {
1295+
return await removeCloudProviderInternal(cloudProviderId);
1296+
}
1297+
1298+
async function performCloudProviderSync(reason: CloudProviderSyncReason) {
1299+
if (!hasCloudProviderSyncPrerequisites()) {
1300+
return;
1301+
}
1302+
1303+
const importedProviders = await refreshImportedCloudProviders();
1304+
const liveProviders = await refreshCloudOrgProviders({ force: true });
1305+
const liveProviderMap = new Map(liveProviders.map((provider) => [provider.id, provider]));
1306+
const failures: string[] = [];
1307+
const processedLiveProviderIds = new Set<string>();
1308+
let configChanged = false;
1309+
1310+
for (const importedProvider of Object.values(importedProviders)) {
1311+
const liveProvider = liveProviderMap.get(importedProvider.cloudProviderId);
1312+
if (!liveProvider) {
1313+
try {
1314+
await removeCloudProviderInternal(importedProvider.cloudProviderId, { silent: true });
1315+
configChanged = true;
1316+
} catch (error) {
1317+
failures.push(logCloudProviderSyncError(reason, error));
1318+
}
1319+
continue;
1320+
}
1321+
1322+
processedLiveProviderIds.add(liveProvider.id);
1323+
1324+
if (isDesktopProviderBlocked({
1325+
providerId: liveProvider.providerId,
1326+
checkRestriction: options.checkDesktopAppRestriction,
1327+
})) {
1328+
continue;
1329+
}
1330+
1331+
if (!isCloudProviderOutOfSync(liveProvider, importedProvider)) {
1332+
continue;
1333+
}
1334+
1335+
try {
1336+
await removeCloudProviderInternal(importedProvider.cloudProviderId, { silent: true });
1337+
await connectCloudProviderInternal(liveProvider.id, { silent: true });
1338+
configChanged = true;
1339+
} catch (error) {
1340+
failures.push(logCloudProviderSyncError(reason, error));
1341+
}
1342+
}
1343+
1344+
const nextImportedProviders = importedCloudProviders();
1345+
for (const liveProvider of liveProviders) {
1346+
if (processedLiveProviderIds.has(liveProvider.id)) {
1347+
continue;
1348+
}
1349+
if (isDesktopProviderBlocked({
1350+
providerId: liveProvider.providerId,
1351+
checkRestriction: options.checkDesktopAppRestriction,
1352+
})) {
1353+
continue;
1354+
}
1355+
if (nextImportedProviders[liveProvider.id]) {
1356+
continue;
1357+
}
1358+
1359+
try {
1360+
await connectCloudProviderInternal(liveProvider.id, { silent: true });
1361+
configChanged = true;
1362+
} catch (error) {
1363+
failures.push(logCloudProviderSyncError(reason, error));
1364+
}
1365+
}
1366+
1367+
if (configChanged) {
1368+
await refreshProviders({ dispose: true }).catch(() => null);
1369+
}
1370+
1371+
if (failures.length > 0) {
1372+
throw new Error(failures.join("\n"));
1373+
}
1374+
}
1375+
1376+
async function runCloudProviderSync(reason: CloudProviderSyncReason) {
1377+
if (cloudProviderSyncInFlight) {
1378+
cloudProviderSyncQueuedReason = reason;
1379+
return cloudProviderSyncInFlight;
1380+
}
1381+
1382+
const request = performCloudProviderSync(reason)
1383+
.catch((error) => {
1384+
const message = logCloudProviderSyncError(reason, error);
1385+
if (reason === "settings_cloud_opened") {
1386+
setProviderAuthError(message);
1387+
}
1388+
})
1389+
.finally(() => {
1390+
cloudProviderSyncInFlight = null;
1391+
const queuedReason = cloudProviderSyncQueuedReason;
1392+
cloudProviderSyncQueuedReason = null;
1393+
if (queuedReason) {
1394+
void runCloudProviderSync(queuedReason);
1395+
}
1396+
});
1397+
1398+
cloudProviderSyncInFlight = request;
1399+
return request;
1400+
}
1401+
11671402
async function disconnectProvider(providerId: string) {
11681403
setProviderAuthError(null);
11691404
const c = options.client();
@@ -1275,6 +1510,7 @@ export function createProvidersStore(options: CreateProvidersStoreOptions) {
12751510
connectCloudProvider,
12761511
removeCloudProvider,
12771512
disconnectProvider,
1513+
runCloudProviderSync,
12781514
ensureProjectProviderDisabledState,
12791515
openProviderAuthModal,
12801516
closeProviderAuthModal,

0 commit comments

Comments
 (0)