From b2024c1a37aee2933d225b0fb2b28dd6eb7b616a Mon Sep 17 00:00:00 2001
From: Nick Szittai <nszittai@gmail.com>
Date: Fri, 20 Mar 2026 22:09:29 -0400
Subject: [PATCH 01/40] feat(import): add Docker Manager container import
 functionality and preview generation

---
 .../include/ComposeManager.php                | 151 +++++++++
 source/compose.manager/include/Exec.php       | 138 ++++++++
 source/compose.manager/include/Util.php       | 313 ++++++++++++++++++
 3 files changed, 602 insertions(+)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index e28d34a..6f4ff52 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2208,6 +2208,156 @@ function(data) {
 
 
 
+    function importFromDockerManager() {
+        var modalHtml = `
+            <div id="compose-import-modal-overlay" class="compose-modal-overlay" style="display:flex;">
+                <div class="compose-modal" role="dialog" aria-modal="true" aria-labelledby="compose-import-modal-title" tabindex="-1" style="width:760px; max-width:95%;">
+                    <div class="compose-modal-header">
+                        <span id="compose-import-modal-title">Import from Docker Manager</span>
+                        <button type="button" class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()" aria-label="Close modal"><i class="fa fa-times"></i></button>
+                    </div>
+                    <div class="compose-modal-body" id="compose-import-modal-body">Loading Docker Manager containers...</div>
+                    <div class="compose-modal-footer" id="compose-import-modal-footer"></div>
+                </div>
+            </div>
+        `;
+
+        var existing = document.getElementById('compose-import-modal-overlay');
+        if (existing) existing.remove();
+        document.body.insertAdjacentHTML('beforeend', modalHtml);
+
+        window.closeComposeImportModal = function() {
+            var overlay = document.getElementById('compose-import-modal-overlay');
+            if (overlay) overlay.remove();
+        };
+
+        $.post(caURL, {action: 'getDockerContainersForImport'}, function(data) {
+            var response;
+            try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
+            if (response.result !== 'success') {
+                $('#compose-import-modal-body').html('<div style="color:#f44336">Failed to load containers.</div>');
+                return;
+            }
+            var containers = response.containers || [];
+            if (!containers.length) {
+                $('#compose-import-modal-body').html('<div>No Docker Manager containers found.</div>');
+                return;
+            }
+            var rows = containers.map(function(ct) {
+                return '<tr>' +
+                    '<td><input type="checkbox" class="cm-import-container" value="' + ct.Id + '"></td>' +
+                    '<td>' + escapeHtml(ct.Name) + '</td>' +
+                    '<td>' + escapeHtml(ct.Image) + '</td>' +
+                    '<td>' + escapeHtml(ct.Status) + '</td>' +
+                    '<td>' + (ct.Icon ? '<img src="' + ct.Icon + '" style="height:20px;max-width:20px;" />' : '') + '</td>' +
+                    '<td>' + (ct.Url ? '<a href="' + ct.Url + '" target="_blank">Link</a>' : '') + '</td>' +
+                    '</tr>';
+            }).join('');
+            var table = '<div style="max-height:300px;overflow:auto;"><table class="tablesorter" style="width:100%"><thead><tr><th></th><th>Name</th><th>Image</th><th>Status</th><th>Icon</th><th>WebUI</th></tr></thead><tbody>' + rows + '</tbody></table></div>';
+            $('#compose-import-modal-body').html(table);
+            $('#compose-import-modal-footer').html('<button class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()">Cancel</button><button class="editor-btn editor-btn-save-all" onclick="composeImportPreview()">Next</button>');
+        }).fail(function() {
+            $('#compose-import-modal-body').html('<div style="color:#f44336">Failed to contact server.</div>');
+        });
+    }
+
+    function composeImportPreview() {
+        var selected = [];
+        $('.cm-import-container:checked').each(function() {
+            selected.push(this.value);
+        });
+        if (!selected.length) {
+            swal('No containers selected', 'Please select at least one container to import.', 'warning');
+            return;
+        }
+
+        $('#compose-import-modal-body').html('<div>Generating import preview...</div>');
+        $('#compose-import-modal-footer').empty();
+
+        $.post(caURL, {action: 'generateImportPreview', containerIds: JSON.stringify(selected)}, function(data) {
+            var response;
+            try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
+            if (response.result !== 'success') {
+                $('#compose-import-modal-body').html('<div style="color:#f44336">' + (response.message || 'Failed to generate preview') + '</div>');
+                return;
+            }
+            var preview = '<div style="margin-bottom:10px;"><strong>Compose YAML preview</strong></div>' +
+                '<pre style="max-height:220px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + escapeHtml(response.composeYml) + '</pre>' +
+                '<div style="margin-top:10px;"><strong>.env preview (optional)</strong></div>' +
+                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + escapeHtml(response.env) + '</pre>' +
+                '<div style="margin-top:10px;"><strong>Override preview (icons/webui)</strong></div>' +
+                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + escapeHtml(response.override) + '</pre>';
+
+            preview += '<div style="margin-top:14px; font-weight:bold;">Stack name</div>' +
+                '<input type="text" id="cm-import-stack-name" placeholder="Import Stack Name" style="width:100%; margin-bottom:10px;">' +
+                '<div style="margin-bottom:5px; font-weight:bold;">Actions</div>' +
+                '<label style="display:block;margin-bottom:4px;"><input id="cm-import-stop-containers" type="checkbox" checked> Stop containers</label>' +
+                '<label style="display:block;margin-bottom:4px;"><input id="cm-import-remove-containers" type="checkbox" checked> Remove containers</label>' +
+                '<label style="display:block;margin-bottom:10px;"><input id="cm-import-start-stack" type="checkbox" checked> Start imported stack</label>';
+
+            $('#compose-import-modal-body').html(preview);
+            $('#compose-import-modal-footer').html('<button class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()">Cancel</button><button class="editor-btn editor-btn-save-all" onclick="composeImportPerform()">Import</button>');
+
+            $('#cm-import-remove-containers').on('change', function() {
+                if ($(this).is(':checked')) {
+                    $('#cm-import-stop-containers').prop('checked', true);
+                }
+            });
+            $('#cm-import-stop-containers').on('change', function() {
+                if (!$(this).is(':checked')) {
+                    $('#cm-import-remove-containers').prop('checked', false);
+                }
+            });
+
+            window.__composeImportPayload = {composeYml: response.composeYml, env: response.env, override: response.override, containerIds: selected};
+        }).fail(function() {
+            $('#compose-import-modal-body').html('<div style="color:#f44336">Failed to contact server for preview.</div>');
+        });
+    }
+
+    function composeImportPerform() {
+        var payload = window.__composeImportPayload || {};
+        var name = document.getElementById('cm-import-stack-name').value.trim();
+        if (!name) {
+            swal('Stack name required', 'Please provide a stack name to continue.', 'warning');
+            return;
+        }
+
+        var stopContainers = document.getElementById('cm-import-stop-containers').checked ? '1' : '0';
+        var removeContainers = document.getElementById('cm-import-remove-containers').checked ? '1' : '0';
+        var startStack = document.getElementById('cm-import-start-stack').checked ? '1' : '0';
+
+        $.post(caURL, {
+            action: 'performImportTransfer',
+            stackName: name,
+            stopContainers: stopContainers,
+            removeContainers: removeContainers,
+            startStack: startStack,
+            composeYml: payload.composeYml || '',
+            env: payload.env || '',
+            override: payload.override || '',
+            containerIds: JSON.stringify(payload.containerIds || [])
+        }, function(data) {
+            var response;
+            try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
+            if (response.result === 'success') {
+                closeComposeImportModal();
+                composeLoadlist();
+                openEditorModalByProject(response.project, response.projectName);
+
+                if (response.startStack === 1 && response.projectPath) {
+                    ComposeUp(response.projectPath);
+                }
+
+                swal('Imported', 'Stack imported successfully.', 'success');
+            } else {
+                swal('Import failed', response.message || 'Unknown error', 'error');
+            }
+        }).fail(function() {
+            swal('Import failed', 'Communication error', 'error');
+        });
+    }
+
     function stripTags(string) {
         return string.replace(/(<([^>]+)>)/ig, "");
     }
@@ -6090,6 +6240,7 @@ function addComposeStackContext(elementId) {
     </div>
     <span class='tipsterallowed' hidden>
         <input type='button' value='Add New Stack' onclick='addStack();'>
+        <input type='button' value='Import from Docker Manager' onclick='importFromDockerManager();'>
         <input type='button' value='Start All' onclick='startAllStacks();' id='startAllBtn'>
         <input type='button' value='Stop All' onclick='stopAllStacks();' id='stopAllBtn'>
         <input type='button' value='Check for Updates' onclick='checkAllUpdates();' id='checkUpdatesBtn'>
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 6b7c68a..52ab37d 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -77,6 +77,144 @@ function getPostScript(): string
 
         clientDebug("Created stack: $stackName", null, 'user', 'info', 'stack');
         echo json_encode(['result' => 'success', 'message' => '', 'project' => $stack->projectFolder, 'projectName' => $stack->getName()]);
+        break;
+    case 'getDockerContainersForImport':
+        $candidates = getDockerManagerImportCandidates();
+        echo json_encode(['result' => 'success', 'containers' => $candidates]);
+        break;
+    case 'generateImportPreview':
+        $containerIds = [];
+        if (!empty($_POST['containerIds'])) {
+            $data = json_decode($_POST['containerIds'], true);
+            if (is_array($data)) {
+                $containerIds = $data;
+            }
+        }
+        if (empty($containerIds)) {
+            echo json_encode(['result' => 'error', 'message' => 'No containers selected']);
+            break;
+        }
+
+        $services = [];
+        foreach ($containerIds as $id) {
+            $id = trim($id);
+            if ($id === '') {
+                continue;
+            }
+            $info = getDockerManagerContainerInfo($id);
+            if (empty($info)) {
+                continue;
+            }
+            $converted = dockerContainerToComposeService($info);
+            $name = $converted['name'];
+            $service = $converted['service'];
+
+            $serviceIcon = $info['Config']['Labels']['net.unraid.docker.icon'] ?? '';
+            $serviceWebui = $info['Config']['Labels']['net.unraid.docker.webui'] ?? '';
+            if ($serviceIcon) {
+                $service['icon'] = $serviceIcon;
+            }
+            if ($serviceWebui) {
+                $service['webui'] = $serviceWebui;
+            }
+
+            $originalName = $name;
+            $append = 1;
+            while (isset($services[$name])) {
+                $name = $originalName . '_' . $append;
+                $append++;
+            }
+            $services[$name] = $service;
+        }
+
+        if (empty($services)) {
+            echo json_encode(['result' => 'error', 'message' => 'No valid Docker Manager containers found for import']);
+            break;
+        }
+
+        $env = dockerResolveEnvAndCompose($services);
+        $composeYml = dockerServicesToComposeYml($services);
+        $override = dockerAddOverrideIcons($services);
+
+        echo json_encode(['result' => 'success', 'composeYml' => $composeYml, 'env' => $env, 'override' => $override]);
+        break;
+    case 'performImportTransfer':
+        $stackName = trim($_POST['stackName'] ?? '');
+        $stackDesc = trim($_POST['stackDesc'] ?? '');
+        $stopContainers = (!empty($_POST['stopContainers']) && $_POST['stopContainers'] === '1');
+        $removeContainers = (!empty($_POST['removeContainers']) && $_POST['removeContainers'] === '1');
+        $startStack = (!empty($_POST['startStack']) && $_POST['startStack'] === '1');
+        $composeYml = trim($_POST['composeYml'] ?? '');
+        $env = trim($_POST['env'] ?? '');
+        $override = trim($_POST['override'] ?? '');
+
+        if ($stackName === '') {
+            echo json_encode(['result' => 'error', 'message' => 'Stack name is required']);
+            break;
+        }
+
+        if ($removeContainers && !$stopContainers) {
+            // Enforce logical dependency (remove implies stop)
+            $stopContainers = true;
+        }
+
+        try {
+            $stackInfo = StackInfo::createNew($compose_root, $stackName, $stackDesc);
+        } catch (\RuntimeException $e) {
+            clientDebug('[stack] Failed to create import stack: ' . $e->getMessage(), null, 'daemon', 'error');
+            echo json_encode(['result' => 'error', 'message' => 'Failed to create new stack']);
+            break;
+        }
+
+        $composePath = $stackInfo->composeFilePath;
+        $envPath = $stackInfo->getEnvFilePath() ?? $stackInfo->composeSource . '/.env';
+        $overridePath = $stackInfo->getOverridePath() ?: $stackInfo->composeSource . '/docker-compose.override.yml';
+
+        if ($composeYml !== '') {
+            file_put_contents($composePath, $composeYml);
+        }
+        if ($env !== '') {
+            file_put_contents($envPath, $env);
+        }
+        if ($override !== '') {
+            file_put_contents($overridePath, $override);
+        }
+
+        $containerIds = [];
+        if (!empty($_POST['containerIds'])) {
+            $data = json_decode($_POST['containerIds'], true);
+            if (is_array($data)) {
+                $containerIds = $data;
+            }
+        }
+
+        foreach ($containerIds as $id) {
+            $id = trim($id);
+            if ($id === '') {
+                continue;
+            }
+
+            if ($stopContainers) {
+                exec('docker stop ' . escapeshellarg($id) . ' 2>&1');
+                if (!$removeContainers) {
+                    exec('docker container update --label-add net.unraid.docker.managed=composeman ' . escapeshellarg($id) . ' 2>&1');
+                }
+            }
+
+            if ($removeContainers) {
+                exec('docker rm -f ' . escapeshellarg($id) . ' 2>&1');
+            }
+        }
+
+        echo json_encode([
+            'result' => 'success',
+            'message' => 'Stack imported successfully',
+            'project' => $stackInfo->projectFolder,
+            'projectName' => $stackInfo->getName(),
+            'projectPath' => $stackInfo->path,
+            'startStack' => $startStack ? 1 : 0
+        ]);
+
         break;
     case 'deleteStack':
         $stackName = isset($_POST['stackName']) ? basename(trim($_POST['stackName'])) : "";
diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index 3b4d67d..651cdbb 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -255,6 +255,319 @@ public static function hasTraversal(string $path): bool
     }
 }
 
+/**
+ * Import helper for Docker Manager containers.
+ */
+function getDockerManagerImportCandidates(): array
+{
+    require_once "/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php";
+
+    $dockerClient = new DockerClient();
+    $containers = $dockerClient->getDockerContainers();
+    $candidates = [];
+
+    foreach ($containers as $ct) {
+        if (!is_array($ct)) {
+            continue;
+        }
+        $manager = $ct['Manager'] ?? '';
+        if ($manager !== 'dockerman') {
+            continue;
+        }
+        $candidates[] = [
+            'Id' => $ct['Id'] ?? '',
+            'Name' => $ct['Name'] ?? '',
+            'Image' => $ct['Image'] ?? '',
+            'Status' => $ct['Status'] ?? '',
+            'Running' => $ct['Running'] ?? false,
+            'Icon' => $ct['Icon'] ?? '',
+            'Url' => $ct['Url'] ?? '',
+            'TSUrl' => $ct['TSUrl'] ?? '',
+            'Labels' => $ct['Labels'] ?? [],
+        ];
+    }
+
+    return $candidates;
+}
+
+function getDockerManagerContainerInfo(string $id): array
+{
+    require_once "/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php";
+
+    $dockerClient = new DockerClient();
+    $info = $dockerClient->getContainerDetails($id);
+    if (!is_array($info)) {
+        return [];
+    }
+    return $info;
+}
+
+function dockerContainerToComposeService(array $info): array
+{
+    $service = [];
+    $serviceName = ltrim(trim($info['Name'] ?? $info['Id'] ?? ''), '/');
+    $serviceName = preg_replace('/[^a-zA-Z0-9_.-]/', '_', $serviceName);
+    if ($serviceName === '') {
+        $serviceName = 'container_' . substr($info['Id'] ?? 'unknown', 0, 12);
+    }
+
+    $config = $info['Config'] ?? [];
+    $hostConfig = $info['HostConfig'] ?? [];
+
+    $service['image'] = $config['Image'] ?? '';
+
+    // Do not include explicit command/entrypoint by default in generated compose
+    // because Compose can use defaults from the image; this avoids embedding Unraid startup semantics.
+
+    if (!empty($config['Env']) && is_array($config['Env'])) {
+        $env = [];
+        $blacklist = ['TERM', 'LANG', 'HOME', 'PATH', 'HOST_OS', 'HOST_HOSTNAME', 'HOST_CONTAINERNAME'];
+        foreach ($config['Env'] as $entry) {
+            if (!str_contains($entry, '=')) {
+                continue;
+            }
+            [$key, $value] = explode('=', $entry, 2);
+            if (in_array($key, $blacklist, true)) {
+                continue;
+            }
+            $env[$key] = $value;
+        }
+        if (!empty($env)) {
+            // Replace values with env variable expansion in compose file, values go in .env file.
+            $service['environment'] = array_map(function ($key) {
+                return sprintf('%s=${%s}', $key, $key);
+            }, array_keys($env));
+            // We store the resolved env set as a reserved field to generate .env file later.
+            $service['__resolved_env'] = $env;
+        }
+    }
+
+    if (!empty($hostConfig['RestartPolicy']['Name'])) {
+        $policy = $hostConfig['RestartPolicy']['Name'];
+        if ($policy !== 'no') {
+            $service['restart'] = $policy;
+        }
+    }
+
+    $ports = [];
+    if (!empty($hostConfig['PortBindings']) && is_array($hostConfig['PortBindings'])) {
+        foreach ($hostConfig['PortBindings'] as $port => $bindings) {
+            [$privatePort, $proto] = array_pad(explode('/', $port), 2, 'tcp');
+            foreach ((array)$bindings as $bind) {
+                if (!is_array($bind)) continue;
+                $hostIp = $bind['HostIp'] ?? '';
+                $hostPort = $bind['HostPort'] ?? '';
+                if ($hostIp !== '' && $hostIp !== '0.0.0.0') {
+                    $ports[] = "{$hostIp}:{$hostPort}:{$privatePort}/{$proto}";
+                } elseif ($hostPort !== '') {
+                    $ports[] = "{$hostPort}:{$privatePort}/{$proto}";
+                } else {
+                    $ports[] = "{$privatePort}/{$proto}";
+                }
+            }
+        }
+    }
+    if (!empty($ports)) {
+        $service['ports'] = $ports;
+    }
+
+    $volumes = [];
+    if (!empty($info['Mounts']) && is_array($info['Mounts'])) {
+        foreach ($info['Mounts'] as $mount) {
+            $source = $mount['Source'] ?? '';
+            $target = $mount['Destination'] ?? '';
+            if ($source !== '' && $target !== '') {
+                $mode = '';
+                if (array_key_exists('RW', $mount) && $mount['RW'] === false) {
+                    $mode = ':ro';
+                }
+                $volumes[] = "{$source}:{$target}{$mode}";
+            }
+        }
+    }
+    if (!empty($volumes)) {
+        $service['volumes'] = $volumes;
+    }
+
+    $labels = [];
+    if (!empty($config['Labels']) && is_array($config['Labels'])) {
+        foreach ($config['Labels'] as $key => $val) {
+            // Skip internal Compose Manager markers and helper labels
+            if (in_array($key, ['net.unraid.docker.managed', 'net.unraid.docker.icon', 'net.unraid.docker.webui'], true)) {
+                continue;
+            }
+
+            // Skip uncaught LinuxServer/OCI metadata that is not needed in compose services
+            if ($key === 'build_version' || $key === 'maintainer') {
+                continue;
+            }
+            $excludePrefixes = [
+                'org.opencontainers.image.',
+                'org.label-schema.',
+                'com.docker.compose.',
+            ];
+            $skip = false;
+            foreach ($excludePrefixes as $prefix) {
+                if (str_starts_with($key, $prefix)) {
+                    $skip = true;
+                    break;
+                }
+            }
+            if ($skip) {
+                continue;
+            }
+
+            $labels[$key] = $val;
+        }
+    }
+    if (!empty($labels)) {
+        $service['labels'] = $labels;
+    }
+
+    if (!empty($hostConfig['NetworkMode'])) {
+        $networkMode = $hostConfig['NetworkMode'];
+        if ($networkMode !== 'default') {
+            if (in_array($networkMode, ['host', 'bridge', 'none'])) {
+                $service['network_mode'] = $networkMode;
+            }
+        }
+    }
+
+    return ['name' => $serviceName, 'service' => $service];
+}
+
+function dockerServicesToComposeYml(array $services): string
+{
+    $yaml = "services:\n";
+    $allNetworks = [];
+
+    foreach ($services as $name => $service) {
+        $yaml .= "  " . $name . ":\n";
+
+        if (!empty($service['networks']) && is_array($service['networks'])) {
+            foreach ($service['networks'] as $networkName) {
+                if (!in_array($networkName, $allNetworks, true)) {
+                    $allNetworks[] = $networkName;
+                }
+            }
+        }
+
+        foreach ($service as $key => $value) {
+            if ($key === '__resolved_env' || $key === 'icon' || $key === 'webui') {
+                continue; // internal helper field and metadata should not be in compose service
+            }
+            if (is_string($value) || is_numeric($value) || is_bool($value)) {
+                $yaml .= "    $key: " . (is_bool($value) ? ($value ? 'true' : 'false') : $value) . "\n";
+            } elseif (is_array($value)) {
+                $yaml .= "    $key:\n";
+                if (array_is_list($value)) {
+                    foreach ($value as $item) {
+                        $yaml .= "      - " . (is_bool($item) ? ($item ? 'true' : 'false') : $item) . "\n";
+                    }
+                } else {
+                    foreach ($value as $subKey => $subVal) {
+                        $yaml .= "      " . $subKey . ": " . (is_bool($subVal) ? ($subVal ? 'true' : 'false') : $subVal) . "\n";
+                    }
+                }
+            }
+        }
+    }
+
+    if (!empty($allNetworks)) {
+        $yaml .= "\nnetworks:\n";
+        foreach ($allNetworks as $networkName) {
+            $yaml .= "  " . $networkName . ":\n";
+            $yaml .= "    external: true\n";
+        }
+    }
+
+    return $yaml;
+}
+
+function dockerResolveEnvAndCompose(array &$services): string
+{
+    $globalEnv = [];
+
+    // Track environment values by canonical variable to avoid duplicates for same values across multiple services
+    $valueKeyMap = [];
+
+    foreach ($services as $serviceName => &$service) {
+        $serviceEnvItems = [];
+
+        if (!empty($service['__resolved_env']) && is_array($service['__resolved_env'])) {
+            foreach ($service['__resolved_env'] as $k => $v) {
+                if ($k === '') {
+                    continue;
+                }
+
+                // If single value reused exactly, reuse same variable name (dedupe name and value)
+                if (isset($valueKeyMap[$k][$v])) {
+                    $resolvedKey = $valueKeyMap[$k][$v];
+                } else {
+                    if (!array_key_exists($k, $globalEnv)) {
+                        $globalEnv[$k] = $v;
+                        $resolvedKey = $k;
+                    } elseif ($globalEnv[$k] === $v) {
+                        $resolvedKey = $k;
+                    } else {
+                        $suffix = 1;
+                        $resolvedKey = $k . '_' . $suffix;
+                        while (array_key_exists($resolvedKey, $globalEnv)) {
+                            if ($globalEnv[$resolvedKey] === $v) {
+                                break;
+                            }
+                            $suffix++;
+                            $resolvedKey = $k . '_' . $suffix;
+                        }
+                        if (!array_key_exists($resolvedKey, $globalEnv)) {
+                            $globalEnv[$resolvedKey] = $v;
+                        }
+                    }
+                    $valueKeyMap[$k][$v] = $resolvedKey;
+                }
+
+                $serviceEnvItems[] = sprintf('%s=${%s}', $k, $resolvedKey);
+            }
+        }
+
+        if (!empty($serviceEnvItems)) {
+            $service['environment'] = $serviceEnvItems;
+        }
+
+        // Cleanup internal field before rendering
+        unset($service['__resolved_env']);
+    }
+    unset($service);
+
+    $lines = [];
+    foreach ($globalEnv as $k => $v) {
+        $lines[] = "$k=$v";
+    }
+    return implode("\n", $lines) . (empty($lines) ? '' : "\n");
+}
+
+function dockerAddOverrideIcons(array $importedServices): string
+{
+    $yaml = "services:\n";
+    foreach ($importedServices as $serviceName => $service) {
+        $labels = ['net.unraid.docker.managed' => 'composeman'];
+        $icon = $service['icon'] ?? null;
+        $webui = $service['webui'] ?? null;
+        if ($icon) {
+            $labels['net.unraid.docker.icon'] = $icon;
+        }
+        if ($webui) {
+            $labels['net.unraid.docker.webui'] = $webui;
+        }
+
+        $yaml .= "  " . $serviceName . ":\n";
+        $yaml .= "    labels:\n";
+        foreach ($labels as $key => $val) {
+            $yaml .= "      " . $key . ": \"" . addslashes($val) . "\"\n";
+        }
+    }
+    return $yaml;
+}
 
 function pruneOverrideContentServices(string $overrideContent, array $validServices): array
 {

From 957568086dffa76802c7c7e3db8b736162a534cd Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Sat, 28 Mar 2026 11:16:35 -0400
Subject: [PATCH 02/40] fix(escape): replace escapeHtml with composeEscapeHtml
 for container details and previews to match new base

---
 source/compose.manager/include/ComposeManager.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 6f4ff52..1c6f03a 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2246,9 +2246,9 @@ function importFromDockerManager() {
             var rows = containers.map(function(ct) {
                 return '<tr>' +
                     '<td><input type="checkbox" class="cm-import-container" value="' + ct.Id + '"></td>' +
-                    '<td>' + escapeHtml(ct.Name) + '</td>' +
-                    '<td>' + escapeHtml(ct.Image) + '</td>' +
-                    '<td>' + escapeHtml(ct.Status) + '</td>' +
+                    '<td>' + composeEscapeHtml(ct.Name) + '</td>' +
+                    '<td>' + composeEscapeHtml(ct.Image) + '</td>' +
+                    '<td>' + composeEscapeHtml(ct.Status) + '</td>' +
                     '<td>' + (ct.Icon ? '<img src="' + ct.Icon + '" style="height:20px;max-width:20px;" />' : '') + '</td>' +
                     '<td>' + (ct.Url ? '<a href="' + ct.Url + '" target="_blank">Link</a>' : '') + '</td>' +
                     '</tr>';
@@ -2282,11 +2282,11 @@ function composeImportPreview() {
                 return;
             }
             var preview = '<div style="margin-bottom:10px;"><strong>Compose YAML preview</strong></div>' +
-                '<pre style="max-height:220px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + escapeHtml(response.composeYml) + '</pre>' +
+                '<pre style="max-height:220px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + composeEscapeHtml(response.composeYml) + '</pre>' +
                 '<div style="margin-top:10px;"><strong>.env preview (optional)</strong></div>' +
-                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + escapeHtml(response.env) + '</pre>' +
+                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + composeEscapeHtml(response.env) + '</pre>' +
                 '<div style="margin-top:10px;"><strong>Override preview (icons/webui)</strong></div>' +
-                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + escapeHtml(response.override) + '</pre>';
+                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + composeEscapeHtml(response.override) + '</pre>';
 
             preview += '<div style="margin-top:14px; font-weight:bold;">Stack name</div>' +
                 '<input type="text" id="cm-import-stack-name" placeholder="Import Stack Name" style="width:100%; margin-bottom:10px;">' +

From 1dd0bc269b7205b86c95bd6dfc19a412b3547e92 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Sat, 28 Mar 2026 12:20:02 -0400
Subject: [PATCH 03/40] feat(ui): enhance dropdown menu styling and improve
 YAML handling in compose functions

---
 .../include/ComposeManager.php                | 19 +++++--
 source/compose.manager/include/Exec.php       | 26 +++++++--
 source/compose.manager/include/Util.php       | 56 +++++++++++++++++--
 3 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 1c6f03a..85f9515 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -229,8 +229,9 @@ function compose_manager_cpu_spec_count($cpuSpec)
         padding-right: 20px
     }
 
-    .dropdown-menu {
-        z-index: 100 !important; 
+    .compose-modal-overlay .dropdown-menu,
+    #compose_stacks .dropdown-menu {
+        z-index: 100;
     }
 
     /* CPU & Memory load display (matches Docker manager usage-disk style) */
@@ -2244,13 +2245,21 @@ function importFromDockerManager() {
                 return;
             }
             var rows = containers.map(function(ct) {
+                var iconHtml = '';
+                if (ct.Icon) {
+                    iconHtml = '<img src="' + composeEscapeHtml(ct.Icon) + '" style="height:20px;max-width:20px;" />';
+                }
+                var urlHtml = '';
+                if (ct.Url && /^https?:\/\//i.test(ct.Url)) {
+                    urlHtml = '<a href="' + composeEscapeHtml(ct.Url) + '" target="_blank">Link</a>';
+                }
                 return '<tr>' +
-                    '<td><input type="checkbox" class="cm-import-container" value="' + ct.Id + '"></td>' +
+                    '<td><input type="checkbox" class="cm-import-container" value="' + composeEscapeHtml(ct.Id) + '"></td>' +
                     '<td>' + composeEscapeHtml(ct.Name) + '</td>' +
                     '<td>' + composeEscapeHtml(ct.Image) + '</td>' +
                     '<td>' + composeEscapeHtml(ct.Status) + '</td>' +
-                    '<td>' + (ct.Icon ? '<img src="' + ct.Icon + '" style="height:20px;max-width:20px;" />' : '') + '</td>' +
-                    '<td>' + (ct.Url ? '<a href="' + ct.Url + '" target="_blank">Link</a>' : '') + '</td>' +
+                    '<td>' + iconHtml + '</td>' +
+                    '<td>' + urlHtml + '</td>' +
                     '</tr>';
             }).join('');
             var table = '<div style="max-height:300px;overflow:auto;"><table class="tablesorter" style="width:100%"><thead><tr><th></th><th>Name</th><th>Image</th><th>Status</th><th>Icon</th><th>WebUI</th></tr></thead><tbody>' + rows + '</tbody></table></div>';
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 52ab37d..fcbccb6 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -162,7 +162,15 @@ function getPostScript(): string
             $stackInfo = StackInfo::createNew($compose_root, $stackName, $stackDesc);
         } catch (\RuntimeException $e) {
             clientDebug('[stack] Failed to create import stack: ' . $e->getMessage(), null, 'daemon', 'error');
-            echo json_encode(['result' => 'error', 'message' => 'Failed to create new stack']);
+            $userMessage = match (true) {
+                str_contains($e->getMessage(), 'cannot be empty') => 'Stack name cannot be empty.',
+                str_contains($e->getMessage(), 'empty folder name') => 'Invalid stack name.',
+                str_contains($e->getMessage(), 'unique folder name') => 'Could not create a unique folder for this stack.',
+                str_contains($e->getMessage(), 'escape compose root') => 'Invalid stack name.',
+                str_contains($e->getMessage(), 'Invalid compose root') => 'Server configuration error.',
+                default => 'Failed to create stack. Check server logs for details.',
+            };
+            echo json_encode(['result' => 'error', 'message' => $userMessage]);
             break;
         }
 
@@ -171,6 +179,19 @@ function getPostScript(): string
         $overridePath = $stackInfo->getOverridePath() ?: $stackInfo->composeSource . '/docker-compose.override.yml';
 
         if ($composeYml !== '') {
+            // Validate that the compose content is parseable YAML before writing
+            try {
+                $parsed = yaml_parse($composeYml);
+                if ($parsed === false) {
+                    throw new \Exception('Invalid YAML');
+                }
+            } catch (\Throwable $e) {
+                // yaml_parse may not be available; fall back to basic structure check
+                if (function_exists('yaml_parse')) {
+                    echo json_encode(['result' => 'error', 'message' => 'Generated compose YAML is invalid']);
+                    break;
+                }
+            }
             file_put_contents($composePath, $composeYml);
         }
         if ($env !== '') {
@@ -196,9 +217,6 @@ function getPostScript(): string
 
             if ($stopContainers) {
                 exec('docker stop ' . escapeshellarg($id) . ' 2>&1');
-                if (!$removeContainers) {
-                    exec('docker container update --label-add net.unraid.docker.managed=composeman ' . escapeshellarg($id) . ' 2>&1');
-                }
             }
 
             if ($removeContainers) {
diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index 651cdbb..453e0cb 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -429,13 +429,53 @@ function dockerContainerToComposeService(array $info): array
         if ($networkMode !== 'default') {
             if (in_array($networkMode, ['host', 'bridge', 'none'])) {
                 $service['network_mode'] = $networkMode;
+            } elseif (str_starts_with($networkMode, 'container:')) {
+                $service['network_mode'] = $networkMode;
             }
         }
     }
 
+    // Extract named networks from NetworkSettings
+    $networks = $info['NetworkSettings']['Networks'] ?? [];
+    if (is_array($networks) && !isset($service['network_mode'])) {
+        $namedNetworks = [];
+        foreach (array_keys($networks) as $netName) {
+            if (!in_array($netName, ['bridge', 'host', 'none'], true)) {
+                $namedNetworks[] = $netName;
+            }
+        }
+        if (!empty($namedNetworks)) {
+            $service['networks'] = $namedNetworks;
+        }
+    }
+
     return ['name' => $serviceName, 'service' => $service];
 }
 
+/**
+ * Quote a YAML scalar value if it contains special characters.
+ */
+function yamlQuoteValue($value): string
+{
+    if (is_bool($value)) {
+        return $value ? 'true' : 'false';
+    }
+    $str = (string)$value;
+    if ($str === '') {
+        return '""';
+    }
+    // Quote if value contains YAML-special characters or could be misinterpreted
+    if (preg_match('/[:\#{}\[\],&*?|>!\'"%@`]/', $str)
+        || preg_match('/^[\s-]/', $str)
+        || preg_match('/\s$/', $str)
+        || in_array(strtolower($str), ['true', 'false', 'null', 'yes', 'no', 'on', 'off'], true)
+        || is_numeric($str)
+    ) {
+        return '"' . str_replace(['\\', '"', "\n"], ['\\\\', '\\"', '\\n'], $str) . '"';
+    }
+    return $str;
+}
+
 function dockerServicesToComposeYml(array $services): string
 {
     $yaml = "services:\n";
@@ -457,16 +497,16 @@ function dockerServicesToComposeYml(array $services): string
                 continue; // internal helper field and metadata should not be in compose service
             }
             if (is_string($value) || is_numeric($value) || is_bool($value)) {
-                $yaml .= "    $key: " . (is_bool($value) ? ($value ? 'true' : 'false') : $value) . "\n";
+                $yaml .= "    $key: " . yamlQuoteValue($value) . "\n";
             } elseif (is_array($value)) {
                 $yaml .= "    $key:\n";
                 if (array_is_list($value)) {
                     foreach ($value as $item) {
-                        $yaml .= "      - " . (is_bool($item) ? ($item ? 'true' : 'false') : $item) . "\n";
+                        $yaml .= "      - " . yamlQuoteValue($item) . "\n";
                     }
                 } else {
                     foreach ($value as $subKey => $subVal) {
-                        $yaml .= "      " . $subKey . ": " . (is_bool($subVal) ? ($subVal ? 'true' : 'false') : $subVal) . "\n";
+                        $yaml .= "      " . $subKey . ": " . yamlQuoteValue($subVal) . "\n";
                     }
                 }
             }
@@ -541,7 +581,13 @@ function dockerResolveEnvAndCompose(array &$services): string
 
     $lines = [];
     foreach ($globalEnv as $k => $v) {
-        $lines[] = "$k=$v";
+        // Quote values that contain special characters to prevent .env parsing issues
+        if (preg_match('/[\s#$"\\\n]/', $v) || $v === '') {
+            $escaped = str_replace(['\\', '"', '$', "\n"], ['\\\\', '\\"', '\\$', '\\n'], $v);
+            $lines[] = "$k=\"$escaped\"";
+        } else {
+            $lines[] = "$k=$v";
+        }
     }
     return implode("\n", $lines) . (empty($lines) ? '' : "\n");
 }
@@ -563,7 +609,7 @@ function dockerAddOverrideIcons(array $importedServices): string
         $yaml .= "  " . $serviceName . ":\n";
         $yaml .= "    labels:\n";
         foreach ($labels as $key => $val) {
-            $yaml .= "      " . $key . ": \"" . addslashes($val) . "\"\n";
+            $yaml .= "      " . $key . ": " . yamlQuoteValue($val) . "\n";
         }
     }
     return $yaml;

From 536cb6deb2a6c0fc8882c47f3a8c4f9e88894f64 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Sat, 28 Mar 2026 16:50:16 -0400
Subject: [PATCH 04/40] Add Import Wizard styles and unit tests for backend
 functions

- Implemented CSS styles for the Import Wizard, including a 6-stage stepper, service configuration cards, healthcheck sections, and validation stages.
- Created unit tests for new backend functions related to the Import Wizard, covering duration conversion, port mapping parsing, healthcheck guessing, port conflict detection, and YAML generation for Docker services.
---
 .../include/ComposeManager.php                | 1032 +++++++++++++++--
 source/compose.manager/include/Exec.php       |  221 ++++
 source/compose.manager/include/Util.php       |  407 ++++++-
 source/compose.manager/sheets/ComboButton.css |  592 ++++++++++
 tests/unit/ImportWizardTest.php               |  506 ++++++++
 5 files changed, 2672 insertions(+), 86 deletions(-)
 create mode 100644 tests/unit/ImportWizardTest.php

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 85f9515..cf95ac5 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2209,19 +2209,104 @@ function(data) {
 
 
 
+    // =========================================================================
+    // Import Wizard — 6-Stage Flow
+    // =========================================================================
+
+    var importWizard = {
+        stage: 1,
+        containerIds: [],
+        containers: [],     // raw container list from getDockerContainersForImport
+        services: {},       // per-service metadata from generateImportData
+        portConflicts: [],
+        availableNetworks: [],
+        config: {
+            stackName: '',
+            stackDesc: '',
+            stopContainers: true,
+            removeContainers: true,
+            startStack: true,
+            containerNames: {},
+            networkConfig: {
+                stackNetwork: { enabled: true, name: '' },
+                externalNetworks: [],
+                perService: {}
+            },
+            healthchecks: {},
+            dependencies: {}
+        },
+        result: null        // finalizeImportCompose response
+    };
+
+    var WIZARD_STAGES = [
+        { num: 1, label: 'Select Containers' },
+        { num: 2, label: 'Select Options' },
+        { num: 3, label: 'Configure Containers' },
+        { num: 4, label: 'Configure Dependencies' },
+        { num: 5, label: 'Generating' },
+        { num: 6, label: 'Validate Compose' }
+    ];
+
+    function renderWizardStepper(activeStage) {
+        var html = '<div class="import-wizard-stepper">';
+        WIZARD_STAGES.forEach(function(s, i) {
+            var cls = 'import-wizard-step';
+            if (s.num < activeStage) cls += ' completed';
+            else if (s.num === activeStage) cls += ' active';
+            if (i > 0) html += '<div class="import-wizard-step-connector"></div>';
+            var icon = s.num < activeStage ? '<i class="fa fa-check"></i>' : s.num;
+            html += '<div class="' + cls + '"><span class="import-wizard-step-number">' + icon + '</span><span>' + composeEscapeHtml(s.label) + '</span></div>';
+        });
+        html += '</div>';
+        return html;
+    }
+
+    function wizardFooter(opts) {
+        var left = '';
+        var right = '';
+        if (opts.back) {
+            left = '<button class="editor-btn editor-btn-cancel" onclick="' + opts.back + '"><i class="fa fa-arrow-left"></i> Back</button>';
+        }
+        if (opts.cancel !== false) {
+            right += '<button class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()">Cancel</button>';
+        }
+        if (opts.next) {
+            var disabledAttr = opts.nextDisabled ? ' disabled' : '';
+            var label = opts.nextLabel || 'Next';
+            right += '<button class="editor-btn editor-btn-save-all" id="import-wizard-next-btn" onclick="' + opts.next + '"' + disabledAttr + '>' + composeEscapeHtml(label) + ' <i class="fa fa-arrow-right"></i></button>';
+        }
+        if (opts.action) {
+            right += '<button class="editor-btn editor-btn-save-all" onclick="' + opts.action + '">' + composeEscapeHtml(opts.actionLabel || 'Import') + '</button>';
+        }
+        return '<div style="display:flex;justify-content:space-between;align-items:center;width:100%;">' +
+               '<div>' + left + '</div><div style="display:flex;gap:8px;">' + right + '</div></div>';
+    }
+
     function importFromDockerManager() {
-        var modalHtml = `
-            <div id="compose-import-modal-overlay" class="compose-modal-overlay" style="display:flex;">
-                <div class="compose-modal" role="dialog" aria-modal="true" aria-labelledby="compose-import-modal-title" tabindex="-1" style="width:760px; max-width:95%;">
-                    <div class="compose-modal-header">
-                        <span id="compose-import-modal-title">Import from Docker Manager</span>
-                        <button type="button" class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()" aria-label="Close modal"><i class="fa fa-times"></i></button>
-                    </div>
-                    <div class="compose-modal-body" id="compose-import-modal-body">Loading Docker Manager containers...</div>
-                    <div class="compose-modal-footer" id="compose-import-modal-footer"></div>
-                </div>
-            </div>
-        `;
+        // Reset wizard state
+        importWizard = {
+            stage: 1, containerIds: [], containers: [], services: {},
+            portConflicts: [], availableNetworks: [],
+            config: {
+                stackName: '', stackDesc: '',
+                stopContainers: true, removeContainers: true, startStack: true,
+                containerNames: {},
+                networkConfig: { stackNetwork: { enabled: true, name: '' }, externalNetworks: [], perService: {} },
+                healthchecks: {}, dependencies: {}
+            },
+            result: null
+        };
+
+        var modalHtml = '<div id="compose-import-modal-overlay" class="compose-modal-overlay" style="display:flex;">' +
+            '<div class="compose-modal import-wizard-modal" role="dialog" aria-modal="true" aria-labelledby="compose-import-modal-title" tabindex="-1">' +
+            '<div class="compose-modal-header">' +
+            '<span id="compose-import-modal-title">Import from Docker Manager</span>' +
+            '<button type="button" class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()" aria-label="Close modal"><i class="fa fa-times"></i></button>' +
+            '</div>' +
+            '<div id="compose-import-stepper"></div>' +
+            '<div class="compose-modal-body" id="compose-import-modal-body">Loading Docker Manager containers...</div>' +
+            '<div class="compose-modal-footer" id="compose-import-modal-footer"></div>' +
+            '</div></div>';
 
         var existing = document.getElementById('compose-import-modal-overlay');
         if (existing) existing.remove();
@@ -2232,6 +2317,16 @@ function importFromDockerManager() {
             if (overlay) overlay.remove();
         };
 
+        renderImportStage1();
+    }
+
+    // ── Stage 1: Select Containers ──────────────────────────────────────────
+    function renderImportStage1() {
+        importWizard.stage = 1;
+        $('#compose-import-stepper').html(renderWizardStepper(1));
+        $('#compose-import-modal-body').html('Loading Docker Manager containers...');
+        $('#compose-import-modal-footer').html('');
+
         $.post(caURL, {action: 'getDockerContainersForImport'}, function(data) {
             var response;
             try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
@@ -2239,113 +2334,890 @@ function importFromDockerManager() {
                 $('#compose-import-modal-body').html('<div style="color:#f44336">Failed to load containers.</div>');
                 return;
             }
-            var containers = response.containers || [];
-            if (!containers.length) {
+            importWizard.containers = response.containers || [];
+            if (!importWizard.containers.length) {
                 $('#compose-import-modal-body').html('<div>No Docker Manager containers found.</div>');
                 return;
             }
-            var rows = containers.map(function(ct) {
-                var iconHtml = '';
-                if (ct.Icon) {
-                    iconHtml = '<img src="' + composeEscapeHtml(ct.Icon) + '" style="height:20px;max-width:20px;" />';
-                }
-                var urlHtml = '';
-                if (ct.Url && /^https?:\/\//i.test(ct.Url)) {
-                    urlHtml = '<a href="' + composeEscapeHtml(ct.Url) + '" target="_blank">Link</a>';
-                }
+
+            var selectAll = '<label style="display:inline-flex;align-items:center;gap:6px;margin-bottom:10px;cursor:pointer;">' +
+                '<input type="checkbox" id="cm-import-select-all"> <strong>Select All</strong></label>';
+
+            var rows = importWizard.containers.map(function(ct) {
+                var iconHtml = ct.Icon ? '<img src="' + composeEscapeHtml(ct.Icon) + '" style="height:20px;max-width:20px;" />' : '';
+                var urlHtml = (ct.Url && /^https?:\/\//i.test(ct.Url)) ?
+                    '<a href="' + composeEscapeHtml(ct.Url) + '" target="_blank">Link</a>' : '';
                 return '<tr>' +
                     '<td><input type="checkbox" class="cm-import-container" value="' + composeEscapeHtml(ct.Id) + '"></td>' +
                     '<td>' + composeEscapeHtml(ct.Name) + '</td>' +
                     '<td>' + composeEscapeHtml(ct.Image) + '</td>' +
                     '<td>' + composeEscapeHtml(ct.Status) + '</td>' +
                     '<td>' + iconHtml + '</td>' +
-                    '<td>' + urlHtml + '</td>' +
-                    '</tr>';
+                    '<td>' + urlHtml + '</td></tr>';
             }).join('');
-            var table = '<div style="max-height:300px;overflow:auto;"><table class="tablesorter" style="width:100%"><thead><tr><th></th><th>Name</th><th>Image</th><th>Status</th><th>Icon</th><th>WebUI</th></tr></thead><tbody>' + rows + '</tbody></table></div>';
+            var table = selectAll + '<div style="max-height:350px;overflow:auto;"><table class="tablesorter" style="width:100%">' +
+                '<thead><tr><th></th><th>Name</th><th>Image</th><th>Status</th><th>Icon</th><th>WebUI</th></tr></thead>' +
+                '<tbody>' + rows + '</tbody></table></div>';
             $('#compose-import-modal-body').html(table);
-            $('#compose-import-modal-footer').html('<button class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()">Cancel</button><button class="editor-btn editor-btn-save-all" onclick="composeImportPreview()">Next</button>');
+            $('#compose-import-modal-footer').html(wizardFooter({
+                next: 'importWizardStage1Next()',
+                nextLabel: 'Next'
+            }));
+
+            // Select-all toggle
+            $('#cm-import-select-all').on('change', function() {
+                $('.cm-import-container').prop('checked', this.checked);
+            });
         }).fail(function() {
             $('#compose-import-modal-body').html('<div style="color:#f44336">Failed to contact server.</div>');
         });
     }
 
-    function composeImportPreview() {
+    function importWizardStage1Next() {
         var selected = [];
-        $('.cm-import-container:checked').each(function() {
-            selected.push(this.value);
-        });
+        $('.cm-import-container:checked').each(function() { selected.push(this.value); });
         if (!selected.length) {
             swal('No containers selected', 'Please select at least one container to import.', 'warning');
             return;
         }
+        importWizard.containerIds = selected;
 
-        $('#compose-import-modal-body').html('<div>Generating import preview...</div>');
-        $('#compose-import-modal-footer').empty();
+        // Fetch rich import data
+        $('#compose-import-modal-body').html('<div class="import-generating"><i class="fa fa-spinner fa-spin"></i><span>Analyzing containers...</span></div>');
+        $('#compose-import-modal-footer').html('');
 
-        $.post(caURL, {action: 'generateImportPreview', containerIds: JSON.stringify(selected)}, function(data) {
+        $.post(caURL, {action: 'generateImportData', containerIds: JSON.stringify(selected)}, function(data) {
             var response;
             try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
             if (response.result !== 'success') {
-                $('#compose-import-modal-body').html('<div style="color:#f44336">' + (response.message || 'Failed to generate preview') + '</div>');
+                $('#compose-import-modal-body').html('<div style="color:#f44336">' + composeEscapeHtml(response.message || 'Failed to analyze containers') + '</div>');
+                $('#compose-import-modal-footer').html(wizardFooter({ back: 'renderImportStage1()' }));
                 return;
             }
-            var preview = '<div style="margin-bottom:10px;"><strong>Compose YAML preview</strong></div>' +
-                '<pre style="max-height:220px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + composeEscapeHtml(response.composeYml) + '</pre>' +
-                '<div style="margin-top:10px;"><strong>.env preview (optional)</strong></div>' +
-                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + composeEscapeHtml(response.env) + '</pre>' +
-                '<div style="margin-top:10px;"><strong>Override preview (icons/webui)</strong></div>' +
-                '<pre style="max-height:120px; overflow:auto; background:#1e1e1e; color:#ffffff; padding:10px; border-radius:6px;">' + composeEscapeHtml(response.override) + '</pre>';
-
-            preview += '<div style="margin-top:14px; font-weight:bold;">Stack name</div>' +
-                '<input type="text" id="cm-import-stack-name" placeholder="Import Stack Name" style="width:100%; margin-bottom:10px;">' +
-                '<div style="margin-bottom:5px; font-weight:bold;">Actions</div>' +
-                '<label style="display:block;margin-bottom:4px;"><input id="cm-import-stop-containers" type="checkbox" checked> Stop containers</label>' +
-                '<label style="display:block;margin-bottom:4px;"><input id="cm-import-remove-containers" type="checkbox" checked> Remove containers</label>' +
-                '<label style="display:block;margin-bottom:10px;"><input id="cm-import-start-stack" type="checkbox" checked> Start imported stack</label>';
-
-            $('#compose-import-modal-body').html(preview);
-            $('#compose-import-modal-footer').html('<button class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()">Cancel</button><button class="editor-btn editor-btn-save-all" onclick="composeImportPerform()">Import</button>');
-
-            $('#cm-import-remove-containers').on('change', function() {
-                if ($(this).is(':checked')) {
-                    $('#cm-import-stop-containers').prop('checked', true);
+            importWizard.services = response.services || {};
+            importWizard.portConflicts = response.portConflicts || [];
+            importWizard.availableNetworks = response.networks || [];
+
+            // Initialize defaults for wizard config from service data
+            var svcKeys = Object.keys(importWizard.services);
+            svcKeys.forEach(function(key) {
+                var meta = importWizard.services[key];
+                if (!importWizard.config.containerNames[key]) {
+                    importWizard.config.containerNames[key] = meta.containerName || key;
                 }
-            });
-            $('#cm-import-stop-containers').on('change', function() {
-                if (!$(this).is(':checked')) {
-                    $('#cm-import-remove-containers').prop('checked', false);
+                if (!importWizard.config.networkConfig.perService[key]) {
+                    importWizard.config.networkConfig.perService[key] = {
+                        networkMode: meta.networkMode || 'default',
+                        attachStackNet: !meta.networkMode || meta.networkMode === 'default' || meta.networkMode === 'bridge',
+                        externalNets: meta.networks || []
+                    };
+                }
+                // Initialize healthcheck from service data
+                if (!importWizard.config.healthchecks.hasOwnProperty(key)) {
+                    if (meta.healthcheck) {
+                        importWizard.config.healthchecks[key] = meta.healthcheck;
+                    } else if (meta.guessedHealthcheck) {
+                        importWizard.config.healthchecks[key] = meta.guessedHealthcheck;
+                    } else {
+                        importWizard.config.healthchecks[key] = null;
+                    }
+                }
+                if (!importWizard.config.dependencies[key]) {
+                    importWizard.config.dependencies[key] = [];
                 }
             });
 
-            window.__composeImportPayload = {composeYml: response.composeYml, env: response.env, override: response.override, containerIds: selected};
+            renderImportStage2();
         }).fail(function() {
-            $('#compose-import-modal-body').html('<div style="color:#f44336">Failed to contact server for preview.</div>');
+            $('#compose-import-modal-body').html('<div style="color:#f44336">Failed to contact server.</div>');
+            $('#compose-import-modal-footer').html(wizardFooter({ back: 'renderImportStage1()' }));
+        });
+    }
+
+    // ── Stage 2: Select Options ─────────────────────────────────────────────
+    function renderImportStage2() {
+        importWizard.stage = 2;
+        $('#compose-import-stepper').html(renderWizardStepper(2));
+
+        var cfg = importWizard.config;
+        var netCfg = cfg.networkConfig;
+
+        // Sanitize stack name preview helper
+        function sanitizeName(name) {
+            return name.toLowerCase().replace(/[^a-z0-9_-]/g, '_').replace(/^_+|_+$/g, '');
+        }
+
+        var html = '';
+
+        // Stack name
+        html += '<div class="import-field" style="margin-bottom:16px;">' +
+            '<label><strong>Stack Name</strong> <span style="color:var(--status-error);">*</span></label>' +
+            '<input type="text" id="iw-stack-name" value="' + composeEscapeHtml(cfg.stackName) + '" placeholder="my-stack">' +
+            '<div id="iw-stack-name-preview" style="font-size:0.82rem;color:var(--alt-text-color);margin-top:4px;"></div>' +
+            '</div>';
+
+        // Stack Network
+        var stackNetChecked = netCfg.stackNetwork.enabled ? ' checked' : '';
+        html += '<div style="margin-bottom:16px;padding:14px;background:var(--dynamix-tablesorter-tbody-row-alt-bg-color);border:1px solid var(--border-color);border-radius:6px;">' +
+            '<label style="display:flex;align-items:center;gap:8px;font-weight:600;margin-bottom:10px;cursor:pointer;">' +
+            '<input type="checkbox" id="iw-stack-net-enabled"' + stackNetChecked + '> Create Stack Network</label>' +
+            '<div id="iw-stack-net-details"' + (netCfg.stackNetwork.enabled ? '' : ' style="display:none;"') + '>' +
+            '<div class="import-field-row">' +
+            '<div class="import-field"><label>Network Name</label>' +
+            '<input type="text" id="iw-stack-net-name" value="' + composeEscapeHtml(netCfg.stackNetwork.name) + '" placeholder="stack_net"></div>' +
+            '<div class="import-field"><label>Driver</label>' +
+            '<input type="text" value="bridge" disabled style="opacity:0.6;"></div>' +
+            '</div></div></div>';
+
+        // External Networks
+        var existingNets = importWizard.availableNetworks.filter(function(n) {
+            return n.name !== 'bridge' && n.name !== 'host' && n.name !== 'none';
         });
+        var selectedExt = netCfg.externalNetworks || [];
+        html += '<div style="margin-bottom:16px;padding:14px;background:var(--dynamix-tablesorter-tbody-row-alt-bg-color);border:1px solid var(--border-color);border-radius:6px;">' +
+            '<div style="font-weight:600;margin-bottom:10px;">External Networks</div>';
+        if (existingNets.length) {
+            html += '<div class="import-net-checks" id="iw-ext-nets">';
+            existingNets.forEach(function(net) {
+                var checked = selectedExt.indexOf(net.name) >= 0 ? ' checked' : '';
+                html += '<label><input type="checkbox" class="iw-ext-net-cb" value="' + composeEscapeHtml(net.name) + '"' + checked + '> ' +
+                    composeEscapeHtml(net.name) + ' <small>(' + composeEscapeHtml(net.driver) + ')</small></label>';
+            });
+            html += '</div>';
+        } else {
+            html += '<div style="color:var(--alt-text-color);font-size:0.9rem;">No custom Docker networks found.</div>';
+        }
+        html += '<div class="import-ext-net-add">' +
+            '<input type="text" id="iw-ext-net-custom" placeholder="Custom network name">' +
+            '<button type="button" onclick="iwAddCustomNetwork()">Add</button>' +
+            '</div></div>';
+
+        // Container handling
+        html += '<div style="padding:14px;background:var(--dynamix-tablesorter-tbody-row-alt-bg-color);border:1px solid var(--border-color);border-radius:6px;">' +
+            '<div style="font-weight:600;margin-bottom:10px;">After Import</div>' +
+            '<label style="display:block;margin-bottom:6px;cursor:pointer;"><input type="checkbox" id="iw-stop-containers"' + (cfg.stopContainers ? ' checked' : '') + '> Stop original containers</label>' +
+            '<label style="display:block;margin-bottom:6px;cursor:pointer;"><input type="checkbox" id="iw-remove-containers"' + (cfg.removeContainers ? ' checked' : '') + '> Remove original containers</label>' +
+            '<label style="display:block;cursor:pointer;"><input type="checkbox" id="iw-start-stack"' + (cfg.startStack ? ' checked' : '') + '> Start imported stack</label>' +
+            '</div>';
+
+        $('#compose-import-modal-body').html(html);
+        $('#compose-import-modal-footer').html(wizardFooter({
+            back: 'renderImportStage1()',
+            next: 'importWizardStage2Next()'
+        }));
+
+        // Wire up events
+        $('#iw-stack-name').on('input', function() {
+            var val = this.value;
+            var san = sanitizeName(val);
+            $('#iw-stack-name-preview').text(san ? 'Folder: ' + san : '');
+            // Update default stack net name
+            if ($('#iw-stack-net-name').val() === '' || $('#iw-stack-net-name').data('auto')) {
+                $('#iw-stack-net-name').val(san ? san + '_net' : '').data('auto', true);
+            }
+        }).trigger('input');
+        $('#iw-stack-net-name').on('input', function() { $(this).data('auto', false); });
+        $('#iw-stack-net-enabled').on('change', function() {
+            $('#iw-stack-net-details').toggle(this.checked);
+        });
+        $('#iw-remove-containers').on('change', function() {
+            if (this.checked) $('#iw-stop-containers').prop('checked', true);
+        });
+        $('#iw-stop-containers').on('change', function() {
+            if (!this.checked) $('#iw-remove-containers').prop('checked', false);
+        });
+    }
+
+    function iwAddCustomNetwork() {
+        var name = document.getElementById('iw-ext-net-custom').value.trim();
+        if (!name) return;
+        // Check if already exists
+        var exists = false;
+        $('.iw-ext-net-cb').each(function() { if (this.value === name) exists = true; });
+        if (exists) { document.getElementById('iw-ext-net-custom').value = ''; return; }
+        var label = '<label><input type="checkbox" class="iw-ext-net-cb" value="' + composeEscapeHtml(name) + '" checked> ' +
+            composeEscapeHtml(name) + ' <small>(custom)</small></label>';
+        if ($('#iw-ext-nets').length) {
+            $('#iw-ext-nets').append(label);
+        } else {
+            // Create the container if it didn't exist
+            var container = '<div class="import-net-checks" id="iw-ext-nets">' + label + '</div>';
+            $('.import-ext-net-add').before(container);
+        }
+        document.getElementById('iw-ext-net-custom').value = '';
     }
 
-    function composeImportPerform() {
-        var payload = window.__composeImportPayload || {};
-        var name = document.getElementById('cm-import-stack-name').value.trim();
-        if (!name) {
-            swal('Stack name required', 'Please provide a stack name to continue.', 'warning');
+    function importWizardStage2Next() {
+        var cfg = importWizard.config;
+        cfg.stackName = document.getElementById('iw-stack-name').value.trim();
+        if (!cfg.stackName) {
+            swal('Stack name required', 'Please enter a stack name.', 'warning');
             return;
         }
 
-        var stopContainers = document.getElementById('cm-import-stop-containers').checked ? '1' : '0';
-        var removeContainers = document.getElementById('cm-import-remove-containers').checked ? '1' : '0';
-        var startStack = document.getElementById('cm-import-start-stack').checked ? '1' : '0';
+        var netCfg = cfg.networkConfig;
+        netCfg.stackNetwork.enabled = document.getElementById('iw-stack-net-enabled').checked;
+        netCfg.stackNetwork.name = document.getElementById('iw-stack-net-name').value.trim();
+
+        var extNets = [];
+        $('.iw-ext-net-cb:checked').each(function() { extNets.push(this.value); });
+        netCfg.externalNetworks = extNets;
+
+        cfg.stopContainers = document.getElementById('iw-stop-containers').checked;
+        cfg.removeContainers = document.getElementById('iw-remove-containers').checked;
+        cfg.startStack = document.getElementById('iw-start-stack').checked;
+
+        renderImportStage3();
+    }
+
+    // ── Stage 3: Configure Containers ───────────────────────────────────────
+    function renderImportStage3() {
+        importWizard.stage = 3;
+        $('#compose-import-stepper').html(renderWizardStepper(3));
+
+        var cfg = importWizard.config;
+        var services = importWizard.services;
+        var svcKeys = Object.keys(services);
+        var netCfg = cfg.networkConfig;
+        var html = '';
+
+        // Port conflict banner
+        if (importWizard.portConflicts.length) {
+            html += '<div class="import-conflict-banner"><i class="fa fa-exclamation-triangle"></i><div>';
+            importWizard.portConflicts.forEach(function(c) {
+                html += '<div>Host port <strong>' + composeEscapeHtml(c.hostPort + '/' + c.protocol) +
+                    '</strong> is mapped by: ' + c.services.map(composeEscapeHtml).join(', ') + '</div>';
+            });
+            html += '</div></div>';
+        }
+
+        // Build conflict lookup for ports
+        var portConflictMap = {};
+        importWizard.portConflicts.forEach(function(c) {
+            c.services.forEach(function(svc) {
+                if (!portConflictMap[svc]) portConflictMap[svc] = [];
+                portConflictMap[svc].push(c);
+            });
+        });
+
+        svcKeys.forEach(function(key, idx) {
+            var meta = services[key];
+            var cName = cfg.containerNames[key] || meta.containerName || key;
+            var perSvc = netCfg.perService[key] || {};
+            var netMode = perSvc.networkMode || 'default';
+            var isNetModeRestricted = (netMode === 'host' || netMode === 'none');
+            var attachStackNet = perSvc.attachStackNet !== false;
+            var svcExtNets = perSvc.externalNets || [];
+            var hc = cfg.healthchecks[key];
+            var hcSource = meta.healthcheckSource || 'none';
+            if (hc && hcSource === 'none') hcSource = 'auto';
+
+            // Card
+            var expanded = idx === 0 ? ' expanded' : '';
+            html += '<div class="import-service-card' + expanded + '" data-service="' + composeEscapeHtml(key) + '">';
+
+            // Header
+            var iconImg = meta.icon ? '<img class="import-service-card-icon" src="' + composeEscapeHtml(meta.icon) + '">' : '';
+            html += '<div class="import-service-card-header" onclick="iwToggleCard(this)">' +
+                iconImg +
+                '<span class="import-service-card-title">' + composeEscapeHtml(key) + '</span>' +
+                '<span class="import-service-card-image">' + composeEscapeHtml(meta.image) + '</span>' +
+                '<i class="import-service-card-toggle fa fa-chevron-right"></i>' +
+                '</div>';
+
+            // Body
+            html += '<div class="import-service-card-body">';
+
+            // Row 1: Container name + network mode
+            html += '<div class="import-field-row">';
+            html += '<div class="import-field"><label>Container Name</label>' +
+                '<input type="text" class="iw-container-name" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(cName) + '">' +
+                '<div class="import-field-error" id="iw-name-error-' + composeEscapeHtml(key) + '"></div></div>';
+            html += '<div class="import-field"><label>Network Mode</label>' +
+                '<select class="iw-net-mode" data-service="' + composeEscapeHtml(key) + '">' +
+                '<option value="default"' + (netMode === 'default' ? ' selected' : '') + '>Default (compose managed)</option>' +
+                '<option value="bridge"' + (netMode === 'bridge' ? ' selected' : '') + '>Bridge</option>' +
+                '<option value="host"' + (netMode === 'host' ? ' selected' : '') + '>Host</option>' +
+                '<option value="none"' + (netMode === 'none' ? ' selected' : '') + '>None</option>' +
+                '</select></div>';
+            html += '</div>';
+
+            // Row 2: Network attachments
+            var stackNetAvailable = netCfg.stackNetwork.enabled && netCfg.stackNetwork.name;
+            var hasExtNets = netCfg.externalNetworks.length > 0;
+            if (stackNetAvailable || hasExtNets) {
+                html += '<div class="import-field" style="margin-bottom:14px;"><label>Network Attachments</label>';
+                html += '<div class="import-net-checks iw-svc-nets" data-service="' + composeEscapeHtml(key) + '">';
+                if (stackNetAvailable) {
+                    var stackChecked = (attachStackNet && !isNetModeRestricted) ? ' checked' : '';
+                    var stackDisabled = isNetModeRestricted ? ' disabled' : '';
+                    var stackDisabledCls = isNetModeRestricted ? ' class="disabled"' : '';
+                    html += '<label' + stackDisabledCls + '><input type="checkbox" class="iw-attach-stack" data-service="' + composeEscapeHtml(key) + '"' + stackChecked + stackDisabled + '> ' +
+                        composeEscapeHtml(netCfg.stackNetwork.name) + ' <small>(stack)</small></label>';
+                }
+                netCfg.externalNetworks.forEach(function(en) {
+                    var extChecked = (svcExtNets.indexOf(en) >= 0 && !isNetModeRestricted) ? ' checked' : '';
+                    var extDisabled = isNetModeRestricted ? ' disabled' : '';
+                    var extDisabledCls = isNetModeRestricted ? ' class="disabled"' : '';
+                    html += '<label' + extDisabledCls + '><input type="checkbox" class="iw-attach-ext" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(en) + '"' + extChecked + extDisabled + '> ' +
+                        composeEscapeHtml(en) + ' <small>(external)</small></label>';
+                });
+                html += '</div></div>';
+            }
+
+            // Ports (read-only)
+            if (meta.ports && meta.ports.length) {
+                var conflicts = portConflictMap[key] || [];
+                html += '<div class="import-field" style="margin-bottom:14px;"><label>Ports</label>';
+                html += '<div class="import-port-list">';
+                meta.ports.forEach(function(p) {
+                    var portStr = (p.hostIp && p.hostIp !== '0.0.0.0' ? p.hostIp + ':' : '') + (p.hostPort ? p.hostPort + ':' : '') + p.containerPort + '/' + p.protocol;
+                    var isConflict = false;
+                    conflicts.forEach(function(c) {
+                        if (c.hostPort === p.hostPort && c.protocol === p.protocol) isConflict = true;
+                    });
+                    html += '<span class="import-port-tag' + (isConflict ? ' conflict' : '') + '">' + composeEscapeHtml(portStr);
+                    if (isConflict) {
+                        var otherSvcs = [];
+                        conflicts.forEach(function(c) {
+                            if (c.hostPort === p.hostPort && c.protocol === p.protocol) {
+                                c.services.forEach(function(s) { if (s !== key) otherSvcs.push(s); });
+                            }
+                        });
+                        html += ' <span class="import-conflict-badge" title="Conflicts with: ' + otherSvcs.map(composeEscapeHtml).join(', ') + '"><i class="fa fa-exclamation-triangle"></i></span>';
+                    }
+                    html += '</span>';
+                });
+                html += '</div></div>';
+            }
+
+            // Healthcheck section
+            var hcSourceLabel = hcSource === 'image' ? 'From Image' : (hcSource === 'auto' ? 'Auto-Detected' : 'None');
+            var hcSourceClass = hcSource === 'image' ? 'from-image' : (hcSource === 'auto' ? 'auto-detected' : 'none');
+            var hcExpanded = hc ? ' expanded' : '';
+            html += '<div class="import-healthcheck-section' + hcExpanded + '" data-service="' + composeEscapeHtml(key) + '">';
+            html += '<div class="import-healthcheck-header" onclick="iwToggleHealthcheck(this)">' +
+                '<span><i class="fa fa-heartbeat"></i> Healthcheck <span class="import-healthcheck-source ' + hcSourceClass + '">' + hcSourceLabel + '</span></span>' +
+                '<i class="fa fa-chevron-right import-service-card-toggle"></i></div>';
+
+            html += '<div class="import-healthcheck-fields">';
+
+            var testCmd = '';
+            if (hc && hc.test) {
+                testCmd = Array.isArray(hc.test) ? (hc.test.length > 1 ? hc.test.slice(1).join(' ') : hc.test[0]) : hc.test;
+            }
+            html += '<div class="import-field full-width"><label>Test Command</label>' +
+                '<input type="text" class="iw-hc-test" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(testCmd) + '" placeholder="curl -f http://localhost/ || exit 1"></div>';
+            html += '<div class="import-field"><label>Interval</label>' +
+                '<input type="text" class="iw-hc-interval" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(hc ? (hc.interval || '30s') : '30s') + '"></div>';
+            html += '<div class="import-field"><label>Timeout</label>' +
+                '<input type="text" class="iw-hc-timeout" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(hc ? (hc.timeout || '10s') : '10s') + '"></div>';
+            html += '<div class="import-field"><label>Retries</label>' +
+                '<input type="number" class="iw-hc-retries" data-service="' + composeEscapeHtml(key) + '" value="' + (hc ? (hc.retries || 3) : 3) + '" min="1" max="20"></div>';
+            html += '<div class="import-field"><label>Start Period</label>' +
+                '<input type="text" class="iw-hc-start-period" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(hc ? (hc.start_period || '10s') : '10s') + '"></div>';
+            html += '<div class="import-field"><label>&nbsp;</label>' +
+                '<button type="button" class="editor-btn editor-btn-cancel" style="padding:6px 14px;font-size:0.85rem;" onclick="iwRemoveHealthcheck(\'' + composeEscapeHtml(key) + '\')"><i class="fa fa-trash"></i> Remove</button></div>';
+            html += '</div></div>'; // healthcheck section
+
+            html += '</div></div>'; // card body + card
+        });
+
+        $('#compose-import-modal-body').html(html);
+        $('#compose-import-modal-footer').html(wizardFooter({
+            back: 'iwSaveStage3(); renderImportStage2()',
+            next: 'importWizardStage3Next()',
+            nextDisabled: false
+        }));
+
+        // Wire events
+        $('.iw-container-name').on('input', iwValidateContainerNames);
+        $('.iw-net-mode').on('change', function() {
+            var svc = $(this).data('service');
+            var mode = this.value;
+            var restricted = (mode === 'host' || mode === 'none');
+            var $nets = $('.iw-svc-nets[data-service="' + svc + '"]');
+            $nets.find('input[type="checkbox"]').prop('disabled', restricted);
+            if (restricted) {
+                $nets.find('input[type="checkbox"]').prop('checked', false);
+                $nets.find('label').addClass('disabled');
+            } else {
+                $nets.find('label').removeClass('disabled');
+            }
+        });
+        iwValidateContainerNames();
+    }
+
+    function iwToggleCard(headerEl) {
+        $(headerEl).closest('.import-service-card').toggleClass('expanded');
+    }
+
+    function iwToggleHealthcheck(headerEl) {
+        $(headerEl).closest('.import-healthcheck-section').toggleClass('expanded');
+    }
+
+    function iwRemoveHealthcheck(svc) {
+        importWizard.config.healthchecks[svc] = null;
+        var $section = $('.import-healthcheck-section[data-service="' + svc + '"]');
+        $section.removeClass('expanded');
+        $section.find('.iw-hc-test').val('');
+        $section.find('.import-healthcheck-source').text('None').attr('class', 'import-healthcheck-source none');
+    }
+
+    function iwValidateContainerNames() {
+        var names = {};
+        var hasDuplicates = false;
+        $('.iw-container-name').each(function() {
+            var svc = $(this).data('service');
+            var val = this.value.trim();
+            if (!names[val]) names[val] = [];
+            names[val].push(svc);
+        });
+        $('.iw-container-name').each(function() {
+            var svc = $(this).data('service');
+            var val = this.value.trim();
+            var $err = $('#iw-name-error-' + svc);
+            if (val === '') {
+                $(this).addClass('import-name-error');
+                $err.text('Container name cannot be empty');
+                hasDuplicates = true;
+            } else if (names[val].length > 1) {
+                $(this).addClass('import-name-error');
+                $err.text('Duplicate name — conflicts with: ' + names[val].filter(function(s) { return s !== svc; }).join(', '));
+                hasDuplicates = true;
+            } else {
+                $(this).removeClass('import-name-error');
+                $err.text('');
+            }
+        });
+        $('#import-wizard-next-btn').prop('disabled', hasDuplicates);
+    }
+
+    function iwSaveStage3() {
+        var cfg = importWizard.config;
+        // Save container names
+        $('.iw-container-name').each(function() {
+            cfg.containerNames[$(this).data('service')] = this.value.trim();
+        });
+        // Save network modes & attachments
+        $('.iw-net-mode').each(function() {
+            var svc = $(this).data('service');
+            if (!cfg.networkConfig.perService[svc]) cfg.networkConfig.perService[svc] = {};
+            cfg.networkConfig.perService[svc].networkMode = this.value;
+        });
+        $('.iw-attach-stack').each(function() {
+            var svc = $(this).data('service');
+            if (!cfg.networkConfig.perService[svc]) cfg.networkConfig.perService[svc] = {};
+            cfg.networkConfig.perService[svc].attachStackNet = this.checked;
+        });
+        Object.keys(importWizard.services).forEach(function(svc) {
+            var extNets = [];
+            $('.iw-attach-ext[data-service="' + svc + '"]:checked').each(function() { extNets.push(this.value); });
+            if (!cfg.networkConfig.perService[svc]) cfg.networkConfig.perService[svc] = {};
+            cfg.networkConfig.perService[svc].externalNets = extNets;
+        });
+        // Save healthchecks
+        Object.keys(importWizard.services).forEach(function(svc) {
+            var testCmd = $('.iw-hc-test[data-service="' + svc + '"]').val();
+            if (testCmd && testCmd.trim()) {
+                cfg.healthchecks[svc] = {
+                    test: ['CMD-SHELL', testCmd.trim()],
+                    interval: $('.iw-hc-interval[data-service="' + svc + '"]').val() || '30s',
+                    timeout: $('.iw-hc-timeout[data-service="' + svc + '"]').val() || '10s',
+                    retries: parseInt($('.iw-hc-retries[data-service="' + svc + '"]').val()) || 3,
+                    start_period: $('.iw-hc-start-period[data-service="' + svc + '"]').val() || '10s'
+                };
+            } else if (cfg.healthchecks[svc] !== null) {
+                // Only nullify if not already explicitly removed
+                cfg.healthchecks[svc] = null;
+            }
+        });
+    }
+
+    function importWizardStage3Next() {
+        iwSaveStage3();
+        // Check for name validation
+        var hasDuplicates = false;
+        var names = {};
+        Object.keys(importWizard.config.containerNames).forEach(function(k) {
+            var n = importWizard.config.containerNames[k];
+            if (!n || names[n]) hasDuplicates = true;
+            names[n] = true;
+        });
+        if (hasDuplicates) {
+            swal('Name conflicts', 'Please resolve container name conflicts before continuing.', 'warning');
+            return;
+        }
+        renderImportStage4();
+    }
+
+    // ── Stage 4: Configure Dependencies ─────────────────────────────────────
+    function renderImportStage4() {
+        importWizard.stage = 4;
+        $('#compose-import-stepper').html(renderWizardStepper(4));
+
+        var svcKeys = Object.keys(importWizard.services);
+        var deps = importWizard.config.dependencies;
+        var html = '';
+
+        if (svcKeys.length < 2) {
+            html += '<div style="text-align:center;padding:40px 20px;color:var(--alt-text-color);font-size:1.05rem;">' +
+                '<i class="fa fa-link" style="font-size:2rem;margin-bottom:12px;display:block;opacity:0.4;"></i>' +
+                'Single container — no dependencies to configure.</div>';
+            $('#compose-import-modal-body').html(html);
+            $('#compose-import-modal-footer').html(wizardFooter({
+                back: 'renderImportStage3()',
+                next: 'importWizardStage4Next()',
+                nextLabel: 'Next'
+            }));
+            return;
+        }
+
+        html += '<div id="iw-dep-cycle-error" class="import-dep-cycle-error" style="display:none;"></div>';
+
+        html += '<table class="import-deps-table"><thead><tr><th>Service</th><th>Depends On</th><th></th></tr></thead><tbody>';
+        svcKeys.forEach(function(key) {
+            var svcDeps = deps[key] || [];
+            html += '<tr><td style="font-weight:600;">' + composeEscapeHtml(key) + '</td>';
+            html += '<td><div class="iw-dep-entries" data-service="' + composeEscapeHtml(key) + '">';
+            if (svcDeps.length) {
+                svcDeps.forEach(function(d, di) {
+                    html += iwRenderDepRow(key, svcKeys, d, di);
+                });
+            }
+            html += '</div>';
+            html += '<button type="button" class="import-dep-add" onclick="iwAddDep(\'' + composeEscapeHtml(key) + '\')"><i class="fa fa-plus"></i> Add Dependency</button>';
+            html += '</td><td></td></tr>';
+        });
+        html += '</tbody></table>';
+
+        html += '<div id="iw-startup-order" class="import-startup-order" style="display:none;"></div>';
+
+        $('#compose-import-modal-body').html(html);
+        $('#compose-import-modal-footer').html(wizardFooter({
+            back: 'iwSaveDeps(); renderImportStage3()',
+            next: 'importWizardStage4Next()'
+        }));
+
+        iwWireDepEvents($('#compose-import-modal-body'));
+        iwCheckDependencyCycles();
+    }
+
+    function iwRenderDepRow(svc, allKeys, dep, index) {
+        var targetSvc = dep ? dep.service : '';
+        var condition = dep ? dep.condition : 'service_started';
+        var otherKeys = allKeys.filter(function(k) { return k !== svc; });
+        var html = '<div class="import-dep-row" data-index="' + index + '">';
+        html += '<select class="iw-dep-target" data-service="' + composeEscapeHtml(svc) + '" data-index="' + index + '">';
+        html += '<option value="">-- Select --</option>';
+        otherKeys.forEach(function(k) {
+            html += '<option value="' + composeEscapeHtml(k) + '"' + (k === targetSvc ? ' selected' : '') + '>' + composeEscapeHtml(k) + '</option>';
+        });
+        html += '</select>';
+
+        var hasHC = !!importWizard.config.healthchecks[targetSvc];
+        html += '<select class="iw-dep-condition" data-service="' + composeEscapeHtml(svc) + '" data-index="' + index + '">';
+        html += '<option value="service_started"' + (condition === 'service_started' ? ' selected' : '') + '>service_started</option>';
+        html += '<option value="service_healthy"' + (condition === 'service_healthy' ? ' selected' : '') + (!hasHC && condition !== 'service_healthy' ? ' disabled' : '') + '>service_healthy' + (!hasHC ? ' (no healthcheck)' : '') + '</option>';
+        html += '</select>';
+
+        html += '<button type="button" class="import-dep-remove" onclick="iwRemoveDep(\'' + composeEscapeHtml(svc) + '\',' + index + ')"><i class="fa fa-times"></i></button>';
+        html += '</div>';
+        return html;
+    }
+
+    function iwUpdateConditionDropdown($row) {
+        var targetSvc = $row.find('.iw-dep-target').val();
+        var $cond = $row.find('.iw-dep-condition');
+        var hasHC = !!(targetSvc && importWizard.config.healthchecks[targetSvc]);
+        var $healthy = $cond.find('option[value="service_healthy"]');
+        if (hasHC) {
+            $healthy.prop('disabled', false).text('service_healthy');
+        } else {
+            $healthy.prop('disabled', true).text('service_healthy (no healthcheck)');
+            if ($cond.val() === 'service_healthy') {
+                $cond.val('service_started');
+            }
+        }
+    }
+
+    function iwWireDepEvents($container) {
+        $container.find('.iw-dep-target').off('change.iw').on('change.iw', function() {
+            iwUpdateConditionDropdown($(this).closest('.import-dep-row'));
+            iwCheckDependencyCycles();
+        });
+        $container.find('.iw-dep-condition').off('change.iw').on('change.iw', function() {
+            iwCheckDependencyCycles();
+        });
+    }
+
+    function iwAddDep(svc) {
+        var $entries = $('.iw-dep-entries[data-service="' + svc + '"]');
+        var allKeys = Object.keys(importWizard.services);
+        var index = $entries.find('.import-dep-row').length;
+        $entries.append(iwRenderDepRow(svc, allKeys, null, index));
+        iwWireDepEvents($entries);
+    }
+
+    function iwRemoveDep(svc, index) {
+        var $entries = $('.iw-dep-entries[data-service="' + svc + '"]');
+        $entries.find('.import-dep-row[data-index="' + index + '"]').remove();
+        iwCheckDependencyCycles();
+    }
+
+    function iwCollectDeps() {
+        var deps = {};
+        Object.keys(importWizard.services).forEach(function(svc) {
+            deps[svc] = [];
+            $('.iw-dep-entries[data-service="' + svc + '"] .import-dep-row').each(function() {
+                var target = $(this).find('.iw-dep-target').val();
+                var condition = $(this).find('.iw-dep-condition').val();
+                if (target) {
+                    deps[svc].push({ service: target, condition: condition || 'service_started' });
+                }
+            });
+        });
+        return deps;
+    }
+
+    function iwSaveDeps() {
+        importWizard.config.dependencies = iwCollectDeps();
+    }
+
+    function iwCheckDependencyCycles() {
+        var deps = iwCollectDeps();
+        var cycle = iwDetectCycle(deps);
+        var $err = $('#iw-dep-cycle-error');
+        var $order = $('#iw-startup-order');
+        var $next = $('#import-wizard-next-btn');
+
+        if (cycle) {
+            $err.text('Dependency cycle detected: ' + cycle.join(' → ')).show();
+            $next.prop('disabled', true);
+            $order.hide();
+        } else {
+            $err.hide();
+            $next.prop('disabled', false);
+            // Show startup order via topological sort
+            var order = iwTopologicalSort(deps);
+            if (order.length > 1) {
+                $order.html('<span>Startup order:</span> ' + order.map(composeEscapeHtml).join(' → ')).show();
+            } else {
+                $order.hide();
+            }
+        }
+    }
+
+    /**
+     * Detect cycles in the dependency graph using DFS.
+     * Returns the cycle path as an array, or null if no cycle.
+     */
+    function iwDetectCycle(deps) {
+        var WHITE = 0, GRAY = 1, BLACK = 2;
+        var color = {};
+        var parent = {};
+        var allNodes = Object.keys(deps);
+        allNodes.forEach(function(n) { color[n] = WHITE; });
+
+        for (var i = 0; i < allNodes.length; i++) {
+            if (color[allNodes[i]] === WHITE) {
+                var result = dfs(allNodes[i]);
+                if (result) return result;
+            }
+        }
+        return null;
+
+        function dfs(u) {
+            color[u] = GRAY;
+            var edges = (deps[u] || []).map(function(d) { return d.service; }).filter(function(s) { return s; });
+            for (var j = 0; j < edges.length; j++) {
+                var v = edges[j];
+                if (color[v] === GRAY) {
+                    // Found cycle — reconstruct path
+                    var path = [v, u];
+                    var cur = u;
+                    while (cur !== v && parent[cur]) {
+                        cur = parent[cur];
+                        path.push(cur);
+                    }
+                    return path.reverse();
+                }
+                if (color[v] === WHITE) {
+                    parent[v] = u;
+                    var res = dfs(v);
+                    if (res) return res;
+                }
+            }
+            color[u] = BLACK;
+            return null;
+        }
+    }
+
+    /**
+     * Topological sort via Kahn's algorithm. Returns ordered array of service names.
+     */
+    function iwTopologicalSort(deps) {
+        var inDegree = {};
+        var adjList = {};
+        var allNodes = Object.keys(deps);
+        allNodes.forEach(function(n) { inDegree[n] = 0; adjList[n] = []; });
+        allNodes.forEach(function(n) {
+            (deps[n] || []).forEach(function(d) {
+                if (d.service && adjList[d.service]) {
+                    adjList[d.service].push(n);
+                    inDegree[n] = (inDegree[n] || 0) + 1;
+                }
+            });
+        });
+        var queue = allNodes.filter(function(n) { return inDegree[n] === 0; });
+        var order = [];
+        while (queue.length) {
+            var node = queue.shift();
+            order.push(node);
+            (adjList[node] || []).forEach(function(neighbor) {
+                inDegree[neighbor]--;
+                if (inDegree[neighbor] === 0) queue.push(neighbor);
+            });
+        }
+        return order;
+    }
+
+    function importWizardStage4Next() {
+        iwSaveDeps();
+        var cycle = iwDetectCycle(importWizard.config.dependencies);
+        if (cycle) {
+            swal('Dependency cycle', 'Please resolve the dependency cycle before continuing.', 'warning');
+            return;
+        }
+        renderImportStage5();
+    }
+
+    // ── Stage 5: Generating ─────────────────────────────────────────────────
+    function renderImportStage5() {
+        importWizard.stage = 5;
+        $('#compose-import-stepper').html(renderWizardStepper(5));
+        $('#compose-import-modal-body').html(
+            '<div class="import-generating"><i class="fa fa-spinner fa-spin"></i><span>Generating compose configuration...</span></div>'
+        );
+        $('#compose-import-modal-footer').html('');
+
+        var cfg = importWizard.config;
+        $.post(caURL, {
+            action: 'finalizeImportCompose',
+            containerIds: JSON.stringify(importWizard.containerIds),
+            containerNames: JSON.stringify(cfg.containerNames),
+            networkConfig: JSON.stringify(cfg.networkConfig),
+            healthchecks: JSON.stringify(cfg.healthchecks),
+            dependencies: JSON.stringify(cfg.dependencies)
+        }, function(data) {
+            var response;
+            try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
+            if (response.result !== 'success') {
+                $('#compose-import-modal-body').html('<div style="color:#f44336;padding:20px;">' +
+                    composeEscapeHtml(response.message || 'Failed to generate compose configuration') + '</div>');
+                $('#compose-import-modal-footer').html(wizardFooter({ back: 'renderImportStage4()' }));
+                return;
+            }
+            importWizard.result = response;
+            renderImportStage6();
+        }).fail(function() {
+            $('#compose-import-modal-body').html('<div style="color:#f44336;padding:20px;">Communication error</div>');
+            $('#compose-import-modal-footer').html(wizardFooter({ back: 'renderImportStage4()' }));
+        });
+    }
+
+    // ── Stage 6: Validate Compose ───────────────────────────────────────────
+    function renderImportStage6() {
+        importWizard.stage = 6;
+        $('#compose-import-stepper').html(renderWizardStepper(6));
+
+        var result = importWizard.result;
+        var validation = result.validation || { valid: true, errors: [] };
+        var cfg = importWizard.config;
+        var svcKeys = Object.keys(importWizard.services);
+        var html = '';
+
+        // Validation bar
+        if (validation.valid) {
+            html += '<div class="import-validation-bar valid"><i class="fa fa-check-circle"></i> Compose configuration is valid</div>';
+        } else {
+            html += '<div class="import-validation-bar error"><i class="fa fa-times-circle"></i> Validation errors found</div>';
+            html += '<ul style="color:var(--status-error);margin:0 0 12px 20px;font-size:0.9rem;">';
+            validation.errors.forEach(function(e) {
+                html += '<li>' + composeEscapeHtml(e) + '</li>';
+            });
+            html += '</ul>';
+        }
+
+        // Summary panel
+        var hcCount = 0;
+        var depCount = 0;
+        Object.keys(cfg.healthchecks).forEach(function(k) { if (cfg.healthchecks[k]) hcCount++; });
+        Object.keys(cfg.dependencies).forEach(function(k) { if (cfg.dependencies[k] && cfg.dependencies[k].length) depCount++; });
+
+        html += '<div class="import-summary-panel">' +
+            '<div class="import-summary-item"><strong>Stack</strong>' + composeEscapeHtml(cfg.stackName) + '</div>' +
+            '<div class="import-summary-item"><strong>Services</strong>' + svcKeys.length + '</div>' +
+            '<div class="import-summary-item"><strong>Networks</strong>' +
+                (cfg.networkConfig.stackNetwork.enabled ? composeEscapeHtml(cfg.networkConfig.stackNetwork.name) : 'None') +
+                (cfg.networkConfig.externalNetworks.length ? ' + ' + cfg.networkConfig.externalNetworks.length + ' external' : '') +
+            '</div>' +
+            '<div class="import-summary-item"><strong>Healthchecks</strong>' + hcCount + '</div>' +
+            '<div class="import-summary-item"><strong>Dependencies</strong>' + depCount + '</div>' +
+            '</div>';
+
+        // Port conflict warnings
+        if (importWizard.portConflicts.length) {
+            html += '<div class="import-conflict-banner" style="margin-bottom:12px;"><i class="fa fa-exclamation-triangle"></i><div>';
+            importWizard.portConflicts.forEach(function(c) {
+                html += '<div>Port <strong>' + composeEscapeHtml(c.hostPort + '/' + c.protocol) +
+                    '</strong>: ' + c.services.map(composeEscapeHtml).join(', ') + '</div>';
+            });
+            html += '</div></div>';
+        }
+
+        // YAML preview
+        html += '<div class="import-preview-section">' +
+            '<div class="import-preview-section-title">docker-compose.yml</div>' +
+            '<pre class="import-preview-pre" id="iw-yaml-preview">' + composeEscapeHtml(result.composeYml || '') + '</pre>' +
+            '</div>';
+
+        // Env preview
+        if (result.env) {
+            html += '<details class="import-preview-section"><summary class="import-preview-section-title" style="cursor:pointer;">.env file</summary>' +
+                '<pre class="import-preview-pre">' + composeEscapeHtml(result.env) + '</pre></details>';
+        }
+
+        // Override preview
+        if (result.override) {
+            html += '<details class="import-preview-section"><summary class="import-preview-section-title" style="cursor:pointer;">Override file (icons/labels)</summary>' +
+                '<pre class="import-preview-pre">' + composeEscapeHtml(result.override) + '</pre></details>';
+        }
+
+        $('#compose-import-modal-body').html(html);
+        $('#compose-import-modal-footer').html(wizardFooter({
+            back: 'renderImportStage4()',
+            action: 'importWizardPerform()',
+            actionLabel: 'Import'
+        }));
+    }
+
+    // ── Final: Perform Import ───────────────────────────────────────────────
+    function importWizardPerform() {
+        var cfg = importWizard.config;
+        var result = importWizard.result;
 
         $.post(caURL, {
             action: 'performImportTransfer',
-            stackName: name,
-            stopContainers: stopContainers,
-            removeContainers: removeContainers,
-            startStack: startStack,
-            composeYml: payload.composeYml || '',
-            env: payload.env || '',
-            override: payload.override || '',
-            containerIds: JSON.stringify(payload.containerIds || [])
+            stackName: cfg.stackName,
+            stackDesc: cfg.stackDesc,
+            stopContainers: cfg.stopContainers ? '1' : '0',
+            removeContainers: cfg.removeContainers ? '1' : '0',
+            startStack: cfg.startStack ? '1' : '0',
+            composeYml: result.composeYml || '',
+            env: result.env || '',
+            override: result.override || '',
+            containerIds: JSON.stringify(importWizard.containerIds)
         }, function(data) {
             var response;
             try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
@@ -2353,11 +3225,9 @@ function composeImportPerform() {
                 closeComposeImportModal();
                 composeLoadlist();
                 openEditorModalByProject(response.project, response.projectName);
-
                 if (response.startStack === 1 && response.projectPath) {
                     ComposeUp(response.projectPath);
                 }
-
                 swal('Imported', 'Stack imported successfully.', 'success');
             } else {
                 swal('Import failed', response.message || 'Unknown error', 'error');
@@ -2367,6 +3237,10 @@ function composeImportPerform() {
         });
     }
 
+    // Keep legacy function names working (old callers)
+    function composeImportPreview() { importWizardStage1Next(); }
+    function composeImportPerform() { importWizardPerform(); }
+
     function stripTags(string) {
         return string.replace(/(<([^>]+)>)/ig, "");
     }
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index fcbccb6..f4ba988 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -138,6 +138,227 @@ function getPostScript(): string
 
         echo json_encode(['result' => 'success', 'composeYml' => $composeYml, 'env' => $env, 'override' => $override]);
         break;
+
+    case 'generateImportData':
+        // Rich import data for the 6-stage wizard — returns per-service metadata, port conflicts, networks
+        $containerIds = [];
+        if (!empty($_POST['containerIds'])) {
+            $data = json_decode($_POST['containerIds'], true);
+            if (is_array($data)) {
+                $containerIds = $data;
+            }
+        }
+        if (empty($containerIds)) {
+            echo json_encode(['result' => 'error', 'message' => 'No containers selected']);
+            break;
+        }
+
+        $services = [];
+        $servicesMeta = [];
+        foreach ($containerIds as $id) {
+            $id = trim($id);
+            if ($id === '') {
+                continue;
+            }
+            $info = getDockerManagerContainerInfo($id);
+            if (empty($info)) {
+                continue;
+            }
+            $converted = dockerContainerToComposeService($info);
+            $name = $converted['name'];
+            $service = $converted['service'];
+            $origName = $converted['originalName'] ?? $name;
+
+            $serviceIcon = $info['Config']['Labels']['net.unraid.docker.icon'] ?? '';
+            $serviceWebui = $info['Config']['Labels']['net.unraid.docker.webui'] ?? '';
+            if ($serviceIcon) {
+                $service['icon'] = $serviceIcon;
+            }
+            if ($serviceWebui) {
+                $service['webui'] = $serviceWebui;
+            }
+
+            // Deduplicate service keys
+            $baseName = $name;
+            $append = 1;
+            while (isset($services[$name])) {
+                $name = $baseName . '_' . $append;
+                $append++;
+            }
+            $services[$name] = $service;
+
+            // Parse ports into structured data for the frontend
+            $parsedPorts = [];
+            if (!empty($service['ports'])) {
+                foreach ($service['ports'] as $portStr) {
+                    $parsedPorts[] = parsePortMapping($portStr);
+                }
+            }
+
+            // Build per-service metadata for the wizard
+            $meta = [
+                'originalName' => $origName,
+                'containerName' => $service['container_name'] ?? $name,
+                'image' => $service['image'] ?? '',
+                'ports' => $parsedPorts,
+                'exposedPorts' => array_keys($service['__exposed_ports'] ?? []),
+                'icon' => $serviceIcon,
+                'webui' => $serviceWebui,
+                'networkMode' => $service['network_mode'] ?? null,
+                'networks' => $service['networks'] ?? [],
+            ];
+
+            // Healthcheck info
+            if (!empty($service['healthcheck'])) {
+                $meta['healthcheck'] = $service['healthcheck'];
+                $meta['healthcheckSource'] = $service['__healthcheck_source'] ?? 'image';
+            } elseif (!empty($service['__guessed_healthcheck'])) {
+                $meta['guessedHealthcheck'] = $service['__guessed_healthcheck'];
+                $meta['healthcheckSource'] = 'auto';
+            } else {
+                $meta['healthcheckSource'] = 'none';
+            }
+
+            $servicesMeta[$name] = $meta;
+        }
+
+        if (empty($services)) {
+            echo json_encode(['result' => 'error', 'message' => 'No valid Docker Manager containers found for import']);
+            break;
+        }
+
+        // Detect port conflicts across all services
+        $portConflicts = detectPortConflicts($services);
+
+        // Get available Docker networks
+        $dockerNetworks = getDockerNetworks();
+
+        echo json_encode([
+            'result' => 'success',
+            'services' => $servicesMeta,
+            'portConflicts' => $portConflicts,
+            'networks' => $dockerNetworks,
+        ]);
+        break;
+
+    case 'finalizeImportCompose':
+        // Accept full wizard config and generate final compose YAML with validation
+        $containerIds = [];
+        if (!empty($_POST['containerIds'])) {
+            $data = json_decode($_POST['containerIds'], true);
+            if (is_array($data)) {
+                $containerIds = $data;
+            }
+        }
+        if (empty($containerIds)) {
+            echo json_encode(['result' => 'error', 'message' => 'No containers selected']);
+            break;
+        }
+
+        // Decode wizard configuration
+        $containerNames = [];
+        if (!empty($_POST['containerNames'])) {
+            $data = json_decode($_POST['containerNames'], true);
+            if (is_array($data)) {
+                $containerNames = $data;
+            }
+        }
+        $networkConfig = [];
+        if (!empty($_POST['networkConfig'])) {
+            $data = json_decode($_POST['networkConfig'], true);
+            if (is_array($data)) {
+                $networkConfig = $data;
+            }
+        }
+        $healthchecks = [];
+        if (!empty($_POST['healthchecks'])) {
+            $data = json_decode($_POST['healthchecks'], true);
+            if (is_array($data)) {
+                $healthchecks = $data;
+            }
+        }
+        $dependencies = [];
+        if (!empty($_POST['dependencies'])) {
+            $data = json_decode($_POST['dependencies'], true);
+            if (is_array($data)) {
+                $dependencies = $data;
+            }
+        }
+
+        // Re-fetch and convert containers (same as generateImportData)
+        $services = [];
+        foreach ($containerIds as $id) {
+            $id = trim($id);
+            if ($id === '') {
+                continue;
+            }
+            $info = getDockerManagerContainerInfo($id);
+            if (empty($info)) {
+                continue;
+            }
+            $converted = dockerContainerToComposeService($info);
+            $name = $converted['name'];
+            $service = $converted['service'];
+
+            $serviceIcon = $info['Config']['Labels']['net.unraid.docker.icon'] ?? '';
+            $serviceWebui = $info['Config']['Labels']['net.unraid.docker.webui'] ?? '';
+            if ($serviceIcon) {
+                $service['icon'] = $serviceIcon;
+            }
+            if ($serviceWebui) {
+                $service['webui'] = $serviceWebui;
+            }
+
+            $baseName = $name;
+            $append = 1;
+            while (isset($services[$name])) {
+                $name = $baseName . '_' . $append;
+                $append++;
+            }
+            $services[$name] = $service;
+        }
+
+        if (empty($services)) {
+            echo json_encode(['result' => 'error', 'message' => 'No valid containers found']);
+            break;
+        }
+
+        // Apply wizard configuration to services
+        $wizardConfig = [
+            'containerNames' => $containerNames,
+            'networkConfig' => $networkConfig,
+            'healthchecks' => $healthchecks,
+            'dependencies' => $dependencies,
+        ];
+
+        $env = dockerResolveEnvAndCompose($services);
+        $composeYml = dockerServicesToComposeYml($services, $wizardConfig);
+        $override = dockerAddOverrideIcons($services);
+
+        // Validate the generated YAML
+        $validation = ['valid' => true, 'errors' => []];
+        try {
+            if (function_exists('yaml_parse')) {
+                $parsed = yaml_parse($composeYml);
+                if ($parsed === false) {
+                    $validation['valid'] = false;
+                    $validation['errors'][] = 'Generated YAML is not valid';
+                }
+            }
+        } catch (\Throwable $e) {
+            $validation['valid'] = false;
+            $validation['errors'][] = 'YAML parse error: ' . $e->getMessage();
+        }
+
+        echo json_encode([
+            'result' => 'success',
+            'composeYml' => $composeYml,
+            'env' => $env,
+            'override' => $override,
+            'validation' => $validation,
+        ]);
+        break;
+
     case 'performImportTransfer':
         $stackName = trim($_POST['stackName'] ?? '');
         $stackDesc = trim($_POST['stackDesc'] ?? '');
diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index 453e0cb..0bcc313 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -302,15 +302,240 @@ function getDockerManagerContainerInfo(string $id): array
     return $info;
 }
 
+/**
+ * Known port → healthcheck command map.
+ * Keys are "port/proto", values are healthcheck test commands.
+ */
+function getKnownPortHealthchecks(): array
+{
+    return [
+        '80/tcp'    => 'curl -f http://localhost:80/ || exit 1',
+        '443/tcp'   => 'curl -fk https://localhost:443/ || exit 1',
+        '8080/tcp'  => 'curl -f http://localhost:8080/ || exit 1',
+        '8443/tcp'  => 'curl -fk https://localhost:8443/ || exit 1',
+        '3000/tcp'  => 'curl -f http://localhost:3000/ || exit 1',
+        '9090/tcp'  => 'curl -f http://localhost:9090/ || exit 1',
+        '3306/tcp'  => 'mysqladmin ping -h localhost || exit 1',
+        '5432/tcp'  => 'pg_isready -U postgres || exit 1',
+        '6379/tcp'  => 'redis-cli ping || exit 1',
+        '27017/tcp' => 'mongosh --eval "db.runCommand(\"ping\")" --quiet || exit 1',
+        '9200/tcp'  => 'curl -f http://localhost:9200/_cluster/health || exit 1',
+        '5672/tcp'  => 'rabbitmq-diagnostics -q ping || exit 1',
+        '15672/tcp' => 'curl -f http://localhost:15672/ || exit 1',
+        '1883/tcp'  => 'mosquitto_sub -t "\$SYS/#" -C 1 -W 3 || exit 1',
+        '8086/tcp'  => 'curl -f http://localhost:8086/ping || exit 1',
+        '9000/tcp'  => 'curl -f http://localhost:9000/ || exit 1',
+    ];
+}
+
+/**
+ * Known image name patterns → healthcheck commands (checked when port alone is ambiguous).
+ * Pattern is matched case-insensitively against the image name (without tag).
+ */
+function getImageHealthcheckPatterns(): array
+{
+    return [
+        'mysql'       => ['test' => ['CMD-SHELL', 'mysqladmin ping -h localhost || exit 1']],
+        'mariadb'     => ['test' => ['CMD-SHELL', 'mysqladmin ping -h localhost || exit 1']],
+        'postgres'    => ['test' => ['CMD-SHELL', 'pg_isready -U postgres || exit 1']],
+        'redis'       => ['test' => ['CMD-SHELL', 'redis-cli ping || exit 1']],
+        'mongo'       => ['test' => ['CMD-SHELL', 'mongosh --eval "db.runCommand(\"ping\")" --quiet || exit 1']],
+        'nginx'       => ['test' => ['CMD-SHELL', 'curl -f http://localhost/ || exit 1']],
+        'httpd'       => ['test' => ['CMD-SHELL', 'curl -f http://localhost/ || exit 1']],
+        'apache'      => ['test' => ['CMD-SHELL', 'curl -f http://localhost/ || exit 1']],
+        'traefik'     => ['test' => ['CMD-SHELL', 'traefik healthcheck --ping || exit 1']],
+        'rabbitmq'    => ['test' => ['CMD-SHELL', 'rabbitmq-diagnostics -q ping || exit 1']],
+        'mosquitto'   => ['test' => ['CMD-SHELL', 'mosquitto_sub -t "\\$SYS/#" -C 1 -W 3 || exit 1']],
+        'influxdb'    => ['test' => ['CMD-SHELL', 'curl -f http://localhost:8086/ping || exit 1']],
+        'elasticsearch' => ['test' => ['CMD-SHELL', 'curl -f http://localhost:9200/_cluster/health || exit 1']],
+        'memcached'   => ['test' => ['CMD-SHELL', 'echo stats | nc localhost 11211 || exit 1']],
+    ];
+}
+
+/**
+ * Guess a healthcheck for a service based on its image name and exposed ports.
+ *
+ * @param string $image Full image string (e.g. "nginx:latest", "linuxserver/mariadb:10")
+ * @param array $exposedPorts Exposed ports from Config.ExposedPorts (e.g. {"80/tcp": {}, "443/tcp": {}})
+ * @param array|null $existingHealthcheck Existing healthcheck from Config.Healthcheck (docker inspect)
+ * @return array|null Compose-format healthcheck array, or null if no guess possible
+ */
+function guessHealthcheck(string $image, array $exposedPorts, ?array $existingHealthcheck = null): ?array
+{
+    // If the container already has a healthcheck defined in its image, convert it to compose format
+    if (!empty($existingHealthcheck) && !empty($existingHealthcheck['Test'])) {
+        $test = $existingHealthcheck['Test'];
+        $hc = ['test' => $test];
+        if (!empty($existingHealthcheck['Interval'])) {
+            // Docker stores intervals in nanoseconds; convert to compose duration string
+            $ns = $existingHealthcheck['Interval'];
+            $hc['interval'] = nanosToComposeDuration($ns);
+        }
+        if (!empty($existingHealthcheck['Timeout'])) {
+            $hc['timeout'] = nanosToComposeDuration($existingHealthcheck['Timeout']);
+        }
+        if (isset($existingHealthcheck['Retries'])) {
+            $hc['retries'] = (int)$existingHealthcheck['Retries'];
+        }
+        if (!empty($existingHealthcheck['StartPeriod'])) {
+            $hc['start_period'] = nanosToComposeDuration($existingHealthcheck['StartPeriod']);
+        }
+        return $hc;
+    }
+
+    $defaults = ['interval' => '30s', 'timeout' => '10s', 'retries' => 3, 'start_period' => '10s'];
+
+    // Try to match by exposed port first (most specific)
+    $portMap = getKnownPortHealthchecks();
+    foreach ($exposedPorts as $portProto => $_) {
+        if (isset($portMap[$portProto])) {
+            return array_merge($defaults, [
+                'test' => ['CMD-SHELL', $portMap[$portProto]],
+            ]);
+        }
+    }
+
+    // Fall back to image name pattern matching
+    $imageName = strtolower($image);
+    // Strip tag
+    if (($pos = strpos($imageName, ':')) !== false) {
+        $imageName = substr($imageName, 0, $pos);
+    }
+    // Strip registry prefix (e.g. "linuxserver/mariadb" → check against "mariadb")
+    $parts = explode('/', $imageName);
+    $shortName = end($parts);
+
+    $patterns = getImageHealthcheckPatterns();
+    foreach ($patterns as $pattern => $hc) {
+        if (str_contains($shortName, $pattern)) {
+            return array_merge($defaults, $hc);
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Convert Docker nanoseconds to compose duration string (e.g. "30s", "1m30s").
+ */
+function nanosToComposeDuration(int $ns): string
+{
+    $seconds = (int)($ns / 1_000_000_000);
+    if ($seconds <= 0) {
+        return '0s';
+    }
+    if ($seconds >= 60 && $seconds % 60 === 0) {
+        return ($seconds / 60) . 'm';
+    }
+    if ($seconds >= 60) {
+        $m = intdiv($seconds, 60);
+        $s = $seconds % 60;
+        return "{$m}m{$s}s";
+    }
+    return "{$seconds}s";
+}
+
+/**
+ * Parse a port mapping string into structured data.
+ *
+ * @param string $portStr Port string like "8080:80/tcp", "192.168.1.1:8080:80/tcp", "80/tcp"
+ * @return array{hostIp: string, hostPort: string, containerPort: string, protocol: string}
+ */
+function parsePortMapping(string $portStr): array
+{
+    $protocol = 'tcp';
+    if (($slashPos = strrpos($portStr, '/')) !== false) {
+        $protocol = substr($portStr, $slashPos + 1);
+        $portStr = substr($portStr, 0, $slashPos);
+    }
+
+    $parts = explode(':', $portStr);
+    $count = count($parts);
+
+    if ($count === 3) {
+        return ['hostIp' => $parts[0], 'hostPort' => $parts[1], 'containerPort' => $parts[2], 'protocol' => $protocol];
+    }
+    if ($count === 2) {
+        return ['hostIp' => '', 'hostPort' => $parts[0], 'containerPort' => $parts[1], 'protocol' => $protocol];
+    }
+    // Expose-only (no host binding)
+    return ['hostIp' => '', 'hostPort' => '', 'containerPort' => $parts[0], 'protocol' => $protocol];
+}
+
+/**
+ * Detect host port conflicts across a set of services.
+ *
+ * @param array $services Associative array of serviceName => service definition (with 'ports' key)
+ * @return array Array of conflicts: [{hostPort, protocol, hostIp, services: [name1, name2, ...]}]
+ */
+function detectPortConflicts(array $services): array
+{
+    $portMap = []; // key: "hostIp:hostPort/protocol" => [serviceName, ...]
+
+    foreach ($services as $serviceName => $service) {
+        if (empty($service['ports']) || !is_array($service['ports'])) {
+            continue;
+        }
+        foreach ($service['ports'] as $portStr) {
+            $parsed = parsePortMapping($portStr);
+            if ($parsed['hostPort'] === '') {
+                continue; // expose-only, no host binding
+            }
+            // Normalize: treat empty and 0.0.0.0 as equivalent
+            $ip = ($parsed['hostIp'] === '' || $parsed['hostIp'] === '0.0.0.0') ? '0.0.0.0' : $parsed['hostIp'];
+            $key = "{$ip}:{$parsed['hostPort']}/{$parsed['protocol']}";
+            $portMap[$key][] = $serviceName;
+        }
+    }
+
+    $conflicts = [];
+    foreach ($portMap as $key => $serviceNames) {
+        if (count($serviceNames) > 1) {
+            // Parse the key back
+            preg_match('/^(.+):(\d+)\/(.+)$/', $key, $m);
+            $conflicts[] = [
+                'hostIp' => $m[1] ?? '',
+                'hostPort' => $m[2] ?? '',
+                'protocol' => $m[3] ?? '',
+                'services' => array_unique($serviceNames),
+            ];
+        }
+    }
+    return $conflicts;
+}
+
+/**
+ * Get available Docker networks from the host.
+ *
+ * @return array Array of ['name' => string, 'driver' => string]
+ */
+function getDockerNetworks(): array
+{
+    $networks = [];
+    $output = shell_exec("docker network ls --format '{{.Name}}\t{{.Driver}}' 2>/dev/null");
+    if ($output) {
+        foreach (explode("\n", trim($output)) as $line) {
+            $parts = explode("\t", $line);
+            if (count($parts) === 2) {
+                $networks[] = ['name' => $parts[0], 'driver' => $parts[1]];
+            }
+        }
+    }
+    return $networks;
+}
+
 function dockerContainerToComposeService(array $info): array
 {
     $service = [];
-    $serviceName = ltrim(trim($info['Name'] ?? $info['Id'] ?? ''), '/');
-    $serviceName = preg_replace('/[^a-zA-Z0-9_.-]/', '_', $serviceName);
+    $originalName = ltrim(trim($info['Name'] ?? $info['Id'] ?? ''), '/');
+    $serviceName = preg_replace('/[^a-zA-Z0-9_.-]/', '_', $originalName);
     if ($serviceName === '') {
         $serviceName = 'container_' . substr($info['Id'] ?? 'unknown', 0, 12);
     }
 
+    // Store container_name explicitly so each container gets a deterministic name
+    $service['container_name'] = $serviceName;
+
     $config = $info['Config'] ?? [];
     $hostConfig = $info['HostConfig'] ?? [];
 
@@ -449,7 +674,28 @@ function dockerContainerToComposeService(array $info): array
         }
     }
 
-    return ['name' => $serviceName, 'service' => $service];
+    // Extract exposed ports (for healthcheck guessing)
+    $exposedPorts = $config['ExposedPorts'] ?? [];
+    if (is_array($exposedPorts)) {
+        $service['__exposed_ports'] = $exposedPorts;
+    }
+
+    // Extract existing healthcheck from image, or guess one
+    $existingHC = $config['Healthcheck'] ?? null;
+    $guessed = guessHealthcheck($service['image'], $exposedPorts, $existingHC);
+    if ($existingHC && !empty($existingHC['Test'])) {
+        // Use the image-defined healthcheck (already converted by guessHealthcheck)
+        if ($guessed) {
+            $service['healthcheck'] = $guessed;
+            $service['__healthcheck_source'] = 'image';
+        }
+    } elseif ($guessed) {
+        // Store as a guess that the user can accept or reject
+        $service['__guessed_healthcheck'] = $guessed;
+        $service['__healthcheck_source'] = 'auto';
+    }
+
+    return ['name' => $serviceName, 'originalName' => $originalName, 'service' => $service];
 }
 
 /**
@@ -476,14 +722,114 @@ function yamlQuoteValue($value): string
     return $str;
 }
 
-function dockerServicesToComposeYml(array $services): string
+function dockerServicesToComposeYml(array $services, array $wizardConfig = []): string
 {
     $yaml = "services:\n";
     $allNetworks = [];
+    $externalNetworks = []; // networks declared as external: true
+    $stackNetworks = [];    // networks created by the stack (driver: bridge)
+
+    $containerNames = $wizardConfig['containerNames'] ?? [];
+    $netCfg = $wizardConfig['networkConfig'] ?? [];
+    $healthchecks = $wizardConfig['healthchecks'] ?? [];
+    $dependencies = $wizardConfig['dependencies'] ?? [];
+
+    $stackNetEnabled = !empty($netCfg['stackNetwork']['enabled']);
+    $stackNetName = $netCfg['stackNetwork']['name'] ?? '';
+    $externalNetList = $netCfg['externalNetworks'] ?? [];
+    $perServiceNet = $netCfg['perService'] ?? [];
+
+    // If wizard config provides a stack network, track it
+    if ($stackNetEnabled && $stackNetName !== '') {
+        $stackNetworks[$stackNetName] = true;
+    }
+    // Track external networks from wizard
+    foreach ($externalNetList as $extNet) {
+        if (is_string($extNet) && $extNet !== '') {
+            $externalNetworks[$extNet] = true;
+        }
+    }
+
+    // Internal fields to skip when emitting YAML
+    $internalKeys = [
+        '__resolved_env', '__exposed_ports', '__guessed_healthcheck',
+        '__healthcheck_source', 'icon', 'webui',
+    ];
 
     foreach ($services as $name => $service) {
         $yaml .= "  " . $name . ":\n";
 
+        // Apply container name override from wizard
+        if (isset($containerNames[$name]) && $containerNames[$name] !== '') {
+            $service['container_name'] = $containerNames[$name];
+        }
+
+        // Apply network configuration from wizard (if provided)
+        if (!empty($wizardConfig) && !empty($perServiceNet)) {
+            $svcNetCfg = $perServiceNet[$name] ?? [];
+            $svcNetMode = $svcNetCfg['networkMode'] ?? null;
+
+            if ($svcNetMode && $svcNetMode !== 'default') {
+                // Explicit network_mode overrides any networks setting
+                $service['network_mode'] = $svcNetMode;
+                unset($service['networks']);
+            } else {
+                // Remove any pre-existing network_mode if wizard says "default"
+                unset($service['network_mode']);
+
+                $serviceNetworks = [];
+                // Attach to stack network if enabled
+                if ($stackNetEnabled && $stackNetName !== '' && !empty($svcNetCfg['attachStackNet'])) {
+                    $serviceNetworks[] = $stackNetName;
+                }
+                // Attach to selected external networks
+                $svcExternalNets = $svcNetCfg['externalNets'] ?? [];
+                foreach ($svcExternalNets as $extNet) {
+                    if (is_string($extNet) && $extNet !== '' && !in_array($extNet, $serviceNetworks, true)) {
+                        $serviceNetworks[] = $extNet;
+                        $externalNetworks[$extNet] = true;
+                    }
+                }
+                if (!empty($serviceNetworks)) {
+                    $service['networks'] = $serviceNetworks;
+                } else {
+                    unset($service['networks']);
+                }
+            }
+        }
+
+        // Apply healthcheck from wizard
+        if (!empty($wizardConfig) && array_key_exists($name, $healthchecks)) {
+            $hc = $healthchecks[$name];
+            if ($hc === null || $hc === false) {
+                // User explicitly removed the healthcheck
+                unset($service['healthcheck']);
+                unset($service['__guessed_healthcheck']);
+            } else {
+                $service['healthcheck'] = $hc;
+                unset($service['__guessed_healthcheck']);
+            }
+        } elseif (empty($wizardConfig)) {
+            // No wizard config (legacy path) — don't auto-apply guessed healthchecks
+            unset($service['__guessed_healthcheck']);
+        }
+
+        // Apply depends_on from wizard
+        if (!empty($dependencies[$name]) && is_array($dependencies[$name])) {
+            $dependsOn = [];
+            foreach ($dependencies[$name] as $dep) {
+                $depService = $dep['service'] ?? '';
+                $depCondition = $dep['condition'] ?? 'service_started';
+                if ($depService !== '' && isset($services[$depService])) {
+                    $dependsOn[$depService] = ['condition' => $depCondition];
+                }
+            }
+            if (!empty($dependsOn)) {
+                $service['depends_on'] = $dependsOn;
+            }
+        }
+
+        // Collect all referenced networks for the top-level block
         if (!empty($service['networks']) && is_array($service['networks'])) {
             foreach ($service['networks'] as $networkName) {
                 if (!in_array($networkName, $allNetworks, true)) {
@@ -492,9 +838,37 @@ function dockerServicesToComposeYml(array $services): string
             }
         }
 
+        // Emit service fields
         foreach ($service as $key => $value) {
-            if ($key === '__resolved_env' || $key === 'icon' || $key === 'webui') {
-                continue; // internal helper field and metadata should not be in compose service
+            if (in_array($key, $internalKeys, true)) {
+                continue;
+            }
+            if ($key === 'depends_on' && is_array($value) && !array_is_list($value)) {
+                // depends_on with conditions: nested map format
+                $yaml .= "    depends_on:\n";
+                foreach ($value as $depName => $depConfig) {
+                    $yaml .= "      " . $depName . ":\n";
+                    if (is_array($depConfig)) {
+                        foreach ($depConfig as $dk => $dv) {
+                            $yaml .= "        " . $dk . ": " . yamlQuoteValue($dv) . "\n";
+                        }
+                    }
+                }
+                continue;
+            }
+            if ($key === 'healthcheck' && is_array($value)) {
+                $yaml .= "    healthcheck:\n";
+                foreach ($value as $hcKey => $hcVal) {
+                    if ($hcKey === 'test' && is_array($hcVal)) {
+                        $yaml .= "      test:\n";
+                        foreach ($hcVal as $testItem) {
+                            $yaml .= "        - " . yamlQuoteValue($testItem) . "\n";
+                        }
+                    } elseif (is_string($hcVal) || is_numeric($hcVal)) {
+                        $yaml .= "      $hcKey: " . yamlQuoteValue($hcVal) . "\n";
+                    }
+                }
+                continue;
             }
             if (is_string($value) || is_numeric($value) || is_bool($value)) {
                 $yaml .= "    $key: " . yamlQuoteValue($value) . "\n";
@@ -513,12 +887,31 @@ function dockerServicesToComposeYml(array $services): string
         }
     }
 
-    if (!empty($allNetworks)) {
+    // Emit top-level networks block
+    $hasNetworks = !empty($allNetworks) || !empty($stackNetworks) || !empty($externalNetworks);
+    if ($hasNetworks) {
         $yaml .= "\nnetworks:\n";
+        // Stack-created networks (bridge driver)
+        foreach ($stackNetworks as $netName => $_) {
+            $yaml .= "  " . $netName . ":\n";
+            $yaml .= "    driver: bridge\n";
+        }
+        // External networks
         foreach ($allNetworks as $networkName) {
+            if (isset($stackNetworks[$networkName])) {
+                continue; // Already emitted as stack network
+            }
             $yaml .= "  " . $networkName . ":\n";
             $yaml .= "    external: true\n";
         }
+        // Any external networks from wizard not yet emitted
+        foreach ($externalNetworks as $netName => $_) {
+            if (isset($stackNetworks[$netName]) || in_array($netName, $allNetworks, true)) {
+                continue;
+            }
+            $yaml .= "  " . $netName . ":\n";
+            $yaml .= "    external: true\n";
+        }
     }
 
     return $yaml;
diff --git a/source/compose.manager/sheets/ComboButton.css b/source/compose.manager/sheets/ComboButton.css
index 32fe4c3..f02be76 100644
--- a/source/compose.manager/sheets/ComboButton.css
+++ b/source/compose.manager/sheets/ComboButton.css
@@ -312,6 +312,598 @@
     width: 8%;
   }
 
+  /* ============================================
+     Import Wizard — 6-Stage Stepper
+     ============================================ */
+
+  .import-wizard-stepper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 16px 24px;
+    gap: 0;
+    border-bottom: 1px solid var(--border-color);
+    background: var(--alt-background-color);
+    flex-wrap: wrap;
+  }
+
+  .import-wizard-step {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 0.85rem;
+    color: var(--alt-text-color);
+    white-space: nowrap;
+    opacity: 0.5;
+    transition: opacity 0.2s ease, color 0.2s ease;
+  }
+
+  .import-wizard-step.active {
+    opacity: 1;
+    color: var(--brand-orange);
+    font-weight: 600;
+  }
+
+  .import-wizard-step.completed {
+    opacity: 0.8;
+    color: var(--status-success);
+  }
+
+  .import-wizard-step-number {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    border: 2px solid currentColor;
+    font-size: 0.75rem;
+    font-weight: 700;
+    flex-shrink: 0;
+  }
+
+  .import-wizard-step.completed .import-wizard-step-number {
+    background: var(--status-success);
+    color: #fff;
+    border-color: var(--status-success);
+  }
+
+  .import-wizard-step.active .import-wizard-step-number {
+    background: var(--brand-orange);
+    color: #fff;
+    border-color: var(--brand-orange);
+  }
+
+  .import-wizard-step-connector {
+    width: 24px;
+    height: 2px;
+    background: var(--border-color);
+    margin: 0 6px;
+    flex-shrink: 0;
+  }
+
+  .import-wizard-step.completed + .import-wizard-step-connector {
+    background: var(--status-success);
+  }
+
+  /* ============================================
+     Import Wizard — Service Configuration Cards
+     ============================================ */
+
+  .import-service-card {
+    background-color: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    margin-bottom: 16px;
+    overflow: hidden;
+  }
+
+  .import-service-card-header {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    padding: 14px 18px;
+    background: var(--alt-background-color);
+    border-bottom: 1px solid var(--border-color);
+    cursor: pointer;
+    user-select: none;
+  }
+
+  .import-service-card-header:hover {
+    background: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
+  }
+
+  .import-service-card-icon {
+    width: 28px;
+    height: 28px;
+    border-radius: 4px;
+    object-fit: contain;
+    background: var(--background-color);
+    padding: 2px;
+    flex-shrink: 0;
+  }
+
+  .import-service-card-title {
+    font-weight: 600;
+    font-size: 1.05rem;
+    color: var(--text-color);
+    flex: 1;
+  }
+
+  .import-service-card-image {
+    font-size: 0.85rem;
+    color: var(--alt-text-color);
+    font-family: var(--font-bitstream);
+  }
+
+  .import-service-card-toggle {
+    color: var(--alt-text-color);
+    font-size: 0.85rem;
+    transition: transform 0.2s ease;
+  }
+
+  .import-service-card.expanded .import-service-card-toggle {
+    transform: rotate(90deg);
+  }
+
+  .import-service-card-body {
+    padding: 18px;
+    display: none;
+  }
+
+  .import-service-card.expanded .import-service-card-body {
+    display: block;
+  }
+
+  .import-field-row {
+    display: flex;
+    align-items: flex-start;
+    gap: 16px;
+    margin-bottom: 14px;
+    flex-wrap: wrap;
+  }
+
+  .import-field-row:last-child {
+    margin-bottom: 0;
+  }
+
+  .import-field {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-width: 180px;
+  }
+
+  .import-field label {
+    font-size: 0.9rem;
+    color: var(--alt-text-color);
+    margin-bottom: 6px;
+    font-weight: 500;
+  }
+
+  .import-field input[type="text"],
+  .import-field select {
+    padding: 8px 12px;
+    background-color: var(--input-background-color);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    color: var(--text-color);
+    font-size: 0.95rem;
+    transition: border-color 0.2s ease;
+  }
+
+  .import-field input:focus,
+  .import-field select:focus {
+    outline: none;
+    border-color: var(--brand-orange);
+    box-shadow: 0 0 0 2px rgba(227, 120, 33, 0.15);
+  }
+
+  .import-field input.import-name-error {
+    border-color: var(--status-error);
+    box-shadow: 0 0 0 2px rgba(244, 67, 54, 0.15);
+  }
+
+  .import-field .import-field-error {
+    color: var(--status-error);
+    font-size: 0.8rem;
+    margin-top: 4px;
+  }
+
+  /* Port conflict badge */
+  .import-conflict-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    padding: 2px 8px;
+    background: rgba(255, 152, 0, 0.15);
+    color: var(--status-warning, #ff9800);
+    border-radius: 4px;
+    font-size: 0.8rem;
+    font-weight: 500;
+  }
+
+  .import-conflict-banner {
+    padding: 10px 16px;
+    margin-bottom: 16px;
+    background: rgba(255, 152, 0, 0.1);
+    border: 1px solid rgba(255, 152, 0, 0.3);
+    border-radius: 6px;
+    color: var(--status-warning, #ff9800);
+    font-size: 0.9rem;
+    display: flex;
+    align-items: flex-start;
+    gap: 8px;
+  }
+
+  .import-conflict-banner i {
+    margin-top: 2px;
+    flex-shrink: 0;
+  }
+
+  /* Healthcheck collapsible section */
+  .import-healthcheck-section {
+    margin-top: 12px;
+    padding: 12px;
+    background: var(--background-color);
+    border: 1px solid var(--border-color);
+    border-radius: 6px;
+  }
+
+  .import-healthcheck-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    cursor: pointer;
+    user-select: none;
+  }
+
+  .import-healthcheck-header span {
+    font-weight: 500;
+    font-size: 0.9rem;
+    display: flex;
+    align-items: center;
+    gap: 6px;
+  }
+
+  .import-healthcheck-source {
+    font-size: 0.75rem;
+    padding: 1px 6px;
+    border-radius: 3px;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.3px;
+  }
+
+  .import-healthcheck-source.from-image {
+    background: rgba(76, 175, 80, 0.15);
+    color: var(--status-success);
+  }
+
+  .import-healthcheck-source.auto-detected {
+    background: rgba(33, 150, 243, 0.15);
+    color: #2196f3;
+  }
+
+  .import-healthcheck-source.none {
+    background: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
+    color: var(--alt-text-color);
+  }
+
+  .import-healthcheck-fields {
+    display: none;
+    margin-top: 10px;
+    gap: 10px;
+  }
+
+  .import-healthcheck-section.expanded .import-healthcheck-fields {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+  }
+
+  .import-healthcheck-fields .import-field {
+    min-width: 120px;
+  }
+
+  .import-healthcheck-fields .import-field.full-width {
+    grid-column: 1 / -1;
+    min-width: 100%;
+  }
+
+  /* Network attachment checkboxes */
+  .import-net-checks {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    margin-top: 4px;
+  }
+
+  .import-net-checks label {
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    font-size: 0.85rem;
+    color: var(--text-color);
+    cursor: pointer;
+  }
+
+  .import-net-checks input[type="checkbox"] {
+    margin: 0;
+  }
+
+  .import-net-checks label.disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+  }
+
+  /* Ports read-only list */
+  .import-port-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    margin-top: 4px;
+  }
+
+  .import-port-tag {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    padding: 3px 8px;
+    background: var(--background-color);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    font-size: 0.82rem;
+    font-family: var(--font-bitstream);
+  }
+
+  .import-port-tag.conflict {
+    border-color: var(--status-warning, #ff9800);
+    background: rgba(255, 152, 0, 0.08);
+  }
+
+  /* ============================================
+     Import Wizard — Dependencies Stage
+     ============================================ */
+
+  .import-deps-table {
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 0.9rem;
+  }
+
+  .import-deps-table th {
+    text-align: left;
+    padding: 8px 12px;
+    background: var(--alt-background-color);
+    border-bottom: 2px solid var(--border-color);
+    font-weight: 600;
+    color: var(--alt-text-color);
+    font-size: 0.85rem;
+  }
+
+  .import-deps-table td {
+    padding: 8px 12px;
+    border-bottom: 1px solid var(--border-color);
+    vertical-align: top;
+  }
+
+  .import-dep-row {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 6px;
+  }
+
+  .import-dep-row:last-child {
+    margin-bottom: 0;
+  }
+
+  .import-dep-row select {
+    padding: 6px 10px;
+    background-color: var(--input-background-color);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    color: var(--text-color);
+    font-size: 0.85rem;
+  }
+
+  .import-dep-row select:focus {
+    outline: none;
+    border-color: var(--brand-orange);
+  }
+
+  .import-dep-add {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    padding: 4px 10px;
+    font-size: 0.8rem;
+    color: var(--brand-orange);
+    background: none;
+    border: 1px dashed var(--brand-orange);
+    border-radius: 4px;
+    cursor: pointer;
+    margin-top: 4px;
+  }
+
+  .import-dep-add:hover {
+    background: rgba(227, 120, 33, 0.1);
+  }
+
+  .import-dep-remove {
+    background: none;
+    border: none;
+    color: var(--status-error);
+    cursor: pointer;
+    padding: 4px;
+    font-size: 0.9rem;
+  }
+
+  .import-dep-remove:hover {
+    color: #f44336;
+  }
+
+  .import-dep-cycle-error {
+    padding: 10px 16px;
+    margin-bottom: 12px;
+    background: rgba(244, 67, 54, 0.1);
+    border: 1px solid rgba(244, 67, 54, 0.3);
+    border-radius: 6px;
+    color: var(--status-error);
+    font-size: 0.9rem;
+  }
+
+  .import-startup-order {
+    padding: 10px 16px;
+    margin-top: 12px;
+    background: rgba(76, 175, 80, 0.08);
+    border: 1px solid rgba(76, 175, 80, 0.2);
+    border-radius: 6px;
+    color: var(--status-success);
+    font-size: 0.88rem;
+  }
+
+  .import-startup-order span {
+    font-weight: 600;
+  }
+
+  /* ============================================
+     Import Wizard — Validation Stage
+     ============================================ */
+
+  .import-validation-bar {
+    padding: 12px 18px;
+    margin-bottom: 16px;
+    border-radius: 6px;
+    font-size: 0.95rem;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-weight: 500;
+  }
+
+  .import-validation-bar.valid {
+    background: rgba(76, 175, 80, 0.1);
+    border: 1px solid rgba(76, 175, 80, 0.3);
+    color: var(--status-success);
+  }
+
+  .import-validation-bar.error {
+    background: rgba(244, 67, 54, 0.1);
+    border: 1px solid rgba(244, 67, 54, 0.3);
+    color: var(--status-error);
+  }
+
+  .import-preview-section {
+    margin-bottom: 16px;
+  }
+
+  .import-preview-section-title {
+    font-weight: 600;
+    font-size: 0.95rem;
+    margin-bottom: 8px;
+    color: var(--text-color);
+  }
+
+  .import-preview-pre {
+    max-height: 300px;
+    overflow: auto;
+    background: #1e1e1e;
+    color: #d4d4d4;
+    padding: 12px 16px;
+    border-radius: 6px;
+    font-size: 0.88rem;
+    font-family: var(--font-bitstream);
+    line-height: 1.5;
+    white-space: pre;
+    border: 1px solid var(--border-color);
+  }
+
+  .import-summary-panel {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+    gap: 12px;
+    margin-bottom: 16px;
+  }
+
+  .import-summary-item {
+    padding: 10px 14px;
+    background: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
+    border: 1px solid var(--border-color);
+    border-radius: 6px;
+    font-size: 0.88rem;
+  }
+
+  .import-summary-item strong {
+    color: var(--brand-orange);
+    display: block;
+    font-size: 0.8rem;
+    margin-bottom: 4px;
+    text-transform: uppercase;
+    letter-spacing: 0.3px;
+  }
+
+  /* Generating spinner */
+  .import-generating {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 60px 20px;
+    gap: 16px;
+    color: var(--alt-text-color);
+    font-size: 1.1rem;
+  }
+
+  .import-generating .fa-spinner {
+    font-size: 2.5rem;
+    color: var(--brand-orange);
+  }
+
+  /* External network add custom */
+  .import-ext-net-add {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-top: 8px;
+  }
+
+  .import-ext-net-add input {
+    padding: 6px 10px;
+    background-color: var(--input-background-color);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    color: var(--text-color);
+    font-size: 0.88rem;
+    flex: 1;
+    max-width: 250px;
+  }
+
+  .import-ext-net-add button {
+    padding: 6px 12px;
+    background: var(--brand-orange);
+    color: #fff;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 0.85rem;
+  }
+
+  .import-ext-net-add button:hover {
+    opacity: 0.85;
+  }
+
+  /* Wizard modal sizing override */
+  .compose-modal.import-wizard-modal {
+    max-width: 880px;
+    width: 95%;
+  }
+
+  .compose-modal.import-wizard-modal .compose-modal-body {
+    max-height: calc(100vh - 200px);
+    overflow-y: auto;
+  }
+
   .compose-ct-table .ct-col-ip {
     width: 8%;
   }
diff --git a/tests/unit/ImportWizardTest.php b/tests/unit/ImportWizardTest.php
new file mode 100644
index 0000000..1cc443c
--- /dev/null
+++ b/tests/unit/ImportWizardTest.php
@@ -0,0 +1,506 @@
+<?php
+
+/**
+ * Unit Tests for Import Wizard backend functions (REAL SOURCE)
+ *
+ * Tests new functions added for the 6-stage import wizard:
+ * - guessHealthcheck()
+ * - nanosToComposeDuration()
+ * - parsePortMapping()
+ * - detectPortConflicts()
+ * - dockerServicesToComposeYml() with wizardConfig
+ */
+
+declare(strict_types=1);
+
+namespace ComposeManager\Tests;
+
+use PluginTests\TestCase;
+
+require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+
+class ImportWizardTest extends TestCase
+{
+    // =========================================================
+    // nanosToComposeDuration()
+    // =========================================================
+
+    public function testNanosToComposeDurationZero(): void
+    {
+        $this->assertEquals('0s', nanosToComposeDuration(0));
+    }
+
+    public function testNanosToComposeDurationSeconds(): void
+    {
+        $this->assertEquals('30s', nanosToComposeDuration(30_000_000_000));
+    }
+
+    public function testNanosToComposeDurationExactMinutes(): void
+    {
+        $this->assertEquals('2m', nanosToComposeDuration(120_000_000_000));
+    }
+
+    public function testNanosToComposeDurationMinutesAndSeconds(): void
+    {
+        $this->assertEquals('1m30s', nanosToComposeDuration(90_000_000_000));
+    }
+
+    public function testNanosToComposeDurationOneSecond(): void
+    {
+        $this->assertEquals('1s', nanosToComposeDuration(1_000_000_000));
+    }
+
+    // =========================================================
+    // parsePortMapping()
+    // =========================================================
+
+    public function testParsePortMappingHostAndContainer(): void
+    {
+        $result = parsePortMapping('8080:80/tcp');
+        $this->assertEquals([
+            'hostIp' => '',
+            'hostPort' => '8080',
+            'containerPort' => '80',
+            'protocol' => 'tcp',
+        ], $result);
+    }
+
+    public function testParsePortMappingWithHostIp(): void
+    {
+        $result = parsePortMapping('192.168.1.1:8080:80/tcp');
+        $this->assertEquals([
+            'hostIp' => '192.168.1.1',
+            'hostPort' => '8080',
+            'containerPort' => '80',
+            'protocol' => 'tcp',
+        ], $result);
+    }
+
+    public function testParsePortMappingExposeOnly(): void
+    {
+        $result = parsePortMapping('80/tcp');
+        $this->assertEquals([
+            'hostIp' => '',
+            'hostPort' => '',
+            'containerPort' => '80',
+            'protocol' => 'tcp',
+        ], $result);
+    }
+
+    public function testParsePortMappingUdpProtocol(): void
+    {
+        $result = parsePortMapping('53:53/udp');
+        $this->assertEquals([
+            'hostIp' => '',
+            'hostPort' => '53',
+            'containerPort' => '53',
+            'protocol' => 'udp',
+        ], $result);
+    }
+
+    public function testParsePortMappingNoProtocol(): void
+    {
+        $result = parsePortMapping('8080:80');
+        $this->assertEquals([
+            'hostIp' => '',
+            'hostPort' => '8080',
+            'containerPort' => '80',
+            'protocol' => 'tcp',
+        ], $result);
+    }
+
+    // =========================================================
+    // guessHealthcheck()
+    // =========================================================
+
+    public function testGuessHealthcheckFromExistingInspect(): void
+    {
+        $existing = [
+            'Test' => ['CMD-SHELL', 'curl -f http://localhost/ || exit 1'],
+            'Interval' => 30_000_000_000,
+            'Timeout' => 10_000_000_000,
+            'Retries' => 3,
+            'StartPeriod' => 5_000_000_000,
+        ];
+        $result = guessHealthcheck('nginx:latest', [], $existing);
+        $this->assertNotNull($result);
+        $this->assertEquals(['CMD-SHELL', 'curl -f http://localhost/ || exit 1'], $result['test']);
+        $this->assertEquals('30s', $result['interval']);
+        $this->assertEquals('10s', $result['timeout']);
+        $this->assertEquals(3, $result['retries']);
+        $this->assertEquals('5s', $result['start_period']);
+    }
+
+    public function testGuessHealthcheckFromKnownPort80(): void
+    {
+        $result = guessHealthcheck('someimage:latest', ['80/tcp' => new \stdClass()]);
+        $this->assertNotNull($result);
+        $this->assertEquals(['CMD-SHELL', 'curl -f http://localhost:80/ || exit 1'], $result['test']);
+        $this->assertEquals('30s', $result['interval']);
+        $this->assertEquals('10s', $result['timeout']);
+        $this->assertEquals(3, $result['retries']);
+    }
+
+    public function testGuessHealthcheckFromKnownPort3306(): void
+    {
+        $result = guessHealthcheck('custom-db:v1', ['3306/tcp' => new \stdClass()]);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('mysqladmin', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckFromKnownPort6379(): void
+    {
+        $result = guessHealthcheck('my-redis:7', ['6379/tcp' => new \stdClass()]);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('redis-cli', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckFromImageNameMysql(): void
+    {
+        $result = guessHealthcheck('mysql:8.0', []);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('mysqladmin', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckFromImageNameLinuxserverMariadb(): void
+    {
+        $result = guessHealthcheck('linuxserver/mariadb:10', []);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('mysqladmin', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckFromImageNamePostgres(): void
+    {
+        $result = guessHealthcheck('postgres:15', []);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('pg_isready', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckFromImageNameRedis(): void
+    {
+        $result = guessHealthcheck('redis:7-alpine', []);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('redis-cli', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckFromImageNameNginx(): void
+    {
+        $result = guessHealthcheck('nginx:latest', []);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('curl', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckReturnsNullForUnknown(): void
+    {
+        $result = guessHealthcheck('mycustomapp:v3', []);
+        $this->assertNull($result);
+    }
+
+    public function testGuessHealthcheckPortTakesPriorityOverImageName(): void
+    {
+        // Image says "nginx" (curl localhost/) but exposed port is 5432 (pg_isready)
+        $result = guessHealthcheck('nginx:latest', ['5432/tcp' => new \stdClass()]);
+        $this->assertNotNull($result);
+        $this->assertStringContainsString('pg_isready', $result['test'][1]);
+    }
+
+    public function testGuessHealthcheckExistingTakesPriorityOverAll(): void
+    {
+        $existing = [
+            'Test' => ['CMD', '/usr/bin/custom-check'],
+            'Interval' => 60_000_000_000,
+            'Timeout' => 5_000_000_000,
+            'Retries' => 5,
+        ];
+        // Has known port AND image match, but existing should win
+        $result = guessHealthcheck('mysql:8', ['3306/tcp' => new \stdClass()], $existing);
+        $this->assertNotNull($result);
+        $this->assertEquals(['CMD', '/usr/bin/custom-check'], $result['test']);
+        $this->assertEquals('1m', $result['interval']);
+    }
+
+    // =========================================================
+    // detectPortConflicts()
+    // =========================================================
+
+    public function testDetectPortConflictsNoConflicts(): void
+    {
+        $services = [
+            'web' => ['ports' => ['8080:80/tcp']],
+            'api' => ['ports' => ['3000:3000/tcp']],
+        ];
+        $conflicts = detectPortConflicts($services);
+        $this->assertEmpty($conflicts);
+    }
+
+    public function testDetectPortConflictsDuplicateHostPort(): void
+    {
+        $services = [
+            'nginx' => ['ports' => ['8080:80/tcp']],
+            'app' => ['ports' => ['8080:3000/tcp']],
+        ];
+        $conflicts = detectPortConflicts($services);
+        $this->assertCount(1, $conflicts);
+        $this->assertEquals('8080', $conflicts[0]['hostPort']);
+        $this->assertEquals('tcp', $conflicts[0]['protocol']);
+        $this->assertContains('nginx', $conflicts[0]['services']);
+        $this->assertContains('app', $conflicts[0]['services']);
+    }
+
+    public function testDetectPortConflictsDifferentHostIpsNoConflict(): void
+    {
+        $services = [
+            'svc1' => ['ports' => ['192.168.1.1:8080:80/tcp']],
+            'svc2' => ['ports' => ['192.168.1.2:8080:80/tcp']],
+        ];
+        $conflicts = detectPortConflicts($services);
+        $this->assertEmpty($conflicts);
+    }
+
+    public function testDetectPortConflictsExposeOnlyIgnored(): void
+    {
+        $services = [
+            'svc1' => ['ports' => ['80/tcp']],
+            'svc2' => ['ports' => ['80/tcp']],
+        ];
+        $conflicts = detectPortConflicts($services);
+        $this->assertEmpty($conflicts);
+    }
+
+    public function testDetectPortConflictsNoPorts(): void
+    {
+        $services = [
+            'svc1' => ['image' => 'nginx'],
+            'svc2' => ['image' => 'redis'],
+        ];
+        $conflicts = detectPortConflicts($services);
+        $this->assertEmpty($conflicts);
+    }
+
+    public function testDetectPortConflictsDifferentProtocolNoConflict(): void
+    {
+        $services = [
+            'svc1' => ['ports' => ['53:53/tcp']],
+            'svc2' => ['ports' => ['53:53/udp']],
+        ];
+        $conflicts = detectPortConflicts($services);
+        $this->assertEmpty($conflicts);
+    }
+
+    // =========================================================
+    // dockerServicesToComposeYml() with wizardConfig
+    // =========================================================
+
+    public function testComposeYmlWithContainerNames(): void
+    {
+        $services = [
+            'web' => ['image' => 'nginx:latest'],
+            'db' => ['image' => 'mysql:8'],
+        ];
+        $config = [
+            'containerNames' => ['web' => 'my-web', 'db' => 'my-database'],
+            'networkConfig' => ['stackNetwork' => ['enabled' => false], 'externalNetworks' => [], 'perService' => []],
+            'healthchecks' => [],
+            'dependencies' => [],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+        $this->assertStringContainsString('container_name: my-web', $yaml);
+        $this->assertStringContainsString('container_name: my-database', $yaml);
+    }
+
+    public function testComposeYmlWithStackNetwork(): void
+    {
+        $services = [
+            'web' => ['image' => 'nginx:latest'],
+        ];
+        $config = [
+            'containerNames' => [],
+            'networkConfig' => [
+                'stackNetwork' => ['enabled' => true, 'name' => 'mystack_net'],
+                'externalNetworks' => [],
+                'perService' => [
+                    'web' => ['networkMode' => 'default', 'attachStackNet' => true, 'externalNets' => []],
+                ],
+            ],
+            'healthchecks' => [],
+            'dependencies' => [],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+        $this->assertStringContainsString('networks:', $yaml);
+        $this->assertStringContainsString('mystack_net', $yaml);
+        $this->assertStringContainsString('driver: bridge', $yaml);
+    }
+
+    public function testComposeYmlWithHostNetworkMode(): void
+    {
+        $services = [
+            'web' => ['image' => 'nginx:latest', 'networks' => ['old_net']],
+        ];
+        $config = [
+            'containerNames' => [],
+            'networkConfig' => [
+                'stackNetwork' => ['enabled' => true, 'name' => 'mystack_net'],
+                'externalNetworks' => [],
+                'perService' => [
+                    'web' => ['networkMode' => 'host', 'attachStackNet' => false, 'externalNets' => []],
+                ],
+            ],
+            'healthchecks' => [],
+            'dependencies' => [],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+        $this->assertStringContainsString('network_mode: host', $yaml);
+        // Should NOT contain networks for this service
+        $this->assertStringNotContainsString('old_net', $yaml);
+    }
+
+    public function testComposeYmlWithHealthcheck(): void
+    {
+        $services = [
+            'web' => ['image' => 'nginx:latest'],
+        ];
+        $config = [
+            'containerNames' => [],
+            'networkConfig' => ['stackNetwork' => ['enabled' => false], 'externalNetworks' => [], 'perService' => []],
+            'healthchecks' => [
+                'web' => [
+                    'test' => ['CMD-SHELL', 'curl -f http://localhost/ || exit 1'],
+                    'interval' => '30s',
+                    'timeout' => '10s',
+                    'retries' => 3,
+                    'start_period' => '10s',
+                ],
+            ],
+            'dependencies' => [],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+        $this->assertStringContainsString('healthcheck:', $yaml);
+        $this->assertStringContainsString('test:', $yaml);
+        $this->assertStringContainsString('CMD-SHELL', $yaml);
+        $this->assertStringContainsString('interval: 30s', $yaml);
+        $this->assertMatchesRegularExpression('/retries: "?3"?/', $yaml);
+    }
+
+    public function testComposeYmlWithRemovedHealthcheck(): void
+    {
+        $services = [
+            'web' => ['image' => 'nginx:latest', 'healthcheck' => ['test' => ['CMD', 'true']]],
+        ];
+        $config = [
+            'containerNames' => [],
+            'networkConfig' => ['stackNetwork' => ['enabled' => false], 'externalNetworks' => [], 'perService' => []],
+            'healthchecks' => ['web' => null],
+            'dependencies' => [],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+        $this->assertStringNotContainsString('healthcheck:', $yaml);
+    }
+
+    public function testComposeYmlWithDependsOn(): void
+    {
+        $services = [
+            'web' => ['image' => 'nginx:latest'],
+            'db' => ['image' => 'mysql:8'],
+        ];
+        $config = [
+            'containerNames' => [],
+            'networkConfig' => ['stackNetwork' => ['enabled' => false], 'externalNetworks' => [], 'perService' => []],
+            'healthchecks' => [],
+            'dependencies' => [
+                'web' => [
+                    ['service' => 'db', 'condition' => 'service_healthy'],
+                ],
+            ],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+        $this->assertStringContainsString('depends_on:', $yaml);
+        $this->assertStringContainsString('db:', $yaml);
+        $this->assertStringContainsString('condition: service_healthy', $yaml);
+    }
+
+    public function testComposeYmlWithExternalNetworks(): void
+    {
+        $services = [
+            'web' => ['image' => 'nginx:latest'],
+        ];
+        $config = [
+            'containerNames' => [],
+            'networkConfig' => [
+                'stackNetwork' => ['enabled' => false],
+                'externalNetworks' => ['proxy_net'],
+                'perService' => [
+                    'web' => ['networkMode' => 'default', 'attachStackNet' => false, 'externalNets' => ['proxy_net']],
+                ],
+            ],
+            'healthchecks' => [],
+            'dependencies' => [],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+        $this->assertStringContainsString('proxy_net', $yaml);
+        $this->assertStringContainsString('external: true', $yaml);
+    }
+
+    public function testComposeYmlLegacyPathNoWizardConfig(): void
+    {
+        $services = [
+            'web' => [
+                'image' => 'nginx:latest',
+                'ports' => ['80:80/tcp'],
+                '__guessed_healthcheck' => ['test' => ['CMD', 'true']],
+                '__exposed_ports' => ['80/tcp' => new \stdClass()],
+                'icon' => '/path/to/icon.png',
+            ],
+        ];
+        $yaml = dockerServicesToComposeYml($services);
+        $this->assertStringContainsString('nginx:latest', $yaml);
+        // Internal keys should not appear
+        $this->assertStringNotContainsString('__guessed_healthcheck', $yaml);
+        $this->assertStringNotContainsString('__exposed_ports', $yaml);
+        $this->assertStringNotContainsString('icon:', $yaml);
+    }
+
+    public function testComposeYmlFullWizardConfig(): void
+    {
+        $services = [
+            'app' => ['image' => 'myapp:latest', 'ports' => ['8080:80/tcp']],
+            'db' => ['image' => 'postgres:15', 'ports' => ['5432:5432/tcp']],
+        ];
+        $config = [
+            'containerNames' => ['app' => 'my-app', 'db' => 'my-postgres'],
+            'networkConfig' => [
+                'stackNetwork' => ['enabled' => true, 'name' => 'app_net'],
+                'externalNetworks' => [],
+                'perService' => [
+                    'app' => ['networkMode' => 'default', 'attachStackNet' => true, 'externalNets' => []],
+                    'db' => ['networkMode' => 'default', 'attachStackNet' => true, 'externalNets' => []],
+                ],
+            ],
+            'healthchecks' => [
+                'app' => ['test' => ['CMD-SHELL', 'curl -f http://localhost:80/'], 'interval' => '15s', 'timeout' => '5s', 'retries' => 3, 'start_period' => '10s'],
+                'db' => ['test' => ['CMD-SHELL', 'pg_isready -U postgres'], 'interval' => '30s', 'timeout' => '10s', 'retries' => 5, 'start_period' => '20s'],
+            ],
+            'dependencies' => [
+                'app' => [['service' => 'db', 'condition' => 'service_healthy']],
+            ],
+        ];
+        $yaml = dockerServicesToComposeYml($services, $config);
+
+        // Container names
+        $this->assertStringContainsString('container_name: my-app', $yaml);
+        $this->assertStringContainsString('container_name: my-postgres', $yaml);
+
+        // Network
+        $this->assertStringContainsString('app_net', $yaml);
+        $this->assertStringContainsString('driver: bridge', $yaml);
+
+        // App healthcheck
+        $this->assertStringContainsString('curl -f http://localhost:80/', $yaml);
+
+        // DB healthcheck
+        $this->assertStringContainsString('pg_isready -U postgres', $yaml);
+
+        // Dependency
+        $this->assertStringContainsString('depends_on:', $yaml);
+        $this->assertStringContainsString('condition: service_healthy', $yaml);
+    }
+}

From 7cb4b605e64310c621231afe5b2668c44ee1d72e Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Fri, 10 Apr 2026 22:23:47 -0400
Subject: [PATCH 05/40] fix(tests): update require path for Util.php in
 ImportWizardTest

---
 tests/unit/ImportWizardTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/ImportWizardTest.php b/tests/unit/ImportWizardTest.php
index 1cc443c..c19e536 100644
--- a/tests/unit/ImportWizardTest.php
+++ b/tests/unit/ImportWizardTest.php
@@ -17,7 +17,7 @@
 
 use PluginTests\TestCase;
 
-require_once '/usr/local/emhttp/plugins/compose.manager/php/util.php';
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
 
 class ImportWizardTest extends TestCase
 {

From 7cd7fe268ba0a59aced8538d672a0f1e8d91f5f1 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 13:30:47 -0400
Subject: [PATCH 06/40] feat(import): add Import Wizard documentation for
 converting Docker Manager containers to Compose stacks

---
 README.md             |   2 +
 docs/import-wizard.md | 138 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 docs/import-wizard.md

diff --git a/README.md b/README.md
index 6bf21d0..31790b0 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ The built-in editor provides multiple tabs for managing your compose stack:
 
 - **Docker Compose Integration** - Installs the Docker Compose CLI plugin (v5 by default) and manages stacks on your unRAID server.
 - **Web UI Management** - Create, edit, and manage Compose stacks directly from the unRAID dashboard.
+- **Import Wizard** - Convert existing Docker Manager containers into a Compose stack using a guided flow.
 - **Stack Operations** - Start, stop, restart, update, pull/build, and remove stacks with one click (supports profiles and override files).
 - **Context Menu** - Rich context menu on every stack icon with state-aware actions (see [Context Menu](#context-menu) below).
 - **Container Context Menu** - Right-click individual containers to open a WebUI, console, or logs; start, stop, pause, resume, or restart individual containers without touching the whole stack.
@@ -265,6 +266,7 @@ For detailed guides, see the [docs](docs/) folder:
 
 - [Getting Started](docs/getting-started.md)
 - [User Guide](docs/user-guide.md)
+- [Import Wizard](docs/import-wizard.md)
 - [Configuration](docs/configuration.md)
 - [Profiles](docs/profiles.md)
 
diff --git a/docs/import-wizard.md b/docs/import-wizard.md
new file mode 100644
index 0000000..0e90910
--- /dev/null
+++ b/docs/import-wizard.md
@@ -0,0 +1,138 @@
+# Import Wizard
+
+The Import Wizard lets you convert existing Docker Manager containers into a Compose Manager stack with a guided 6-stage workflow.
+
+## Where to Find It
+
+1. Go to **Docker -> Compose**.
+2. Click **Import from Docker Manager**.
+3. Select one or more existing containers to import.
+
+## What the Wizard Imports
+
+For each selected container, Compose Manager reads Docker metadata and converts it into Compose service definitions, including:
+
+- Image name
+- Container name
+- Ports
+- Environment variables
+- Volumes and bind mounts
+- Labels (including Unraid-specific WebUI/icon labels)
+- Existing healthcheck (if present)
+- Network mode and network attachments
+
+The wizard can also auto-detect likely healthchecks for common services when no healthcheck exists.
+
+## 6-Stage Workflow
+
+### Stage 1: Select Containers
+
+- Shows import candidates from Docker Manager.
+- You can select individual containers or use **Select All**.
+- At least one container is required to continue.
+
+### Stage 2: Select Options
+
+Configure stack-wide options:
+
+- **Stack Name** (required)
+- **Create Stack Network** and network name
+- **External Networks** to make available during import
+- Post-import behavior:
+  - **Stop original containers**
+  - **Remove original containers**
+  - **Start imported stack**
+
+Notes:
+
+- If **Remove original containers** is enabled, **Stop original containers** is enforced.
+- The stack name is sanitized to a safe folder-style name for preview.
+
+### Stage 3: Configure Containers
+
+Per-service configuration:
+
+- Container name (must be unique and non-empty)
+- Network mode (default/bridge/host/none)
+- Network attachments (stack network and selected external networks)
+- Healthcheck command and timing settings
+- Read-only port view with conflict indicators
+
+Validation behavior:
+
+- Duplicate or empty container names disable **Next**.
+- Host port conflicts are highlighted so you can review them before import.
+
+### Stage 4: Configure Dependencies
+
+Define Compose `depends_on` relationships between imported services:
+
+- Add dependencies service-by-service
+- Choose condition:
+  - `service_started`
+  - `service_healthy` (available only when target service has a healthcheck)
+
+Safety checks:
+
+- Dependency cycles are detected and block progress.
+- A calculated startup order preview is shown when possible.
+
+### Stage 5: Generating
+
+Compose Manager generates:
+
+- `docker-compose.yml`
+- `.env` content (when needed)
+- Override content for labels/icons (when needed)
+
+The generated Compose YAML is also checked for parse validity.
+
+### Stage 6: Validate Compose
+
+You get a final review screen with:
+
+- Validation result and any parse errors
+- Import summary (services, networks, healthchecks, dependencies)
+- Compose YAML preview
+- Optional `.env` preview
+- Optional override preview
+
+Click **Import** to write files and complete the transfer.
+
+## What Happens on Import
+
+When you confirm import:
+
+1. A new stack is created in the configured projects directory.
+2. Generated files are written to that stack folder.
+3. Selected source containers can be stopped and/or removed (based on your options).
+4. The stack opens in the editor.
+5. If selected, Compose Manager runs **Compose Up** for the imported stack.
+
+## Tips and Best Practices
+
+- Start with related containers that should live in the same stack.
+- Review network mode carefully: `host`/`none` intentionally limit network attachments.
+- Keep healthchecks when possible; they improve dependency sequencing and startup reliability.
+- Resolve any port conflicts before starting the new stack if services must run in parallel.
+- If this is a production workload, take a backup before removing original containers.
+
+## Troubleshooting
+
+### No containers appear in Stage 1
+
+- Verify containers exist in Docker Manager and are readable by the plugin.
+
+### Cannot continue from Stage 3
+
+- Fix duplicate or empty container names.
+
+### Cannot continue from Stage 4
+
+- Remove circular dependencies until the cycle warning is gone.
+
+### Import fails at the final step
+
+- Re-check stack name validity.
+- Re-open the wizard and re-import if source containers changed during the session.
+- Check Unraid syslog/plugin logs for server-side error details.

From ed91dc09ad3674fdb38ce3d54b1c3203a456800e Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 13:54:05 -0400
Subject: [PATCH 07/40] feat(import): update Import Wizard to support
 Basic/Advanced modes and adjust stage flow

---
 .../include/ComposeManager.php                | 214 ++++++++++++------
 source/compose.manager/sheets/ComboButton.css |  32 ++-
 2 files changed, 181 insertions(+), 65 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index cf95ac5..3a9237c 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2210,11 +2210,12 @@ function(data) {
 
 
     // =========================================================================
-    // Import Wizard — 6-Stage Flow
+    // Import Wizard — 5-Stage Flow (Basic / Advanced)
     // =========================================================================
 
     var importWizard = {
         stage: 1,
+        advancedMode: (localStorage.getItem('compose_import_wizard_mode') === 'advanced'),
         containerIds: [],
         containers: [],     // raw container list from getDockerContainersForImport
         services: {},       // per-service metadata from generateImportData
@@ -2238,29 +2239,60 @@ function(data) {
         result: null        // finalizeImportCompose response
     };
 
-    var WIZARD_STAGES = [
+    var WIZARD_STAGES_ALL = [
         { num: 1, label: 'Select Containers' },
-        { num: 2, label: 'Select Options' },
-        { num: 3, label: 'Configure Containers' },
-        { num: 4, label: 'Configure Dependencies' },
-        { num: 5, label: 'Generating' },
-        { num: 6, label: 'Validate Compose' }
+        { num: 2, label: 'Stack Options' },
+        { num: 3, label: 'Configure Services' },
+        { num: 4, label: 'Dependencies', advancedOnly: true },
+        { num: 5, label: 'Review & Import' }
     ];
 
+    function iwGetVisibleStages() {
+        if (importWizard.advancedMode) return WIZARD_STAGES_ALL;
+        return WIZARD_STAGES_ALL.filter(function(s) { return !s.advancedOnly; });
+    }
+
     function renderWizardStepper(activeStage) {
+        var stages = iwGetVisibleStages();
         var html = '<div class="import-wizard-stepper">';
-        WIZARD_STAGES.forEach(function(s, i) {
+        stages.forEach(function(s, i) {
             var cls = 'import-wizard-step';
             if (s.num < activeStage) cls += ' completed';
             else if (s.num === activeStage) cls += ' active';
             if (i > 0) html += '<div class="import-wizard-step-connector"></div>';
-            var icon = s.num < activeStage ? '<i class="fa fa-check"></i>' : s.num;
+            var displayNum = i + 1;
+            var icon = s.num < activeStage ? '<i class="fa fa-check"></i>' : displayNum;
             html += '<div class="' + cls + '"><span class="import-wizard-step-number">' + icon + '</span><span>' + composeEscapeHtml(s.label) + '</span></div>';
         });
         html += '</div>';
         return html;
     }
 
+    function iwToggleAdvancedMode() {
+        importWizard.advancedMode = !importWizard.advancedMode;
+        localStorage.setItem('compose_import_wizard_mode', importWizard.advancedMode ? 'advanced' : 'basic');
+        iwUpdateToggleLabel();
+        // Re-render current stage to show/hide fields
+        var stage = importWizard.stage;
+        if (stage === 2) { iwSaveStage2(); renderImportStage2(); }
+        else if (stage === 3) { iwSaveStage3(); renderImportStage3(); }
+        else if (stage === 4) renderImportStage4();
+        else if (stage === 5) {} // review stage — no toggle effect needed
+    }
+
+    function iwUpdateToggleLabel() {
+        var $btn = $('#iw-mode-toggle');
+        if ($btn.length) {
+            if (importWizard.advancedMode) {
+                $btn.html('<i class="fa fa-cogs"></i> Advanced');
+                $btn.attr('title', 'Switch to Basic mode');
+            } else {
+                $btn.html('<i class="fa fa-cog"></i> Basic');
+                $btn.attr('title', 'Switch to Advanced mode');
+            }
+        }
+    }
+
     function wizardFooter(opts) {
         var left = '';
         var right = '';
@@ -2285,7 +2317,9 @@ function wizardFooter(opts) {
     function importFromDockerManager() {
         // Reset wizard state
         importWizard = {
-            stage: 1, containerIds: [], containers: [], services: {},
+            stage: 1,
+            advancedMode: (localStorage.getItem('compose_import_wizard_mode') === 'advanced'),
+            containerIds: [], containers: [], services: {},
             portConflicts: [], availableNetworks: [],
             config: {
                 stackName: '', stackDesc: '',
@@ -2297,10 +2331,14 @@ function importFromDockerManager() {
             result: null
         };
 
+        var modeLabel = importWizard.advancedMode ? '<i class="fa fa-cogs"></i> Advanced' : '<i class="fa fa-cog"></i> Basic';
+        var modeTitle = importWizard.advancedMode ? 'Switch to Basic mode' : 'Switch to Advanced mode';
+
         var modalHtml = '<div id="compose-import-modal-overlay" class="compose-modal-overlay" style="display:flex;">' +
             '<div class="compose-modal import-wizard-modal" role="dialog" aria-modal="true" aria-labelledby="compose-import-modal-title" tabindex="-1">' +
             '<div class="compose-modal-header">' +
             '<span id="compose-import-modal-title">Import from Docker Manager</span>' +
+            '<button type="button" class="iw-mode-toggle-btn" id="iw-mode-toggle" onclick="iwToggleAdvancedMode()" title="' + modeTitle + '">' + modeLabel + '</button>' +
             '<button type="button" class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()" aria-label="Close modal"><i class="fa fa-times"></i></button>' +
             '</div>' +
             '<div id="compose-import-stepper"></div>' +
@@ -2463,18 +2501,18 @@ function sanitizeName(name) {
             '<input type="checkbox" id="iw-stack-net-enabled"' + stackNetChecked + '> Create Stack Network</label>' +
             '<div id="iw-stack-net-details"' + (netCfg.stackNetwork.enabled ? '' : ' style="display:none;"') + '>' +
             '<div class="import-field-row">' +
-            '<div class="import-field"><label>Network Name</label>' +
+            '<div class="import-field iw-advanced-section"><label>Network Name</label>' +
             '<input type="text" id="iw-stack-net-name" value="' + composeEscapeHtml(netCfg.stackNetwork.name) + '" placeholder="stack_net"></div>' +
-            '<div class="import-field"><label>Driver</label>' +
+            '<div class="import-field iw-advanced-section"><label>Driver</label>' +
             '<input type="text" value="bridge" disabled style="opacity:0.6;"></div>' +
             '</div></div></div>';
 
-        // External Networks
+        // External Networks (Advanced)
         var existingNets = importWizard.availableNetworks.filter(function(n) {
             return n.name !== 'bridge' && n.name !== 'host' && n.name !== 'none';
         });
         var selectedExt = netCfg.externalNetworks || [];
-        html += '<div style="margin-bottom:16px;padding:14px;background:var(--dynamix-tablesorter-tbody-row-alt-bg-color);border:1px solid var(--border-color);border-radius:6px;">' +
+        html += '<div class="iw-advanced-section" style="margin-bottom:16px;padding:14px;background:var(--dynamix-tablesorter-tbody-row-alt-bg-color);border:1px solid var(--border-color);border-radius:6px;">' +
             '<div style="font-weight:600;margin-bottom:10px;">External Networks</div>';
         if (existingNets.length) {
             html += '<div class="import-net-checks" id="iw-ext-nets">';
@@ -2492,15 +2530,9 @@ function sanitizeName(name) {
             '<button type="button" onclick="iwAddCustomNetwork()">Add</button>' +
             '</div></div>';
 
-        // Container handling
-        html += '<div style="padding:14px;background:var(--dynamix-tablesorter-tbody-row-alt-bg-color);border:1px solid var(--border-color);border-radius:6px;">' +
-            '<div style="font-weight:600;margin-bottom:10px;">After Import</div>' +
-            '<label style="display:block;margin-bottom:6px;cursor:pointer;"><input type="checkbox" id="iw-stop-containers"' + (cfg.stopContainers ? ' checked' : '') + '> Stop original containers</label>' +
-            '<label style="display:block;margin-bottom:6px;cursor:pointer;"><input type="checkbox" id="iw-remove-containers"' + (cfg.removeContainers ? ' checked' : '') + '> Remove original containers</label>' +
-            '<label style="display:block;cursor:pointer;"><input type="checkbox" id="iw-start-stack"' + (cfg.startStack ? ' checked' : '') + '> Start imported stack</label>' +
-            '</div>';
-
         $('#compose-import-modal-body').html(html);
+        // Apply advanced/basic visibility
+        if (!importWizard.advancedMode) $('.iw-advanced-section').hide();
         $('#compose-import-modal-footer').html(wizardFooter({
             back: 'renderImportStage1()',
             next: 'importWizardStage2Next()'
@@ -2520,12 +2552,20 @@ function sanitizeName(name) {
         $('#iw-stack-net-enabled').on('change', function() {
             $('#iw-stack-net-details').toggle(this.checked);
         });
-        $('#iw-remove-containers').on('change', function() {
-            if (this.checked) $('#iw-stop-containers').prop('checked', true);
-        });
-        $('#iw-stop-containers').on('change', function() {
-            if (!this.checked) $('#iw-remove-containers').prop('checked', false);
-        });
+    }
+
+    function iwSaveStage2() {
+        var cfg = importWizard.config;
+        var el = document.getElementById('iw-stack-name');
+        if (el) cfg.stackName = el.value.trim();
+        var netCfg = cfg.networkConfig;
+        var netEl = document.getElementById('iw-stack-net-enabled');
+        if (netEl) netCfg.stackNetwork.enabled = netEl.checked;
+        var nameEl = document.getElementById('iw-stack-net-name');
+        if (nameEl) netCfg.stackNetwork.name = nameEl.value.trim();
+        var extNets = [];
+        $('.iw-ext-net-cb:checked').each(function() { extNets.push(this.value); });
+        netCfg.externalNetworks = extNets;
     }
 
     function iwAddCustomNetwork() {
@@ -2548,25 +2588,11 @@ function iwAddCustomNetwork() {
     }
 
     function importWizardStage2Next() {
-        var cfg = importWizard.config;
-        cfg.stackName = document.getElementById('iw-stack-name').value.trim();
-        if (!cfg.stackName) {
+        iwSaveStage2();
+        if (!importWizard.config.stackName) {
             swal('Stack name required', 'Please enter a stack name.', 'warning');
             return;
         }
-
-        var netCfg = cfg.networkConfig;
-        netCfg.stackNetwork.enabled = document.getElementById('iw-stack-net-enabled').checked;
-        netCfg.stackNetwork.name = document.getElementById('iw-stack-net-name').value.trim();
-
-        var extNets = [];
-        $('.iw-ext-net-cb:checked').each(function() { extNets.push(this.value); });
-        netCfg.externalNetworks = extNets;
-
-        cfg.stopContainers = document.getElementById('iw-stop-containers').checked;
-        cfg.removeContainers = document.getElementById('iw-remove-containers').checked;
-        cfg.startStack = document.getElementById('iw-start-stack').checked;
-
         renderImportStage3();
     }
 
@@ -2633,7 +2659,7 @@ function renderImportStage3() {
             html += '<div class="import-field"><label>Container Name</label>' +
                 '<input type="text" class="iw-container-name" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(cName) + '">' +
                 '<div class="import-field-error" id="iw-name-error-' + composeEscapeHtml(key) + '"></div></div>';
-            html += '<div class="import-field"><label>Network Mode</label>' +
+            html += '<div class="import-field iw-advanced-section"><label>Network Mode</label>' +
                 '<select class="iw-net-mode" data-service="' + composeEscapeHtml(key) + '">' +
                 '<option value="default"' + (netMode === 'default' ? ' selected' : '') + '>Default (compose managed)</option>' +
                 '<option value="bridge"' + (netMode === 'bridge' ? ' selected' : '') + '>Bridge</option>' +
@@ -2642,11 +2668,11 @@ function renderImportStage3() {
                 '</select></div>';
             html += '</div>';
 
-            // Row 2: Network attachments
+            // Row 2: Network attachments (Advanced)
             var stackNetAvailable = netCfg.stackNetwork.enabled && netCfg.stackNetwork.name;
             var hasExtNets = netCfg.externalNetworks.length > 0;
             if (stackNetAvailable || hasExtNets) {
-                html += '<div class="import-field" style="margin-bottom:14px;"><label>Network Attachments</label>';
+                html += '<div class="import-field iw-advanced-section" style="margin-bottom:14px;"><label>Network Attachments</label>';
                 html += '<div class="import-net-checks iw-svc-nets" data-service="' + composeEscapeHtml(key) + '">';
                 if (stackNetAvailable) {
                     var stackChecked = (attachStackNet && !isNetModeRestricted) ? ' checked' : '';
@@ -2691,11 +2717,11 @@ function renderImportStage3() {
                 html += '</div></div>';
             }
 
-            // Healthcheck section
+            // Healthcheck section (Advanced)
             var hcSourceLabel = hcSource === 'image' ? 'From Image' : (hcSource === 'auto' ? 'Auto-Detected' : 'None');
             var hcSourceClass = hcSource === 'image' ? 'from-image' : (hcSource === 'auto' ? 'auto-detected' : 'none');
             var hcExpanded = hc ? ' expanded' : '';
-            html += '<div class="import-healthcheck-section' + hcExpanded + '" data-service="' + composeEscapeHtml(key) + '">';
+            html += '<div class="import-healthcheck-section iw-advanced-section' + hcExpanded + '" data-service="' + composeEscapeHtml(key) + '">';
             html += '<div class="import-healthcheck-header" onclick="iwToggleHealthcheck(this)">' +
                 '<span><i class="fa fa-heartbeat"></i> Healthcheck <span class="import-healthcheck-source ' + hcSourceClass + '">' + hcSourceLabel + '</span></span>' +
                 '<i class="fa fa-chevron-right import-service-card-toggle"></i></div>';
@@ -2724,6 +2750,8 @@ function renderImportStage3() {
         });
 
         $('#compose-import-modal-body').html(html);
+        // Apply advanced/basic visibility
+        if (!importWizard.advancedMode) $('.iw-advanced-section').hide();
         $('#compose-import-modal-footer').html(wizardFooter({
             back: 'iwSaveStage3(); renderImportStage2()',
             next: 'importWizardStage3Next()',
@@ -2848,7 +2876,12 @@ function importWizardStage3Next() {
             swal('Name conflicts', 'Please resolve container name conflicts before continuing.', 'warning');
             return;
         }
-        renderImportStage4();
+        // In basic mode, skip dependencies and go straight to review
+        if (!importWizard.advancedMode) {
+            renderImportStageReview();
+        } else {
+            renderImportStage4();
+        }
     }
 
     // ── Stage 4: Configure Dependencies ─────────────────────────────────────
@@ -3089,11 +3122,11 @@ function importWizardStage4Next() {
             swal('Dependency cycle', 'Please resolve the dependency cycle before continuing.', 'warning');
             return;
         }
-        renderImportStage5();
+        renderImportStageReview();
     }
 
-    // ── Stage 5: Generating ─────────────────────────────────────────────────
-    function renderImportStage5() {
+    // ── Stage 5: Review & Import (merged generating + validation) ───────────
+    function renderImportStageReview() {
         importWizard.stage = 5;
         $('#compose-import-stepper').html(renderWizardStepper(5));
         $('#compose-import-modal-body').html(
@@ -3115,22 +3148,20 @@ function renderImportStage5() {
             if (response.result !== 'success') {
                 $('#compose-import-modal-body').html('<div style="color:#f44336;padding:20px;">' +
                     composeEscapeHtml(response.message || 'Failed to generate compose configuration') + '</div>');
-                $('#compose-import-modal-footer').html(wizardFooter({ back: 'renderImportStage4()' }));
+                var backTarget = importWizard.advancedMode ? 'renderImportStage4()' : 'renderImportStage3()';
+                $('#compose-import-modal-footer').html(wizardFooter({ back: backTarget }));
                 return;
             }
             importWizard.result = response;
-            renderImportStage6();
+            iwRenderReviewContent();
         }).fail(function() {
             $('#compose-import-modal-body').html('<div style="color:#f44336;padding:20px;">Communication error</div>');
-            $('#compose-import-modal-footer').html(wizardFooter({ back: 'renderImportStage4()' }));
+            var backTarget = importWizard.advancedMode ? 'renderImportStage4()' : 'renderImportStage3()';
+            $('#compose-import-modal-footer').html(wizardFooter({ back: backTarget }));
         });
     }
 
-    // ── Stage 6: Validate Compose ───────────────────────────────────────────
-    function renderImportStage6() {
-        importWizard.stage = 6;
-        $('#compose-import-stepper').html(renderWizardStepper(6));
-
+    function iwRenderReviewContent() {
         var result = importWizard.result;
         var validation = result.validation || { valid: true, errors: [] };
         var cfg = importWizard.config;
@@ -3194,15 +3225,67 @@ function renderImportStage6() {
                 '<pre class="import-preview-pre">' + composeEscapeHtml(result.override) + '</pre></details>';
         }
 
+        // After Import actions — always visible
+        html += '<div style="margin-top:16px;padding:14px;background:var(--dynamix-tablesorter-tbody-row-alt-bg-color);border:1px solid var(--border-color);border-radius:6px;">' +
+            '<div style="font-weight:600;margin-bottom:10px;">After Import</div>' +
+            '<label style="display:block;margin-bottom:6px;cursor:pointer;"><input type="checkbox" id="iw-stop-containers"' + (cfg.stopContainers ? ' checked' : '') + '> Stop original containers</label>' +
+            '<label style="display:block;margin-bottom:6px;cursor:pointer;"><input type="checkbox" id="iw-remove-containers"' + (cfg.removeContainers ? ' checked' : '') + '> Remove original containers</label>' +
+            '<label style="display:block;cursor:pointer;"><input type="checkbox" id="iw-start-stack"' + (cfg.startStack ? ' checked' : '') + '> Start imported stack</label>' +
+            '</div>';
+
         $('#compose-import-modal-body').html(html);
+
+        var backTarget = importWizard.advancedMode ? 'renderImportStage4()' : 'renderImportStage3()';
         $('#compose-import-modal-footer').html(wizardFooter({
-            back: 'renderImportStage4()',
-            action: 'importWizardPerform()',
+            back: backTarget,
+            action: 'importWizardConfirmAndPerform()',
             actionLabel: 'Import'
         }));
+
+        // Wire after-import checkbox constraints
+        $('#iw-remove-containers').on('change', function() {
+            if (this.checked) $('#iw-stop-containers').prop('checked', true);
+        });
+        $('#iw-stop-containers').on('change', function() {
+            if (!this.checked) $('#iw-remove-containers').prop('checked', false);
+        });
+    }
+
+    // ── Final: Confirm & Perform Import ─────────────────────────────────────
+    function importWizardConfirmAndPerform() {
+        // Save after-import options from the review stage
+        var cfg = importWizard.config;
+        cfg.stopContainers = document.getElementById('iw-stop-containers').checked;
+        cfg.removeContainers = document.getElementById('iw-remove-containers').checked;
+        cfg.startStack = document.getElementById('iw-start-stack').checked;
+
+        var containerCount = importWizard.containerIds.length;
+
+        // Build confirmation message for destructive actions
+        if (cfg.stopContainers || cfg.removeContainers) {
+            var actions = [];
+            if (cfg.stopContainers) actions.push('stop');
+            if (cfg.removeContainers) actions.push('remove');
+            var actionText = actions.join(' and ');
+            var msg = 'This will ' + actionText + ' ' + containerCount + ' original container' + (containerCount !== 1 ? 's' : '');
+            if (cfg.startStack) msg += ', then start the imported stack';
+            msg += '. Continue?';
+
+            swal({
+                title: 'Confirm Import',
+                text: msg,
+                type: 'warning',
+                showCancelButton: true,
+                confirmButtonText: 'Yes, import',
+                cancelButtonText: 'Cancel'
+            }, function(confirmed) {
+                if (confirmed) importWizardPerform();
+            });
+        } else {
+            importWizardPerform();
+        }
     }
 
-    // ── Final: Perform Import ───────────────────────────────────────────────
     function importWizardPerform() {
         var cfg = importWizard.config;
         var result = importWizard.result;
@@ -3240,6 +3323,9 @@ function importWizardPerform() {
     // Keep legacy function names working (old callers)
     function composeImportPreview() { importWizardStage1Next(); }
     function composeImportPerform() { importWizardPerform(); }
+    // Keep old stage names as aliases for any callers
+    function renderImportStage5() { renderImportStageReview(); }
+    function renderImportStage6() { iwRenderReviewContent(); }
 
     function stripTags(string) {
         return string.replace(/(<([^>]+)>)/ig, "");
diff --git a/source/compose.manager/sheets/ComboButton.css b/source/compose.manager/sheets/ComboButton.css
index f02be76..5994444 100644
--- a/source/compose.manager/sheets/ComboButton.css
+++ b/source/compose.manager/sheets/ComboButton.css
@@ -313,7 +313,7 @@
   }
 
   /* ============================================
-     Import Wizard — 6-Stage Stepper
+     Import Wizard — 5-Stage Stepper (Basic / Advanced)
      ============================================ */
 
   .import-wizard-stepper {
@@ -904,6 +904,36 @@
     overflow-y: auto;
   }
 
+  /* Basic / Advanced mode toggle button */
+  .iw-mode-toggle-btn {
+    background: transparent;
+    border: 1px solid var(--border-color);
+    color: var(--text-color);
+    padding: 4px 12px;
+    border-radius: 4px;
+    font-size: 0.82rem;
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    transition: background 0.15s ease, border-color 0.15s ease;
+  }
+
+  .iw-mode-toggle-btn:hover {
+    background: var(--alt-background-color);
+    border-color: var(--brand-orange);
+  }
+
+  .iw-mode-toggle-btn .fa {
+    font-size: 0.78rem;
+    opacity: 0.7;
+  }
+
+  /* Advanced-only sections hidden in basic mode */
+  .iw-advanced-section.iw-hidden {
+    display: none !important;
+  }
+
   .compose-ct-table .ct-col-ip {
     width: 8%;
   }

From 3d20a4bc0d7b70fc718a49b48ff5cc5c2b843d60 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 14:06:32 -0400
Subject: [PATCH 08/40] fix(styles): update ComboButton and EditorModal styles
 for improved theming and consistency

---
 source/compose.manager/sheets/ComboButton.css | 14 +--
 source/compose.manager/sheets/EditorModal.css | 87 ++++++++++---------
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/source/compose.manager/sheets/ComboButton.css b/source/compose.manager/sheets/ComboButton.css
index 5994444..dd51d2f 100644
--- a/source/compose.manager/sheets/ComboButton.css
+++ b/source/compose.manager/sheets/ComboButton.css
@@ -364,13 +364,13 @@
 
   .import-wizard-step.completed .import-wizard-step-number {
     background: var(--status-success);
-    color: #fff;
+    color: var(--button-text-color, #fff);
     border-color: var(--status-success);
   }
 
   .import-wizard-step.active .import-wizard-step-number {
     background: var(--brand-orange);
-    color: #fff;
+    color: var(--button-text-color, #fff);
     border-color: var(--brand-orange);
   }
 
@@ -582,7 +582,7 @@
 
   .import-healthcheck-source.auto-detected {
     background: rgba(33, 150, 243, 0.15);
-    color: #2196f3;
+    color: var(--status-info, #2196f3);
   }
 
   .import-healthcheck-source.none {
@@ -740,7 +740,7 @@
   }
 
   .import-dep-remove:hover {
-    color: #f44336;
+    color: var(--status-error-hover, #f44336);
   }
 
   .import-dep-cycle-error {
@@ -808,8 +808,8 @@
   .import-preview-pre {
     max-height: 300px;
     overflow: auto;
-    background: #1e1e1e;
-    color: #d4d4d4;
+    background: var(--editor-background-color, var(--background-color));
+    color: var(--editor-text-color, var(--text-color));
     padding: 12px 16px;
     border-radius: 6px;
     font-size: 0.88rem;
@@ -882,7 +882,7 @@
   .import-ext-net-add button {
     padding: 6px 12px;
     background: var(--brand-orange);
-    color: #fff;
+    color: var(--button-text-color, #fff);
     border: none;
     border-radius: 4px;
     cursor: pointer;
diff --git a/source/compose.manager/sheets/EditorModal.css b/source/compose.manager/sheets/EditorModal.css
index 9d89d42..eb28aec 100644
--- a/source/compose.manager/sheets/EditorModal.css
+++ b/source/compose.manager/sheets/EditorModal.css
@@ -172,12 +172,12 @@
 
 .editor-validation.valid {
   color: var(--status-success);
-}
-
-.editor-validation.error {
-  color: var(--status-error);
-}
-
+  .editor-modal-title {
+    font-size: 1.4rem;
+    color: var(--brand-orange);
+    font-weight: bold;
+    margin: 0;
+  }
 .editor-validation-icon {
   margin-right: 8px;
 }
@@ -186,20 +186,20 @@
 .settings-panel {
   position: relative;
   flex: 1;
-  overflow-y: auto;
-  padding: 30px 50px;
-  font-size: 1.1rem;
-}
-
-.settings-section {
-  margin-bottom: 35px;
-  background-color: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
+  .editor-modal-close {
+    background: none;
+    border: none;
+    color: var(--alt-text-color);
+    font-size: 1.5rem;
+    cursor: pointer;
+    padding: 5px 10px;
+  }
   border: 1px solid var(--border-color);
   border-radius: 8px;
   padding: 24px 28px;
-}
-
-.settings-section-title {
+  .editor-modal-close:hover {
+    color: var(--brand-red);
+  }
   font-size: 1.25rem;
   font-weight: 600;
   color: var(--brand-orange);
@@ -210,16 +210,17 @@
   align-items: center;
   gap: 12px;
 }
-
-.settings-section-title i {
-  font-size: 1.1rem;
-  opacity: 0.9;
-}
-
-.settings-field {
-  margin-bottom: 24px;
-  position: relative;
-}
+  .editor-modal {
+    width: 95%;
+    height: calc(100vh - 40px);
+    max-width: 1400px;
+    background-color: var(--background-color);
+    color: var(--text-color);
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    border: 1px solid var(--border-color);
+  }
 
 .settings-field:last-child {
   margin-bottom: 0;
@@ -229,27 +230,29 @@
   display: block;
   font-weight: 600;
   color: var(--text-color);
-  margin-bottom: 10px;
-  font-size: 1.05rem;
-}
-
-.settings-field input[type="text"],
-.settings-field input[type="url"],
-.settings-field textarea {
-  width: 100%;
-  max-width: 100%;
+  .editor-modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 8px 20px;
+    background-color: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
+    color: var(--text-color);
+    border-bottom: 1px solid var(--border-color);
+    border-radius: 8px 8px 0 0;
+  }
   padding: 12px 16px;
   background-color: var(--input-background-color);
   border: 1px solid var(--border-color);
   border-radius: 6px;
   color: var(--text-color);
   font-size: 1.05rem;
-  box-sizing: border-box;
-  transition: border-color 0.2s ease, box-shadow 0.2s ease;
-}
-
-.settings-field input:hover,
-.settings-field textarea:hover {
+  .editor-modal-footer {
+    background: var(--alt-background-color);
+    color: var(--text-color);
+    padding: 12px 24px;
+    text-align: right;
+    border-top: 1px solid var(--border-color);
+  }
   border-color: var(--border-hover-color);
 }
 

From 2661187f3672a594c31aa690ca6608274184954f Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 14:56:23 -0400
Subject: [PATCH 09/40] feat(import): refactor Import Wizard to use checkbox
 for mode toggle and improve stage navigation

---
 .../include/ComposeManager.php                | 68 ++++++++++++-------
 source/compose.manager/sheets/ComboButton.css | 24 -------
 2 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 3a9237c..1f6ed18 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2268,29 +2268,41 @@ function renderWizardStepper(activeStage) {
         return html;
     }
 
-    function iwToggleAdvancedMode() {
-        importWizard.advancedMode = !importWizard.advancedMode;
+    function iwSetAdvancedMode(isAdvanced) {
+        importWizard.advancedMode = !!isAdvanced;
         localStorage.setItem('compose_import_wizard_mode', importWizard.advancedMode ? 'advanced' : 'basic');
-        iwUpdateToggleLabel();
-        // Re-render current stage to show/hide fields
+
         var stage = importWizard.stage;
-        if (stage === 2) { iwSaveStage2(); renderImportStage2(); }
+        var visible = iwGetVisibleStages();
+        var visibleNums = visible.map(function(s) { return s.num; });
+
+        // If current stage is hidden in the new mode, jump to nearest visible stage
+        if (visibleNums.indexOf(stage) === -1) {
+            // Find the closest visible stage (prefer previous, fall back to next)
+            var prev = null, next = null;
+            for (var i = 0; i < visibleNums.length; i++) {
+                if (visibleNums[i] < stage) prev = visibleNums[i];
+                if (visibleNums[i] > stage && next === null) next = visibleNums[i];
+            }
+            var target = prev || next || 1;
+            iwNavigateToStage(target);
+            return;
+        }
+
+        // Current stage is still visible — re-render it to update fields + stepper
+        if (stage === 1) { $('#compose-import-stepper').html(renderWizardStepper(1)); }
+        else if (stage === 2) { iwSaveStage2(); renderImportStage2(); }
         else if (stage === 3) { iwSaveStage3(); renderImportStage3(); }
-        else if (stage === 4) renderImportStage4();
-        else if (stage === 5) {} // review stage — no toggle effect needed
+        else if (stage === 4) { renderImportStage4(); }
+        else if (stage === 5) { $('#compose-import-stepper').html(renderWizardStepper(5)); }
     }
 
-    function iwUpdateToggleLabel() {
-        var $btn = $('#iw-mode-toggle');
-        if ($btn.length) {
-            if (importWizard.advancedMode) {
-                $btn.html('<i class="fa fa-cogs"></i> Advanced');
-                $btn.attr('title', 'Switch to Basic mode');
-            } else {
-                $btn.html('<i class="fa fa-cog"></i> Basic');
-                $btn.attr('title', 'Switch to Advanced mode');
-            }
-        }
+    function iwNavigateToStage(stageNum) {
+        if (stageNum === 1) renderImportStage1();
+        else if (stageNum === 2) renderImportStage2();
+        else if (stageNum === 3) renderImportStage3();
+        else if (stageNum === 4) renderImportStage4();
+        else if (stageNum === 5) renderImportStageReview();
     }
 
     function wizardFooter(opts) {
@@ -2331,16 +2343,15 @@ function importFromDockerManager() {
             result: null
         };
 
-        var modeLabel = importWizard.advancedMode ? '<i class="fa fa-cogs"></i> Advanced' : '<i class="fa fa-cog"></i> Basic';
-        var modeTitle = importWizard.advancedMode ? 'Switch to Basic mode' : 'Switch to Advanced mode';
-
         var modalHtml = '<div id="compose-import-modal-overlay" class="compose-modal-overlay" style="display:flex;">' +
             '<div class="compose-modal import-wizard-modal" role="dialog" aria-modal="true" aria-labelledby="compose-import-modal-title" tabindex="-1">' +
-            '<div class="compose-modal-header">' +
+            '<div class="compose-modal-header" id="compose-import-modal-header">' +
             '<span id="compose-import-modal-title">Import from Docker Manager</span>' +
-            '<button type="button" class="iw-mode-toggle-btn" id="iw-mode-toggle" onclick="iwToggleAdvancedMode()" title="' + modeTitle + '">' + modeLabel + '</button>' +
+            '<div style="display:flex;align-items:center;gap:10px;margin-left:auto;">' +
+            '<input type="checkbox" id="iw-mode-toggle"' + (importWizard.advancedMode ? ' checked' : '') + '>' +
             '<button type="button" class="editor-btn editor-btn-cancel" onclick="closeComposeImportModal()" aria-label="Close modal"><i class="fa fa-times"></i></button>' +
             '</div>' +
+            '</div>' +
             '<div id="compose-import-stepper"></div>' +
             '<div class="compose-modal-body" id="compose-import-modal-body">Loading Docker Manager containers...</div>' +
             '<div class="compose-modal-footer" id="compose-import-modal-footer"></div>' +
@@ -2355,6 +2366,17 @@ function importFromDockerManager() {
             if (overlay) overlay.remove();
         };
 
+        // Initialize Compose-style toggle switch after DOM insertion
+        $('#iw-mode-toggle').switchButton({
+            labels_placement: 'left',
+            on_label: 'Advanced View',
+            off_label: 'Basic View',
+            checked: importWizard.advancedMode
+        });
+        $('#iw-mode-toggle').change(function() {
+            iwSetAdvancedMode($(this).is(':checked'));
+        });
+
         renderImportStage1();
     }
 
diff --git a/source/compose.manager/sheets/ComboButton.css b/source/compose.manager/sheets/ComboButton.css
index dd51d2f..6d54fde 100644
--- a/source/compose.manager/sheets/ComboButton.css
+++ b/source/compose.manager/sheets/ComboButton.css
@@ -904,30 +904,6 @@
     overflow-y: auto;
   }
 
-  /* Basic / Advanced mode toggle button */
-  .iw-mode-toggle-btn {
-    background: transparent;
-    border: 1px solid var(--border-color);
-    color: var(--text-color);
-    padding: 4px 12px;
-    border-radius: 4px;
-    font-size: 0.82rem;
-    cursor: pointer;
-    display: inline-flex;
-    align-items: center;
-    gap: 5px;
-    transition: background 0.15s ease, border-color 0.15s ease;
-  }
-
-  .iw-mode-toggle-btn:hover {
-    background: var(--alt-background-color);
-    border-color: var(--brand-orange);
-  }
-
-  .iw-mode-toggle-btn .fa {
-    font-size: 0.78rem;
-    opacity: 0.7;
-  }
 
   /* Advanced-only sections hidden in basic mode */
   .iw-advanced-section.iw-hidden {

From 9f865cc6d4fb50309f2f64a3435c4c197d4e70e2 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 15:56:06 -0400
Subject: [PATCH 10/40] fix: restore .editor-validation.error CSS rule and fix
 nesting issues

The .editor-validation.error rule was removed and several CSS rules
(.settings-panel, .settings-section, .settings-section-title,
.settings-field) had invalid nesting with unrelated rules embedded inside.

Restores the .editor-validation.error rule and fixes all broken
CSS by removing invalid nesting and restoring proper top-level rules.

Co-authored-by: copilot-pull-request-reviewer[bot]
---
 source/compose.manager/sheets/EditorModal.css | 87 +++++++++----------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/source/compose.manager/sheets/EditorModal.css b/source/compose.manager/sheets/EditorModal.css
index eb28aec..9d89d42 100644
--- a/source/compose.manager/sheets/EditorModal.css
+++ b/source/compose.manager/sheets/EditorModal.css
@@ -172,12 +172,12 @@
 
 .editor-validation.valid {
   color: var(--status-success);
-  .editor-modal-title {
-    font-size: 1.4rem;
-    color: var(--brand-orange);
-    font-weight: bold;
-    margin: 0;
-  }
+}
+
+.editor-validation.error {
+  color: var(--status-error);
+}
+
 .editor-validation-icon {
   margin-right: 8px;
 }
@@ -186,20 +186,20 @@
 .settings-panel {
   position: relative;
   flex: 1;
-  .editor-modal-close {
-    background: none;
-    border: none;
-    color: var(--alt-text-color);
-    font-size: 1.5rem;
-    cursor: pointer;
-    padding: 5px 10px;
-  }
+  overflow-y: auto;
+  padding: 30px 50px;
+  font-size: 1.1rem;
+}
+
+.settings-section {
+  margin-bottom: 35px;
+  background-color: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
   border: 1px solid var(--border-color);
   border-radius: 8px;
   padding: 24px 28px;
-  .editor-modal-close:hover {
-    color: var(--brand-red);
-  }
+}
+
+.settings-section-title {
   font-size: 1.25rem;
   font-weight: 600;
   color: var(--brand-orange);
@@ -210,17 +210,16 @@
   align-items: center;
   gap: 12px;
 }
-  .editor-modal {
-    width: 95%;
-    height: calc(100vh - 40px);
-    max-width: 1400px;
-    background-color: var(--background-color);
-    color: var(--text-color);
-    border-radius: 8px;
-    display: flex;
-    flex-direction: column;
-    border: 1px solid var(--border-color);
-  }
+
+.settings-section-title i {
+  font-size: 1.1rem;
+  opacity: 0.9;
+}
+
+.settings-field {
+  margin-bottom: 24px;
+  position: relative;
+}
 
 .settings-field:last-child {
   margin-bottom: 0;
@@ -230,29 +229,27 @@
   display: block;
   font-weight: 600;
   color: var(--text-color);
-  .editor-modal-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 8px 20px;
-    background-color: var(--dynamix-tablesorter-tbody-row-alt-bg-color);
-    color: var(--text-color);
-    border-bottom: 1px solid var(--border-color);
-    border-radius: 8px 8px 0 0;
-  }
+  margin-bottom: 10px;
+  font-size: 1.05rem;
+}
+
+.settings-field input[type="text"],
+.settings-field input[type="url"],
+.settings-field textarea {
+  width: 100%;
+  max-width: 100%;
   padding: 12px 16px;
   background-color: var(--input-background-color);
   border: 1px solid var(--border-color);
   border-radius: 6px;
   color: var(--text-color);
   font-size: 1.05rem;
-  .editor-modal-footer {
-    background: var(--alt-background-color);
-    color: var(--text-color);
-    padding: 12px 24px;
-    text-align: right;
-    border-top: 1px solid var(--border-color);
-  }
+  box-sizing: border-box;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.settings-field input:hover,
+.settings-field textarea:hover {
   border-color: var(--border-hover-color);
 }
 

From f6100c9134e9949183941c8f9a83f28a5ecf9cd1 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 16:08:01 -0400
Subject: [PATCH 11/40] docs: standardize wizard stage count to 5-stage across
 all files

The UI implements a 5-stage flow (generating + validation merged into
"Review & Import"), but docs and backend comments still referenced a
6-stage workflow. Update all references to 5-stage and merge the
docs for stages 5/6 into a single "Review & Import" stage.

Co-authored-by: copilot-pull-request-reviewer[bot]
---
 docs/import-wizard.md                   | 20 +++++---------------
 source/compose.manager/include/Exec.php |  2 +-
 tests/unit/ImportWizardTest.php         |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/docs/import-wizard.md b/docs/import-wizard.md
index 0e90910..845b917 100644
--- a/docs/import-wizard.md
+++ b/docs/import-wizard.md
@@ -1,6 +1,6 @@
 # Import Wizard
 
-The Import Wizard lets you convert existing Docker Manager containers into a Compose Manager stack with a guided 6-stage workflow.
+The Import Wizard lets you convert existing Docker Manager containers into a Compose Manager stack with a guided 5-stage workflow.
 
 ## Where to Find It
 
@@ -23,7 +23,7 @@ For each selected container, Compose Manager reads Docker metadata and converts
 
 The wizard can also auto-detect likely healthchecks for common services when no healthcheck exists.
 
-## 6-Stage Workflow
+## 5-Stage Workflow
 
 ### Stage 1: Select Containers
 
@@ -77,25 +77,15 @@ Safety checks:
 - Dependency cycles are detected and block progress.
 - A calculated startup order preview is shown when possible.
 
-### Stage 5: Generating
+### Stage 5: Review & Import
 
-Compose Manager generates:
+Compose Manager generates the configuration and presents a final review screen with:
 
-- `docker-compose.yml`
+- `docker-compose.yml` (with parse validation)
 - `.env` content (when needed)
 - Override content for labels/icons (when needed)
-
-The generated Compose YAML is also checked for parse validity.
-
-### Stage 6: Validate Compose
-
-You get a final review screen with:
-
 - Validation result and any parse errors
 - Import summary (services, networks, healthchecks, dependencies)
-- Compose YAML preview
-- Optional `.env` preview
-- Optional override preview
 
 Click **Import** to write files and complete the transfer.
 
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index f4ba988..7d0e87e 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -140,7 +140,7 @@ function getPostScript(): string
         break;
 
     case 'generateImportData':
-        // Rich import data for the 6-stage wizard — returns per-service metadata, port conflicts, networks
+        // Rich import data for the 5-stage wizard — returns per-service metadata, port conflicts, networks
         $containerIds = [];
         if (!empty($_POST['containerIds'])) {
             $data = json_decode($_POST['containerIds'], true);
diff --git a/tests/unit/ImportWizardTest.php b/tests/unit/ImportWizardTest.php
index c19e536..ead315a 100644
--- a/tests/unit/ImportWizardTest.php
+++ b/tests/unit/ImportWizardTest.php
@@ -3,7 +3,7 @@
 /**
  * Unit Tests for Import Wizard backend functions (REAL SOURCE)
  *
- * Tests new functions added for the 6-stage import wizard:
+ * Tests new functions added for the 5-stage import wizard:
  * - guessHealthcheck()
  * - nanosToComposeDuration()
  * - parsePortMapping()

From 7b9713d8935652d410ca8b490d9c5c5b23733e0f Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 16:09:13 -0400
Subject: [PATCH 12/40] fix: preserve numeric types in yamlQuoteValue()

yamlQuoteValue() was casting all values to string before checking
is_numeric(), which caused integer fields like healthcheck.retries
to be emitted as quoted strings ("3") instead of bare numbers (3).
Docker Compose schema validation expects integers for these fields.

Now checks is_int/is_float first and returns them as bare YAML
scalars. Numeric strings (passed as string type) are still quoted
to prevent YAML misinterpretation.

Co-authored-by: copilot-pull-request-reviewer[bot]
---
 source/compose.manager/include/Util.php | 7 +++++++
 tests/unit/ImportWizardTest.php         | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index 0bcc313..0c93f49 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -700,12 +700,19 @@ function dockerContainerToComposeService(array $info): array
 
 /**
  * Quote a YAML scalar value if it contains special characters.
+ *
+ * Preserves native int/float types so that fields like healthcheck.retries
+ * are emitted as bare numbers (3) rather than quoted strings ("3").
  */
 function yamlQuoteValue($value): string
 {
     if (is_bool($value)) {
         return $value ? 'true' : 'false';
     }
+    // Preserve actual numeric types as bare YAML scalars
+    if (is_int($value) || is_float($value)) {
+        return (string)$value;
+    }
     $str = (string)$value;
     if ($str === '') {
         return '""';
diff --git a/tests/unit/ImportWizardTest.php b/tests/unit/ImportWizardTest.php
index ead315a..e2ed432 100644
--- a/tests/unit/ImportWizardTest.php
+++ b/tests/unit/ImportWizardTest.php
@@ -378,7 +378,9 @@ public function testComposeYmlWithHealthcheck(): void
         $this->assertStringContainsString('test:', $yaml);
         $this->assertStringContainsString('CMD-SHELL', $yaml);
         $this->assertStringContainsString('interval: 30s', $yaml);
-        $this->assertMatchesRegularExpression('/retries: "?3"?/', $yaml);
+        $this->assertStringContainsString('retries: 3', $yaml);
+        // Verify retries is NOT quoted (should be bare integer, not "3")
+        $this->assertStringNotContainsString('retries: "3"', $yaml);
     }
 
     public function testComposeYmlWithRemovedHealthcheck(): void

From 4242df727922dd7de09538ccabd34de34f7c9e25 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 16:09:23 -0400
Subject: [PATCH 13/40] fix: disable Import button when compose validation
 fails

The review screen allowed clicking Import even when validation.valid
was false. Since this flow can stop/remove original containers,
proceeding with invalid compose is risky.

Adds actionDisabled support to wizardFooter and disables the Import
button when the generated compose YAML fails validation.

Co-authored-by: copilot-pull-request-reviewer[bot]
---
 source/compose.manager/include/ComposeManager.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 1f6ed18..496ef30 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2320,7 +2320,8 @@ function wizardFooter(opts) {
             right += '<button class="editor-btn editor-btn-save-all" id="import-wizard-next-btn" onclick="' + opts.next + '"' + disabledAttr + '>' + composeEscapeHtml(label) + ' <i class="fa fa-arrow-right"></i></button>';
         }
         if (opts.action) {
-            right += '<button class="editor-btn editor-btn-save-all" onclick="' + opts.action + '">' + composeEscapeHtml(opts.actionLabel || 'Import') + '</button>';
+            var actionDisabledAttr = opts.actionDisabled ? ' disabled' : '';
+            right += '<button class="editor-btn editor-btn-save-all" onclick="' + opts.action + '"' + actionDisabledAttr + '>' + composeEscapeHtml(opts.actionLabel || 'Import') + '</button>';
         }
         return '<div style="display:flex;justify-content:space-between;align-items:center;width:100%;">' +
                '<div>' + left + '</div><div style="display:flex;gap:8px;">' + right + '</div></div>';
@@ -3261,7 +3262,8 @@ function iwRenderReviewContent() {
         $('#compose-import-modal-footer').html(wizardFooter({
             back: backTarget,
             action: 'importWizardConfirmAndPerform()',
-            actionLabel: 'Import'
+            actionLabel: 'Import',
+            actionDisabled: !validation.valid
         }));
 
         // Wire after-import checkbox constraints

From 53325574a84277997717c092164dd30469b661ce Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 16:09:45 -0400
Subject: [PATCH 14/40] fix: check file_put_contents return values before
 stopping containers

performImportTransfer wrote compose/.env/override files via
file_put_contents() without checking for write failures, then
proceeded to stop/remove source containers regardless. This could
cause data loss if files were not written (permissions, full disk).

Now checks return values and aborts with an error before touching
any containers if any file write fails.

Co-authored-by: copilot-pull-request-reviewer[bot]
---
 source/compose.manager/include/Exec.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 7d0e87e..0e3f9a0 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -413,13 +413,22 @@ function getPostScript(): string
                     break;
                 }
             }
-            file_put_contents($composePath, $composeYml);
+            if (file_put_contents($composePath, $composeYml) === false) {
+                echo json_encode(['result' => 'error', 'message' => 'Failed to write compose file']);
+                break;
+            }
         }
         if ($env !== '') {
-            file_put_contents($envPath, $env);
+            if (file_put_contents($envPath, $env) === false) {
+                echo json_encode(['result' => 'error', 'message' => 'Failed to write .env file']);
+                break;
+            }
         }
         if ($override !== '') {
-            file_put_contents($overridePath, $override);
+            if (file_put_contents($overridePath, $override) === false) {
+                echo json_encode(['result' => 'error', 'message' => 'Failed to write override file']);
+                break;
+            }
         }
 
         $containerIds = [];

From 7a8a3d74cb682e07642d31514ce5feef6984f123 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 16:09:53 -0400
Subject: [PATCH 15/40] fix: add rel="noopener noreferrer" to WebUI
 target="_blank" link

The WebUI link in the import wizard container table used
target="_blank" without rel="noopener noreferrer", allowing the
opened page to access window.opener (tabnabbing risk).

Co-authored-by: copilot-pull-request-reviewer[bot]
---
 source/compose.manager/include/ComposeManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 496ef30..85e2ef1 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2407,7 +2407,7 @@ function renderImportStage1() {
             var rows = importWizard.containers.map(function(ct) {
                 var iconHtml = ct.Icon ? '<img src="' + composeEscapeHtml(ct.Icon) + '" style="height:20px;max-width:20px;" />' : '';
                 var urlHtml = (ct.Url && /^https?:\/\//i.test(ct.Url)) ?
-                    '<a href="' + composeEscapeHtml(ct.Url) + '" target="_blank">Link</a>' : '';
+                    '<a href="' + composeEscapeHtml(ct.Url) + '" target="_blank" rel="noopener noreferrer">Link</a>' : '';
                 return '<tr>' +
                     '<td><input type="checkbox" class="cm-import-container" value="' + composeEscapeHtml(ct.Id) + '"></td>' +
                     '<td>' + composeEscapeHtml(ct.Name) + '</td>' +

From e0d0eadabb33a5cc6ffc90b810b72994a92aa71b Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:24:38 -0400
Subject: [PATCH 16/40] fix: reject empty compose content and cleanup orphan
 stack folder on import failure

---
 source/compose.manager/include/Exec.php | 41 +++++++++++++++++--------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 0e3f9a0..fcd751a 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -374,6 +374,11 @@ function getPostScript(): string
             break;
         }
 
+        if ($composeYml === '') {
+            echo json_encode(['result' => 'error', 'message' => 'Compose content is required']);
+            break;
+        }
+
         if ($removeContainers && !$stopContainers) {
             // Enforce logical dependency (remove implies stop)
             $stopContainers = true;
@@ -395,37 +400,47 @@ function getPostScript(): string
             break;
         }
 
+        // Helper to clean up the newly created stack folder on failure
+        $cleanupStack = function () use ($stackInfo) {
+            if (is_dir($stackInfo->path)) {
+                exec('rm -rf ' . escapeshellarg($stackInfo->path));
+                \StackInfo::clearCache();
+            }
+        };
+
         $composePath = $stackInfo->composeFilePath;
         $envPath = $stackInfo->getEnvFilePath() ?? $stackInfo->composeSource . '/.env';
         $overridePath = $stackInfo->getOverridePath() ?: $stackInfo->composeSource . '/docker-compose.override.yml';
 
-        if ($composeYml !== '') {
-            // Validate that the compose content is parseable YAML before writing
-            try {
+        // Validate that the compose content is parseable YAML before writing
+        try {
+            if (function_exists('yaml_parse')) {
                 $parsed = yaml_parse($composeYml);
                 if ($parsed === false) {
                     throw new \Exception('Invalid YAML');
                 }
-            } catch (\Throwable $e) {
-                // yaml_parse may not be available; fall back to basic structure check
-                if (function_exists('yaml_parse')) {
-                    echo json_encode(['result' => 'error', 'message' => 'Generated compose YAML is invalid']);
-                    break;
-                }
-            }
-            if (file_put_contents($composePath, $composeYml) === false) {
-                echo json_encode(['result' => 'error', 'message' => 'Failed to write compose file']);
-                break;
             }
+        } catch (\Throwable $e) {
+            $cleanupStack();
+            echo json_encode(['result' => 'error', 'message' => 'Generated compose YAML is invalid']);
+            break;
+        }
+
+        if (file_put_contents($composePath, $composeYml) === false) {
+            $cleanupStack();
+            echo json_encode(['result' => 'error', 'message' => 'Failed to write compose file']);
+            break;
         }
         if ($env !== '') {
             if (file_put_contents($envPath, $env) === false) {
+                $cleanupStack();
                 echo json_encode(['result' => 'error', 'message' => 'Failed to write .env file']);
                 break;
             }
         }
         if ($override !== '') {
             if (file_put_contents($overridePath, $override) === false) {
+                $cleanupStack();
                 echo json_encode(['result' => 'error', 'message' => 'Failed to write override file']);
                 break;
             }

From ac45d82f82e6c2742c4e26eda3949f92bec1e6fd Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:25:59 -0400
Subject: [PATCH 17/40] fix: use structured data in port conflict detection to
 support port ranges

---
 source/compose.manager/include/Util.php | 27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index 0c93f49..e5165f2 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -470,7 +470,8 @@ function parsePortMapping(string $portStr): array
  */
 function detectPortConflicts(array $services): array
 {
-    $portMap = []; // key: "hostIp:hostPort/protocol" => [serviceName, ...]
+    // Maps grouping key => ['ip' => ..., 'port' => ..., 'proto' => ..., 'services' => [...]]
+    $portMap = [];
 
     foreach ($services as $serviceName => $service) {
         if (empty($service['ports']) || !is_array($service['ports'])) {
@@ -484,20 +485,26 @@ function detectPortConflicts(array $services): array
             // Normalize: treat empty and 0.0.0.0 as equivalent
             $ip = ($parsed['hostIp'] === '' || $parsed['hostIp'] === '0.0.0.0') ? '0.0.0.0' : $parsed['hostIp'];
             $key = "{$ip}:{$parsed['hostPort']}/{$parsed['protocol']}";
-            $portMap[$key][] = $serviceName;
+            if (!isset($portMap[$key])) {
+                $portMap[$key] = [
+                    'hostIp' => $ip,
+                    'hostPort' => $parsed['hostPort'],
+                    'protocol' => $parsed['protocol'],
+                    'services' => [],
+                ];
+            }
+            $portMap[$key]['services'][] = $serviceName;
         }
     }
 
     $conflicts = [];
-    foreach ($portMap as $key => $serviceNames) {
-        if (count($serviceNames) > 1) {
-            // Parse the key back
-            preg_match('/^(.+):(\d+)\/(.+)$/', $key, $m);
+    foreach ($portMap as $entry) {
+        if (count($entry['services']) > 1) {
             $conflicts[] = [
-                'hostIp' => $m[1] ?? '',
-                'hostPort' => $m[2] ?? '',
-                'protocol' => $m[3] ?? '',
-                'services' => array_unique($serviceNames),
+                'hostIp' => $entry['hostIp'],
+                'hostPort' => $entry['hostPort'],
+                'protocol' => $entry['protocol'],
+                'services' => array_values(array_unique($entry['services'])),
             ];
         }
     }

From d2dd2cb5aef0bf914fbf945d61e6bbd357857a1d Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:27:22 -0400
Subject: [PATCH 18/40] fix: auto-seed external networks from discovered
 containers and render per-service unions

---
 .../compose.manager/include/ComposeManager.php   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 85e2ef1..6f524c4 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2473,6 +2473,13 @@ function importWizardStage1Next() {
                         externalNets: meta.networks || []
                     };
                 }
+                // Auto-seed discovered service networks into global externalNetworks list
+                var svcNets = meta.networks || [];
+                svcNets.forEach(function(netName) {
+                    if (importWizard.config.networkConfig.externalNetworks.indexOf(netName) === -1) {
+                        importWizard.config.networkConfig.externalNetworks.push(netName);
+                    }
+                });
                 // Initialize healthcheck from service data
                 if (!importWizard.config.healthchecks.hasOwnProperty(key)) {
                     if (meta.healthcheck) {
@@ -2692,8 +2699,13 @@ function renderImportStage3() {
             html += '</div>';
 
             // Row 2: Network attachments (Advanced)
+            // Build union of global external networks and per-service networks
+            var allExtNets = (netCfg.externalNetworks || []).slice();
+            svcExtNets.forEach(function(n) {
+                if (allExtNets.indexOf(n) === -1) allExtNets.push(n);
+            });
             var stackNetAvailable = netCfg.stackNetwork.enabled && netCfg.stackNetwork.name;
-            var hasExtNets = netCfg.externalNetworks.length > 0;
+            var hasExtNets = allExtNets.length > 0;
             if (stackNetAvailable || hasExtNets) {
                 html += '<div class="import-field iw-advanced-section" style="margin-bottom:14px;"><label>Network Attachments</label>';
                 html += '<div class="import-net-checks iw-svc-nets" data-service="' + composeEscapeHtml(key) + '">';
@@ -2704,7 +2716,7 @@ function renderImportStage3() {
                     html += '<label' + stackDisabledCls + '><input type="checkbox" class="iw-attach-stack" data-service="' + composeEscapeHtml(key) + '"' + stackChecked + stackDisabled + '> ' +
                         composeEscapeHtml(netCfg.stackNetwork.name) + ' <small>(stack)</small></label>';
                 }
-                netCfg.externalNetworks.forEach(function(en) {
+                allExtNets.forEach(function(en) {
                     var extChecked = (svcExtNets.indexOf(en) >= 0 && !isNetModeRestricted) ? ' checked' : '';
                     var extDisabled = isNetModeRestricted ? ' disabled' : '';
                     var extDisabledCls = isNetModeRestricted ? ' class="disabled"' : '';

From 3c52165e810401b65f96b6dbdc9d5a4a3828a032 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:30:19 -0400
Subject: [PATCH 19/40] fix: preserve healthcheck test type (CMD vs CMD-SHELL)
 when command is unchanged

---
 .../include/ComposeManager.php                | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 6f524c4..02d8294 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2482,10 +2482,25 @@ function importWizardStage1Next() {
                 });
                 // Initialize healthcheck from service data
                 if (!importWizard.config.healthchecks.hasOwnProperty(key)) {
+                    var hcData = null;
                     if (meta.healthcheck) {
-                        importWizard.config.healthchecks[key] = meta.healthcheck;
+                        hcData = meta.healthcheck;
                     } else if (meta.guessedHealthcheck) {
-                        importWizard.config.healthchecks[key] = meta.guessedHealthcheck;
+                        hcData = meta.guessedHealthcheck;
+                    }
+                    if (hcData) {
+                        // Store original test type (CMD/CMD-SHELL) and command text for comparison on save
+                        var origType = 'CMD-SHELL';
+                        var origCmd = '';
+                        if (Array.isArray(hcData.test) && hcData.test.length > 0) {
+                            origType = hcData.test[0];
+                            origCmd = hcData.test.slice(1).join(' ');
+                        } else if (typeof hcData.test === 'string') {
+                            origCmd = hcData.test;
+                        }
+                        hcData.__originalTestType = origType;
+                        hcData.__originalTestCmd = origCmd;
+                        importWizard.config.healthchecks[key] = hcData;
                     } else {
                         importWizard.config.healthchecks[key] = null;
                     }
@@ -2767,8 +2782,9 @@ function renderImportStage3() {
             if (hc && hc.test) {
                 testCmd = Array.isArray(hc.test) ? (hc.test.length > 1 ? hc.test.slice(1).join(' ') : hc.test[0]) : hc.test;
             }
+            var origTestCmd = (hc && hc.__originalTestCmd) || '';
             html += '<div class="import-field full-width"><label>Test Command</label>' +
-                '<input type="text" class="iw-hc-test" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(testCmd) + '" placeholder="curl -f http://localhost/ || exit 1"></div>';
+                '<input type="text" class="iw-hc-test" data-service="' + composeEscapeHtml(key) + '" data-original-cmd="' + composeEscapeHtml(origTestCmd) + '" value="' + composeEscapeHtml(testCmd) + '" placeholder="curl -f http://localhost/ || exit 1"></div>';
             html += '<div class="import-field"><label>Interval</label>' +
                 '<input type="text" class="iw-hc-interval" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(hc ? (hc.interval || '30s') : '30s') + '"></div>';
             html += '<div class="import-field"><label>Timeout</label>' +
@@ -2881,10 +2897,18 @@ function iwSaveStage3() {
         });
         // Save healthchecks
         Object.keys(importWizard.services).forEach(function(svc) {
-            var testCmd = $('.iw-hc-test[data-service="' + svc + '"]').val();
+            var $input = $('.iw-hc-test[data-service="' + svc + '"]');
+            var testCmd = $input.val();
             if (testCmd && testCmd.trim()) {
+                // Preserve original test type (CMD/CMD-SHELL) if command text unchanged
+                var origCmd = $input.data('original-cmd') || '';
+                var existingHc = cfg.healthchecks[svc];
+                var testType = 'CMD-SHELL';
+                if (testCmd.trim() === origCmd && existingHc && existingHc.__originalTestType) {
+                    testType = existingHc.__originalTestType;
+                }
                 cfg.healthchecks[svc] = {
-                    test: ['CMD-SHELL', testCmd.trim()],
+                    test: [testType, testCmd.trim()],
                     interval: $('.iw-hc-interval[data-service="' + svc + '"]').val() || '30s',
                     timeout: $('.iw-hc-timeout[data-service="' + svc + '"]').val() || '10s',
                     retries: parseInt($('.iw-hc-retries[data-service="' + svc + '"]').val()) || 3,

From be7ca91b906d41afcfcfffda1ab276cacf786182 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:34:01 -0400
Subject: [PATCH 20/40] fix: use monotonic IDs for dependency rows to prevent
 index collision

---
 source/compose.manager/include/ComposeManager.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 02d8294..7a0b8ad 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2239,6 +2239,8 @@ function(data) {
         result: null        // finalizeImportCompose response
     };
 
+    var iwDepIdCounter = 0;
+
     var WIZARD_STAGES_ALL = [
         { num: 1, label: 'Select Containers' },
         { num: 2, label: 'Stack Options' },
@@ -2343,6 +2345,7 @@ function importFromDockerManager() {
             },
             result: null
         };
+        iwDepIdCounter = 0;
 
         var modalHtml = '<div id="compose-import-modal-overlay" class="compose-modal-overlay" style="display:flex;">' +
             '<div class="compose-modal import-wizard-modal" role="dialog" aria-modal="true" aria-labelledby="compose-import-modal-title" tabindex="-1">' +
@@ -2973,8 +2976,8 @@ function renderImportStage4() {
             html += '<tr><td style="font-weight:600;">' + composeEscapeHtml(key) + '</td>';
             html += '<td><div class="iw-dep-entries" data-service="' + composeEscapeHtml(key) + '">';
             if (svcDeps.length) {
-                svcDeps.forEach(function(d, di) {
-                    html += iwRenderDepRow(key, svcKeys, d, di);
+                svcDeps.forEach(function(d) {
+                    html += iwRenderDepRow(key, svcKeys, d, iwDepIdCounter++);
                 });
             }
             html += '</div>';
@@ -3046,7 +3049,7 @@ function iwWireDepEvents($container) {
     function iwAddDep(svc) {
         var $entries = $('.iw-dep-entries[data-service="' + svc + '"]');
         var allKeys = Object.keys(importWizard.services);
-        var index = $entries.find('.import-dep-row').length;
+        var index = iwDepIdCounter++;
         $entries.append(iwRenderDepRow(svc, allKeys, null, index));
         iwWireDepEvents($entries);
     }

From d38c46bdf0eb9d4d2075c0f9afb84834870ec23f Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:35:55 -0400
Subject: [PATCH 21/40] test: add port range conflict test for
 detectPortConflicts

---
 tests/unit/ImportWizardTest.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/unit/ImportWizardTest.php b/tests/unit/ImportWizardTest.php
index e2ed432..abfb6a0 100644
--- a/tests/unit/ImportWizardTest.php
+++ b/tests/unit/ImportWizardTest.php
@@ -287,6 +287,20 @@ public function testDetectPortConflictsDifferentProtocolNoConflict(): void
         $this->assertEmpty($conflicts);
     }
 
+    public function testDetectPortConflictsPortRange(): void
+    {
+        $services = [
+            'svc1' => ['ports' => ['8000-8005:8000-8005/tcp']],
+            'svc2' => ['ports' => ['8000-8005:9000-9005/tcp']],
+        ];
+        $conflicts = detectPortConflicts($services);
+        $this->assertCount(1, $conflicts);
+        $this->assertEquals('8000-8005', $conflicts[0]['hostPort']);
+        $this->assertEquals('tcp', $conflicts[0]['protocol']);
+        $this->assertContains('svc1', $conflicts[0]['services']);
+        $this->assertContains('svc2', $conflicts[0]['services']);
+    }
+
     // =========================================================
     // dockerServicesToComposeYml() with wizardConfig
     // =========================================================

From 8ddc1129bc42c3593ec2639577e577801d1be28d Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:42:44 -0400
Subject: [PATCH 22/40] test: add exec action tests for all 4 import wizard
 actions

---
 tests/unit/ExecActionsTest.php | 231 +++++++++++++++++++++++++++++++++
 1 file changed, 231 insertions(+)

diff --git a/tests/unit/ExecActionsTest.php b/tests/unit/ExecActionsTest.php
index 473ba7e..9e9741b 100644
--- a/tests/unit/ExecActionsTest.php
+++ b/tests/unit/ExecActionsTest.php
@@ -16,6 +16,7 @@
 
 use PluginTests\TestCase;
 use PluginTests\Mocks\FunctionMocks;
+use PluginTests\Mocks\DockerUtilMock;
 
 
 require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
@@ -113,6 +114,36 @@ private function createTestStack(string $name, array $files = []): string
         return $stackPath;
     }
 
+    /**
+     * Build a minimal Docker inspect-style container array suitable for
+     * DockerUtilMock and dockerContainerToComposeService().
+     */
+    private function makeContainer(string $id, string $name, string $image, array $extra = []): array
+    {
+        return array_replace_recursive([
+            'Id' => $id,
+            'Name' => '/' . $name,
+            'Image' => $image,
+            'Manager' => 'dockerman',
+            'Running' => true,
+            'Status' => 'Up 2 hours',
+            'Config' => [
+                'Image' => $image,
+                'Env' => [],
+                'Labels' => [],
+                'ExposedPorts' => [],
+            ],
+            'HostConfig' => [
+                'PortBindings' => [],
+                'Binds' => [],
+                'RestartPolicy' => ['Name' => ''],
+                'NetworkMode' => 'bridge',
+            ],
+            'Mounts' => [],
+            'NetworkSettings' => ['Networks' => []],
+        ], $extra);
+    }
+
     // ===========================================
     // changeName Action Tests
     // ===========================================
@@ -750,4 +781,204 @@ public function testCheckStackLockReturnsFalseWhenNoLock(): void
         $this->assertEquals('success', $result['result']);
         $this->assertFalse($result['locked']);
     }
+
+    // ===========================================
+    // performImportTransfer Action Tests
+    // ===========================================
+
+    public function testPerformImportTransferMissingStackName(): void
+    {
+        $output = $this->executeAction('performImportTransfer', [
+            'stackName' => '',
+            'composeYml' => "services:\n  web:\n    image: nginx\n",
+        ]);
+
+        $result = json_decode($output, true);
+        $this->assertEquals('error', $result['result']);
+        $this->assertStringContainsString('Stack name is required', $result['message']);
+    }
+
+    public function testPerformImportTransferEmptyCompose(): void
+    {
+        $output = $this->executeAction('performImportTransfer', [
+            'stackName' => 'import-test',
+            'composeYml' => '',
+        ]);
+
+        $result = json_decode($output, true);
+        $this->assertEquals('error', $result['result']);
+        $this->assertStringContainsString('Compose content is required', $result['message']);
+
+        // Stack folder should NOT have been created
+        $this->assertDirectoryDoesNotExist($this->testComposeRoot . '/import-test');
+    }
+
+    public function testPerformImportTransferSuccess(): void
+    {
+        $yaml = "services:\n  web:\n    image: nginx\n";
+
+        $output = $this->executeAction('performImportTransfer', [
+            'stackName' => 'import-ok',
+            'stackDesc' => 'My import',
+            'composeYml' => $yaml,
+        ]);
+
+        $result = json_decode($output, true);
+        $this->assertEquals('success', $result['result']);
+        $this->assertStringContainsString('import-ok', $result['projectPath']);
+
+        // compose file written
+        $composePath = $result['projectPath'] . '/compose.yaml';
+        $this->assertFileExists($composePath);
+        $this->assertEquals($yaml, file_get_contents($composePath));
+    }
+
+    public function testPerformImportTransferWritesEnvAndOverride(): void
+    {
+        $yaml = "services:\n  web:\n    image: nginx\n";
+        $env = "FOO=bar\n";
+        $override = "services:\n  web:\n    labels:\n      - test=1\n";
+
+        $output = $this->executeAction('performImportTransfer', [
+            'stackName' => 'import-extras',
+            'composeYml' => $yaml,
+            'env' => $env,
+            'override' => $override,
+        ]);
+
+        $result = json_decode($output, true);
+        $this->assertEquals('success', $result['result']);
+
+        $basePath = $result['projectPath'];
+        $this->assertEquals($env, file_get_contents($basePath . '/.env'));
+        $this->assertEquals($override, file_get_contents($basePath . '/docker-compose.override.yml'));
+    }
+
+    // ===========================================
+    // getDockerContainersForImport Action Tests
+    // ===========================================
+
+    public function testGetDockerContainersForImportReturnsDockerManOnly(): void
+    {
+        DockerUtilMock::setContainers([
+            'nginx' => $this->makeContainer('abc123', 'nginx', 'nginx:latest'),
+            'compose-svc' => $this->makeContainer('def456', 'compose-svc', 'redis:7', [
+                'Manager' => 'compose',
+            ]),
+        ]);
+
+        $output = $this->executeAction('getDockerContainersForImport');
+        $result = json_decode($output, true);
+
+        $this->assertEquals('success', $result['result']);
+        $this->assertCount(1, $result['containers']);
+        $this->assertEquals('abc123', $result['containers'][0]['Id']);
+    }
+
+    public function testGetDockerContainersForImportEmptyWhenNoCandidates(): void
+    {
+        DockerUtilMock::setContainers([]);
+
+        $output = $this->executeAction('getDockerContainersForImport');
+        $result = json_decode($output, true);
+
+        $this->assertEquals('success', $result['result']);
+        $this->assertEmpty($result['containers']);
+    }
+
+    // ===========================================
+    // generateImportData Action Tests
+    // ===========================================
+
+    public function testGenerateImportDataErrorWhenNoContainers(): void
+    {
+        $output = $this->executeAction('generateImportData', [
+            'containerIds' => json_encode([]),
+        ]);
+        $result = json_decode($output, true);
+        $this->assertEquals('error', $result['result']);
+    }
+
+    public function testGenerateImportDataReturnsServiceMeta(): void
+    {
+        DockerUtilMock::setContainers([
+            'web' => $this->makeContainer('aaa111', 'web', 'nginx:latest', [
+                'Config' => [
+                    'Image' => 'nginx:latest',
+                    'Env' => ['MY_VAR=hello'],
+                    'Labels' => [
+                        'net.unraid.docker.icon' => 'https://example.com/icon.png',
+                    ],
+                    'ExposedPorts' => ['80/tcp' => (object) []],
+                ],
+                'HostConfig' => [
+                    'PortBindings' => [
+                        '80/tcp' => [['HostIp' => '', 'HostPort' => '8080']],
+                    ],
+                    'Binds' => [],
+                    'RestartPolicy' => ['Name' => 'unless-stopped'],
+                    'NetworkMode' => 'bridge',
+                ],
+            ]),
+        ]);
+
+        $output = $this->executeAction('generateImportData', [
+            'containerIds' => json_encode(['aaa111']),
+        ]);
+        $result = json_decode($output, true);
+
+        $this->assertEquals('success', $result['result']);
+        $this->assertArrayHasKey('services', $result);
+        $this->assertArrayHasKey('portConflicts', $result);
+        $this->assertArrayHasKey('networks', $result);
+
+        // Should have exactly one service
+        $this->assertCount(1, $result['services']);
+        $svc = reset($result['services']);
+        $this->assertEquals('nginx:latest', $svc['image']);
+        $this->assertEquals('https://example.com/icon.png', $svc['icon']);
+    }
+
+    // ===========================================
+    // finalizeImportCompose Action Tests
+    // ===========================================
+
+    public function testFinalizeImportComposeErrorWhenNoContainers(): void
+    {
+        $output = $this->executeAction('finalizeImportCompose', [
+            'containerIds' => json_encode([]),
+        ]);
+        $result = json_decode($output, true);
+        $this->assertEquals('error', $result['result']);
+    }
+
+    public function testFinalizeImportComposeReturnsYaml(): void
+    {
+        DockerUtilMock::setContainers([
+            'redis' => $this->makeContainer('bbb222', 'redis', 'redis:7', [
+                'Config' => [
+                    'Image' => 'redis:7',
+                    'Env' => [],
+                    'Labels' => [],
+                    'ExposedPorts' => [],
+                ],
+                'HostConfig' => [
+                    'PortBindings' => [],
+                    'Binds' => [],
+                    'RestartPolicy' => ['Name' => ''],
+                    'NetworkMode' => 'bridge',
+                ],
+            ]),
+        ]);
+
+        $output = $this->executeAction('finalizeImportCompose', [
+            'containerIds' => json_encode(['bbb222']),
+        ]);
+        $result = json_decode($output, true);
+
+        $this->assertEquals('success', $result['result']);
+        $this->assertArrayHasKey('composeYml', $result);
+        $this->assertStringContainsString('redis:7', $result['composeYml']);
+        $this->assertArrayHasKey('validation', $result);
+    }
 }

From 76f574b13e9b633bdcd867e736ef7084694fbb7f Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 21:48:47 -0400
Subject: [PATCH 23/40] fix(tests): trim whitespace from imported YAML and
 environment files in ExecActionsTest

---
 tests/unit/ExecActionsTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/ExecActionsTest.php b/tests/unit/ExecActionsTest.php
index 9e9741b..0162df1 100644
--- a/tests/unit/ExecActionsTest.php
+++ b/tests/unit/ExecActionsTest.php
@@ -827,10 +827,10 @@ public function testPerformImportTransferSuccess(): void
         $this->assertEquals('success', $result['result']);
         $this->assertStringContainsString('import-ok', $result['projectPath']);
 
-        // compose file written
+        // compose file written (trim() in handler strips trailing newline)
         $composePath = $result['projectPath'] . '/compose.yaml';
         $this->assertFileExists($composePath);
-        $this->assertEquals($yaml, file_get_contents($composePath));
+        $this->assertEquals(trim($yaml), file_get_contents($composePath));
     }
 
     public function testPerformImportTransferWritesEnvAndOverride(): void
@@ -850,8 +850,8 @@ public function testPerformImportTransferWritesEnvAndOverride(): void
         $this->assertEquals('success', $result['result']);
 
         $basePath = $result['projectPath'];
-        $this->assertEquals($env, file_get_contents($basePath . '/.env'));
-        $this->assertEquals($override, file_get_contents($basePath . '/docker-compose.override.yml'));
+        $this->assertEquals(trim($env), file_get_contents($basePath . '/.env'));
+        $this->assertEquals(trim($override), file_get_contents($basePath . '/compose.override.yaml'));
     }
 
     // ===========================================

From 7441b4b099b4dddec3630847a0fed6fa520a3feb Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 22:24:48 -0400
Subject: [PATCH 24/40] fix(ports): handle IPv6 port binds in parsePortMapping
 and port generation

---
 .../include/ComposeManager.php                |  3 ++-
 source/compose.manager/include/Util.php       | 21 +++++++++++++++++-
 tests/unit/ImportWizardTest.php               | 22 +++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 7a0b8ad..58813aa 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2750,7 +2750,8 @@ function renderImportStage3() {
                 html += '<div class="import-field" style="margin-bottom:14px;"><label>Ports</label>';
                 html += '<div class="import-port-list">';
                 meta.ports.forEach(function(p) {
-                    var portStr = (p.hostIp && p.hostIp !== '0.0.0.0' ? p.hostIp + ':' : '') + (p.hostPort ? p.hostPort + ':' : '') + p.containerPort + '/' + p.protocol;
+                    var displayIp = (p.hostIp && p.hostIp !== '0.0.0.0') ? (p.hostIp.indexOf(':') !== -1 ? '[' + p.hostIp + ']' : p.hostIp) : '';
+                    var portStr = (displayIp ? displayIp + ':' : '') + (p.hostPort ? p.hostPort + ':' : '') + p.containerPort + '/' + p.protocol;
                     var isConflict = false;
                     conflicts.forEach(function(c) {
                         if (c.hostPort === p.hostPort && c.protocol === p.protocol) isConflict = true;
diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index e5165f2..b70d5cc 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -449,6 +449,23 @@ function parsePortMapping(string $portStr): array
         $portStr = substr($portStr, 0, $slashPos);
     }
 
+    // Handle bracketed IPv6 host IP: [::1]:8080:80
+    if (str_starts_with($portStr, '[')) {
+        $bracketEnd = strpos($portStr, ']');
+        if ($bracketEnd !== false) {
+            $hostIp = substr($portStr, 1, $bracketEnd - 1);
+            $rest = substr($portStr, $bracketEnd + 1); // e.g. ":8080:80"
+            $rest = ltrim($rest, ':');
+            $parts = explode(':', $rest);
+            if (count($parts) === 2) {
+                return ['hostIp' => $hostIp, 'hostPort' => $parts[0], 'containerPort' => $parts[1], 'protocol' => $protocol];
+            }
+            if (count($parts) === 1 && $parts[0] !== '') {
+                return ['hostIp' => $hostIp, 'hostPort' => '', 'containerPort' => $parts[0], 'protocol' => $protocol];
+            }
+        }
+    }
+
     $parts = explode(':', $portStr);
     $count = count($parts);
 
@@ -590,7 +607,9 @@ function dockerContainerToComposeService(array $info): array
                 $hostIp = $bind['HostIp'] ?? '';
                 $hostPort = $bind['HostPort'] ?? '';
                 if ($hostIp !== '' && $hostIp !== '0.0.0.0') {
-                    $ports[] = "{$hostIp}:{$hostPort}:{$privatePort}/{$proto}";
+                    // Bracket IPv6 addresses for valid Compose port syntax
+                    $formattedIp = str_contains($hostIp, ':') ? "[{$hostIp}]" : $hostIp;
+                    $ports[] = "{$formattedIp}:{$hostPort}:{$privatePort}/{$proto}";
                 } elseif ($hostPort !== '') {
                     $ports[] = "{$hostPort}:{$privatePort}/{$proto}";
                 } else {
diff --git a/tests/unit/ImportWizardTest.php b/tests/unit/ImportWizardTest.php
index abfb6a0..f023b79 100644
--- a/tests/unit/ImportWizardTest.php
+++ b/tests/unit/ImportWizardTest.php
@@ -109,6 +109,28 @@ public function testParsePortMappingNoProtocol(): void
         ], $result);
     }
 
+    public function testParsePortMappingIpv6Loopback(): void
+    {
+        $result = parsePortMapping('[::1]:8080:80/tcp');
+        $this->assertEquals([
+            'hostIp' => '::1',
+            'hostPort' => '8080',
+            'containerPort' => '80',
+            'protocol' => 'tcp',
+        ], $result);
+    }
+
+    public function testParsePortMappingIpv6Unspecified(): void
+    {
+        $result = parsePortMapping('[::]:8080:80/tcp');
+        $this->assertEquals([
+            'hostIp' => '::',
+            'hostPort' => '8080',
+            'containerPort' => '80',
+            'protocol' => 'tcp',
+        ], $result);
+    }
+
     // =========================================================
     // guessHealthcheck()
     // =========================================================

From 3c53389436a0345557fae4f73709843dc9cd5d32 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 22:25:54 -0400
Subject: [PATCH 25/40] fix(import): guard against name conflict when starting
 stack without removing containers

---
 source/compose.manager/include/ComposeManager.php | 12 +++++++++++-
 source/compose.manager/include/Exec.php           |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 58813aa..f1910ce 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -3309,9 +3309,19 @@ function iwRenderReviewContent() {
         // Wire after-import checkbox constraints
         $('#iw-remove-containers').on('change', function() {
             if (this.checked) $('#iw-stop-containers').prop('checked', true);
+            if (!this.checked) $('#iw-start-stack').prop('checked', false);
         });
         $('#iw-stop-containers').on('change', function() {
-            if (!this.checked) $('#iw-remove-containers').prop('checked', false);
+            if (!this.checked) {
+                $('#iw-remove-containers').prop('checked', false);
+                $('#iw-start-stack').prop('checked', false);
+            }
+        });
+        $('#iw-start-stack').on('change', function() {
+            if (this.checked) {
+                $('#iw-stop-containers').prop('checked', true);
+                $('#iw-remove-containers').prop('checked', true);
+            }
         });
     }
 
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index fcd751a..dfcd815 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -384,6 +384,11 @@ function getPostScript(): string
             $stopContainers = true;
         }
 
+        if ($startStack && !$removeContainers) {
+            echo json_encode(['result' => 'error', 'message' => 'Cannot start imported stack without removing original containers — container names would conflict']);
+            break;
+        }
+
         try {
             $stackInfo = StackInfo::createNew($compose_root, $stackName, $stackDesc);
         } catch (\RuntimeException $e) {

From ade5bebaec7a42066b75f69c2104cbf05b376df8 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 22:26:46 -0400
Subject: [PATCH 26/40] fix(ui): disable network attachments for bridge network
 mode

---
 source/compose.manager/include/ComposeManager.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index f1910ce..7bafae2 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2679,7 +2679,7 @@ function renderImportStage3() {
             var cName = cfg.containerNames[key] || meta.containerName || key;
             var perSvc = netCfg.perService[key] || {};
             var netMode = perSvc.networkMode || 'default';
-            var isNetModeRestricted = (netMode === 'host' || netMode === 'none');
+            var isNetModeRestricted = (netMode === 'host' || netMode === 'none' || netMode === 'bridge');
             var attachStackNet = perSvc.attachStackNet !== false;
             var svcExtNets = perSvc.externalNets || [];
             var hc = cfg.healthchecks[key];
@@ -2727,6 +2727,9 @@ function renderImportStage3() {
             if (stackNetAvailable || hasExtNets) {
                 html += '<div class="import-field iw-advanced-section" style="margin-bottom:14px;"><label>Network Attachments</label>';
                 html += '<div class="import-net-checks iw-svc-nets" data-service="' + composeEscapeHtml(key) + '">';
+                if (isNetModeRestricted) {
+                    html += '<div style="font-size:0.85rem;color:var(--alt-text-color);margin-bottom:6px;"><i class="fa fa-info-circle"></i> Network attachments unavailable in ' + composeEscapeHtml(netMode) + ' mode</div>';
+                }
                 if (stackNetAvailable) {
                     var stackChecked = (attachStackNet && !isNetModeRestricted) ? ' checked' : '';
                     var stackDisabled = isNetModeRestricted ? ' disabled' : '';
@@ -2818,7 +2821,7 @@ function renderImportStage3() {
         $('.iw-net-mode').on('change', function() {
             var svc = $(this).data('service');
             var mode = this.value;
-            var restricted = (mode === 'host' || mode === 'none');
+            var restricted = (mode === 'host' || mode === 'none' || mode === 'bridge');
             var $nets = $('.iw-svc-nets[data-service="' + svc + '"]');
             $nets.find('input[type="checkbox"]').prop('disabled', restricted);
             if (restricted) {

From 9de43b0827c6277decb8c2692eee75d4beed8cdc Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Mon, 13 Apr 2026 22:27:23 -0400
Subject: [PATCH 27/40] fix(docs): rename docker-compose.yml label to
 compose.yaml in UI and docs

---
 docs/import-wizard.md                             | 2 +-
 source/compose.manager/include/ComposeManager.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/import-wizard.md b/docs/import-wizard.md
index 845b917..2c4377a 100644
--- a/docs/import-wizard.md
+++ b/docs/import-wizard.md
@@ -81,7 +81,7 @@ Safety checks:
 
 Compose Manager generates the configuration and presents a final review screen with:
 
-- `docker-compose.yml` (with parse validation)
+- `compose.yaml` (with parse validation)
 - `.env` content (when needed)
 - Override content for labels/icons (when needed)
 - Validation result and any parse errors
diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 7bafae2..e8aa09b 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -3275,7 +3275,7 @@ function iwRenderReviewContent() {
 
         // YAML preview
         html += '<div class="import-preview-section">' +
-            '<div class="import-preview-section-title">docker-compose.yml</div>' +
+            '<div class="import-preview-section-title">compose.yaml</div>' +
             '<pre class="import-preview-pre" id="iw-yaml-preview">' + composeEscapeHtml(result.composeYml || '') + '</pre>' +
             '</div>';
 

From dae4ec57e922ba51df95e91f907be695bca07610 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 09:37:26 -0400
Subject: [PATCH 28/40] fix: avoid redundant docker stop before docker rm -f in
 import transfer

When both stopContainers and removeContainers are enabled, docker rm -f
already force-stops the container. Running docker stop first is redundant
and doubles shutdown time per container.
---
 source/compose.manager/include/Exec.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index dfcd815..8030789 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -465,12 +465,11 @@ function getPostScript(): string
                 continue;
             }
 
-            if ($stopContainers) {
-                exec('docker stop ' . escapeshellarg($id) . ' 2>&1');
-            }
-
             if ($removeContainers) {
+                // rm -f already force-stops the container; no separate stop needed
                 exec('docker rm -f ' . escapeshellarg($id) . ' 2>&1');
+            } elseif ($stopContainers) {
+                exec('docker stop ' . escapeshellarg($id) . ' 2>&1');
             }
         }
 

From d0abea5605f8d3591a85e70d5a3fdae484884e9f Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 09:38:01 -0400
Subject: [PATCH 29/40] fix: remove dead generateImportPreview action

Superseded by generateImportData which returns richer per-service metadata
for the 5-stage wizard. No frontend callers exist for this action.
---
 source/compose.manager/include/Exec.php | 56 -------------------------
 1 file changed, 56 deletions(-)

diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 8030789..d6ee6ea 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -82,62 +82,6 @@ function getPostScript(): string
         $candidates = getDockerManagerImportCandidates();
         echo json_encode(['result' => 'success', 'containers' => $candidates]);
         break;
-    case 'generateImportPreview':
-        $containerIds = [];
-        if (!empty($_POST['containerIds'])) {
-            $data = json_decode($_POST['containerIds'], true);
-            if (is_array($data)) {
-                $containerIds = $data;
-            }
-        }
-        if (empty($containerIds)) {
-            echo json_encode(['result' => 'error', 'message' => 'No containers selected']);
-            break;
-        }
-
-        $services = [];
-        foreach ($containerIds as $id) {
-            $id = trim($id);
-            if ($id === '') {
-                continue;
-            }
-            $info = getDockerManagerContainerInfo($id);
-            if (empty($info)) {
-                continue;
-            }
-            $converted = dockerContainerToComposeService($info);
-            $name = $converted['name'];
-            $service = $converted['service'];
-
-            $serviceIcon = $info['Config']['Labels']['net.unraid.docker.icon'] ?? '';
-            $serviceWebui = $info['Config']['Labels']['net.unraid.docker.webui'] ?? '';
-            if ($serviceIcon) {
-                $service['icon'] = $serviceIcon;
-            }
-            if ($serviceWebui) {
-                $service['webui'] = $serviceWebui;
-            }
-
-            $originalName = $name;
-            $append = 1;
-            while (isset($services[$name])) {
-                $name = $originalName . '_' . $append;
-                $append++;
-            }
-            $services[$name] = $service;
-        }
-
-        if (empty($services)) {
-            echo json_encode(['result' => 'error', 'message' => 'No valid Docker Manager containers found for import']);
-            break;
-        }
-
-        $env = dockerResolveEnvAndCompose($services);
-        $composeYml = dockerServicesToComposeYml($services);
-        $override = dockerAddOverrideIcons($services);
-
-        echo json_encode(['result' => 'success', 'composeYml' => $composeYml, 'env' => $env, 'override' => $override]);
-        break;
 
     case 'generateImportData':
         // Rich import data for the 5-stage wizard — returns per-service metadata, port conflicts, networks

From 231526afe29c7f574f2508c933ac30e4230552d8 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 09:39:11 -0400
Subject: [PATCH 30/40] fix: prevent __originalTestType leaking into generated
 compose YAML

Frontend stores __originalTestType and __originalTestCmd as metadata inside
healthcheck objects for CMD/CMD-SHELL type preservation. These private keys
leaked through to the YAML emitter because they weren't filtered.

1. Backend: skip __-prefixed keys when emitting healthcheck YAML
2. Frontend: strip __original* keys before sending to finalizeImportCompose
---
 source/compose.manager/include/ComposeManager.php | 14 +++++++++++++-
 source/compose.manager/include/Util.php           |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index e8aa09b..5a4684c 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -3201,12 +3201,24 @@ function renderImportStageReview() {
         $('#compose-import-modal-footer').html('');
 
         var cfg = importWizard.config;
+        // Strip __-prefixed metadata keys from healthchecks before sending
+        var cleanHC = {};
+        Object.keys(cfg.healthchecks).forEach(function(svc) {
+            var hc = cfg.healthchecks[svc];
+            if (hc && typeof hc === 'object') {
+                var clean = {};
+                Object.keys(hc).forEach(function(k) { if (k.indexOf('__') !== 0) clean[k] = hc[k]; });
+                cleanHC[svc] = clean;
+            } else {
+                cleanHC[svc] = hc;
+            }
+        });
         $.post(caURL, {
             action: 'finalizeImportCompose',
             containerIds: JSON.stringify(importWizard.containerIds),
             containerNames: JSON.stringify(cfg.containerNames),
             networkConfig: JSON.stringify(cfg.networkConfig),
-            healthchecks: JSON.stringify(cfg.healthchecks),
+            healthchecks: JSON.stringify(cleanHC),
             dependencies: JSON.stringify(cfg.dependencies)
         }, function(data) {
             var response;
diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index b70d5cc..e02c5b0 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -892,6 +892,10 @@ function dockerServicesToComposeYml(array $services, array $wizardConfig = []):
             if ($key === 'healthcheck' && is_array($value)) {
                 $yaml .= "    healthcheck:\n";
                 foreach ($value as $hcKey => $hcVal) {
+                    // Skip private metadata keys (e.g. __originalTestType)
+                    if (is_string($hcKey) && str_starts_with($hcKey, '__')) {
+                        continue;
+                    }
                     if ($hcKey === 'test' && is_array($hcVal)) {
                         $yaml .= "      test:\n";
                         foreach ($hcVal as $testItem) {

From 8eddc96d0808d47e8a7c7f63eaeba8b1c169fb95 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 09:56:23 -0400
Subject: [PATCH 31/40] fix: escape tab chars in yamlQuoteValue + add
 service-group comments to .env output

---
 source/compose.manager/include/Util.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index e02c5b0..6f317ba 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -750,7 +750,7 @@ function yamlQuoteValue($value): string
         || in_array(strtolower($str), ['true', 'false', 'null', 'yes', 'no', 'on', 'off'], true)
         || is_numeric($str)
     ) {
-        return '"' . str_replace(['\\', '"', "\n"], ['\\\\', '\\"', '\\n'], $str) . '"';
+        return '"' . str_replace(['\\', '"', "\n", "\t"], ['\\\\', '\\"', '\\n', '\\t'], $str) . '"';
     }
     return $str;
 }
@@ -1009,8 +1009,31 @@ function dockerResolveEnvAndCompose(array &$services): string
     }
     unset($service);
 
+    // Build per-service lookup: envKey → [serviceName, ...]
+    $keyServices = [];
+    foreach ($services as $svcName => $svc) {
+        if (!empty($svc['environment']) && is_array($svc['environment'])) {
+            foreach ($svc['environment'] as $entry) {
+                if (preg_match('/^[^=]+=\$\{(.+)\}$/', $entry, $m)) {
+                    $keyServices[$m[1]][] = $svcName;
+                }
+            }
+        }
+    }
+
     $lines = [];
+    $lastServices = null;
     foreach ($globalEnv as $k => $v) {
+        // Add service-group comment when the owning service(s) change
+        $owners = $keyServices[$k] ?? [];
+        sort($owners);
+        if ($owners !== $lastServices) {
+            if (!empty($lines)) {
+                $lines[] = '';
+            }
+            $lines[] = '# ' . implode(', ', $owners);
+            $lastServices = $owners;
+        }
         // Quote values that contain special characters to prevent .env parsing issues
         if (preg_match('/[\s#$"\\\n]/', $v) || $v === '') {
             $escaped = str_replace(['\\', '"', '$', "\n"], ['\\\\', '\\"', '\\$', '\\n'], $v);

From aaa6988fc02efd315b058570e0368c87fefad67a Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 09:58:59 -0400
Subject: [PATCH 32/40] fix: replace inline onclick XSS vectors with data-attr
 + jQuery event delegation

---
 source/compose.manager/include/ComposeManager.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 5a4684c..81d01e5 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2801,7 +2801,7 @@ function renderImportStage3() {
             html += '<div class="import-field"><label>Start Period</label>' +
                 '<input type="text" class="iw-hc-start-period" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(hc ? (hc.start_period || '10s') : '10s') + '"></div>';
             html += '<div class="import-field"><label>&nbsp;</label>' +
-                '<button type="button" class="editor-btn editor-btn-cancel" style="padding:6px 14px;font-size:0.85rem;" onclick="iwRemoveHealthcheck(\'' + composeEscapeHtml(key) + '\')"><i class="fa fa-trash"></i> Remove</button></div>';
+                '<button type="button" class="editor-btn editor-btn-cancel iw-remove-hc-btn" style="padding:6px 14px;font-size:0.85rem;" data-svc="' + composeEscapeHtml(key) + '"><i class="fa fa-trash"></i> Remove</button></div>';
             html += '</div></div>'; // healthcheck section
 
             html += '</div></div>'; // card body + card
@@ -2817,6 +2817,9 @@ function renderImportStage3() {
         }));
 
         // Wire events
+        $('#compose-import-modal-body').off('click.iwHcRm').on('click.iwHcRm', '.iw-remove-hc-btn', function() {
+            iwRemoveHealthcheck($(this).data('svc'));
+        });
         $('.iw-container-name').on('input', iwValidateContainerNames);
         $('.iw-net-mode').on('change', function() {
             var svc = $(this).data('service');
@@ -2985,7 +2988,7 @@ function renderImportStage4() {
                 });
             }
             html += '</div>';
-            html += '<button type="button" class="import-dep-add" onclick="iwAddDep(\'' + composeEscapeHtml(key) + '\')"><i class="fa fa-plus"></i> Add Dependency</button>';
+            html += '<button type="button" class="import-dep-add" data-svc="' + composeEscapeHtml(key) + '"><i class="fa fa-plus"></i> Add Dependency</button>';
             html += '</td><td></td></tr>';
         });
         html += '</tbody></table>';
@@ -3020,7 +3023,7 @@ function iwRenderDepRow(svc, allKeys, dep, index) {
         html += '<option value="service_healthy"' + (condition === 'service_healthy' ? ' selected' : '') + (!hasHC && condition !== 'service_healthy' ? ' disabled' : '') + '>service_healthy' + (!hasHC ? ' (no healthcheck)' : '') + '</option>';
         html += '</select>';
 
-        html += '<button type="button" class="import-dep-remove" onclick="iwRemoveDep(\'' + composeEscapeHtml(svc) + '\',' + index + ')"><i class="fa fa-times"></i></button>';
+        html += '<button type="button" class="import-dep-remove" data-svc="' + composeEscapeHtml(svc) + '" data-index="' + index + '"><i class="fa fa-times"></i></button>';
         html += '</div>';
         return html;
     }
@@ -3048,6 +3051,12 @@ function iwWireDepEvents($container) {
         $container.find('.iw-dep-condition').off('change.iw').on('change.iw', function() {
             iwCheckDependencyCycles();
         });
+        $container.off('click.iwAdd').on('click.iwAdd', '.import-dep-add', function() {
+            iwAddDep($(this).data('svc'));
+        });
+        $container.off('click.iwRm').on('click.iwRm', '.import-dep-remove', function() {
+            iwRemoveDep($(this).data('svc'), $(this).data('index'));
+        });
     }
 
     function iwAddDep(svc) {

From 9e973959130197b0a50dfaf4b5428d3370090793 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 09:59:45 -0400
Subject: [PATCH 33/40] cleanup: remove unused .iw-hidden CSS rule

---
 source/compose.manager/sheets/ComboButton.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/source/compose.manager/sheets/ComboButton.css b/source/compose.manager/sheets/ComboButton.css
index 6d54fde..aca23b0 100644
--- a/source/compose.manager/sheets/ComboButton.css
+++ b/source/compose.manager/sheets/ComboButton.css
@@ -905,11 +905,6 @@
   }
 
 
-  /* Advanced-only sections hidden in basic mode */
-  .iw-advanced-section.iw-hidden {
-    display: none !important;
-  }
-
   .compose-ct-table .ct-col-ip {
     width: 8%;
   }

From b8f3dc34f00a54aa60abb2b5ee16b8b5c4d2cd06 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 13:34:38 -0400
Subject: [PATCH 34/40] fix: improve Docker network listing and add
 buildImportServicesFromIds function for container deduplication

---
 source/compose.manager/include/Util.php | 65 ++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index 6f317ba..33a7eb9 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -536,13 +536,15 @@ function detectPortConflicts(array $services): array
 function getDockerNetworks(): array
 {
     $networks = [];
-    $output = shell_exec("docker network ls --format '{{.Name}}\t{{.Driver}}' 2>/dev/null");
-    if ($output) {
-        foreach (explode("\n", trim($output)) as $line) {
-            $parts = explode("\t", $line);
-            if (count($parts) === 2) {
-                $networks[] = ['name' => $parts[0], 'driver' => $parts[1]];
-            }
+    exec("docker network ls --format '{{.Name}}\t{{.Driver}}' 2>/dev/null", $outputLines, $exitCode);
+    if ($exitCode !== 0) {
+        clientDebug('Failed to list Docker networks (exit code ' . $exitCode . ')', null, 'daemon', 'warning');
+        return [];
+    }
+    foreach ($outputLines as $line) {
+        $parts = explode("\t", $line);
+        if (count($parts) === 2) {
+            $networks[] = ['name' => $parts[0], 'driver' => $parts[1]];
         }
     }
     return $networks;
@@ -724,6 +726,55 @@ function dockerContainerToComposeService(array $info): array
     return ['name' => $serviceName, 'originalName' => $originalName, 'service' => $service];
 }
 
+/**
+ * Fetch, convert, and deduplicate Docker Manager containers into compose services.
+ *
+ * Shared by generateImportData and finalizeImportCompose to avoid duplicating
+ * the container-fetch → convert → label-extract → dedup loop.
+ *
+ * @param string[] $containerIds Docker container IDs to process
+ * @return array{services: array, inspectData: array} services keyed by deduped name,
+ *         inspectData keyed by same name → raw docker inspect array
+ */
+function buildImportServicesFromIds(array $containerIds): array
+{
+    $services = [];
+    $inspectData = [];
+    foreach ($containerIds as $id) {
+        $id = trim($id);
+        if ($id === '') {
+            continue;
+        }
+        $info = getDockerManagerContainerInfo($id);
+        if (empty($info)) {
+            continue;
+        }
+        $converted = dockerContainerToComposeService($info);
+        $name = $converted['name'];
+        $service = $converted['service'];
+
+        $serviceIcon = $info['Config']['Labels']['net.unraid.docker.icon'] ?? '';
+        $serviceWebui = $info['Config']['Labels']['net.unraid.docker.webui'] ?? '';
+        if ($serviceIcon) {
+            $service['icon'] = $serviceIcon;
+        }
+        if ($serviceWebui) {
+            $service['webui'] = $serviceWebui;
+        }
+
+        // Deduplicate service keys
+        $baseName = $name;
+        $append = 1;
+        while (isset($services[$name])) {
+            $name = $baseName . '_' . $append;
+            $append++;
+        }
+        $services[$name] = $service;
+        $inspectData[$name] = $info;
+    }
+    return ['services' => $services, 'inspectData' => $inspectData];
+}
+
 /**
  * Quote a YAML scalar value if it contains special characters.
  *

From 88bed16dac74919aef722d40f64e8a9c79ecce8f Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 13:34:45 -0400
Subject: [PATCH 35/40] fix: refactor container import logic to use
 buildImportServicesFromIds for improved error handling and metadata
 generation

---
 source/compose.manager/include/Exec.php | 185 +++++++++++++++---------
 1 file changed, 116 insertions(+), 69 deletions(-)

diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index d6ee6ea..489f945 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -97,39 +97,24 @@ function getPostScript(): string
             break;
         }
 
-        $services = [];
+        $importResult = buildImportServicesFromIds($containerIds);
+        $services = $importResult['services'];
+        $inspectData = $importResult['inspectData'];
+
+        if ($services === []) {
+            echo json_encode(['result' => 'error', 'message' => 'No valid Docker Manager containers found for import']);
+            break;
+        }
+
+        // Build per-service metadata for the wizard from inspect data
         $servicesMeta = [];
-        foreach ($containerIds as $id) {
-            $id = trim($id);
-            if ($id === '') {
-                continue;
-            }
-            $info = getDockerManagerContainerInfo($id);
-            if (empty($info)) {
-                continue;
-            }
+        foreach ($services as $name => $service) {
+            $info = $inspectData[$name];
             $converted = dockerContainerToComposeService($info);
-            $name = $converted['name'];
-            $service = $converted['service'];
             $origName = $converted['originalName'] ?? $name;
 
             $serviceIcon = $info['Config']['Labels']['net.unraid.docker.icon'] ?? '';
             $serviceWebui = $info['Config']['Labels']['net.unraid.docker.webui'] ?? '';
-            if ($serviceIcon) {
-                $service['icon'] = $serviceIcon;
-            }
-            if ($serviceWebui) {
-                $service['webui'] = $serviceWebui;
-            }
-
-            // Deduplicate service keys
-            $baseName = $name;
-            $append = 1;
-            while (isset($services[$name])) {
-                $name = $baseName . '_' . $append;
-                $append++;
-            }
-            $services[$name] = $service;
 
             // Parse ports into structured data for the frontend
             $parsedPorts = [];
@@ -139,7 +124,6 @@ function getPostScript(): string
                 }
             }
 
-            // Build per-service metadata for the wizard
             $meta = [
                 'originalName' => $origName,
                 'containerName' => $service['container_name'] ?? $name,
@@ -229,38 +213,9 @@ function getPostScript(): string
             }
         }
 
-        // Re-fetch and convert containers (same as generateImportData)
-        $services = [];
-        foreach ($containerIds as $id) {
-            $id = trim($id);
-            if ($id === '') {
-                continue;
-            }
-            $info = getDockerManagerContainerInfo($id);
-            if (empty($info)) {
-                continue;
-            }
-            $converted = dockerContainerToComposeService($info);
-            $name = $converted['name'];
-            $service = $converted['service'];
-
-            $serviceIcon = $info['Config']['Labels']['net.unraid.docker.icon'] ?? '';
-            $serviceWebui = $info['Config']['Labels']['net.unraid.docker.webui'] ?? '';
-            if ($serviceIcon) {
-                $service['icon'] = $serviceIcon;
-            }
-            if ($serviceWebui) {
-                $service['webui'] = $serviceWebui;
-            }
-
-            $baseName = $name;
-            $append = 1;
-            while (isset($services[$name])) {
-                $name = $baseName . '_' . $append;
-                $append++;
-            }
-            $services[$name] = $service;
-        }
+        // Re-fetch and convert containers using shared helper
+        $importResult = buildImportServicesFromIds($containerIds);
+        $services = $importResult['services'];
 
         if (empty($services)) {
             echo json_encode(['result' => 'error', 'message' => 'No valid containers found']);
@@ -359,7 +314,7 @@ function getPostScript(): string
 
         $composePath = $stackInfo->composeFilePath;
         $envPath = $stackInfo->getEnvFilePath() ?? $stackInfo->composeSource . '/.env';
-        $overridePath = $stackInfo->getOverridePath() ?: $stackInfo->composeSource . '/docker-compose.override.yml';
+        $overridePath = $stackInfo->getOverridePath();
 
         // Validate that the compose content is parseable YAML before writing
         try {
@@ -403,17 +358,109 @@ function getPostScript(): string
             }
         }
 
-        foreach ($containerIds as $id) {
-            $id = trim($id);
-            if ($id === '') {
-                continue;
+        // ── Two-phase atomic container operations with full rollback ──
+        if (($stopContainers || $removeContainers) && !empty($containerIds)) {
+            require_once('/usr/local/emhttp/plugins/dynamix.docker.manager/include/Helpers.php');
+            $dockerClient = new \DockerClient();
+            $dockerTemplates = new \DockerTemplates();
+
+            // Pre-snapshot: record each container's state and XML template for rollback
+            $containerSnapshots = [];
+            foreach ($containerIds as $id) {
+                $id = trim($id);
+                if ($id === '') {
+                    continue;
+                }
+                $details = $dockerClient->getContainerDetails($id);
+                if (!is_array($details)) {
+                    continue;
+                }
+                $containerName = ltrim(trim($details['Name'] ?? ''), '/');
+                $state = strtolower($details['State']['Status'] ?? 'unknown');
+                $xmlTemplate = $containerName !== '' ? $dockerTemplates->getUserTemplate($containerName) : false;
+                $containerSnapshots[] = [
+                    'id' => $id,
+                    'name' => $containerName,
+                    'state' => $state,          // running, paused, exited, etc.
+                    'xmlTemplate' => $xmlTemplate, // path or false
+                ];
             }
 
+            // Rollback helper: restart containers that were stopped
+            $rollbackStopped = function (array $stoppedIds) {
+                foreach (array_reverse($stoppedIds) as $sid) {
+                    exec('docker start ' . escapeshellarg($sid) . ' 2>&1');
+                }
+            };
+
+            // Rollback helper: recreate containers that were removed from XML templates
+            $rollbackRemoved = function (array $removedSnapshots) {
+                foreach (array_reverse($removedSnapshots) as $snap) {
+                    if (empty($snap['xmlTemplate'])) {
+                        clientDebug('[import] Cannot restore container ' . $snap['name'] . ': no XML template found', null, 'daemon', 'error');
+                        continue;
+                    }
+                    $cmdResult = xmlToCommand($snap['xmlTemplate']);
+                    if (!is_array($cmdResult) || empty($cmdResult[0])) {
+                        clientDebug('[import] Failed to generate recreate command for ' . $snap['name'], null, 'daemon', 'error');
+                        continue;
+                    }
+                    $cmd = $cmdResult[0];
+                    if ($snap['state'] === 'running') {
+                        $cmd = str_replace('/docker create ', '/docker run -d ', $cmd);
+                    }
+                    exec($cmd . ' 2>&1', $cmdOutput, $exitCode);
+                    if ($exitCode !== 0) {
+                        clientDebug('[import] Failed to recreate container ' . $snap['name'] . ': exit ' . $exitCode, null, 'daemon', 'error');
+                    }
+                }
+            };
+
+            // Phase 1: STOP all running/paused containers
+            $stoppedIds = [];
+            $stopFailed = false;
+            $failedName = '';
+            foreach ($containerSnapshots as $snap) {
+                if ($snap['state'] !== 'running' && $snap['state'] !== 'paused') {
+                    continue; // Already stopped
+                }
+                exec('docker stop ' . escapeshellarg($snap['id']) . ' 2>&1', $stopOutput, $exitCode);
+                if ($exitCode !== 0) {
+                    $stopFailed = true;
+                    $failedName = $snap['name'];
+                    break;
+                }
+                $stoppedIds[] = $snap['id'];
+            }
+
+            if ($stopFailed) {
+                $rollbackStopped($stoppedIds);
+                $cleanupStack();
+                echo json_encode(['result' => 'error', 'message' => 'Failed to stop container "' . $failedName . '". Import rolled back — no containers were changed.']);
+                break;
+            }
+
+            // Phase 2: REMOVE all containers (if requested)
             if ($removeContainers) {
-                // rm -f already force-stops the container; no separate stop needed
-                exec('docker rm -f ' . escapeshellarg($id) . ' 2>&1');
-            } elseif ($stopContainers) {
-                exec('docker stop ' . escapeshellarg($id) . ' 2>&1');
+                $removedSnapshots = [];
+                $rmFailed = false;
+                $failedName = '';
+                foreach ($containerSnapshots as $snap) {
+                    exec('docker rm -f ' . escapeshellarg($snap['id']) . ' 2>&1', $rmOutput, $exitCode);
+                    if ($exitCode !== 0) {
+                        $rmFailed = true;
+                        $failedName = $snap['name'];
+                        break;
+                    }
+                    $removedSnapshots[] = $snap;
+                }
+
+                if ($rmFailed) {
+                    $rollbackRemoved($removedSnapshots);
+                    $cleanupStack();
+                    echo json_encode(['result' => 'error', 'message' => 'Failed to remove container "' . $failedName . '". Import rolled back — containers restored from Docker Manager templates.']);
+                    break;
+                }
             }
         }
 

From 7810930d82ed1569dd8b9edc553335e559f26fcf Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 13:34:53 -0400
Subject: [PATCH 36/40] fix: update attachStackNet logic to simplify network
 mode handling in import wizard

---
 source/compose.manager/include/ComposeManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 81d01e5..d717f30 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2472,7 +2472,7 @@ function importWizardStage1Next() {
                 if (!importWizard.config.networkConfig.perService[key]) {
                     importWizard.config.networkConfig.perService[key] = {
                         networkMode: meta.networkMode || 'default',
-                        attachStackNet: !meta.networkMode || meta.networkMode === 'default' || meta.networkMode === 'bridge',
+                        attachStackNet: !meta.networkMode || meta.networkMode === 'default',
                         externalNets: meta.networks || []
                     };
                 }

From 2798f490681b2165c302121b00f128e961fff941 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 13:34:59 -0400
Subject: [PATCH 37/40] fix: add missing DockerTemplates and xmlToCommand
 messages to phpstan configuration

---
 phpstan.neon | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpstan.neon b/phpstan.neon
index 7c0251e..8b0e78f 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -23,9 +23,14 @@ parameters:
     # Platform classes (Docker management)
     - messages:
         - "#DockerClient#"
+        - "#DockerTemplates#"
         - "#DockerUpdate#"
         - "#DockerUtil#"
       identifier: class.notFound
+    # Platform functions (Docker management)
+    - messages:
+        - "#xmlToCommand#"
+      identifier: function.notFound
     # Global variables from platform/defines.php
     - message: "#Variable \\$\\w+ might not be defined#"
       identifier: variable.undefined

From 90bf74d1462e0498a4c06abbc3bdfd59d56fd000 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 13:39:48 -0400
Subject: [PATCH 38/40] fix: remove error message for empty Docker Manager
 containers in import process

---
 source/compose.manager/include/Exec.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 489f945..3461774 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -150,11 +150,6 @@ function getPostScript(): string
             $servicesMeta[$name] = $meta;
         }
 
-        if (empty($services)) {
-            echo json_encode(['result' => 'error', 'message' => 'No valid Docker Manager containers found for import']);
-            break;
-        }
-
         // Detect port conflicts across all services
         $portConflicts = detectPortConflicts($services);
 

From 3468fde42cd6b02be23bf9eca8e466ae9fe7e1f8 Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 14:21:08 -0400
Subject: [PATCH 39/40] fix: add loading spinner overlay during stack import
 process

---
 .../compose.manager/include/ComposeManager.php  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index d717f30..5b4f7d7 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -3388,6 +3388,15 @@ function importWizardPerform() {
         var cfg = importWizard.config;
         var result = importWizard.result;
 
+        // Close wizard immediately and show a loading spinner overlay
+        closeComposeImportModal();
+        var spinnerHtml = '<div id="compose-import-spinner-overlay" style="position:fixed;inset:0;z-index:100000;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,0.45);">' +
+            '<div style="text-align:center;color:#fff;font-size:1.3em;">' +
+            '<i class="fa fa-spinner fa-spin" style="font-size:2.5em;margin-bottom:12px;display:block;"></i>' +
+            'Importing stack<span id="compose-import-spinner-details">...</span>' +
+            '</div></div>';
+        document.body.insertAdjacentHTML('beforeend', spinnerHtml);
+
         $.post(caURL, {
             action: 'performImportTransfer',
             stackName: cfg.stackName,
@@ -3400,20 +3409,24 @@ function importWizardPerform() {
             override: result.override || '',
             containerIds: JSON.stringify(importWizard.containerIds)
         }, function(data) {
+            var spinner = document.getElementById('compose-import-spinner-overlay');
+            if (spinner) spinner.remove();
+
             var response;
             try { response = JSON.parse(data); } catch (e) { response = { result:'error', message: 'Invalid response' }; }
             if (response.result === 'success') {
-                closeComposeImportModal();
                 composeLoadlist();
                 openEditorModalByProject(response.project, response.projectName);
                 if (response.startStack === 1 && response.projectPath) {
-                    ComposeUp(response.projectPath);
+                    ComposeUpConfirmed(response.projectPath, "", true, true);
                 }
                 swal('Imported', 'Stack imported successfully.', 'success');
             } else {
                 swal('Import failed', response.message || 'Unknown error', 'error');
             }
         }).fail(function() {
+            var spinner = document.getElementById('compose-import-spinner-overlay');
+            if (spinner) spinner.remove();
             swal('Import failed', 'Communication error', 'error');
         });
     }

From a0f00fd929e52b773a35c10a17d9aad36b8f696f Mon Sep 17 00:00:00 2001
From: mstrhakr <mstrhakr@gmail.com>
Date: Tue, 14 Apr 2026 14:34:36 -0400
Subject: [PATCH 40/40] feat(import): enhance network configuration to support
 static IP addresses in Docker services

---
 .../include/ComposeManager.php                | 73 ++++++++++++++++++-
 source/compose.manager/include/Exec.php       |  1 +
 source/compose.manager/include/Util.php       | 66 +++++++++++++++--
 3 files changed, 131 insertions(+), 9 deletions(-)

diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index 5b4f7d7..e0d520b 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -2473,7 +2473,8 @@ function importWizardStage1Next() {
                     importWizard.config.networkConfig.perService[key] = {
                         networkMode: meta.networkMode || 'default',
                         attachStackNet: !meta.networkMode || meta.networkMode === 'default',
-                        externalNets: meta.networks || []
+                        externalNets: meta.networks || [],
+                        ipv4Addresses: meta.networkIPs || {}
                     };
                 }
                 // Auto-seed discovered service networks into global externalNetworks list
@@ -2744,7 +2745,26 @@ function renderImportStage3() {
                     html += '<label' + extDisabledCls + '><input type="checkbox" class="iw-attach-ext" data-service="' + composeEscapeHtml(key) + '" value="' + composeEscapeHtml(en) + '"' + extChecked + extDisabled + '> ' +
                         composeEscapeHtml(en) + ' <small>(external)</small></label>';
                 });
-                html += '</div></div>';
+                html += '</div>';
+
+                // Static IP fields for attached networks
+                var svcIPs = perSvc.ipv4Addresses || {};
+                var attachedNets = [];
+                if (stackNetAvailable && attachStackNet && !isNetModeRestricted) attachedNets.push(netCfg.stackNetwork.name);
+                svcExtNets.forEach(function(n) { if (!isNetModeRestricted) attachedNets.push(n); });
+                if (attachedNets.length > 0) {
+                    html += '<div class="import-ip-fields" data-service="' + composeEscapeHtml(key) + '" style="margin-top:8px;">';
+                    attachedNets.forEach(function(netName) {
+                        var ipVal = svcIPs[netName] || '';
+                        html += '<div style="display:flex;align-items:center;gap:8px;margin-bottom:4px;">' +
+                            '<label style="min-width:120px;font-size:0.85rem;">' + composeEscapeHtml(netName) + ' IP:</label>' +
+                            '<input type="text" class="iw-ipv4-addr" data-service="' + composeEscapeHtml(key) + '" data-network="' + composeEscapeHtml(netName) + '" ' +
+                            'value="' + composeEscapeHtml(ipVal) + '" placeholder="(auto)" style="max-width:180px;font-size:0.85rem;">' +
+                            '</div>';
+                    });
+                    html += '</div>';
+                }
+                html += '</div>';
             }
 
             // Ports (read-only)
@@ -2833,10 +2853,51 @@ function renderImportStage3() {
             } else {
                 $nets.find('label').removeClass('disabled');
             }
+            iwRefreshIpFields(svc);
+        });
+        $('.iw-attach-stack, .iw-attach-ext').on('change', function() {
+            iwRefreshIpFields($(this).data('service'));
         });
         iwValidateContainerNames();
     }
 
+    function iwRefreshIpFields(svc) {
+        var $container = $('.import-ip-fields[data-service="' + svc + '"]');
+        if (!$container.length) return;
+        // Gather currently checked networks
+        var nets = [];
+        var $card = $container.closest('.import-service-card');
+        var mode = $card.find('.iw-net-mode').val();
+        var restricted = (mode === 'host' || mode === 'none' || mode === 'bridge');
+        if (!restricted) {
+            $card.find('.iw-attach-stack:checked').each(function() {
+                var netCfg = importWizard.config.networkConfig;
+                if (netCfg.stackNetwork.enabled && netCfg.stackNetwork.name) {
+                    nets.push(netCfg.stackNetwork.name);
+                }
+            });
+            $card.find('.iw-attach-ext:checked').each(function() { nets.push(this.value); });
+        }
+        // Save existing IP values
+        var existingIPs = {};
+        $container.find('.iw-ipv4-addr').each(function() {
+            existingIPs[$(this).data('network')] = this.value;
+        });
+        // Also check saved config
+        var savedIPs = (importWizard.config.networkConfig.perService[svc] || {}).ipv4Addresses || {};
+        // Rebuild IP fields
+        var html = '';
+        nets.forEach(function(netName) {
+            var ipVal = existingIPs[netName] || savedIPs[netName] || '';
+            html += '<div style="display:flex;align-items:center;gap:8px;margin-bottom:4px;">' +
+                '<label style="min-width:120px;font-size:0.85rem;">' + composeEscapeHtml(netName) + ' IP:</label>' +
+                '<input type="text" class="iw-ipv4-addr" data-service="' + composeEscapeHtml(svc) + '" data-network="' + composeEscapeHtml(netName) + '" ' +
+                'value="' + composeEscapeHtml(ipVal) + '" placeholder="(auto)" style="max-width:180px;font-size:0.85rem;">' +
+                '</div>';
+        });
+        $container.html(html);
+    }
+
     function iwToggleCard(headerEl) {
         $(headerEl).closest('.import-service-card').toggleClass('expanded');
     }
@@ -2904,6 +2965,14 @@ function iwSaveStage3() {
             $('.iw-attach-ext[data-service="' + svc + '"]:checked').each(function() { extNets.push(this.value); });
             if (!cfg.networkConfig.perService[svc]) cfg.networkConfig.perService[svc] = {};
             cfg.networkConfig.perService[svc].externalNets = extNets;
+            // Save static IP addresses
+            var ips = {};
+            $('.iw-ipv4-addr[data-service="' + svc + '"]').each(function() {
+                var net = $(this).data('network');
+                var ip = this.value.trim();
+                if (net && ip) ips[net] = ip;
+            });
+            cfg.networkConfig.perService[svc].ipv4Addresses = ips;
         });
         // Save healthchecks
         Object.keys(importWizard.services).forEach(function(svc) {
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 3461774..8822d25 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -134,6 +134,7 @@ function getPostScript(): string
                 'webui' => $serviceWebui,
                 'networkMode' => $service['network_mode'] ?? null,
                 'networks' => $service['networks'] ?? [],
+                'networkIPs' => $service['__network_ips'] ?? [],
             ];
 
             // Healthcheck info
diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index 33a7eb9..eb96917 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -688,18 +688,27 @@ function dockerContainerToComposeService(array $info): array
         }
     }
 
-    // Extract named networks from NetworkSettings
+    // Extract named networks from NetworkSettings (including static IPs)
     $networks = $info['NetworkSettings']['Networks'] ?? [];
     if (is_array($networks) && !isset($service['network_mode'])) {
         $namedNetworks = [];
-        foreach (array_keys($networks) as $netName) {
+        $networkIPs = [];
+        foreach ($networks as $netName => $netInfo) {
             if (!in_array($netName, ['bridge', 'host', 'none'], true)) {
                 $namedNetworks[] = $netName;
+                // Preserve static IP from IPAMConfig (user-assigned, not DHCP)
+                $staticIP = $netInfo['IPAMConfig']['IPv4Address'] ?? '';
+                if ($staticIP !== '') {
+                    $networkIPs[$netName] = $staticIP;
+                }
             }
         }
         if (!empty($namedNetworks)) {
             $service['networks'] = $namedNetworks;
         }
+        if (!empty($networkIPs)) {
+            $service['__network_ips'] = $networkIPs;
+        }
     }
 
     // Extract exposed ports (for healthcheck guessing)
@@ -837,7 +846,7 @@ function dockerServicesToComposeYml(array $services, array $wizardConfig = []):
     // Internal fields to skip when emitting YAML
     $internalKeys = [
         '__resolved_env', '__exposed_ports', '__guessed_healthcheck',
-        '__healthcheck_source', 'icon', 'webui',
+        '__healthcheck_source', '__network_ips', 'icon', 'webui',
     ];
 
     foreach ($services as $name => $service) {
@@ -862,6 +871,7 @@ function dockerServicesToComposeYml(array $services, array $wizardConfig = []):
                 unset($service['network_mode']);
 
                 $serviceNetworks = [];
+                $svcIPv4 = $svcNetCfg['ipv4Addresses'] ?? [];
                 // Attach to stack network if enabled
                 if ($stackNetEnabled && $stackNetName !== '' && !empty($svcNetCfg['attachStackNet'])) {
                     $serviceNetworks[] = $stackNetName;
@@ -875,7 +885,24 @@ function dockerServicesToComposeYml(array $services, array $wizardConfig = []):
                     }
                 }
                 if (!empty($serviceNetworks)) {
-                    $service['networks'] = $serviceNetworks;
+                    // Use mapping format if any network has a static IP
+                    $hasIPs = false;
+                    foreach ($serviceNetworks as $netName) {
+                        if (!empty($svcIPv4[$netName])) {
+                            $hasIPs = true;
+                            break;
+                        }
+                    }
+                    if ($hasIPs) {
+                        $netMap = [];
+                        foreach ($serviceNetworks as $netName) {
+                            $ip = $svcIPv4[$netName] ?? '';
+                            $netMap[$netName] = $ip !== '' ? ['ipv4_address' => $ip] : null;
+                        }
+                        $service['networks'] = $netMap;
+                    } else {
+                        $service['networks'] = $serviceNetworks;
+                    }
                 } else {
                     unset($service['networks']);
                 }
@@ -915,9 +942,18 @@ function dockerServicesToComposeYml(array $services, array $wizardConfig = []):
 
         // Collect all referenced networks for the top-level block
         if (!empty($service['networks']) && is_array($service['networks'])) {
-            foreach ($service['networks'] as $networkName) {
-                if (!in_array($networkName, $allNetworks, true)) {
-                    $allNetworks[] = $networkName;
+            if (array_is_list($service['networks'])) {
+                foreach ($service['networks'] as $networkName) {
+                    if (!in_array($networkName, $allNetworks, true)) {
+                        $allNetworks[] = $networkName;
+                    }
+                }
+            } else {
+                // Mapping format (network => config or null)
+                foreach (array_keys($service['networks']) as $networkName) {
+                    if (!in_array($networkName, $allNetworks, true)) {
+                        $allNetworks[] = $networkName;
+                    }
                 }
             }
         }
@@ -958,6 +994,22 @@ function dockerServicesToComposeYml(array $services, array $wizardConfig = []):
                 }
                 continue;
             }
+            if ($key === 'networks' && is_array($value) && !array_is_list($value)) {
+                // Networks mapping format with per-network config (e.g. ipv4_address)
+                $yaml .= "    networks:\n";
+                foreach ($value as $netName => $netConfig) {
+                    if (is_array($netConfig) && !empty($netConfig)) {
+                        $yaml .= "      " . $netName . ":\n";
+                        foreach ($netConfig as $nk => $nv) {
+                            $yaml .= "        " . $nk . ": " . yamlQuoteValue($nv) . "\n";
+                        }
+                    } else {
+                        // No config for this network — emit as simple entry
+                        $yaml .= "      " . $netName . ":\n";
+                    }
+                }
+                continue;
+            }
             if (is_string($value) || is_numeric($value) || is_bool($value)) {
                 $yaml .= "    $key: " . yamlQuoteValue($value) . "\n";
             } elseif (is_array($value)) {