devchain-cli 0.24.1 → 0.25.0

package/dist/server/modules/remotes/docker/docker-plan-fit.d.ts

@@ -7,16 +7,19 @@ export interface DockerPlanCapacity {
     dockerRoot: DockerFilesystem | null;
     binds: DockerPathCapacity[];
 }
-export declare function copiedMounts(item: DockerPlanItem): DockerPlanMount[];
-export declare function copiedDataMounts(item: DockerPlanItem, projectRoot: string): DockerPlanMount[];
-export declare function potentialDataMounts(item: DockerPlanItem, projectRoot: string): DockerPlanMount[];
+export declare function copiedMounts(item: Pick<DockerPlanItem, 'mounts' | 'temporary' | 'selectedMode' | 'dataAction'>): DockerPlanMount[];
+export declare function copiedDataMounts(item: Pick<DockerPlanItem, 'mounts' | 'temporary' | 'selectedMode' | 'dataAction'>, _projectRoot: string): DockerPlanMount[];
+export declare function potentialDataMounts(item: Pick<DockerPlanItem, 'mounts' | 'temporary'>, projectRoot: string): DockerPlanMount[];
 export declare function movesToVm(item: DockerPlanItem): boolean;
+export declare function skipsImageCopy(item: DockerPlanItem, projectRoot: string): boolean;
+export declare function copiesImages(item: DockerPlanItem, projectRoot: string): boolean;
 export declare function writerStops(item: DockerPlanItem, containerIds: ReadonlySet<string>, projectRoot: string): string[];
 export declare function uniqueCopiedMounts(items: DockerPlanItem[], projectRoot: string): DockerPlanMount[];
 export declare function planDockerFit(items: DockerPlanItem[], presentImages: string[], capacity: DockerPlanCapacity, projectRoot: string): {
     filesystems: DockerPlanFilesystem[];
     fit: DockerPlan['fit'];
     bytes: number;
+    unknown: boolean;
     images: string[];
 };
 export declare function estimateDockerPlan(bytes: number, probeSeconds: number, exportBytesPerSecond: number | null): DockerPlan['estimate'];

package/dist/server/modules/remotes/docker/docker-plan-fit.js

@@ -5,30 +5,45 @@ exports.copiedMounts = copiedMounts;
 exports.copiedDataMounts = copiedDataMounts;
 exports.potentialDataMounts = potentialDataMounts;
 exports.movesToVm = movesToVm;
+exports.skipsImageCopy = skipsImageCopy;
+exports.copiesImages = copiesImages;
 exports.writerStops = writerStops;
 exports.uniqueCopiedMounts = uniqueCopiedMounts;
 exports.planDockerFit = planDockerFit;
 exports.estimateDockerPlan = estimateDockerPlan;
 exports.keptWriterStops = keptWriterStops;
 const docker_plan_dto_1 = require("./docker-plan.dto");
-const node_path_1 = require("node:path");
 const docker_plan_files_1 = require("./docker-plan-files");
 exports.DOCKER_LOAD_MARGIN_BYTES = 256 * 1024 * 1024;
 function copiedMounts(item) {
-    if (!item.selectedMode || item.selectedMode === 'without-data' || item.dataAction === 'keep-vm')
+    if (!item.selectedMode ||
+        item.selectedMode === 'without-data' ||
+        item.dataAction === 'keep-vm' ||
+        item.dataAction === 'start-empty')
         return [];
     return item.mounts.filter((mount) => item.temporary ? mount.kind === 'named-volume' : docker_plan_dto_1.COPYABLE_MOUNT_KINDS.includes(mount.kind));
 }
-function copiedDataMounts(item, projectRoot) {
-    const root = (0, node_path_1.resolve)(projectRoot);
-    return copiedMounts(item).filter((mount) => (0, docker_plan_dto_1.isVolumeMount)(mount.kind) || (0, node_path_1.resolve)(mount.source) !== root);
+function copiedDataMounts(item, _projectRoot) {
+    return copiedMounts(item);
 }
 function potentialDataMounts(item, projectRoot) {
     return copiedDataMounts({ ...item, selectedMode: 'container-and-data', dataAction: undefined }, projectRoot);
 }
 function movesToVm(item) {
     return (Boolean(item.selectedMode) &&
-        (item.targetAction !== 'leave-as-is' || item.dataAction === 'keep-vm'));
+        (item.targetAction !== 'leave-as-is' ||
+            item.dataAction === 'keep-vm' ||
+            item.dataAction === 'start-empty'));
+}
+function skipsImageCopy(item, projectRoot) {
+    return (item.kind === 'container' &&
+        !item.temporary &&
+        item.buildsFromProject === true &&
+        item.targetAction === 'leave-as-is' &&
+        copiedDataMounts(item, projectRoot).length === 0);
+}
+function copiesImages(item, projectRoot) {
+    return movesToVm(item) && !skipsImageCopy(item, projectRoot);
 }
 function writerStops(item, containerIds, projectRoot) {
     if (item.targetAction === 'leave-as-is' || !copiedDataMounts(item, projectRoot).length)
@@ -71,20 +86,23 @@ function planDockerFit(items, presentImages, capacity, projectRoot) {
     };
     const images = [
         ...new Map(items
-            .filter(movesToVm)
+            .filter((item) => copiesImages(item, projectRoot))
             .flatMap((i) => i.images)
             .map((image) => [image.id, image])).values(),
     ].filter((i) => !presentImages.includes(i.id));
     let bytes = 0;
+    let unknown = false;
     for (const image of images) {
         add(capacity.imageStore?.path ?? 'image-store', capacity.imageStore, image.size);
         bytes += image.size.bytes;
+        unknown ||= image.size.unknown;
     }
     if (images.length) {
         add(capacity.imageStore?.path ?? 'image-store', capacity.imageStore, { bytes: 0, unknown: images.some((i) => i.size.unknown) }, Math.max(...images.map((i) => i.size.bytes)) + exports.DOCKER_LOAD_MARGIN_BYTES);
     }
     for (const mount of uniqueCopiedMounts(items, projectRoot)) {
         bytes += mount.size.bytes;
+        unknown ||= mount.size.unknown;
         if ((0, docker_plan_dto_1.isVolumeMount)(mount.kind))
             add(capacity.dockerRoot?.path ?? 'docker-root', capacity.dockerRoot, mount.size);
         else {
@@ -96,7 +114,7 @@ function planDockerFit(items, presentImages, capacity, projectRoot) {
         group.status = filesystemStatus(group);
     const filesystems = [...groups.values()];
     const fit = ['refused', 'unknown', 'warning'].find((status) => filesystems.some((f) => f.status === status)) ?? 'fits';
-    return { filesystems, fit, bytes, images: images.map((i) => i.id) };
+    return { filesystems, fit, bytes, unknown, images: images.map((i) => i.id) };
 }
 function filesystemStatus(group) {
     if (group.freeBytes !== null && group.requiredBytes > group.freeBytes)

package/dist/server/modules/remotes/docker/docker-plan-fit.js.map

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

package/dist/server/modules/remotes/docker/docker-plan-policy.d.ts

@@ -1,8 +1,12 @@
 import { type DockerScanResult } from '../host/host-docker.dto';
 import type { DockerImportInventory } from '../operations/docker-import-inventory.store';
-import { type DockerDataGroupCheck, type DockerPlan, type DockerPlanItem, type DockerPlanRequest, type DockerSelectionMode } from './docker-plan.dto';
+import { type ConnectDockerChoice } from '../connect-choices.dto';
+import { type DockerDataGroupCheck, type DockerPlan, type DockerPlanItem, type DockerPlanNetwork, type DockerPlanIssue, type DockerPlanRequest, type DockerSelectionMode } from './docker-plan.dto';
 export declare const DATA_BLOCKER_CODES: readonly string[];
 export declare function blocksMode(mode: DockerSelectionMode, code: string): boolean;
-export declare function applyDockerPolicy(items: DockerPlanItem[], request: DockerPlanRequest, target: DockerScanResult, projectId: string, targetHome: string | null, targetUid: number | null, homeUid: number | null): void;
+export declare function applyDockerPolicy(items: DockerPlanItem[], request: DockerPlanRequest, target: DockerScanResult, projectId: string, targetHome: string | null, projectRoot: string, remembered?: Readonly<Record<string, ConnectDockerChoice>>): void;
+export declare function rangeConflict(homeSubnets: readonly string[], vmNetworks?: DockerScanResult['networks'], vmRoutes?: readonly string[]): string | undefined;
+export declare function dockerNetworkPolicy(items: DockerPlanItem[], target: DockerScanResult): DockerPlanNetwork[];
+export declare function dockerNetworkWarnings(networks: DockerPlanNetwork[]): DockerPlanIssue[];
 export declare function dockerReconnect(items: DockerPlanItem[], inventory: DockerImportInventory | null, projectRoot: string): DockerPlan['reconnect'];
-export declare function applyDockerDataPolicy(items: DockerPlanItem[], groups: DockerDataGroupCheck[], request: DockerPlanRequest, target: DockerScanResult): void;
+export declare function applyDockerDataPolicy(items: DockerPlanItem[], groups: DockerDataGroupCheck[], request: DockerPlanRequest, target: DockerScanResult, inventory?: DockerImportInventory | null, projectRoot?: string, projectId?: string): void;

package/dist/server/modules/remotes/docker/docker-plan-policy.js

@@ -3,29 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DATA_BLOCKER_CODES = void 0;
 exports.blocksMode = blocksMode;
 exports.applyDockerPolicy = applyDockerPolicy;
+exports.rangeConflict = rangeConflict;
+exports.dockerNetworkPolicy = dockerNetworkPolicy;
+exports.dockerNetworkWarnings = dockerNetworkWarnings;
 exports.dockerReconnect = dockerReconnect;
 exports.applyDockerDataPolicy = applyDockerDataPolicy;
 const error_types_1 = require("../../../common/errors/error-types");
+const docker_settings_1 = require("../../core/controllers/docker-settings");
 const host_docker_dto_1 = require("../host/host-docker.dto");
+const connect_choices_dto_1 = require("../connect-choices.dto");
+const docker_data_groups_1 = require("./docker-data-groups");
+const docker_data_representation_1 = require("./docker-data-representation");
+const docker_ownership_1 = require("./docker-ownership");
 const docker_plan_fit_1 = require("./docker-plan-fit");
 const docker_plan_files_1 = require("./docker-plan-files");
+const docker_project_resources_1 = require("./docker-project-resources");
 const docker_plan_dto_1 = require("./docker-plan.dto");
 exports.DATA_BLOCKER_CODES = [
     'non-local-volume',
     'external-writable-bind',
     'bind-destination',
 ];
+const CONTAINER_ONLY_BLOCKER_CODES = [
+    'runtime-bound',
+    'fixed-ipv4-unavailable',
+    'privileged-not-accepted',
+];
+const CONTAINER_BLOCKER_CODES = [
+    ...CONTAINER_ONLY_BLOCKER_CODES,
+    'architecture-mismatch',
+    'readonly-path-missing',
+];
 function blocksMode(mode, code) {
     if (mode === 'without-data')
         return !exports.DATA_BLOCKER_CODES.includes(code);
-    return mode !== 'data-only' || code !== 'runtime-bound';
+    return mode !== 'data-only' || !CONTAINER_ONLY_BLOCKER_CODES.includes(code);
 }
-function applyDockerPolicy(items, request, target, projectId, targetHome, targetUid, homeUid) {
+function applyDockerPolicy(items, request, target, projectId, targetHome, projectRoot, remembered = {}) {
     const selections = new Map();
     for (const selection of request.items ?? []) {
         if (selections.has(selection.id) || !items.some((i) => i.id === selection.id))
             throw new error_types_1.ValidationError('Docker selection has duplicate or unknown item ids');
-        selections.set(selection.id, selection.mode);
+        selections.set(selection.id, selection);
     }
     for (const item of items) {
         for (const mount of item.mounts) {
@@ -63,14 +82,13 @@ function applyDockerPolicy(items, request, target, projectId, targetHome, target
                 code: 'architecture-mismatch',
                 message: 'Image architecture differs from the VM.',
             });
-        item.warnings = item.warnings.filter((warning) => warning.code !== 'home-uid' ||
-            (targetUid !== null && homeUid !== null && targetUid !== homeUid));
-        for (const warning of item.warnings)
-            if (warning.code === 'home-uid')
-                warning.message = `Container runs as home uid ${homeUid}; VM uid is ${targetUid}. File permissions may differ.`;
-        const runtimeBound = item.blockers.some((b) => b.code === 'runtime-bound');
+        const existing = vmContainerNamed(target, item.name);
+        const action = existing
+            ? counterpartAction(existing, target, projectId, projectRoot, item)
+            : 'create';
+        fixedIPv4Policy(item, target, action === 'conflict' ? undefined : existing?.id);
         const dataBlocked = item.blockers.some((b) => exports.DATA_BLOCKER_CODES.includes(b.code));
-        const containerBlocked = item.blockers.some((b) => ['runtime-bound', 'architecture-mismatch', 'readonly-path-missing'].includes(b.code));
+        const containerBlocked = item.blockers.some((b) => CONTAINER_BLOCKER_CODES.includes(b.code));
         if (item.temporary || item.kind === 'compose-project')
             item.choices =
                 dataBlocked ||
@@ -82,43 +100,42 @@ function applyDockerPolicy(items, request, target, projectId, targetHome, target
                 item.choices.push('container-and-data');
             if (!containerBlocked)
                 item.choices.push('without-data');
-            if (runtimeBound && !dataBlocked && item.blockers.every((b) => b.code === 'runtime-bound'))
+            if ((item.ownership?.class === 'follows-user' && !containerBlocked && !dataBlocked) ||
+                (item.privileged && !dataBlocked) ||
+                (item.blockers.length > 0 &&
+                    item.blockers.every((b) => CONTAINER_ONLY_BLOCKER_CODES.includes(b.code))))
                 item.choices.push('data-only');
         }
         item.defaultSelected =
             item.linkedReasons.length > 0 && !item.temporary && item.blockers.length === 0;
-        item.selectedMode =
-            request.items === undefined
-                ? item.defaultSelected
-                    ? (item.choices[0] ?? null)
-                    : null
-                : (selections.get(item.id) ?? null);
+        if (request.items !== undefined) {
+            item.selectedMode = selections.get(item.id)?.mode ?? null;
+        }
+        else {
+            const saved = remembered[(0, connect_choices_dto_1.connectChoiceKey)(item)];
+            if (saved?.included === false) {
+                item.defaultSelected = false;
+                item.selectedMode = null;
+            }
+            else if (saved?.mode && item.choices.includes(saved.mode)) {
+                item.defaultSelected = true;
+                item.selectedMode = saved.mode;
+            }
+            else {
+                item.selectedMode = item.defaultSelected ? (item.choices[0] ?? null) : null;
+            }
+        }
         if (item.selectedMode && !item.choices.includes(item.selectedMode))
-            throw new error_types_1.ValidationError(`Unavailable Docker selection mode for item ${item.id}`);
-        const existing = target.containers.find((c) => c.name.replace(/^\//, '') === item.name);
+            throw new error_types_1.ValidationError(item.blockers.find((b) => b.code === 'fixed-ipv4-unavailable' && blocksMode(item.selectedMode, b.code))?.message ?? `Unavailable Docker selection mode for item ${item.id}`);
         if (existing &&
             item.kind === 'container' &&
             !item.temporary &&
             item.selectedMode !== 'data-only') {
-            const composeProject = existing.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL];
-            const imported = composeProject &&
-                target.volumes.some((v) => v.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] === projectId &&
-                    v.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL] === composeProject);
-            const holdsImported = composeProject &&
-                existing.mounts.some((m) => m.type === 'volume' &&
-                    target.volumes.some((v) => v.name === m.name &&
-                        v.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] === projectId &&
-                        v.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL] === composeProject));
-            if (existing.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] === projectId || holdsImported)
-                item.targetAction = 'replace';
-            else if (imported &&
-                !existing.mounts.some((m) => m.type === 'volume' &&
-                    target.volumes.some((v) => v.name === m.name && Boolean(v.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL])))) {
-                item.targetAction = 'leave-as-is';
+            item.targetAction = action;
+            if (action === 'leave-as-is') {
                 item.notes.push('already on the VM (managed by Compose), left as is');
             }
-            else {
-                item.targetAction = 'conflict';
+            else if (action === 'conflict') {
                 item.blockers.push({
                     code: 'container-conflict',
                     message: `The VM container ${item.name} is not owned by this project; skip it or resolve the conflict manually.`,
@@ -133,16 +150,13 @@ function applyDockerPolicy(items, request, target, projectId, targetHome, target
             const volume = target.volumes.find((v) => v.name === mount.source);
             if (!volume)
                 continue;
-            if (volume.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] !== projectId)
+            if (!(0, docker_project_resources_1.projectVolume)(volume.labels, target.containers, projectRoot, projectId, target.volumes))
                 item.blockers.push({
                     code: 'volume-conflict',
                     message: `VM volume ${mount.source} is not owned by this project; it cannot be replaced.`,
                 });
             for (const holder of target.containers.filter((c) => c.mounts.some((m) => m.type === 'volume' && m.name === mount.source))) {
-                const managed = holder.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] === projectId ||
-                    (Boolean(holder.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL]) &&
-                        holder.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL] === volume.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL] &&
-                        volume.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] === projectId);
+                const managed = (0, docker_project_resources_1.projectContainer)(holder, projectRoot, projectId, target.volumes);
                 if (!managed)
                     item.blockers.push({
                         code: 'unrelated-holder',
@@ -150,7 +164,120 @@ function applyDockerPolicy(items, request, target, projectId, targetHome, target
                     });
             }
         }
+        if (item.privileged &&
+            (item.selectedMode === 'container-and-data' || item.selectedMode === 'without-data') &&
+            !selections.get(item.id)?.acceptPrivileged)
+            item.blockers.push({
+                code: 'privileged-not-accepted',
+                message: 'Accept Run privileged for this container, or pick Copy its data only.',
+            });
+    }
+}
+function counterpartAction(existing, target, projectId, projectRoot, home) {
+    if ((0, docker_project_resources_1.foreignProjectOwner)(existing.labels, projectId))
+        return 'conflict';
+    const composeProject = existing.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL];
+    const importedVolumes = target.volumes.filter((v) => v.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] === projectId &&
+        v.labels[host_docker_dto_1.COMPOSE_PROJECT_LABEL] === composeProject);
+    const holdsImported = composeProject &&
+        existing.mounts.some((m) => m.type === 'volume' && importedVolumes.some((v) => v.name === m.name));
+    if (existing.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL] === projectId || holdsImported)
+        return 'replace';
+    if ((0, docker_project_resources_1.projectContainer)(existing, projectRoot, projectId))
+        return home.mounts.some((mount) => docker_plan_dto_1.COPYABLE_MOUNT_KINDS.includes(mount.kind))
+            ? 'replace'
+            : 'leave-as-is';
+    if (composeProject &&
+        importedVolumes.length &&
+        !existing.mounts.some((m) => m.type === 'volume' &&
+            target.volumes.some((v) => v.name === m.name && Boolean(v.labels[host_docker_dto_1.DOCKER_PROJECT_LABEL]))))
+        return 'leave-as-is';
+    return 'conflict';
+}
+function rangeConflict(homeSubnets, vmNetworks = [], vmRoutes = []) {
+    return (vmNetworks.find((other) => (0, docker_settings_1.overlappingIPv4Range)(homeSubnets, other.subnets))?.name ??
+        (0, docker_settings_1.overlappingIPv4Range)(homeSubnets, vmRoutes));
+}
+function dockerNetworkPolicy(items, target) {
+    const networks = new Map();
+    const selected = items.filter((item) => item.kind === 'container' && item.selectedMode);
+    for (const item of selected)
+        for (const network of item.networks ?? [])
+            networks.set(network.name, network);
+    const fixedNetworks = new Set(selected
+        .filter((item) => !item.temporary && item.selectedMode !== 'data-only')
+        .flatMap((item) => item.fixedIPv4?.map((fixed) => fixed.network) ?? []));
+    return [...networks.values()].map((network) => {
+        const existing = target.networks?.find((vm) => vm.name === network.name);
+        if (existing) {
+            const differs = !network.subnets.some((home) => existing.subnets.includes(home));
+            const overlaps = differs
+                ? rangeConflict(network.subnets, target.networks?.filter((vm) => vm.name !== network.name), target.routes?.filter((route) => !existing.subnets.includes(route)))
+                : undefined;
+            return {
+                ...network,
+                kind: 'reused',
+                vmSubnets: existing.subnets,
+                differs,
+                ...(overlaps ? { overlaps } : {}),
+            };
+        }
+        const overlaps = rangeConflict(network.subnets, target.networks, target.routes);
+        return overlaps && !fixedNetworks.has(network.name)
+            ? { ...network, kind: 'automatic-range', overlaps }
+            : { ...network, kind: 'home-range' };
+    });
+}
+function dockerNetworkWarnings(networks) {
+    return networks.flatMap((network) => {
+        if (network.kind === 'automatic-range')
+            return [
+                {
+                    code: 'network-automatic-range',
+                    message: `Network ${network.name} uses an automatic VM range because its home range ${network.subnets.join(', ')} overlaps ${network.overlaps}.`,
+                },
+            ];
+        if (network.kind === 'reused' && network.differs) {
+            const remedy = network.overlaps
+                ? `The home range overlaps ${network.overlaps} on the VM, so removing the VM network would not restore it. Keep the VM range, or free the home range on the VM first.`
+                : 'Remove the VM network when no container uses it, then connect again.';
+            return [
+                {
+                    code: 'network-range-differs',
+                    message: `VM network ${network.name} uses ${network.vmSubnets.join(', ') || 'no IPv4 range'}, not the home range ${network.subnets.join(', ') || 'no IPv4 range'}. ${remedy}`,
+                },
+            ];
+        }
+        return [];
+    });
+}
+function fixedIPv4Policy(item, target, counterpartId) {
+    for (const fixed of item.fixedIPv4 ?? []) {
+        const reason = fixedIPv4Refusal(fixed, target, counterpartId);
+        if (reason)
+            item.blockers.push({
+                code: 'fixed-ipv4-unavailable',
+                message: `${item.name} cannot use ${fixed.address} on network ${fixed.network}: ${reason}`,
+            });
+    }
+}
+function fixedIPv4Refusal(fixed, target, counterpartId) {
+    const network = target.networks?.find((n) => n.name === fixed.network);
+    if (!network) {
+        const vmNetwork = target.networks?.find((other) => (0, docker_settings_1.overlappingIPv4Range)(fixed.subnets, other.subnets));
+        if (vmNetwork)
+            return `the home network range overlaps VM network ${vmNetwork.name}. Remove the unused VM network and connect again, or change the network range and address on the PC.`;
+        const route = (0, docker_settings_1.overlappingIPv4Range)(fixed.subnets, target.routes ?? []);
+        if (route)
+            return `the home network range overlaps VM on-link route ${route}. Change the network range and address on the PC, then connect again.`;
+        return undefined;
     }
+    if (!network.subnets.some((subnet) => (0, docker_settings_1.containsIPv4)(subnet, fixed.address)))
+        return 'the address is outside the VM network range. Remove the VM network when no container uses it and connect again, or change the address on the PC.';
+    const holder = network.addresses?.find((entry) => entry.address === fixed.address && entry.containerId !== counterpartId);
+    if (holder)
+        return `VM container ${holder.containerName} uses that address. Free the address on the VM, or change the address on the PC.`;
+    return undefined;
 }
 function dockerReconnect(items, inventory, projectRoot) {
     if (!inventory)
@@ -178,11 +305,25 @@ function dockerReconnect(items, inventory, projectRoot) {
         lossNotice: 'Fresh home data replaces the VM copies DevChain created. VM changes not copied back are lost; Cancel cannot recover a VM copy already replaced.',
     };
 }
+function vmContainerNamed(target, name) {
+    return target.containers.find((container) => container.name.replace(/^\//, '') === name);
+}
 function normalizeArchitecture(value) {
     return { x86_64: 'amd64', aarch64: 'arm64' }[value] ?? value;
 }
-function applyDockerDataPolicy(items, groups, request, target) {
+function applyDockerDataPolicy(items, groups, request, target, inventory = null, projectRoot, projectId) {
     const selections = new Map((request.items ?? []).map((i) => [i.id, i]));
+    for (const item of items) {
+        const state = groups.find((g) => g.itemIds.includes(item.id))?.state;
+        if (state === 'no-record' || !item.choices.includes('container-and-data'))
+            continue;
+        item.choices = item.choices.filter((choice) => choice !== 'without-data');
+        if (item.selectedMode !== 'without-data')
+            continue;
+        if (request.items !== undefined)
+            throw new error_types_1.ValidationError(`Unavailable Docker selection mode for item ${item.id}`);
+        item.selectedMode = item.choices[0] ?? null;
+    }
     for (const group of groups) {
         const members = items.filter((i) => group.itemIds.includes(i.id));
         const selected = members.filter((i) => i.selectedMode);
@@ -195,13 +336,116 @@ function applyDockerDataPolicy(items, groups, request, target) {
             bindPaths: group.bindPaths.filter((p) => target.paths.some((entry) => entry.path === p && 'exists' in entry && !entry.exists)),
         };
         const partial = missing.volumes.length > 0 || missing.bindPaths.length > 0;
+        const follows = group.ownership?.class === 'follows-user';
+        const matchingRecords = (inventory?.groups ?? []).filter((record) => (0, docker_data_groups_1.overlapsData)(group, record));
+        const compatibleRecord = (0, docker_data_representation_1.dataRepresentationMatches)(group, matchingRecords);
+        const incompatible = group.ownership !== undefined &&
+            group.state !== 'no-record' &&
+            members.some((member) => {
+                const existing = vmContainerNamed(target, member.name);
+                const desired = (0, docker_ownership_1.dockerTargetUser)(member);
+                return existing && desired !== undefined && existing.user !== desired && !compatibleRecord;
+            });
+        if (follows || incompatible) {
+            const holdsData = group.state !== 'no-record';
+            const available = holdsData
+                ? ['keep-vm', 'replace-home', 'start-empty']
+                : ['replace-home', 'start-empty'];
+            if (choice === 'start-empty' &&
+                (target.volumes.some((volume) => group.volumes.includes(volume.name) &&
+                    (volume.driver !== 'local' ||
+                        (projectId !== undefined &&
+                            !(0, docker_project_resources_1.projectVolume)(volume.labels, target.containers, projectRoot, projectId, target.volumes)))) ||
+                    (projectRoot !== undefined &&
+                        group.bindPaths.some((path) => path === projectRoot || !(0, docker_plan_files_1.within)(projectRoot, path)))))
+                throw new error_types_1.ValidationError('Start with empty data requires project-owned local volumes and in-project data folders.');
+            if (choice && !available.includes(choice))
+                throw new error_types_1.ValidationError('Unavailable Docker data choice for this ownership group.');
+            const anyWithoutData = selected.some((member) => member.selectedMode === 'without-data');
+            let defaultAction = 'replace-home';
+            if (holdsData)
+                defaultAction = 'keep-vm';
+            else if (anyWithoutData)
+                defaultAction = 'start-empty';
+            const action = choice ?? defaultAction;
+            if (action === 'replace-home' && anyWithoutData)
+                throw new error_types_1.ValidationError('Docker items sharing data cannot mix replacement and without-data choices');
+            for (const member of members) {
+                member.dataGroup = group.itemIds;
+                member.dataState = group.state;
+                member.dataChoices = available;
+                member.dataChoice = choice ?? (holdsData ? 'keep-vm' : undefined);
+                member.dataAction = action;
+                member.dataChoiceRequired = false;
+                member.missingData = missing;
+                const existing = vmContainerNamed(target, member.name);
+                if (!existing) {
+                    if (holdsData &&
+                        !compatibleRecord &&
+                        member.ownership?.class === 'follows-user' &&
+                        member.dataAction === 'keep-vm' &&
+                        member.selectedMode !== 'data-only')
+                        member.blockers.push({
+                            code: 'ownership-data-incompatible',
+                            message: 'The VM data has no matching ownership representation. Replace with home data or start with empty data before creating this container with VM user ids.',
+                        });
+                    continue;
+                }
+                if (member.targetAction === 'conflict' || member.selectedMode === 'data-only')
+                    continue;
+                member.vmUser = existing.user;
+                if (member.dataAction !== 'keep-vm') {
+                    member.targetAction = 'replace';
+                    continue;
+                }
+                const desired = (0, docker_ownership_1.dockerTargetUser)(member);
+                if (incompatible && existing.user !== desired) {
+                    member.targetAction = 'leave-as-is';
+                    member.retainedOwnership =
+                        inventory?.items.find((item) => item.name === member.name)?.ownership ??
+                            (member.ownership
+                                ? {
+                                    class: 'exact',
+                                    home: member.ownership.home,
+                                    vm: member.ownership.vm,
+                                    targetUser: existing.user,
+                                }
+                                : undefined);
+                    member.notes.push(`runs as ${existing.user || '0'} until its data is reset or copied again`);
+                }
+                else if (existing.user !== desired) {
+                    member.targetAction = 'replace';
+                }
+                else {
+                    member.targetAction = 'leave-as-is';
+                }
+            }
+            continue;
+        }
+        if (choice === 'start-empty')
+            throw new error_types_1.ValidationError('Start with empty data is unavailable for this group.');
+        for (const member of members)
+            member.dataChoices = ['keep-vm', 'replace-home'];
         const requiresChoice = group.state === 'both-changed' ||
             group.state === 'unknown' ||
             (partial && group.state === 'home-newer');
         const action = connectDataAction(group.state, choice, requiresChoice);
+        if (request.items === undefined &&
+            action === 'replace-home' &&
+            selected.some((i) => i.selectedMode === 'without-data')) {
+            for (const member of selected) {
+                if (member.choices.includes('without-data')) {
+                    member.selectedMode = 'without-data';
+                }
+                else {
+                    member.selectedMode = null;
+                    member.defaultSelected = false;
+                }
+            }
+        }
         if (action === 'replace-home' &&
             selected.some((i) => i.selectedMode === 'without-data') &&
-            selected.some((i) => i.selectedMode !== 'without-data'))
+            selected.some((i) => i.selectedMode !== null && i.selectedMode !== 'without-data'))
             throw new error_types_1.ValidationError('Docker items sharing data cannot mix replacement and without-data choices');
         for (const item of members) {
             item.dataGroup = group.itemIds;