devchain-cli 0.24.1 → 0.25.0

package/dist/server/modules/remotes/docker/docker-compose-user-fix.js

@@ -0,0 +1,212 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.composeUserFixProposal = composeUserFixProposal;
+exports.applyComposeUserFix = applyComposeUserFix;
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const dotenv_1 = require("dotenv");
+const yaml_1 = require("yaml");
+const error_types_1 = require("../../../common/errors/error-types");
+const docker_plan_files_1 = require("./docker-plan-files");
+const docker_project_compose_1 = require("./docker-project-compose");
+function manualEditReason(doc, entry, scalar, result) {
+    if (doc.has('include'))
+        return 'Compose include requires a manual edit, then Verify.';
+    let anchors = false;
+    (0, yaml_1.visit)(doc, (_key, node) => {
+        if ((0, yaml_1.isAlias)(node) || ((0, yaml_1.isNode)(node) && 'anchor' in node && node.anchor))
+            anchors = true;
+    });
+    if (anchors)
+        return 'Compose anchors or aliases require a manual edit, then Verify.';
+    if ((0, yaml_1.isMap)(entry) && entry.has('extends'))
+        return 'Compose extends requires a manual edit, then Verify.';
+    if (!(0, yaml_1.isScalar)(scalar) || !result.range)
+        return 'Add or update the service user line yourself, then Verify.';
+    if (!['PLAIN', 'QUOTE_SINGLE', 'QUOTE_DOUBLE'].includes(scalar.type ?? '') ||
+        /[\r\n]/.test(result.text.slice(...result.range)) ||
+        !['string', 'number'].includes(typeof scalar.value) ||
+        scalar.tag)
+        return 'Only a plain, single-line user scalar can be applied automatically. Edit it yourself, then Verify.';
+    if (result.oldUser?.includes('$'))
+        return 'This user value already uses interpolation. Edit it yourself, then Verify.';
+    return undefined;
+}
+function userScalar(text, service) {
+    const lines = new yaml_1.LineCounter();
+    const doc = (0, yaml_1.parseDocument)(text, { lineCounter: lines });
+    const result = { text, oldUser: null, line: null };
+    if (doc.errors.length || !(0, yaml_1.isMap)(doc.contents))
+        return {
+            ...result,
+            reason: 'The Compose file cannot be safely parsed. Edit it yourself, then Verify.',
+        };
+    const services = doc.get('services', true);
+    const entry = (0, yaml_1.isMap)(services) ? services.get(service, true) : undefined;
+    const scalar = (0, yaml_1.isMap)(entry) ? entry.get('user', true) : undefined;
+    if ((0, yaml_1.isNode)(scalar) && scalar.range)
+        result.line = lines.linePos(scalar.range[0]).line;
+    if ((0, yaml_1.isScalar)(scalar)) {
+        result.oldUser = String(scalar.value);
+        result.style =
+            scalar.type === 'PLAIN' && (0, yaml_1.isMap)(entry) && entry.flow ? 'QUOTE_DOUBLE' : scalar.type;
+        if (scalar.range)
+            result.range = [scalar.range[0], scalar.range[1]];
+    }
+    else if ((0, yaml_1.isAlias)(scalar)) {
+        const value = scalar.resolve(doc);
+        if ((0, yaml_1.isScalar)(value))
+            result.oldUser = String(value.value);
+    }
+    result.reason = manualEditReason(doc, entry, scalar, result);
+    return result;
+}
+function scalarText(style, value) {
+    if (style === 'QUOTE_DOUBLE')
+        return JSON.stringify(value);
+    if (style === 'QUOTE_SINGLE')
+        return `'${value}'`;
+    return value;
+}
+async function projectFile(root, file) {
+    const [actualRoot, actualFile, info] = await Promise.all([
+        (0, promises_1.realpath)(root),
+        (0, promises_1.realpath)(file),
+        (0, promises_1.lstat)(file),
+    ]);
+    return info.isFile() && (0, docker_plan_files_1.within)(actualRoot, actualFile) && actualFile === (0, node_path_1.resolve)(file);
+}
+async function sourceFiles(source) {
+    if (source.files.length)
+        return { files: source.files };
+    let env = {};
+    try {
+        env = (0, dotenv_1.parse)(await (0, promises_1.readFile)((0, node_path_1.join)(source.directory, '.env')));
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT')
+            return {
+                files: [],
+                reason: 'The Compose source-file relationship is unavailable. Edit it yourself, then Verify.',
+            };
+    }
+    const encoded = process.env.COMPOSE_FILE ?? env.COMPOSE_FILE;
+    if (encoded) {
+        return {
+            files: encoded.includes('$')
+                ? []
+                : encoded
+                    .split(process.env.COMPOSE_PATH_SEPARATOR ?? env.COMPOSE_PATH_SEPARATOR ?? ':')
+                    .filter(Boolean)
+                    .map((file) => (0, node_path_1.resolve)(source.directory, file)),
+            reason: 'The Compose file set is selected through the environment. Edit it yourself, then Verify.',
+        };
+    }
+    const candidates = [
+        ...docker_project_compose_1.DEFAULT_COMPOSE_FILES,
+        'compose.override.yaml',
+        'compose.override.yml',
+        'docker-compose.override.yaml',
+        'docker-compose.override.yml',
+    ];
+    const files = [];
+    for (const name of candidates) {
+        const file = (0, node_path_1.join)(source.directory, name);
+        if (await (0, promises_1.access)(file).then(() => true, () => false))
+            files.push(file);
+    }
+    return {
+        files,
+        ...(files.length === 0
+            ? { reason: 'The source Compose file is unavailable. Edit it yourself, then Verify.' }
+            : {}),
+    };
+}
+async function composeUserFixProposal(root, ownership, container, id, resolvedUser) {
+    const source = ownership.compose;
+    if (!source || !['needs-user-fix', 'image-user-hint'].includes(ownership.class))
+        return null;
+    const located = await sourceFiles(source);
+    const files = located.files;
+    let file = files[0] ? (0, node_path_1.resolve)(source.directory, files[0]) : null;
+    let scalar = { text: '', oldUser: null, line: null };
+    let reason = located.reason;
+    for (const path of files) {
+        const candidate = (0, node_path_1.resolve)(source.directory, path);
+        try {
+            if (!(await projectFile(root, candidate))) {
+                reason =
+                    'Only a regular Compose file inside this project can be edited. Edit it yourself, then Verify.';
+                continue;
+            }
+            const read = userScalar(await (0, promises_1.readFile)(candidate, 'utf8'), source.service);
+            if (read.oldUser !== null || scalar.oldUser === null) {
+                file = candidate;
+                scalar = read;
+            }
+        }
+        catch {
+            reason = 'The source Compose file is unavailable. Edit it yourself, then Verify.';
+        }
+    }
+    const imageHint = ownership.class === 'image-user-hint';
+    if (files.length > 1)
+        reason = 'Several Compose files require a manual edit, then Verify.';
+    else if (imageHint)
+        reason = 'The user is inherited from the image. Add this user line yourself, then Verify.';
+    else
+        reason ??= scalar.reason;
+    if (!reason && resolvedUser !== undefined && scalar.oldUser !== resolvedUser)
+        reason =
+            'The source user no longer matches the Compose resolution. Verify or get a fresh plan.';
+    const uidOnly = !imageHint && /^\d+$/.test(resolvedUser ?? scalar.oldUser ?? '');
+    const newUser = `\${DEVCHAIN_UID:-${ownership.home.uid}}${uidOnly ? '' : `:\${DEVCHAIN_GID:-${ownership.home.gid}}`}`;
+    return {
+        id,
+        service: source.service,
+        container,
+        file,
+        line: scalar.line,
+        oldUser: imageHint ? null : scalar.oldUser,
+        newUser,
+        canApply: !reason && Boolean(scalar.range),
+        ...(reason ? { reason } : {}),
+        hint: `On this VM your user id is ${ownership.vm.uid}. With this line, the container runs as your user on each machine: ${ownership.home.uid} here, ${ownership.vm.uid} on the VM. Shells outside DevChain use the fallback, so \`docker compose up\` in a normal terminal at home keeps running as you.`,
+    };
+}
+async function applyComposeUserFix(root, proposal) {
+    if (!proposal.canApply || !proposal.file)
+        throw new error_types_1.AppError(proposal.reason ?? 'This proposal requires a manual edit, then Verify.', 'DOCKER_USER_FIX_SHOW_ONLY', 422);
+    try {
+        if (!(await projectFile(root, proposal.file)))
+            throw new error_types_1.AppError('The Compose file relationship changed. Get a fresh plan.', 'DOCKER_USER_FIX_STALE', 409);
+        const handle = await (0, promises_1.open)(proposal.file, node_fs_1.constants.O_RDWR | node_fs_1.constants.O_NOFOLLOW);
+        try {
+            if (!(await handle.stat()).isFile())
+                throw new error_types_1.AppError('The Compose file relationship changed. Get a fresh plan.', 'DOCKER_USER_FIX_STALE', 409);
+            const scalar = userScalar(await handle.readFile('utf8'), proposal.service);
+            if (scalar.oldUser !== proposal.oldUser)
+                throw new error_types_1.AppError('The service user changed since the plan. Get a fresh plan.', 'DOCKER_USER_FIX_STALE', 409);
+            if (scalar.reason || !scalar.range)
+                throw new error_types_1.AppError(scalar.reason ?? 'This proposal requires a manual edit, then Verify.', 'DOCKER_USER_FIX_SHOW_ONLY', 422);
+            const replacement = scalarText(scalar.style, proposal.newUser);
+            const edited = scalar.text.slice(0, scalar.range[0]) + replacement + scalar.text.slice(scalar.range[1]);
+            const data = Buffer.from(edited, 'utf8');
+            for (let offset = 0; offset < data.length;) {
+                const written = await handle.write(data, offset, data.length - offset, offset);
+                offset += written.bytesWritten;
+            }
+            await handle.truncate(data.length);
+        }
+        finally {
+            await handle.close();
+        }
+    }
+    catch (error) {
+        if (error instanceof error_types_1.AppError)
+            throw error;
+        throw new error_types_1.AppError('The Compose file could not be edited. Get a fresh plan or edit it yourself, then Verify.', 'DOCKER_USER_FIX_UNAVAILABLE', 422);
+    }
+}
+//# sourceMappingURL=docker-compose-user-fix.js.map

package/dist/server/modules/remotes/docker/docker-compose-user-fix.js.map

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

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"}