devchain-cli 0.25.0 → 0.26.0

package/dist/server/modules/remotes/services/remote-shared-vm.service.js

@@ -0,0 +1,184 @@
+"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.RemoteSharedVmService = void 0;
+exports.notifyForcedStep = notifyForcedStep;
+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 home_identity_1 = require("../home-identity");
+const remote_host_client_1 = require("../operations/remote-host.client");
+const shared_vm_dto_1 = require("../dtos/shared-vm.dto");
+const remote_shared_vm_store_1 = require("./remote-shared-vm.store");
+const logger_1 = require("../../../common/logging/logger");
+const logger = (0, logger_1.createLogger)('RemoteSharedVmService');
+function notifyForcedStep(sharedVm) {
+    return {
+        id: 'notify_forced',
+        label: 'Notify the other VM users',
+        skip: (details) => details.forceOccupied !== true && details.force !== true,
+        run: async ({ operation }) => {
+            await sharedVm()
+                .notify(operation.remoteId, { action: 'forced' })
+                .catch(() => undefined);
+        },
+    };
+}
+let RemoteSharedVmService = class RemoteSharedVmService {
+    storage;
+    client;
+    store;
+    constructor(storage, client, store) {
+        this.storage = storage;
+        this.client = client;
+        this.store = store;
+    }
+    lastRoster(remoteId) {
+        return this.store.read(remoteId);
+    }
+    async context(remoteId) {
+        const remote = await this.storage.getRemote(remoteId);
+        const lastRoster = this.store.read(remoteId);
+        if (!remote.baseUrl)
+            return { occupancy: { unavailable: true, instances: [] }, lastRoster };
+        const [identity] = await this.storage.listRemoteOperations({
+            remoteId,
+            states: ['done'],
+            kinds: home_identity_1.CLAIM_IDENTITY_KINDS,
+            limit: 1,
+        });
+        const ownUser = typeof identity?.details.userName === 'string'
+            ? identity.details.userName
+            : (0, home_identity_1.homeIdentity)().user;
+        let roster;
+        try {
+            roster = shared_vm_dto_1.SharedVmRosterSchema.parse(await this.client.sharedVmRoster(remoteId));
+            if (new Set(roster.instances.map(({ user }) => user)).size !== roster.instances.length ||
+                !roster.instances.some(({ user }) => user === ownUser)) {
+                throw new Error('The roster does not identify this instance.');
+            }
+        }
+        catch {
+            return { occupancy: { unavailable: true, instances: [] }, lastRoster };
+        }
+        const saved = { roster, ownUser, at: new Date().toISOString(), vmIdentity: remote.vmIdentity };
+        await this.store.write(remoteId, saved);
+        return {
+            occupancy: {
+                unavailable: false,
+                instances: roster.instances.filter(({ user }) => user !== ownUser),
+            },
+            lastRoster: saved,
+        };
+    }
+    async assertAllowed(remoteId, input) {
+        const context = await this.context(remoteId);
+        if (!input.forceOccupied && (0, shared_vm_dto_1.sharedVmOccupied)(context.occupancy))
+            this.refuse(context);
+        if (input.forceOccupied && input.confirmedOccupancy)
+            this.assertConfirmed(context, input.confirmedOccupancy);
+        return input.forceOccupied
+            ? (input.confirmedOccupancy ?? context.occupancy)
+            : context.occupancy;
+    }
+    async notify(remoteId, input) {
+        return this.client.sharedVmNotify(remoteId, input);
+    }
+    async fencedDestroy(input) {
+        const { operation, details } = input;
+        if (input.previouslyAttempted && input.confirmedGone && (await input.confirmedGone())) {
+            await input.destroy();
+            return;
+        }
+        try {
+            await this.client.sharedVmFence(operation.remoteId, {
+                mode: 'set',
+                operationId: operation.id,
+            });
+        }
+        catch (error) {
+            if (error instanceof remote_host_client_1.RemoteHostRequestError && error.status !== null && error.status < 500)
+                throw error;
+            if (!details.forceOccupied)
+                throw error;
+        }
+        try {
+            const context = await this.context(operation.remoteId);
+            if (!details.forceOccupied && (0, shared_vm_dto_1.sharedVmOccupied)(context.occupancy))
+                this.refuse(context);
+            this.assertConfirmed(context, details.confirmedOccupancy ?? { unavailable: false, instances: [] });
+        }
+        catch (error) {
+            await this.releaseFenceIfIdle(input, !input.previouslyAttempted);
+            throw error;
+        }
+        try {
+            await input.destroy();
+        }
+        catch (error) {
+            await this.releaseFenceIfIdle(input, error instanceof error_types_1.ConflictError && !input.previouslyAttempted);
+            throw error;
+        }
+    }
+    async releaseFenceIfIdle(input, knownIdle) {
+        let idle = knownIdle;
+        try {
+            if (!idle)
+                idle = await input.confirmedIdle();
+        }
+        catch {
+        }
+        if (idle)
+            await this.clearFence(input.operation);
+    }
+    assertConfirmed(context, confirmed) {
+        if (confirmed.unavailable)
+            return;
+        if (context.occupancy.unavailable)
+            this.refuse(context);
+        for (const current of context.occupancy.instances) {
+            const previous = confirmed.instances.find(({ user }) => user === current.user);
+            if (!previous)
+                this.refuse(context);
+            const confirmedIds = previous.connectedProjectIds;
+            if (confirmedIds === 'unknown' || previous.connectedCount === 'unknown')
+                continue;
+            if (current.connectedProjectIds === 'unknown' ||
+                current.connectedCount === 'unknown' ||
+                current.connectedProjectIds.some((id) => !confirmedIds.includes(id)))
+                this.refuse(context);
+        }
+    }
+    refuse(context) {
+        const users = context.occupancy.instances.map(({ user, connectedCount, connectedProjectIds }) => `${user} (${connectedProjectIds === 'unknown' ? 'unknown' : connectedCount} projects)`);
+        throw new error_types_1.AppError(context.occupancy.unavailable
+            ? 'Other users’ connected projects on this VM are unknown. Notify them or confirm a forced operation.'
+            : `Other users are connected to this VM: ${users.join(', ')}. Notify them or confirm a forced operation.`, shared_vm_dto_1.SHARED_VM_GUARD_CODE, 409, { ...context });
+    }
+    async clearFence(operation) {
+        await this.client
+            .sharedVmFence(operation.remoteId, { mode: 'clear', operationId: operation.id })
+            .catch((error) => {
+            logger.warn({ remoteId: operation.remoteId, operationId: operation.id, error: String(error) }, 'Could not clear the destroy fence');
+        });
+    }
+};
+exports.RemoteSharedVmService = RemoteSharedVmService;
+exports.RemoteSharedVmService = RemoteSharedVmService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(storage_interface_1.STORAGE_SERVICE)),
+    __metadata("design:paramtypes", [Object, remote_host_client_1.RemoteHostClient,
+        remote_shared_vm_store_1.RemoteSharedVmStore])
+], RemoteSharedVmService);
+//# sourceMappingURL=remote-shared-vm.service.js.map

package/dist/server/modules/remotes/services/remote-shared-vm.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-shared-vm.service.js","sourceRoot":"","sources":["../../../../src/modules/remotes/services/remote-shared-vm.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/remotes/services/remote-shared-vm.store.d.ts

@@ -0,0 +1,11 @@
+import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
+import type { SharedVmSavedRoster } from '../dtos/shared-vm.dto';
+export declare class RemoteSharedVmStore {
+    private readonly sqlite;
+    private readonly transactions;
+    private cached;
+    constructor(db: BetterSQLite3Database);
+    read(remoteId: string): SharedVmSavedRoster | null;
+    write(remoteId: string, roster: SharedVmSavedRoster): Promise<void>;
+    private rosters;
+}

package/dist/server/modules/remotes/services/remote-shared-vm.store.js

@@ -0,0 +1,75 @@
+"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.RemoteSharedVmStore = void 0;
+const common_1 = require("@nestjs/common");
+const zod_1 = require("zod");
+const db_provider_1 = require("../../storage/db/db.provider");
+const sqlite_raw_1 = require("../../storage/db/sqlite-raw");
+const transaction_runner_1 = require("../../storage/db/transaction-runner");
+const shared_vm_dto_1 = require("../dtos/shared-vm.dto");
+const KEY = 'remotes.sharedVmRosters';
+const RostersSchema = zod_1.z.record(shared_vm_dto_1.SharedVmSavedRosterSchema);
+let RemoteSharedVmStore = class RemoteSharedVmStore {
+    sqlite;
+    transactions;
+    cached = null;
+    constructor(db) {
+        this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(db);
+        this.transactions = new transaction_runner_1.TransactionRunner(this.sqlite);
+    }
+    read(remoteId) {
+        this.cached ??= this.rosters();
+        return this.cached[remoteId] ?? null;
+    }
+    async write(remoteId, roster) {
+        this.cached = await this.transactions.runImmediateQueued(() => {
+            const rosters = this.rosters();
+            const previous = rosters[remoteId];
+            if (previous && sameRoster(previous, roster))
+                return rosters;
+            rosters[remoteId] = shared_vm_dto_1.SharedVmSavedRosterSchema.parse(roster);
+            const now = new Date().toISOString();
+            this.sqlite
+                .prepare(`INSERT INTO settings (id,key,value,created_at,updated_at)
+        VALUES(lower(hex(randomblob(16))),?,?,?,?)
+        ON CONFLICT(key) DO UPDATE SET value=excluded.value,updated_at=excluded.updated_at`)
+                .run(KEY, JSON.stringify(rosters), now, now);
+            return rosters;
+        });
+    }
+    rosters() {
+        const row = this.sqlite.prepare('SELECT value FROM settings WHERE key=?').get(KEY);
+        if (!row)
+            return {};
+        try {
+            return RostersSchema.parse(JSON.parse(row.value));
+        }
+        catch {
+            return {};
+        }
+    }
+};
+exports.RemoteSharedVmStore = RemoteSharedVmStore;
+exports.RemoteSharedVmStore = RemoteSharedVmStore = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(db_provider_1.DB_CONNECTION)),
+    __metadata("design:paramtypes", [Function])
+], RemoteSharedVmStore);
+function sameRoster(a, b) {
+    return (a.ownUser === b.ownUser &&
+        a.vmIdentity === b.vmIdentity &&
+        JSON.stringify(a.roster) === JSON.stringify(b.roster));
+}
+//# sourceMappingURL=remote-shared-vm.store.js.map

package/dist/server/modules/remotes/services/remote-shared-vm.store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-shared-vm.store.js","sourceRoot":"","sources":["../../../../src/modules/remotes/services/remote-shared-vm.store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAGpD,6BAAwB;AACxB,8DAA6D;AAC7D,4DAAiE;AACjE,4EAAwE;AACxE,yDAAkE;AAGlE,MAAM,GAAG,GAAG,yBAAyB,CAAC;AACtC,MAAM,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC,yCAAyB,CAAC,CAAC;AAOnD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IACb,MAAM,CAAoB;IAC1B,YAAY,CAAoB;IACzC,MAAM,GAA+C,IAAI,CAAC;IAElE,YAAmC,EAAyB;QAC1D,IAAI,CAAC,MAAM,GAAG,IAAA,+BAAkB,EAAC,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,IAAI,sCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,CAAC,QAAgB;QACnB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;IACvC,CAAC;IAGD,KAAK,CAAC,KAAK,CAAC,QAAgB,EAAE,MAA2B;QACvD,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE;YAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAAE,OAAO,OAAO,CAAC;YAC7D,OAAO,CAAC,QAAQ,CAAC,GAAG,yCAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,MAAM;iBACR,OAAO,CACN;;2FAEiF,CAClF;iBACA,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,OAAO;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC,GAAG,CAAC,GAAG,CAEpE,CAAC;QACd,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;CACF,CAAA;AA7CY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAME,WAAA,IAAA,eAAM,EAAC,2BAAa,CAAC,CAAA;;GALvB,mBAAmB,CA6C/B;AAED,SAAS,UAAU,CAAC,CAAsB,EAAE,CAAsB;IAChE,OAAO,CACL,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO;QACvB,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU;QAC7B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CACtD,CAAC;AACJ,CAAC"}

package/dist/server/modules/remotes/sync/remote-file-sync.service.d.ts

@@ -7,6 +7,7 @@ import { FileSyncFailuresService } from './file-sync-failures.service';
 import { FileSyncSuggestionsService } from './file-sync-suggestions.service';
 import { FileSyncService } from '../../file-sync/file-sync.service';
 import { GitService } from '../../git/services/git.service';
+import type { GitCoordinatorRecord } from '../git-coordinator/git-coordinator.dto';
 import { type RemoteStorage, type ProjectStorage } from '../../storage/interfaces/storage.interface';
 import { RemoteHostClient } from '../operations/remote-host.client';
 import { type RemoteHealthPort } from '../ports/remote-health.port';
@@ -35,7 +36,7 @@ export declare class RemoteFileSyncService {
     setAutoFix(projectId: string, enabled: boolean): FileSyncAutoFix;
     warning(projectId: string): string | null;
     problem(projectId: string): FileSyncProblem | null;
-    hasOpenHold(projectId: string): Promise<boolean>;
+    hasOpenHold(projectId: string, vm?: GitCoordinatorRecord): Promise<boolean>;
     assertNoHold(projectId: string): Promise<void>;
     forceSyncOffer(projectId: string, excludeOperationId?: string): Promise<ForceSyncOffer>;
     failedCounts(projectId: string): FileSyncFailedCounts | null;
@@ -44,7 +45,10 @@ export declare class RemoteFileSyncService {
     private retryPullErrors;
     private pauseCode;
     private resumeOwed;
+    private repairGitIgnores;
     tick(projectId: string, remoteId: string, active: () => boolean): Promise<void>;
+    private protectLaneBranches;
+    private followVmRecord;
     private checkSync;
     private fixAutomatically;
     private scanVmOwnership;

package/dist/server/modules/remotes/sync/remote-file-sync.service.js

@@ -92,19 +92,21 @@ let RemoteFileSyncService = class RemoteFileSyncService {
             return 'setup';
         return null;
     }
-    async hasOpenHold(projectId) {
+    async hasOpenHold(projectId, vm) {
+        if (vm && (vm.transition || vm.closed || Object.keys(vm.homeWrites).length))
+            return true;
         const operations = await this.storage.listRemoteOperations({
             projectId,
-            kinds: ['force_sync', 'git_owner'],
+            kinds: ['force_sync'],
             states: ['running', 'failed'],
             limit: 1,
         });
-        return operations.some((operation) => (operation.kind === 'force_sync' || operation.kind === 'git_owner') &&
+        return operations.some((operation) => operation.kind === 'force_sync' &&
             (operation.state === 'running' || operation.state === 'failed'));
     }
     async assertNoHold(projectId) {
         if (await this.hasOpenHold(projectId))
-            throw new error_types_1.ConflictError('Force sync or a Git switch is running for this project. Save the list after it finishes.');
+            throw new error_types_1.ConflictError('Force sync is running for this project. Save the list after it finishes.');
     }
     async forceSyncOffer(projectId, excludeOperationId) {
         const pending = { fromVm: null, fromHome: null };
@@ -283,6 +285,18 @@ let RemoteFileSyncService = class RemoteFileSyncService {
             }
         }
     }
+    async repairGitIgnores(projectId, remoteId) {
+        const id = (0, file_sync_service_1.projectFolderId)(projectId, 'git');
+        const ignores = (0, file_sync_dto_1.gitIgnores)(true);
+        const [home, vm] = await Promise.all([
+            this.files.installedIgnores(id),
+            this.host.syncFolderIgnores(remoteId, id),
+        ]);
+        if (home.ignore.join('\0') !== ignores.join('\0'))
+            await this.files.updateFolder(id, { ignores });
+        if (vm.ignore.join('\0') !== ignores.join('\0'))
+            await this.host.syncFolderType(remoteId, id, { ignores }, this.gitOwner.fence(projectId));
+    }
     async tick(projectId, remoteId, active) {
         const health = this.health.getState(remoteId);
         if (!active() || !health.online || health.apiKeyRejected || !health.versionMatches)
@@ -306,54 +320,59 @@ let RemoteFileSyncService = class RemoteFileSyncService {
                 await this.move(projectId, state, active);
                 return;
             }
+            const now = Date.now();
+            if (state.hasGit &&
+                (state.ignoresRepairedAt === undefined ||
+                    now - state.ignoresRepairedAt >= CHECK_INTERVAL_MS)) {
+                await this.repairGitIgnores(projectId, remoteId);
+                state.ignoresRepairedAt = now;
+            }
+            if (!active())
+                return;
             await this.checkSync(projectId, state, active);
             if (!state.hasGit || !active())
                 return;
-            const owner = this.gitOwner.get(projectId);
-            const receiver = owner === 'vm' ? 'home' : 'vm';
-            const generation = this.gitOwner.generation(projectId);
-            if (state.headsGeneration !== generation) {
-                state.heads = undefined;
-                state.headsGeneration = generation;
+            const vm = await this.host.gitCoordinatorStatus(remoteId, projectId);
+            if (!active() || (await this.hasOpenHold(projectId, vm)))
+                return;
+            const owner = this.followVmRecord(projectId, vm, state);
+            if (owner === null || !active())
+                return;
+            if (owner === 'home') {
+                await this.protectLaneBranches(projectId, remoteId, state, vm.worktreeBranches);
+                if (!active())
+                    return;
             }
             const id = (0, file_sync_service_1.projectFolderId)(projectId, 'git');
-            const config = receiver === 'home'
+            const config = owner === 'vm'
                 ? await this.files.folderConfiguration(id)
                 : await this.host.syncFolderConfiguration(remoteId, id);
             if (!active() || config.type !== 'receiveonly' || config.paused)
                 return;
-            const status = receiver === 'home'
-                ? await this.files.status(id)
-                : await this.host.syncStatus(remoteId, id);
+            const status = owner === 'vm' ? await this.files.status(id) : await this.host.syncStatus(remoteId, id);
             if (!active() || status.state !== 'idle' || status.needTotalItems !== 0)
                 return;
             state.warning = null;
             if (status.receiveOnlyChangedFiles > 0) {
-                if (receiver === 'home')
+                if (owner === 'vm')
                     await this.files.revertLocalChanges(id);
                 else
-                    await this.host.syncRevert(remoteId, id);
+                    await this.host.syncRevert(remoteId, id, this.gitOwner.fence(projectId));
+                return;
+            }
+            if (owner === 'home')
                 return;
+            const revision = this.gitOwner.revision(projectId);
+            if (state.homeHeadRevision !== revision) {
+                state.homeHead = undefined;
+                state.homeHeadRevision = revision;
             }
             const root = await this.files.folderPath(projectId);
             const head = await this.git.mirroredHead(projectId, root);
-            if (!active() || head === null || head === state.heads?.[receiver])
+            if (!active() || head === null || head === state.homeHead)
                 return;
-            if (receiver === 'home') {
-                await this.git.refreshIndexFromHead(projectId, root);
-                (state.heads ??= {}).home = head;
-            }
-            else {
-                const result = await this.host.refreshGitIndex(remoteId, projectId, state.heads?.vm ?? null);
-                if (!active())
-                    return;
-                if (result.warning) {
-                    state.warning = result.warning;
-                    return;
-                }
-                if (result.refreshed && result.head !== null)
-                    (state.heads ??= {}).vm = result.head;
-            }
+            await this.git.refreshIndexFromHead(projectId, root);
+            state.homeHead = head;
         }
         catch (error) {
             state.warning =
@@ -361,6 +380,32 @@ let RemoteFileSyncService = class RemoteFileSyncService {
             logger.warn({ error, projectId, step: state.step }, 'Remote file sync will retry');
         }
     }
+    async protectLaneBranches(projectId, remoteId, state, worktreeBranches) {
+        try {
+            const warning = await this.guard.protectBranches(projectId, remoteId, worktreeBranches);
+            if (warning && warning !== state.laneBranchesWarning)
+                logger.warn({ projectId }, warning);
+            state.laneBranchesWarning = warning;
+        }
+        catch (error) {
+            logger.warn({ error, projectId }, 'VM worktree branch protection was not refreshed');
+        }
+    }
+    followVmRecord(projectId, vm, state) {
+        const cached = this.gitOwner.get(projectId);
+        if (vm.generation === this.gitOwner.generation(projectId) &&
+            (vm.owner === cached || cached === 'home'))
+            return cached;
+        if (vm.owner === 'vm' && cached === 'vm') {
+            this.gitOwner.remember(projectId, vm);
+            return 'vm';
+        }
+        state.warning =
+            cached === 'home'
+                ? 'The VM took Git back while this PC was away. File sync continues after this PC gives up Git.'
+                : 'Git is moving to this PC. File sync continues after the move finishes.';
+        return null;
+    }
     async checkSync(projectId, state, active) {
         const now = Date.now();
         if (!active() || (state.lastCheck !== undefined && now - state.lastCheck < CHECK_INTERVAL_MS))
@@ -532,7 +577,6 @@ let RemoteFileSyncService = class RemoteFileSyncService {
     }
     async move(projectId, state, active) {
         const { remoteId } = state;
-        const owner = this.gitOwner.get(projectId);
         const codeId = (0, file_sync_service_1.projectFolderId)(projectId, 'code');
         const gitId = (0, file_sync_service_1.projectFolderId)(projectId, 'git');
         if (state.step === 'create') {
@@ -540,6 +584,19 @@ let RemoteFileSyncService = class RemoteFileSyncService {
             if (!active() || !folders.some((folder) => folder.kind === 'code'))
                 return;
             state.hasGit = (await this.files.initialFolders(projectId)).some((folder) => folder.kind === 'git');
+        }
+        let owner = this.gitOwner.get(projectId);
+        if (state.hasGit) {
+            const vm = await this.host.gitCoordinatorStatus(remoteId, projectId);
+            if (!active() || (await this.hasOpenHold(projectId, vm)))
+                return;
+            const followed = this.followVmRecord(projectId, vm, state);
+            if (followed === null)
+                return;
+            owner = followed;
+        }
+        const fence = this.gitOwner.fence(projectId);
+        if (state.step === 'create') {
             if (state.hasGit) {
                 const home = this.files.device();
                 const host = await this.host.syncDevice(remoteId);
@@ -554,7 +611,7 @@ let RemoteFileSyncService = class RemoteFileSyncService {
                     peerDeviceId: home.deviceId,
                     ignores: (0, file_sync_dto_1.gitIgnores)(true),
                     paused: true,
-                });
+                }, fence);
                 const ensureHome = () => this.files.ensureFolder({
                     projectId,
                     kind: 'git',
@@ -571,9 +628,9 @@ let RemoteFileSyncService = class RemoteFileSyncService {
                     await ensureVm();
                     await ensureHome();
                 }
-                await this.host.syncFolderType(remoteId, gitId, { paused: false });
+                await this.host.syncFolderType(remoteId, gitId, { paused: false }, fence);
                 await this.files.updateFolder(gitId, { paused: false });
-                await Promise.all([this.host.syncScan(remoteId, gitId), this.files.rescan(gitId)]);
+                await Promise.all([this.host.syncScan(remoteId, gitId, fence), this.files.rescan(gitId)]);
             }
             state.step = state.hasGit ? 'settle' : 'ignores';
         }
@@ -600,7 +657,7 @@ let RemoteFileSyncService = class RemoteFileSyncService {
                 if (owner === 'vm')
                     await this.files.revertLocalChanges(gitId);
                 else
-                    await this.host.syncRevert(remoteId, gitId);
+                    await this.host.syncRevert(remoteId, gitId, fence);
                 return;
             }
             if (!(0, file_sync_service_1.evaluateCompletion)(sender, receiver).done) {
@@ -632,10 +689,7 @@ let RemoteFileSyncService = class RemoteFileSyncService {
                 state.guardWarning =
                     owner === 'vm'
                         ? await this.guard.install(projectId, remoteId)
-                        : (await this.host.installGitGuard(remoteId, projectId, {
-                            homeName: (0, node_os_1.hostname)(),
-                            reason: 'pc-git',
-                        })).warning;
+                        : (await this.host.installGitGuard(remoteId, projectId, { homeName: (0, node_os_1.hostname)(), reason: 'pc-git' }, fence)).warning;
             }
             state.step = 'done';
             state.warning = null;