devchain-cli 0.24.2 → 0.25.0

package/dist/server/modules/remotes/docker/docker-copy-back-exclusions.d.ts

@@ -0,0 +1,27 @@
+import { FileSyncManagedExclusionsStore } from '../../file-sync/file-sync-managed-exclusions.store';
+import { FileSyncService } from '../../file-sync/file-sync.service';
+import { RemoteHostClient } from '../operations/remote-host.client';
+import { RemoteBindingsService } from '../services/remote-bindings.service';
+import { FileSyncSuggestionsService } from '../sync/file-sync-suggestions.service';
+export interface DockerCopyBackExclusionProof {
+    revision: number;
+    confirmed: string[];
+    pending: boolean;
+}
+export declare class DockerCopyBackExclusions {
+    private readonly files;
+    private readonly host;
+    private readonly suggestions;
+    private readonly managed;
+    private readonly bindings;
+    constructor(files: FileSyncService, host: RemoteHostClient, suggestions: FileSyncSuggestionsService, managed: FileSyncManagedExclusionsStore, bindings: RemoteBindingsService);
+    preview(projectId: string, remoteId: string, root: string, targets: string[], signal?: AbortSignal): Promise<string[]>;
+    prepare(projectId: string, remoteId: string, root: string, targets: string[], signal: AbortSignal): Promise<DockerCopyBackExclusionProof>;
+    confirm(projectId: string, remoteId: string, root: string, targets: string[], revision: number, signal: AbortSignal): Promise<string[]>;
+    private installedOnBoth;
+    private projectPath;
+    private excludedOnBoth;
+    private outside;
+    private overlapsGit;
+    private admit;
+}

package/dist/server/modules/remotes/docker/docker-copy-back-exclusions.js

@@ -0,0 +1,185 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DockerCopyBackExclusions = void 0;
+const common_1 = require("@nestjs/common");
+const node_path_1 = require("node:path");
+const error_types_1 = require("../../../common/errors/error-types");
+const file_sync_dto_1 = require("../../file-sync/file-sync.dto");
+const file_sync_managed_exclusions_store_1 = require("../../file-sync/file-sync-managed-exclusions.store");
+const file_sync_service_1 = require("../../file-sync/file-sync.service");
+const ignore_pattern_matcher_1 = require("../../file-sync/ignore-pattern-matcher");
+const sync_path_inspection_dto_1 = require("../../file-sync/sync-path-inspection.dto");
+const remote_host_client_1 = require("../operations/remote-host.client");
+const remote_bindings_service_1 = require("../services/remote-bindings.service");
+const file_sync_suggestions_service_1 = require("../sync/file-sync-suggestions.service");
+const docker_plan_files_1 = require("./docker-plan-files");
+let DockerCopyBackExclusions = class DockerCopyBackExclusions {
+    files;
+    host;
+    suggestions;
+    managed;
+    bindings;
+    constructor(files, host, suggestions, managed, bindings) {
+        this.files = files;
+        this.host = host;
+        this.suggestions = suggestions;
+        this.managed = managed;
+        this.bindings = bindings;
+    }
+    async preview(projectId, remoteId, root, targets, signal) {
+        if (!targets.length)
+            return [];
+        signal?.throwIfAborted();
+        const revision = this.files.getIgnoresRevision(projectId);
+        const binding = await this.bindings.get(projectId);
+        if (binding?.remoteId !== remoteId || !['remote', 'detaching'].includes(binding.state))
+            return [];
+        const state = binding.state;
+        try {
+            const installed = await this.installedOnBoth(projectId, remoteId);
+            signal?.throwIfAborted();
+            const current = await this.bindings.get(projectId);
+            if (current?.remoteId !== remoteId ||
+                current.state !== state ||
+                this.files.getIgnoresRevision(projectId) !== revision)
+                return [];
+            return targets.filter((target) => !this.overlapsGit(root, target) && this.excludedOnBoth(root, target, installed));
+        }
+        catch {
+            signal?.throwIfAborted();
+            return [];
+        }
+    }
+    async prepare(projectId, remoteId, root, targets, signal) {
+        await this.admit(projectId, remoteId, signal);
+        const revision = this.files.getIgnoresRevision(projectId);
+        const unconfirmed = () => ({
+            revision,
+            confirmed: this.outside(root, targets),
+            pending: true,
+        });
+        const paths = targets.filter((target) => target !== root && (0, docker_plan_files_1.within)(root, target) && !this.overlapsGit(root, target));
+        const names = paths
+            .map((path) => this.projectPath(root, path))
+            .filter((path) => sync_path_inspection_dto_1.SyncRelativePathSchema.safeParse(path).success);
+        let additions;
+        try {
+            const inspected = await this.suggestions.vmSuggestions(projectId, remoteId, names);
+            signal.throwIfAborted();
+            additions = inspected.groups
+                .filter((group) => (0, sync_path_inspection_dto_1.isSelectableExclusion)(group) &&
+                group.selected &&
+                group.patternChecksPassed === true &&
+                names.some((name) => {
+                    const match = (0, ignore_pattern_matcher_1.firstMatch)(group.patterns, name);
+                    return match.kind === 'matched' && match.ignored;
+                }))
+                .flatMap((group) => group.patterns);
+        }
+        catch {
+            await this.admit(projectId, remoteId, signal);
+            return unconfirmed();
+        }
+        await this.admit(projectId, remoteId, signal);
+        const current = this.files.getIgnores(projectId);
+        const list = [...new Set([...current, ...additions])];
+        if (this.files.getIgnoresRevision(projectId) !== revision)
+            return unconfirmed();
+        if (list.length !== current.length)
+            this.files.setIgnores(projectId, list, revision);
+        const savedRevision = this.files.getIgnoresRevision(projectId);
+        const installed = (0, file_sync_dto_1.codeIgnores)(this.managed.get(projectId), this.files.getIgnores(projectId));
+        const folderId = (0, file_sync_service_1.codeFolderId)(projectId);
+        let applied = true;
+        for (const apply of [
+            () => this.host.syncFolderType(remoteId, folderId, { ignores: installed }),
+            () => this.files.updateFolder(folderId, { ignores: installed }),
+        ]) {
+            await this.admit(projectId, remoteId, signal);
+            try {
+                await apply();
+            }
+            catch {
+                applied = false;
+            }
+            signal.throwIfAborted();
+        }
+        const confirmed = applied
+            ? await this.confirm(projectId, remoteId, root, targets, savedRevision, signal)
+            : this.outside(root, targets);
+        await this.admit(projectId, remoteId, signal);
+        return { revision: savedRevision, confirmed, pending: true };
+    }
+    async confirm(projectId, remoteId, root, targets, revision, signal) {
+        await this.admit(projectId, remoteId, signal);
+        const outside = this.outside(root, targets);
+        if (this.files.getIgnoresRevision(projectId) !== revision)
+            return outside;
+        let installed;
+        try {
+            installed = await this.installedOnBoth(projectId, remoteId);
+        }
+        catch {
+            await this.admit(projectId, remoteId, signal);
+            return outside;
+        }
+        await this.admit(projectId, remoteId, signal);
+        if (this.files.getIgnoresRevision(projectId) !== revision)
+            return outside;
+        return targets.filter((target) => {
+            if (this.overlapsGit(root, target))
+                return false;
+            return outside.includes(target) || this.excludedOnBoth(root, target, installed);
+        });
+    }
+    installedOnBoth(projectId, remoteId) {
+        const folderId = (0, file_sync_service_1.codeFolderId)(projectId);
+        return Promise.all([
+            this.files.installedIgnores(folderId),
+            this.host.syncFolderIgnores(remoteId, folderId),
+        ]);
+    }
+    projectPath(root, target) {
+        return (0, node_path_1.relative)(root, target).split(node_path_1.sep).join('/');
+    }
+    excludedOnBoth(root, target, installed) {
+        if (target === root || !(0, docker_plan_files_1.within)(root, target))
+            return false;
+        const path = this.projectPath(root, target);
+        return (sync_path_inspection_dto_1.SyncRelativePathSchema.safeParse(path).success &&
+            installed.every((peer) => (0, ignore_pattern_matcher_1.ignoreListExcludesSubtree)(peer.ignore, path)));
+    }
+    outside(root, targets) {
+        return targets.filter((target) => !(0, docker_plan_files_1.within)(root, target) && !(0, docker_plan_files_1.within)(target, root) && !this.overlapsGit(root, target));
+    }
+    overlapsGit(root, target) {
+        const gitRoot = (0, node_path_1.join)(root, '.git');
+        return (0, docker_plan_files_1.within)(gitRoot, target) || (0, docker_plan_files_1.within)(target, gitRoot);
+    }
+    async admit(projectId, remoteId, signal) {
+        signal.throwIfAborted();
+        const binding = await this.bindings.get(projectId);
+        signal.throwIfAborted();
+        if (binding?.remoteId !== remoteId || binding.state !== 'detaching')
+            throw new error_types_1.AppError('The Disconnect binding changed.', 'FILE_SYNC_COPY_BACK_CHANGED', 409);
+    }
+};
+exports.DockerCopyBackExclusions = DockerCopyBackExclusions;
+exports.DockerCopyBackExclusions = DockerCopyBackExclusions = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [file_sync_service_1.FileSyncService,
+        remote_host_client_1.RemoteHostClient,
+        file_sync_suggestions_service_1.FileSyncSuggestionsService,
+        file_sync_managed_exclusions_store_1.FileSyncManagedExclusionsStore,
+        remote_bindings_service_1.RemoteBindingsService])
+], DockerCopyBackExclusions);
+//# sourceMappingURL=docker-copy-back-exclusions.js.map

package/dist/server/modules/remotes/docker/docker-copy-back-exclusions.js.map

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

package/dist/server/modules/remotes/docker/docker-copy-back.d.ts

@@ -7,6 +7,7 @@ import { type DockerSyncState } from './docker-copy-back.dto';
 import { DockerHandoffStore } from './docker-handoff.store';
 import { DockerPlanService } from './docker-plan.service';
 import { DockerPlanSourceService } from './docker-plan-source.service';
+import { DockerCopyBackExclusions } from './docker-copy-back-exclusions';
 export declare class DockerCopyBack {
     private readonly plans;
     private readonly source;
@@ -15,15 +16,27 @@ export declare class DockerCopyBack {
     private readonly journal;
     private readonly inventory;
     private readonly health;
+    private readonly exclusions;
     private readonly active;
-    constructor(plans: DockerPlanService, source: DockerPlanSourceService, host: RemoteHostClient, store: DockerHandoffStore, journal: DockerArchiveJournal, inventory: DockerImportInventoryStore, health: RemoteHealthPort);
+    constructor(plans: DockerPlanService, source: DockerPlanSourceService, host: RemoteHostClient, store: DockerHandoffStore, journal: DockerArchiveJournal, inventory: DockerImportInventoryStore, health: RemoteHealthPort, exclusions: DockerCopyBackExclusions);
     syncState(projectId: string, input: unknown, signal?: AbortSignal): Promise<DockerSyncState>;
     interrupt(operationId: string): void;
     partialGroups(operationId: string): Promise<string[]>;
     finish(operationId: string): Promise<void>;
+    prepareHomeCopy(run: RemoteOperationStepRun): Promise<void>;
+    private recordFor;
+    private prepareExclusions;
     copyHome(run: RemoteOperationStepRun): Promise<void>;
     private decide;
+    private candidates;
+    private knownIdentities;
+    private resolveImportedNewData;
+    private vmOwnershipConsumers;
+    private hasHomeData;
+    private mappedOwnershipRefusal;
+    private checkMappedOwnership;
     private copyGroup;
+    private skipSyncedBinds;
     private stopVmProjectHolders;
     private copyOne;
     private clear;
@@ -31,6 +44,7 @@ export declare class DockerCopyBack {
     private scanVm;
     private homeChange;
     private homeContainers;
+    private inventoryOrEmpty;
     private stamp;
     private discardVm;
     private step;

package/dist/server/modules/remotes/docker/docker-copy-back.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import type { DockerDataState, DockerPlan } from './docker-plan.dto';
+import type { DockerDataRepresentationGroup, DockerDataState, DockerPlan } from './docker-plan.dto';
 export declare const DockerSyncStateRequestSchema: z.ZodObject<{
     remoteId: z.ZodString;
 }, "strict", z.ZodTypeAny, {
@@ -17,12 +17,18 @@ export declare const DockerCopyBackRequestSchema: z.ZodObject<{
     choices?: Record<string, "copy-home" | "keep-home"> | undefined;
 }>;
 export type DockerCopyBackRequest = z.infer<typeof DockerCopyBackRequestSchema>;
+export declare const FILE_SYNC_SKIP_REASON: "still synced by file sync";
+export declare const FOLLOWS_USER_SKIP_REASON = "Data whose owners follow the developer user stays on the VM because its recorded owner representation is unknown. Verify or replace the data through Connect before copying it home.";
 export interface DockerSyncGroup {
     key: string;
     itemNames: string[];
     volumes: string[];
     bindPaths: string[];
     state: DockerDataState;
+    dataRepresentations?: DockerDataRepresentationGroup[];
+    createdOnVm?: boolean;
+    skipReason?: string;
+    syncedByFileSync?: string[];
     needsChoice: boolean;
 }
 export interface DockerSyncState {
@@ -34,4 +40,5 @@ export interface DockerCopyBackResult {
     copied: string[];
     kept: string[];
     skipped: string[];
+    alreadyTargetEntries?: number;
 }

package/dist/server/modules/remotes/docker/docker-copy-back.dto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DockerCopyBackRequestSchema = exports.DockerCopyBackChoiceSchema = exports.DockerSyncStateRequestSchema = void 0;
+exports.FOLLOWS_USER_SKIP_REASON = exports.FILE_SYNC_SKIP_REASON = exports.DockerCopyBackRequestSchema = exports.DockerCopyBackChoiceSchema = exports.DockerSyncStateRequestSchema = void 0;
 const zod_1 = require("zod");
 exports.DockerSyncStateRequestSchema = zod_1.z.object({ remoteId: zod_1.z.string().uuid() }).strict();
 exports.DockerCopyBackChoiceSchema = zod_1.z.enum(['copy-home', 'keep-home']);
@@ -12,4 +12,6 @@ exports.DockerCopyBackRequestSchema = zod_1.z
         .default({}),
 })
     .strict();
+exports.FILE_SYNC_SKIP_REASON = 'still synced by file sync';
+exports.FOLLOWS_USER_SKIP_REASON = 'Data whose owners follow the developer user stays on the VM because its recorded owner representation is unknown. Verify or replace the data through Connect before copying it home.';
 //# sourceMappingURL=docker-copy-back.dto.js.map

package/dist/server/modules/remotes/docker/docker-copy-back.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker-copy-back.dto.js","sourceRoot":"","sources":["../../../../src/modules/remotes/docker/docker-copy-back.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAGX,QAAA,4BAA4B,GAAG,OAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;AAGlF,QAAA,0BAA0B,GAAG,OAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AAIhE,QAAA,2BAA2B,GAAG,OAAC;KACzC,MAAM,CAAC;IACN,OAAO,EAAE,OAAC;SACP,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,kCAA0B,CAAC;SACtE,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC;SACxD,OAAO,CAAC,EAAE,CAAC;CACf,CAAC;KACD,MAAM,EAAE,CAAC"}
+{"version":3,"file":"docker-copy-back.dto.js","sourceRoot":"","sources":["../../../../src/modules/remotes/docker/docker-copy-back.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAGX,QAAA,4BAA4B,GAAG,OAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;AAGlF,QAAA,0BAA0B,GAAG,OAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AAIhE,QAAA,2BAA2B,GAAG,OAAC;KACzC,MAAM,CAAC;IACN,OAAO,EAAE,OAAC;SACP,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,kCAA0B,CAAC;SACtE,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC;SACxD,OAAO,CAAC,EAAE,CAAC;CACf,CAAC;KACD,MAAM,EAAE,CAAC;AAIC,QAAA,qBAAqB,GAAG,2BAAoC,CAAC;AAE7D,QAAA,wBAAwB,GACnC,sLAAsL,CAAC"}