devchain-cli 0.25.0 → 0.26.1

package/dist/server/modules/remotes/git-owner.store.js

@@ -18,29 +18,57 @@ 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 git_coordinator_dto_1 = require("./git-coordinator/git-coordinator.dto");
 const SETTINGS_KEY = 'remotes.gitOwner';
-const GitOwnersSchema = zod_1.z.record(zod_1.z.literal('home'));
+const CachedOwnerSchema = git_coordinator_dto_1.GitCoordinatorRecordSchema.pick({ owner: true, generation: true });
+const GitOwnersSchema = zod_1.z.record(zod_1.z.union([
+    zod_1.z.literal('home').transform(() => ({ owner: 'home', generation: 0 })),
+    CachedOwnerSchema,
+]));
+const VM_OWNED = { owner: 'vm', generation: 0 };
 let GitOwnerStore = class GitOwnerStore {
     sqlite;
     transactions;
-    generations = new Map();
+    revisions = new Map();
     constructor(db) {
         this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(db);
         this.transactions = new transaction_runner_1.TransactionRunner(this.sqlite);
     }
     get(projectId) {
-        return this.readMap()[projectId] ?? 'vm';
+        return this.cached(projectId).owner;
     }
     generation(projectId) {
-        return this.generations.get(projectId) ?? 0;
+        return this.cached(projectId).generation;
+    }
+    fence(projectId) {
+        return { expectedGeneration: this.generation(projectId), transitionId: null };
+    }
+    revision(projectId) {
+        return this.revisions.get(projectId) ?? 0;
     }
     set(projectId, owner) {
+        this.write(projectId, (current) => ({ owner, generation: current.generation }));
+    }
+    remember(projectId, record) {
+        this.write(projectId, () => ({ owner: record.owner, generation: record.generation }));
+    }
+    clear(projectId) {
+        this.write(projectId, () => VM_OWNED);
+    }
+    cached(projectId) {
+        return this.readMap()[projectId] ?? VM_OWNED;
+    }
+    write(projectId, next) {
+        let changed = false;
         this.transactions.runImmediate(() => {
             const map = this.readMap();
-            if (owner === 'home')
-                map[projectId] = owner;
-            else
+            const current = map[projectId] ?? VM_OWNED;
+            const value = next(current);
+            changed = value.owner !== current.owner || value.generation !== current.generation;
+            if (value.owner === 'vm' && value.generation === 0)
                 delete map[projectId];
+            else
+                map[projectId] = value;
             const now = new Date().toISOString();
             this.sqlite
                 .prepare(`INSERT INTO settings (id, key, value, created_at, updated_at)
@@ -48,10 +76,8 @@ let GitOwnerStore = class GitOwnerStore {
            ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`)
                 .run(SETTINGS_KEY, JSON.stringify(map), now, now);
         });
-        this.generations.set(projectId, this.generation(projectId) + 1);
-    }
-    clear(projectId) {
-        this.set(projectId, 'vm');
+        if (changed)
+            this.revisions.set(projectId, this.revision(projectId) + 1);
     }
     readMap() {
         const row = this.sqlite

package/dist/server/modules/remotes/git-owner.store.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-owner.store.js","sourceRoot":"","sources":["../../../src/modules/remotes/git-owner.store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAGpD,6BAAwB;AACxB,2DAA0D;AAC1D,yDAA8D;AAC9D,yEAAqE;AAErE,MAAM,YAAY,GAAG,kBAAkB,CAAC;AACxC,MAAM,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAI7C,IAAM,aAAa,GAAnB,MAAM,aAAa;IACP,MAAM,CAAoB;IAC1B,YAAY,CAAoB;IAChC,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEzD,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,GAAG,CAAC,SAAiB;QACnB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC;IAC3C,CAAC;IAGD,UAAU,CAAC,SAAiB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,GAAG,CAAC,SAAiB,EAAE,KAAe;QACpC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE;YAClC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC3B,IAAI,KAAK,KAAK,MAAM;gBAAE,GAAG,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;;gBACxC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,MAAM;iBACR,OAAO,CACN;;mGAEyF,CAC1F;iBACA,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,SAAiB;QACrB,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAEO,OAAO;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM;aACpB,OAAO,CAAC,0CAA0C,CAAC;aACnD,GAAG,CAAC,YAAY,CAAkC,CAAC;QACtD,OAAO,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,CAAC;CACF,CAAA;AA9CY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;IAME,WAAA,IAAA,eAAM,EAAC,2BAAa,CAAC,CAAA;;GALvB,aAAa,CA8CzB"}
+{"version":3,"file":"git-owner.store.js","sourceRoot":"","sources":["../../../src/modules/remotes/git-owner.store.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/remotes/git-shim/git-shim-registry.service.d.ts

@@ -0,0 +1,30 @@
+import type { OnApplicationBootstrap, OnModuleDestroy } from '@nestjs/common';
+import { FileSyncService } from '../../file-sync/file-sync.service';
+import { type ProjectStorage, type RemoteStorage } from '../../storage/interfaces/storage.interface';
+import { ProcessExecutor } from '../../terminal/services/process-executor/process-executor.port';
+import { GitCoordinatorStore } from '../git-coordinator/git-coordinator.store';
+import { GitOwnerStore } from '../git-owner.store';
+export declare const GIT_SHIM_HOME: unique symbol;
+export declare const GIT_SHIM_REFRESH_MS: unique symbol;
+export declare class GitShimRegistryService implements OnApplicationBootstrap, OnModuleDestroy {
+    private readonly storage;
+    private readonly files;
+    private readonly owners;
+    private readonly coordinator;
+    private readonly executor;
+    private readonly home;
+    private readonly refreshMs;
+    private readonly onVm;
+    private timer?;
+    private running?;
+    private gitSupported?;
+    constructor(storage: ProjectStorage & RemoteStorage, files: FileSyncService, owners: GitOwnerStore, coordinator: GitCoordinatorStore, executor: ProcessExecutor, home: string, refreshMs: number, onVm: () => boolean);
+    onApplicationBootstrap(): void;
+    onModuleDestroy(): Promise<void>;
+    refresh(): Promise<void>;
+    private write;
+    private projects;
+    private render;
+    private replace;
+    private supportsShim;
+}

package/dist/server/modules/remotes/git-shim/git-shim-registry.service.js

@@ -0,0 +1,175 @@
+"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.GitShimRegistryService = exports.GIT_SHIM_REFRESH_MS = exports.GIT_SHIM_HOME = void 0;
+const common_1 = require("@nestjs/common");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const git_shim_paths_1 = require("../../../common/git-shim-paths");
+const logger_1 = require("../../../common/logging/logger");
+const file_sync_service_1 = require("../../file-sync/file-sync.service");
+const storage_interface_1 = require("../../storage/interfaces/storage.interface");
+const process_executor_port_1 = require("../../terminal/services/process-executor/process-executor.port");
+const quote_shell_arg_1 = require("../../terminal/services/terminal-io/quote-shell-arg");
+const git_checkpoint_1 = require("../git-coordinator/git-checkpoint");
+const git_coordinator_store_1 = require("../git-coordinator/git-coordinator.store");
+const git_owner_store_1 = require("../git-owner.store");
+const logger = (0, logger_1.createLogger)('GitShimRegistry');
+exports.GIT_SHIM_HOME = Symbol('GIT_SHIM_HOME');
+exports.GIT_SHIM_REFRESH_MS = Symbol('GIT_SHIM_REFRESH_MS');
+const PROJECTS_FILE = 'projects.sh';
+let GitShimRegistryService = class GitShimRegistryService {
+    storage;
+    files;
+    owners;
+    coordinator;
+    executor;
+    home;
+    refreshMs;
+    onVm;
+    timer;
+    running;
+    gitSupported;
+    constructor(storage, files, owners, coordinator, executor, home, refreshMs, onVm) {
+        this.storage = storage;
+        this.files = files;
+        this.owners = owners;
+        this.coordinator = coordinator;
+        this.executor = executor;
+        this.home = home;
+        this.refreshMs = refreshMs;
+        this.onVm = onVm;
+    }
+    onApplicationBootstrap() {
+        if (this.refreshMs <= 0)
+            return;
+        void this.refresh();
+        this.timer = setInterval(() => void this.refresh(), this.refreshMs);
+        this.timer.unref();
+    }
+    async onModuleDestroy() {
+        clearInterval(this.timer);
+        await this.running;
+    }
+    refresh() {
+        this.running ??= this.write()
+            .catch((error) => logger.warn({ error }, 'Git shim project list not refreshed'))
+            .finally(() => {
+            this.running = undefined;
+        });
+        return this.running;
+    }
+    async write() {
+        const projects = (await this.supportsShim()) ? await this.projects() : [];
+        await (0, promises_1.mkdir)((0, node_path_1.join)(this.home, 'state'), { recursive: true });
+        for (const project of projects)
+            await this.replace((0, node_path_1.join)(this.home, 'state', project.projectId), `${project.owner} ${project.generation}\n`);
+        await this.replace((0, node_path_1.join)(this.home, PROJECTS_FILE), this.render(projects));
+        const kept = new Set(projects.map((project) => project.projectId));
+        for (const name of await (0, promises_1.readdir)((0, node_path_1.join)(this.home, 'state')))
+            if (!kept.has(name))
+                await (0, promises_1.rm)((0, node_path_1.join)(this.home, 'state', name), { force: true });
+    }
+    async projects() {
+        const bindings = new Map((await this.storage.listRemoteProjectBindings()).map((binding) => [
+            binding.projectId,
+            binding,
+        ]));
+        const onVm = this.onVm();
+        const projects = [];
+        for (const projectId of await this.files.projectsWithFolder('git')) {
+            const binding = bindings.get(projectId);
+            if (!binding && !onVm)
+                continue;
+            let commonDir;
+            try {
+                commonDir = await (0, promises_1.realpath)((0, node_path_1.join)((await this.storage.getProject(projectId)).rootPath, '.git'));
+            }
+            catch {
+                continue;
+            }
+            if (binding) {
+                const remote = await this.storage.getRemote(binding.remoteId).catch(() => null);
+                projects.push({
+                    projectId,
+                    side: 'home',
+                    commonDir,
+                    remoteName: remote?.name ?? binding.remoteId,
+                    owner: this.owners.get(projectId),
+                    generation: this.owners.generation(projectId),
+                });
+            }
+            else {
+                const record = this.coordinator.read(projectId);
+                projects.push({
+                    projectId,
+                    side: 'vm',
+                    commonDir,
+                    remoteName: record.homeName ?? 'the PC',
+                    owner: record.owner,
+                    generation: record.generation,
+                });
+            }
+        }
+        return projects;
+    }
+    render(projects) {
+        const entries = projects.map((project) => {
+            const values = [
+                `devchain_project=${(0, quote_shell_arg_1.quoteShellArg)(project.projectId)}`,
+                `devchain_side=${project.side}`,
+                `devchain_remote=${(0, quote_shell_arg_1.quoteShellArg)(project.remoteName)}`,
+                `devchain_state=${(0, quote_shell_arg_1.quoteShellArg)((0, node_path_1.join)(this.home, 'state', project.projectId))}`,
+            ];
+            return `  ${(0, quote_shell_arg_1.quoteShellArg)(project.commonDir)}) ${values.join(' ')} ;;\n`;
+        });
+        return `# Written by DevChain for its git shim; do not edit.\ncase $devchain_common in\n${entries.join('')}esac\n`;
+    }
+    async replace(path, content) {
+        if ((await (0, promises_1.readFile)(path, 'utf8').catch(() => null)) === content)
+            return;
+        const temporary = `${path}.${process.pid}.tmp`;
+        await (0, promises_1.writeFile)(temporary, content, 'utf8');
+        await (0, promises_1.rename)(temporary, path);
+    }
+    async supportsShim() {
+        if (this.gitSupported !== undefined)
+            return this.gitSupported;
+        const result = await this.executor.run({
+            argv: ['git', '--version'],
+            mode: 'pipe',
+            env: (0, git_checkpoint_1.internalGitEnv)(),
+            timeout: 15_000,
+        });
+        const match = /git version (\d+)\.(\d+)/.exec(result.stdout);
+        const [major, minor] = match ? [Number(match[1]), Number(match[2])] : [0, 0];
+        this.gitSupported = major > 2 || (major === 2 && minor >= 31);
+        if (!this.gitSupported)
+            logger.warn({ version: result.stdout.trim() }, 'Git is older than 2.31: the git shim does not route Git writes in connected projects');
+        return this.gitSupported;
+    }
+};
+exports.GitShimRegistryService = GitShimRegistryService;
+exports.GitShimRegistryService = GitShimRegistryService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(storage_interface_1.STORAGE_SERVICE)),
+    __param(5, (0, common_1.Inject)(exports.GIT_SHIM_HOME)),
+    __param(6, (0, common_1.Inject)(exports.GIT_SHIM_REFRESH_MS)),
+    __param(7, (0, common_1.Inject)(git_shim_paths_1.GIT_SHIM_ON_VM)),
+    __metadata("design:paramtypes", [Object, file_sync_service_1.FileSyncService,
+        git_owner_store_1.GitOwnerStore,
+        git_coordinator_store_1.GitCoordinatorStore,
+        process_executor_port_1.ProcessExecutor, String, Number, Function])
+], GitShimRegistryService);
+//# sourceMappingURL=git-shim-registry.service.js.map

package/dist/server/modules/remotes/git-shim/git-shim-registry.service.js.map

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

package/dist/server/modules/remotes/git-writes/change-barrier.d.ts

@@ -0,0 +1,16 @@
+export declare function waitForChangeBarrier(options: {
+    sequences: Record<string, number>;
+    needed: (folderId: string, sequence: number) => Promise<string[]>;
+    failed: (folderId: string) => Promise<string[]>;
+    timeoutMs: number;
+    pollMs: number;
+    sleep: (ms: number) => Promise<void>;
+}): Promise<void>;
+export declare class ChangeBarrierTimeoutError extends Error {
+}
+export declare function scanSequences(files: {
+    rescan(folderId: string): Promise<void>;
+    status(folderId: string): Promise<{
+        sequence?: number;
+    }>;
+}, folderIds: string[]): Promise<Record<string, number | undefined>>;

package/dist/server/modules/remotes/git-writes/change-barrier.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChangeBarrierTimeoutError = void 0;
+exports.waitForChangeBarrier = waitForChangeBarrier;
+exports.scanSequences = scanSequences;
+async function waitForChangeBarrier(options) {
+    const deadline = Date.now() + options.timeoutMs;
+    for (;;) {
+        const counts = await Promise.all(Object.entries(options.sequences).map(async ([folderId, sequence]) => {
+            const needed = await options.needed(folderId, sequence);
+            if (needed.length === 0)
+                return 0;
+            const failed = new Set(await options.failed(folderId));
+            return needed.filter((name) => !failed.has(name)).length;
+        }));
+        const pending = counts.reduce((sum, count) => sum + count, 0);
+        if (pending === 0)
+            return;
+        if (Date.now() >= deadline)
+            throw new ChangeBarrierTimeoutError(`${pending} changed items have not arrived yet`);
+        await options.sleep(options.pollMs);
+    }
+}
+class ChangeBarrierTimeoutError extends Error {
+}
+exports.ChangeBarrierTimeoutError = ChangeBarrierTimeoutError;
+async function scanSequences(files, folderIds) {
+    const scans = await Promise.allSettled(folderIds.map(async (folderId) => {
+        await files.rescan(folderId);
+        return (await files.status(folderId)).sequence;
+    }));
+    const sequences = {};
+    scans.forEach((scan, index) => {
+        if (scan.status === 'rejected')
+            throw scan.reason;
+        sequences[folderIds[index]] = scan.value;
+    });
+    return sequences;
+}
+//# sourceMappingURL=change-barrier.js.map

package/dist/server/modules/remotes/git-writes/change-barrier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-barrier.js","sourceRoot":"","sources":["../../../../src/modules/remotes/git-writes/change-barrier.ts"],"names":[],"mappings":";;;AAMA,oDA2BC;AAQD,sCAmBC;AAtDM,KAAK,UAAU,oBAAoB,CAAC,OAU1C;IACC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;IAChD,SAAS,CAAC;QACR,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;YACnE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACxD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;YAClC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACvD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QAC3D,CAAC,CAAC,CACH,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;QAC9D,IAAI,OAAO,KAAK,CAAC;YAAE,OAAO;QAC1B,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ;YACxB,MAAM,IAAI,yBAAyB,CAAC,GAAG,OAAO,qCAAqC,CAAC,CAAC;QACvF,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;AACH,CAAC;AAED,MAAa,yBAA0B,SAAQ,KAAK;CAAG;AAAvD,8DAAuD;AAMhD,KAAK,UAAU,aAAa,CACjC,KAGC,EACD,SAAmB;IAEnB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,UAAU,CACpC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/B,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IACjD,CAAC,CAAC,CACH,CAAC;IACF,MAAM,SAAS,GAAuC,EAAE,CAAC;IACzD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU;YAAE,MAAM,IAAI,CAAC,MAAM,CAAC;QAClD,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;IAC3C,CAAC,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/server/modules/remotes/git-writes/home-git-handover.service.d.ts

@@ -0,0 +1,42 @@
+import { type FileSyncPaths } from '../../file-sync/file-sync-paths';
+import { FileSyncService } from '../../file-sync/file-sync.service';
+import { HomeGitGuardService } from '../../file-sync/home-git-guard.service';
+import { GitService } from '../../git/services/git.service';
+import { ProcessExecutor } from '../../terminal/services/process-executor/process-executor.port';
+import { GitCoordinatorIndexService } from '../git-coordinator/git-coordinator-index.service';
+import { GitOwnerStore } from '../git-owner.store';
+import { RemoteHostClient } from '../operations/remote-host.client';
+import { RemoteLiveSyncService } from '../sync/remote-live-sync.service';
+import { HomeGitTransitions, type HomeGitTransitionContext } from './home-git-transitions';
+export declare const HOME_GIT_HANDOVER_TIMINGS: unique symbol;
+export declare const DEFAULT_HOME_GIT_HANDOVER_TIMINGS: {
+    barrierPollMs: number;
+    drainMs: number;
+    barrierMs: number;
+    renewMs: number;
+    settleMs: number;
+    retryMs: number;
+};
+export type HomeGitHandoverTimings = typeof DEFAULT_HOME_GIT_HANDOVER_TIMINGS;
+export declare class HomeGitHandoverService extends HomeGitTransitions {
+    private readonly host;
+    private readonly files;
+    private readonly guard;
+    private readonly indexes;
+    private readonly owners;
+    private readonly git;
+    private readonly executor;
+    private readonly live;
+    private readonly paths;
+    private readonly timings;
+    constructor(host: RemoteHostClient, files: FileSyncService, guard: HomeGitGuardService, indexes: GitCoordinatorIndexService, owners: GitOwnerStore, git: GitService, executor: ProcessExecutor, live: RemoteLiveSyncService, paths: FileSyncPaths, timings: HomeGitHandoverTimings);
+    handover(context: HomeGitTransitionContext): Promise<void>;
+    stepDown(context: HomeGitTransitionContext): Promise<void>;
+    private runHandover;
+    private drain;
+    private barrier;
+    private finish;
+    private abortBeforeFlip;
+    private runStepDown;
+    private backup;
+}