devchain-cli 0.25.0 → 0.26.0

package/dist/server/modules/remotes/operations/disconnect-all.operation.js

@@ -0,0 +1,222 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DisconnectAllOperation = void 0;
+exports.findBatchChild = findBatchChild;
+const common_1 = require("@nestjs/common");
+const error_types_1 = require("../../../common/errors/error-types");
+const storage_interface_1 = require("../../storage/interfaces/storage.interface");
+const remote_operation_errors_1 = require("./remote-operation.errors");
+async function findBatchChild(storage, id) {
+    try {
+        return await storage.getRemoteOperation(id);
+    }
+    catch (error) {
+        if (error instanceof error_types_1.NotFoundError)
+            return null;
+        throw error;
+    }
+}
+let DisconnectAllOperation = class DisconnectAllOperation {
+    storage;
+    kind = 'disconnect_all';
+    steps;
+    runner;
+    running = new Map();
+    cancelling = new Set();
+    constructor(storage) {
+        this.storage = storage;
+        this.steps = [
+            { id: 'preflight', label: 'Check the connected projects', run: (c) => this.preflight(c) },
+        ];
+    }
+    useRunner(runner) {
+        this.runner = runner;
+    }
+    stepsFor(details) {
+        const batch = details;
+        const steps = [
+            ...this.steps,
+            ...batch.projects.map((project, index) => ({
+                id: `disconnect:${index}`,
+                label: `Disconnect ${project.projectId}`,
+                run: (run) => this.disconnect(run, index),
+            })),
+        ];
+        return steps.map((step) => ({
+            ...step,
+            run: async (run) => {
+                this.running.set(run.operation.id, run);
+                try {
+                    if (this.cancelling.has(run.operation.id))
+                        await run.progress({ cancelRequested: true }, { durable: true });
+                    if (!run.details.cancelRequested)
+                        await step.run(run);
+                }
+                finally {
+                    this.running.delete(run.operation.id);
+                }
+            },
+        }));
+    }
+    assertCancellable() { }
+    cancellationRequested(operation) {
+        return operation.details.cancelRequested === true;
+    }
+    async interrupt(id) {
+        this.cancelling.add(id);
+        const run = this.running.get(id);
+        if (run)
+            await run.progress({ cancelRequested: true }, { durable: true });
+        else {
+            const operation = await this.storage.getRemoteOperation(id);
+            await this.storage.updateRemoteOperation(id, {
+                details: { ...operation.details, cancelRequested: true },
+            });
+        }
+        await this.cancelChildren(await this.storage.getRemoteOperation(id));
+    }
+    async rollback(operation) {
+        try {
+            operation.details.cancelRequested = true;
+            await this.storage.updateRemoteOperation(operation.id, { details: operation.details });
+            await this.cancelChildren(operation);
+        }
+        finally {
+            this.cancelling.delete(operation.id);
+        }
+    }
+    async completed(operation) {
+        this.cancelling.delete(operation.id);
+    }
+    async preflight({ operation, details }) {
+        const batch = details;
+        const current = (await this.storage.listRemoteProjectBindings()).filter((binding) => binding.remoteId === operation.remoteId);
+        const ids = new Set(batch.projects.map((project) => project.projectId));
+        if (ids.size !== batch.projects.length ||
+            current.length !== ids.size ||
+            current.some((binding) => binding.state !== 'remote' || !ids.has(binding.projectId))) {
+            throw new remote_operation_errors_1.RemoteOperationStepRefusedError('DISCONNECT_ALL_BINDINGS_CHANGED', 'The connected projects changed; cancel and start Disconnect all again.');
+        }
+        let [open] = await this.storage.listRemoteOperations({
+            remoteId: operation.remoteId,
+            kinds: ['attach', 'detach', 'force_sync'],
+            states: ['running', 'failed'],
+            limit: 1,
+        });
+        for (const { projectId } of batch.projects) {
+            if (open)
+                break;
+            [open] = await this.storage.listRemoteOperations({
+                projectId,
+                states: ['running', 'failed'],
+                limit: 1,
+            });
+        }
+        if (open) {
+            throw new remote_operation_errors_1.RemoteOperationStepRefusedError('DISCONNECT_ALL_PROJECT_OPERATION_OPEN', 'A project operation is still open; finish it before Disconnect all.');
+        }
+    }
+    async disconnect(run, index) {
+        const { operation, details } = run;
+        const batch = details;
+        const project = batch.projects[index];
+        let child = await findBatchChild(this.storage, project.operationId);
+        if (!child) {
+            if (batch.cancelRequested || this.cancelling.has(operation.id))
+                return;
+            child = await this.runner.start({
+                id: project.operationId,
+                kind: 'detach',
+                remoteId: operation.remoteId,
+                projectId: project.projectId,
+                details: {
+                    parentOperationId: operation.id,
+                    force: batch.force,
+                    ...(!batch.force && project.dockerCopyBack && { dockerCopyBack: project.dockerCopyBack }),
+                },
+            });
+        }
+        else if (child.state === 'failed' && batch.failedChildId === child.id) {
+            if (child.steps.some((step) => step.error?.code === 'DOCKER_COPY_BACK_CHOICE_REQUIRED'))
+                this.childFailed(child, batch);
+            await this.runner.whenIdle(child.id);
+            if (batch.cancelRequested || this.cancelling.has(operation.id))
+                return;
+            child = await this.runner.retry(child.id);
+            delete batch.failedChildId;
+            await run.progress({ failedChildId: undefined }, { durable: true });
+        }
+        if (batch.cancelRequested || this.cancelling.has(operation.id))
+            await this.cancelChild(child);
+        else if (child.state === 'running')
+            await this.runner.resumeChild(child.id);
+        await this.runner.whenIdle(child.id);
+        child = await this.storage.getRemoteOperation(child.id);
+        if (child.state === 'failed')
+            this.childFailed(child, batch);
+    }
+    childFailed(child, batch) {
+        batch.failedChildId = child.id;
+        const error = child.steps.find((step) => step.state === 'failed')?.error;
+        throw new remote_operation_errors_1.RemoteOperationStepRefusedError(error?.code ?? 'DISCONNECT_ALL_CHILD_FAILED', error?.message ?? 'A Disconnect stopped; retry or cancel Disconnect all.');
+    }
+    async cancelChildren(operation) {
+        const batch = operation.details;
+        for (const project of batch.projects) {
+            const child = await findBatchChild(this.storage, project.operationId);
+            if (child && (child.state === 'running' || child.state === 'failed'))
+                await this.cancelChild(child);
+        }
+    }
+    async cancelChild(child) {
+        try {
+            await this.runner.cancel(child.id);
+        }
+        catch (error) {
+            if (error instanceof error_types_1.ConflictError && error.details?.code === 'REMOTE_OPERATION_FINISHED') {
+                const finished = await this.storage.getRemoteOperation(child.id);
+                if (finished.state === 'done' || finished.state === 'cancelled')
+                    return;
+            }
+            if (!(error instanceof error_types_1.ConflictError) ||
+                error.details?.code !== 'REMOTE_OPERATION_NOT_CANCELLABLE')
+                throw error;
+            await this.runner.whenIdle(child.id);
+            const current = await this.storage.getRemoteOperation(child.id);
+            if (current.state === 'failed') {
+                await this.runner.retry(child.id);
+                await this.runner.whenIdle(child.id);
+            }
+            else if (current.state === 'running') {
+                await this.runner.resumeChild(child.id);
+                await this.runner.whenIdle(child.id);
+            }
+            const after = await this.storage.getRemoteOperation(child.id);
+            if (after.state !== 'done' && after.state !== 'cancelled') {
+                throw new error_types_1.ConflictError('The active Disconnect must finish before the batch can be cancelled.', {
+                    code: 'DISCONNECT_ALL_CHILD_UNFINISHED',
+                    operationId: child.id,
+                });
+            }
+        }
+    }
+};
+exports.DisconnectAllOperation = DisconnectAllOperation;
+exports.DisconnectAllOperation = DisconnectAllOperation = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(storage_interface_1.STORAGE_SERVICE)),
+    __metadata("design:paramtypes", [Object])
+], DisconnectAllOperation);
+//# sourceMappingURL=disconnect-all.operation.js.map

package/dist/server/modules/remotes/operations/disconnect-all.operation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"disconnect-all.operation.js","sourceRoot":"","sources":["../../../../src/modules/remotes/operations/disconnect-all.operation.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/remotes/operations/file-sync-handoff.d.ts

@@ -41,7 +41,6 @@ export declare class FileSyncHandoff {
     ensureAvailable(): Promise<void>;
     ensureRepository(projectId: string): Promise<boolean>;
     flipToHost(run: RemoteOperationStepRun, projectId: string): Promise<void>;
-    settleGit(run: RemoteOperationStepRun, projectId: string, owner: GitOwner): Promise<void>;
     flipGit(run: RemoteOperationStepRun, projectId: string, owner: GitOwner): Promise<void>;
     forceCopy(run: RemoteOperationStepRun, projectId: string, source: 'home' | 'vm', kinds: readonly ProjectFolder['kind'][]): Promise<void>;
     restoreConnected(run: RemoteOperationStepRun, projectId: string, kinds: readonly ProjectFolder['kind'][]): Promise<void>;
@@ -65,4 +64,7 @@ export declare class FileSyncHandoff {
     private status;
     private scan;
     private revert;
+    private gitFence;
+    private followVmGit;
+    private settleVmGit;
 }

package/dist/server/modules/remotes/operations/file-sync-handoff.js

@@ -28,6 +28,7 @@ const logger = (0, logger_1.createLogger)('FileSyncHandoff');
 const SYNC_TIMEOUT_MS = 30 * 60_000;
 const CONNECT_TIMEOUT_MS = 60_000;
 const POLL_MS = 500;
+const GIT_SETTLE_TIMEOUT_MS = 2 * 60_000;
 class FileSyncNotConnectedError extends error_types_1.AppError {
     constructor(address) {
         super(`Syncthing at home could not connect to the remote's Syncthing at ${address}.`, 'FILE_SYNC_NOT_CONNECTED', 502, { address });
@@ -69,7 +70,7 @@ let FileSyncHandoff = class FileSyncHandoff {
         try {
             const { remoteId } = run.operation;
             const ignores = this.syncIgnores(projectId);
-            const { removed } = await this.host.removeGitGuard(remoteId, projectId);
+            const { removed } = await this.host.removeGitGuard(remoteId, projectId, {}, this.gitOwner.fence(projectId));
             if (removed)
                 await run.progress({ vmGuardRemoved: true });
             controller.signal.throwIfAborted();
@@ -189,46 +190,20 @@ let FileSyncHandoff = class FileSyncHandoff {
                 await run.progress({ guardWarning });
         }
     }
-    async settleGit(run, projectId, owner) {
-        const controller = new AbortController();
-        const { remoteId, id } = run.operation;
-        this.active.set(id, controller);
-        try {
-            const devices = await this.pair(remoteId, controller.signal);
-            const folders = (0, file_sync_service_1.projectFolderList)(projectId, ['git']);
-            const config = owner === 'vm'
-                ? await this.fileSync.folderConfiguration(folders[0].id)
-                : await this.host.syncFolderConfiguration(remoteId, folders[0].id);
-            controller.signal.throwIfAborted();
-            if (config.type !== 'receiveonly' || config.paused)
-                throw new error_types_1.AppError('The receiving Git folder is not ready. Retry the switch.', 'GIT_SWITCH_RECEIVER_NOT_READY', 409);
-            await this.waitAll(run, folders, {
-                sender: owner === 'vm' ? 'host' : 'home',
-                devices,
-                requireNoReceiveOnlyChanges: true,
-                revertAfterComplete: true,
-                signal: controller.signal,
-            });
-        }
-        finally {
-            if (this.active.get(id) === controller)
-                this.active.delete(id);
-        }
-    }
     async flipGit(run, projectId, owner) {
         const { remoteId } = run.operation;
         const folderId = (0, file_sync_service_1.projectFolderId)(projectId, 'git');
         const ignores = (0, file_sync_dto_1.gitIgnores)(true);
         if (owner === 'home') {
-            await this.host.syncFolderType(remoteId, folderId, { type: 'receiveonly', ignores });
+            await this.update('host', remoteId, folderId, { type: 'receiveonly', ignores });
             await this.fileSync.updateFolder(folderId, { type: 'sendonly', ignores });
         }
         else {
             await this.fileSync.updateFolder(folderId, { type: 'receiveonly', ignores });
-            await this.host.syncFolderType(remoteId, folderId, { type: 'sendonly', ignores });
+            await this.update('host', remoteId, folderId, { type: 'sendonly', ignores });
         }
         this.gitOwner.set(projectId, owner);
-        await this.host.syncFolderType(remoteId, folderId, { paused: false });
+        await this.update('host', remoteId, folderId, { paused: false });
         await this.fileSync.updateFolder(folderId, { paused: false });
     }
     async forceCopy(run, projectId, source, kinds) {
@@ -245,15 +220,16 @@ let FileSyncHandoff = class FileSyncHandoff {
             backups.push({ side: receiver === 'home' ? 'home' : 'vm', kind: folder.kind, path });
         }
         await this.forceProgress(run, { backups, verified: false });
+        await this.followVmGit(remoteId, projectId);
         await this.guard.remove(projectId, { refreshIndex: false });
-        await this.host.removeGitGuard(remoteId, projectId);
+        await this.host.removeGitGuard(remoteId, projectId, {}, this.gitOwner.fence(projectId));
         for (const folder of folders) {
             for (const side of ['home', 'host']) {
                 try {
                     if (side === 'home')
                         await this.fileSync.removeFolder(folder.id);
                     else
-                        await this.host.syncRemoveFolder(remoteId, folder.id);
+                        await this.host.syncRemoveFolder(remoteId, folder.id, ...this.gitFence(folder.id));
                 }
                 catch (error) {
                     if (!((error instanceof syncthing_rest_client_1.SyncthingRestError || error instanceof remote_host_client_1.RemoteHostRequestError) &&
@@ -282,7 +258,7 @@ let FileSyncHandoff = class FileSyncHandoff {
                 type: sender === 'host' ? 'sendonly' : 'receiveonly',
                 peerDeviceId: devices.home,
                 ...(receiver === 'host' && { forceCopy: { operationId } }),
-            });
+            }, ...this.gitFence(folder.id));
         }
         await this.unpauseAll(remoteId, folders);
         for (const folder of folders) {
@@ -296,7 +272,7 @@ let FileSyncHandoff = class FileSyncHandoff {
             if (sender === 'home')
                 await this.fileSync.override(folder.id);
             else
-                await this.host.syncOverride(remoteId, folder.id);
+                await this.host.syncOverride(remoteId, folder.id, ...this.gitFence(folder.id));
         }
         const replaced = { count: 0, sample: [] };
         for (const folder of folders) {
@@ -335,7 +311,7 @@ let FileSyncHandoff = class FileSyncHandoff {
         if (this.forceDetails(run).verified !== true)
             throw new error_types_1.AppError('Force sync has not verified the copy.', 'FORCE_SYNC_NOT_VERIFIED', 409);
         const { remoteId } = run.operation;
-        const owner = this.gitOwner.get(projectId);
+        const owner = await this.followVmGit(remoteId, projectId);
         const devices = await this.pair(remoteId);
         const folders = (0, file_sync_service_1.projectFolderList)(projectId, kinds);
         const ignores = this.syncIgnores(projectId);
@@ -355,7 +331,7 @@ let FileSyncHandoff = class FileSyncHandoff {
                 ...request,
                 type: folder.kind === 'code' ? 'sendreceive' : owner === 'vm' ? 'sendonly' : 'receiveonly',
                 peerDeviceId: devices.home,
-            });
+            }, ...this.gitFence(folder.id));
             if (folder.kind === 'git' && owner === 'home') {
                 await ensureHost();
                 await ensureHome();
@@ -373,10 +349,7 @@ let FileSyncHandoff = class FileSyncHandoff {
                     await run.progress({ guardWarning });
             }
             else {
-                const { warning } = await this.host.installGitGuard(remoteId, projectId, {
-                    homeName: (0, node_os_1.hostname)(),
-                    reason: 'pc-git',
-                });
+                const { warning } = await this.host.installGitGuard(remoteId, projectId, { homeName: (0, node_os_1.hostname)(), reason: 'pc-git' }, this.gitOwner.fence(projectId));
                 await run.progress({ vmGuardWarning: warning });
             }
         }
@@ -433,10 +406,12 @@ let FileSyncHandoff = class FileSyncHandoff {
     }
     async final(run, projectId) {
         const { remoteId } = run.operation;
-        const owner = this.gitOwner.get(projectId);
+        const folders = await this.fileSync.projectFolders(projectId);
+        const owner = folders.some((folder) => folder.kind === 'git')
+            ? await this.settleVmGit(run, projectId)
+            : this.gitOwner.get(projectId);
         const ignores = this.syncIgnores(projectId);
         const devices = await this.pair(remoteId);
-        const folders = await this.fileSync.projectFolders(projectId);
         await run.progress({ fileSyncPaused: true });
         for (const folder of folders) {
             const request = {
@@ -449,7 +424,7 @@ let FileSyncHandoff = class FileSyncHandoff {
                 ...request,
                 type: folder.kind === 'code' ? 'sendreceive' : owner === 'vm' ? 'sendonly' : 'receiveonly',
                 peerDeviceId: devices.home,
-            });
+            }, ...this.gitFence(folder.id));
             const ensureHome = () => this.fileSync.ensureFolder({
                 ...request,
                 type: folder.kind === 'code' ? 'sendreceive' : owner === 'home' ? 'sendonly' : 'receiveonly',
@@ -473,7 +448,10 @@ let FileSyncHandoff = class FileSyncHandoff {
     }
     async flipToHome(run, projectId, force) {
         const { remoteId } = run.operation;
-        for (const folder of await this.fileSync.projectFolders(projectId)) {
+        const folders = await this.fileSync.projectFolders(projectId);
+        if (!force && folders.some((folder) => folder.kind === 'git'))
+            await this.followVmGit(remoteId, projectId);
+        for (const folder of folders) {
             if (!force) {
                 await this.update('host', remoteId, folder.id, { type: 'receiveonly', paused: true });
             }
@@ -486,10 +464,7 @@ let FileSyncHandoff = class FileSyncHandoff {
         }
         else {
             await run.progress({ vmGuardInstalled: true }, { durable: true });
-            const { warning } = await this.host.installGitGuard(remoteId, projectId, {
-                homeName: (0, node_os_1.hostname)(),
-                reason: 'disconnect',
-            });
+            const { warning } = await this.host.installGitGuard(remoteId, projectId, { homeName: (0, node_os_1.hostname)(), reason: 'disconnect' }, this.gitOwner.fence(projectId));
             await run.progress({ vmGuardWarning: warning, vmGuardInstalled: warning === null });
         }
         await this.deleteHomeTempFiles(projectId);
@@ -507,7 +482,7 @@ let FileSyncHandoff = class FileSyncHandoff {
         }
         try {
             for (const folder of folders) {
-                await this.host.syncRemoveFolder(remoteId, folder.id);
+                await this.host.syncRemoveFolder(remoteId, folder.id, ...this.gitFence(folder.id));
             }
             return null;
         }
@@ -517,18 +492,17 @@ let FileSyncHandoff = class FileSyncHandoff {
         }
     }
     async flipBackToHost(remoteId, projectId, force) {
-        const owner = this.gitOwner.get(projectId);
         const folders = await this.fileSync.projectFolders(projectId);
+        const owner = force || !folders.some((folder) => folder.kind === 'git')
+            ? this.gitOwner.get(projectId)
+            : await this.followVmGit(remoteId, projectId);
         await this.hostDirections(remoteId, folders, owner, force, false);
         if (folders.some((folder) => folder.kind === 'git')) {
-            const guardWarning = owner === 'vm'
-                ? await this.guard.reinstall(projectId, remoteId)
-                : force
-                    ? null
-                    : (await this.host.installGitGuard(remoteId, projectId, {
-                        homeName: (0, node_os_1.hostname)(),
-                        reason: 'pc-git',
-                    })).warning;
+            let guardWarning = null;
+            if (owner === 'vm')
+                guardWarning = await this.guard.reinstall(projectId, remoteId);
+            else if (!force)
+                guardWarning = (await this.host.installGitGuard(remoteId, projectId, { homeName: (0, node_os_1.hostname)(), reason: 'pc-git' }, this.gitOwner.fence(projectId))).warning;
             if (guardWarning) {
                 logger.warn({ projectId, remoteId, guardWarning }, 'Remote git guard not reinstalled');
             }
@@ -635,14 +609,9 @@ let FileSyncHandoff = class FileSyncHandoff {
                         const status = await this.status(receiver, remoteId, folder.id, symmetric ? options.devices[sender] : undefined);
                         if (!symmetric && status.receiveOnlyChangedFiles > 0) {
                             signal.throwIfAborted();
-                            const source = await this.status(sender, remoteId, folder.id, options.revertAfterComplete ? receiverDevice : undefined);
+                            const source = await this.status(sender, remoteId, folder.id);
                             signal.throwIfAborted();
-                            const transferred = (0, file_sync_service_1.senderIndexReached)(source, status) &&
-                                source.peer?.completion === 100 &&
-                                source.peer.needItems === 0 &&
-                                source.peer.remoteState === 'valid' &&
-                                status.needTotalItems === 0;
-                            if (options.revertAfterComplete ? transferred : (0, file_sync_service_1.senderIndexReached)(source, status))
+                            if ((0, file_sync_service_1.senderIndexReached)(source, status))
                                 await this.revert(receiver, remoteId, folder.id);
                         }
                         return status;
@@ -670,7 +639,7 @@ let FileSyncHandoff = class FileSyncHandoff {
             if (side === 'home')
                 await this.fileSync.updateFolder(folderId, patch);
             else
-                await this.host.syncFolderType(remoteId, folderId, patch);
+                await this.host.syncFolderType(remoteId, folderId, patch, ...this.gitFence(folderId));
         }
         catch (error) {
             if ((error instanceof syncthing_rest_client_1.SyncthingRestError || error instanceof remote_host_client_1.RemoteHostRequestError) &&
@@ -691,12 +660,44 @@ let FileSyncHandoff = class FileSyncHandoff {
     scan(side, remoteId, folderId, signal) {
         return side === 'home'
             ? this.fileSync.rescan(folderId, signal)
-            : this.host.syncScan(remoteId, folderId);
+            : this.host.syncScan(remoteId, folderId, ...this.gitFence(folderId));
     }
     revert(side, remoteId, folderId) {
         return side === 'home'
             ? this.fileSync.revertLocalChanges(folderId)
-            : this.host.syncRevert(remoteId, folderId);
+            : this.host.syncRevert(remoteId, folderId, ...this.gitFence(folderId));
+    }
+    gitFence(folderId) {
+        const projectId = (0, file_sync_service_1.gitFolderProjectId)(folderId);
+        return projectId === null ? [] : [this.gitOwner.fence(projectId)];
+    }
+    async followVmGit(remoteId, projectId) {
+        const record = await this.host.gitCoordinatorStatus(remoteId, projectId);
+        if (record.transition)
+            throw new error_types_1.AppError('Git is moving between this PC and the VM. Retry after the move finishes.', 'GIT_TRANSITION_PENDING', 409);
+        this.gitOwner.remember(projectId, record);
+        return record.owner;
+    }
+    async settleVmGit(run, projectId) {
+        const { remoteId } = run.operation;
+        await run.progress({ gitAdmissionClosed: true }, { durable: true });
+        let record = await this.host.gitCoordinatorClose(remoteId, projectId);
+        const deadline = Date.now() + GIT_SETTLE_TIMEOUT_MS;
+        for (;;) {
+            const busy = [
+                Object.keys(record.homeWrites).length && 'a Git write on this PC is not confirmed',
+                record.transition && 'Git is moving between this PC and the VM',
+                Object.keys(record.vmHolds).length && 'Git commands are running on the VM',
+            ].filter(Boolean);
+            if (busy.length === 0)
+                break;
+            if (Date.now() >= deadline)
+                throw new error_types_1.AppError(`Git is still busy: ${busy.join('; ')}. Retry the Disconnect after it finishes.`, 'GIT_STILL_BUSY', 409);
+            await sleep(POLL_MS);
+            record = await this.host.gitCoordinatorStatus(remoteId, projectId);
+        }
+        this.gitOwner.remember(projectId, record);
+        return record.owner;
     }
 };
 exports.FileSyncHandoff = FileSyncHandoff;