Skip to content

Hydrate cloud integrations before local mounts #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjgbot merged 1 commit into from
Jun 5, 2026
Merged

Hydrate cloud integrations before local mounts #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions src/main/integrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ const POLL_INTERVAL_MS = 2_000
const POLL_TIMEOUT_MS = 5 * 60_000
const CATALOG_CACHE_MS = 5 * 60_000
const SYSTEM_MESSAGE_DEBOUNCE_MS = 1_000
const LOCAL_MOUNT_CLOUD_HYDRATION_THROTTLE_MS = 30_000
const CATALOG_PATH = '/api/v1/integrations/catalog'
const MAX_REMOTE_DIRECTORY_ENTRIES = 5_000

Expand Down Expand Up @@ -620,6 +621,8 @@ export class IntegrationsManager {
private systemMessageTimers = new Map<string, NodeJS.Timeout>()
private catalogCache: IntegrationAdapter[] | null = null
private catalogFetchedAt = 0
private localMountCloudHydrationStartedAt = 0
private localMountCloudHydrationPromise: Promise<void> | null = null

onEvent(handler: (event: IntegrationsEvent) => void): () => void {
this.listeners.add(handler)
Expand Down Expand Up @@ -1663,7 +1666,41 @@ export class IntegrationsManager {
await Promise.all(loadStore().projects.map((project) => this.syncEventSubscriptions(project.id)))
}

private async syncLocalMounts(): Promise<void> {
private async hydrateCloudIntegrationsForLocalMounts(): Promise<void> {
const now = Date.now()
if (this.localMountCloudHydrationPromise) return this.localMountCloudHydrationPromise
if (now - this.localMountCloudHydrationStartedAt < LOCAL_MOUNT_CLOUD_HYDRATION_THROTTLE_MS) return

this.localMountCloudHydrationStartedAt = now
const pending = (async () => {
const projects = loadStore().projects
if (projects.length === 0) return

const cloud = await this.listCloudWorkspaceIntegrations()
if (cloud.length === 0) return

for (const project of projects) {
await this.mergeCloudIntegrationsIntoProject(project.id, cloud)
}
Comment on lines +1682 to +1684

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

If mergeCloudIntegrationsIntoProject throws an error for one project (for example, due to a corrupted store entry or a transient issue during listCatalog), the loop will terminate early. This prevents subsequent projects from being hydrated. Wrapping the call in a try/catch block ensures that a failure in one project does not block the hydration of others.

      for (const project of projects) {
        try {
          await this.mergeCloudIntegrationsIntoProject(project.id, cloud)
        } catch (error) {
          console.warn('[integrations] Failed to merge cloud integrations for project ' + project.id + ':', toErrorMessage(error))
        }
      }

})()
.catch((error) => {
console.warn('[integrations] Failed to hydrate cloud integrations for local mounts:', toErrorMessage(error))
})
.finally(() => {
if (this.localMountCloudHydrationPromise === pending) {
this.localMountCloudHydrationPromise = null
}
})

this.localMountCloudHydrationPromise = pending
return pending
}

private async syncLocalMounts(options: { hydrateCloud?: boolean } = {}): Promise<void> {
if (options.hydrateCloud !== false) {
await this.hydrateCloudIntegrationsForLocalMounts()
}

const localEntries = loadStore().projects.flatMap((project) =>
this.listConnected(project.id).map((integration) => ({
projectId: project.id,
Expand Down Expand Up @@ -1718,7 +1755,7 @@ export class IntegrationsManager {
}

private async withLocalMountPaths(integrations: ConnectedIntegration[]): Promise<ConnectedIntegration[]> {
await this.syncLocalMounts()
await this.syncLocalMounts({ hydrateCloud: false })
const workspaceId = integrationMountManager.currentWorkspaceId()
if (!workspaceId) return integrations
return integrations.map((integration) => {
Expand Down
Loading