diff --git a/source/compose.manager/include/ComposeList.php b/source/compose.manager/include/ComposeList.php
index a176f5a..72fc3c9 100755
--- a/source/compose.manager/include/ComposeList.php
+++ b/source/compose.manager/include/ComposeList.php
@@ -24,38 +24,23 @@
     $composeFile = $stackInfo->composeFilePath ?? ($stackInfo->composeSource . '/' . COMPOSE_FILE_NAMES[0]);
     $overridePath = $stackInfo->getOverridePath();
 
-    // Use StackInfo's getDefinedServices for accurate service count
-    $definedServicesList = $stackInfo->getDefinedServices();
-    $definedServices = count($definedServicesList);
-
-    $projectContainers = $stackInfo->getContainerList();
-    $runningCount = 0;
-    $stoppedCount = 0;
-    $pausedCount = 0;
-    $restartingCount = 0;
-
-    foreach ($projectContainers as $ct) {
-        $ctState = $ct['State'] ?? '';
-        if ($ctState === 'running') {
-            $runningCount++;
-        } elseif ($ctState === 'exited') {
-            $stoppedCount++;
-        } elseif ($ctState === 'paused') {
-            $pausedCount++;
-        } elseif ($ctState === 'restarting') {
-            $restartingCount++;
-        }
-    }
-
-    // Container counts
-    $actualContainerCount = count($projectContainers);
-    $containerCount = $definedServices > 0 ? $definedServices : $actualContainerCount;
+    // getStackState() internally calls getContainerCounts(), which caches
+    // the result.  Calling getContainerCounts() afterwards is free.
+    $stackState = $stackInfo->getStackState();
+    $counts = $stackInfo->getContainerCounts();
+
+    $runningCount = $counts['running'];
+    $stoppedCount = $counts['stopped'];
+    $pausedCount = $counts['paused'];
+    $restartingCount = $counts['restarting'];
+    $actualContainerCount = $counts['total'];
+    $containerCount = $counts['total'];
 
     // Collect container names for the hide-from-docker feature (data attribute)
     $containerNamesList = [];
     // Collect short container IDs for CPU/MEM load mapping (docker stats uses 12-char short IDs)
     $containerIdsList = [];
-    foreach ($projectContainers as $ct) {
+    foreach ($stackInfo->getContainerList() as $ct) {
         $n = $ct['Names'] ?? '';
         if ($n) $containerNamesList[] = $n;
         $ctId = $ct['ID'] ?? '';
@@ -124,24 +109,12 @@
     $hasInvalidIndirect = ($invalidIndirectPath !== null && trim($invalidIndirectPath) !== '');
     $invalidIndirectPathHtml = htmlspecialchars($invalidIndirectPath ?? '', ENT_QUOTES, 'UTF-8');
 
-    // Status like Docker tab (started/stopped with icon)
-    $status = $isrunning ? ($runningCount == $containerCount ? 'started' : 'partial') : 'stopped';
-    // Use exclamation icon for partial state so it looks like a warning
-    if ($status === 'partial') {
-        $shape = 'exclamation-circle';
-    } elseif ($isrunning) {
-        $shape = 'play';
-    } else {
-        $shape = 'square';
-    }
-    $color = $status == 'started' ? 'green-text' : ($status == 'partial' ? 'orange-text' : 'grey-text');
-    // Use 'partial' outer class for partial state to allow correct styling
-    $outerClass = $isrunning ? ($runningCount == $containerCount ? 'started' : 'partial') : 'stopped';
-
-    $statusLabel = $status;
-    if ($status == 'partial') {
-        $statusLabel = "partial ($runningCount/$containerCount)";
-    }
+    // Status icon, label, color — derived from centralized getStackState()
+    $status = $stackState['state'];
+    $shape = $stackState['shape'];
+    $color = $stackState['color'];
+    $outerClass = $status;
+    $statusLabel = $stackState['label'];
 
     // Get stack started_at timestamp via StackInfo
     $stackStartedAt = $stackInfo->getStartedAt();
diff --git a/source/compose.manager/include/ComposeManager.php b/source/compose.manager/include/ComposeManager.php
index c384f77..51e284f 100755
--- a/source/compose.manager/include/ComposeManager.php
+++ b/source/compose.manager/include/ComposeManager.php
@@ -275,6 +275,7 @@ function compose_manager_cpu_spec_count($cpuSpec)
 <script src="<?php autov('/plugins/compose.manager/javascript/js-yaml/js-yaml.min.js'); ?>" type="text/javascript"></script>
 <script src="<?php autov('/plugins/compose.manager/javascript/common.js'); ?>" type="text/javascript"></script>
 <script src="<?php autov('/plugins/compose.manager/javascript/composeSortable.js'); ?>" type="text/javascript"></script>
+<script src="<?php autov('/plugins/compose.manager/javascript/composeStackUtils.js'); ?>" type="text/javascript"></script>
 <script>
     var compose_root = <?php echo json_encode($compose_root); ?>;
     var caURL = "/plugins/compose.manager/include/Exec.php";
@@ -419,7 +420,7 @@ function createStackInfo(project, containers, opts) {
         return {
             projectName: opts.projectName || project,
             containers: normalized,
-            isRunning: (opts.isRunning !== undefined) ? opts.isRunning : isRunning,
+            isRunning: isRunning,
             hasUpdate: (opts.hasUpdate !== undefined) ? opts.hasUpdate : hasUpdate,
             totalServices: opts.totalServices || normalized.length,
             lastChecked: opts.lastChecked || null
@@ -1179,9 +1180,13 @@ function updateUpdateAllButton() {
         var stacksWithUpdates = 0;
         for (var stackName in stackUpdateStatus) {
             var stackInfo = stackUpdateStatus[stackName];
-            if (stackInfo.hasUpdate && stackInfo.isRunning) {
-                stacksWithUpdates++;
-            }
+            if (!stackInfo.hasUpdate) continue;
+            // Derive running state from DOM — saved status may be stale
+            var $row = $('#compose_stacks tr.compose-sortable[data-project="' + stackName + '"]');
+            if ($row.length === 0) continue;
+            var stateText = $row.find('.state').text();
+            var isRunning = stateText.indexOf('started') !== -1 || stateText.indexOf('partial') !== -1;
+            if (isRunning) stacksWithUpdates++;
         }
         $('#updateAllBtn').prop('disabled', stacksWithUpdates === 0);
     }
@@ -1194,24 +1199,26 @@ function updateAllStacks() {
         // Collect all stacks with updates
         for (var stackName in stackUpdateStatus) {
             var stackInfo = stackUpdateStatus[stackName];
-            if (stackInfo.hasUpdate && stackInfo.isRunning) {
-                var $stackRow = $('#compose_stacks tr.compose-sortable[data-project="' + stackName + '"]');
-                if ($stackRow.length === 0) continue;
+            if (!stackInfo.hasUpdate) continue;
+            var $stackRow = $('#compose_stacks tr.compose-sortable[data-project="' + stackName + '"]');
+            if ($stackRow.length === 0) continue;
+            // Derive running state from DOM — saved status may be stale
+            var rowStateText = $stackRow.find('.state').text();
+            if (rowStateText.indexOf('started') === -1 && rowStateText.indexOf('partial') === -1) continue;
 
-                var autostart = $stackRow.find('.auto_start').is(':checked');
+            var autostart = $stackRow.find('.auto_start').is(':checked');
 
-                // Skip if autostart only mode and autostart is not enabled
-                if (autostartOnly && !autostart) continue;
+            // Skip if autostart only mode and autostart is not enabled
+            if (autostartOnly && !autostart) continue;
 
-                var path = $stackRow.data('path');
-                var projectName = $stackRow.data('projectname');
+            var path = $stackRow.data('path');
+            var projectName = $stackRow.data('projectname');
 
-                stacks.push({
-                    project: stackName,
-                    projectName: projectName,
-                    path: path
-                });
-            }
+            stacks.push({
+                project: stackName,
+                projectName: projectName,
+                path: path
+            });
         }
 
         if (stacks.length === 0) {
@@ -1322,25 +1329,15 @@ function updateStackUpdateUI(stackName, stackInfo) {
         var stackId = $stackRow.attr('id').replace('stack-row-', '');
         var $updateCell = $stackRow.find('.compose-updatecolumn');
 
-        // Check if the stack is running - use server response or DOM state
-        var isRunning = stackInfo.isRunning;
-        if (isRunning === undefined) {
-            // Fallback to DOM state check
-            var stateText = $stackRow.find('.state').text();
-            isRunning = stateText.indexOf('started') !== -1 || stateText.indexOf('partial') !== -1;
-        }
-
-        // If the stack is stopped and we have no previously-checked update
-        // data, show "stopped".  But if a prior update check produced valid
-        // container info (images are still on disk), display it — the SHA
-        // comparison is still accurate even when the stack isn't running.
-        var hasCheckedData = stackInfo.containers && stackInfo.containers.length > 0 &&
-            stackInfo.containers.some(function(ct) {
-                return ct.hasUpdate !== undefined || ct.localSha || ct.updateStatus;
-            });
+        // Always derive running state from the current DOM rather than the
+        // stackInfo payload.  The saved update-status file may contain a stale
+        // isRunning value from when the check originally ran (e.g. the stack
+        // was stopped then but has since been started).
+        var stateText = $stackRow.find('.state').text();
+        var isRunning = stateText.indexOf('started') !== -1 || stateText.indexOf('partial') !== -1;
 
-        if (!isRunning && !hasCheckedData) {
-            // Stack is not running and no prior update info - show stopped
+        if (!isRunning) {
+            // Stack is not running - show stopped
             $updateCell.html('<span class="grey-text" style="white-space:nowrap;"><i class="fa fa-stop fa-fw"></i> stopped</span>');
             return;
         }
@@ -1409,8 +1406,10 @@ function updateStackUpdateUI(stackName, stackInfo) {
                 $updateCell.html(html);
             }
         } else {
-            // No containers found - show pull updates as clickable (for stacks that aren't running)
-            $updateCell.html('<a class="exec" style="cursor:pointer;" onclick="showUpdateWarning(\'' + composeEscapeAttr(stackName) + '\', \'' + composeEscapeAttr(stackId) + '\');"><i class="fa fa-cloud-download fa-fw"></i> pull updates</a>');
+            // No containers found in update data — stack is running but
+            // hasn't been checked yet.  Prompt a check rather than an
+            // update so the SHA metadata gets populated first.
+            $updateCell.html('<a class="exec" style="cursor:pointer;" onclick="checkStackUpdates(\'' + composeEscapeAttr(stackName) + '\');"><i class="fa fa-cloud-download fa-fw"></i> check for updates</a>');
         }
 
         // Apply current view mode — cm-advanced elements are controlled by
@@ -1472,8 +1471,7 @@ function checkStackUpdates(stackName) {
                     var response = JSON.parse(data);
                     if (response.result === 'success') {
                         var stackInfo = createStackInfo(stackName, response.updates, {
-                            projectName: response.projectName,
-                            isRunning: true
+                            projectName: response.projectName
                         });
                         stackUpdateStatus[stackName] = stackInfo;
                         updateStackUpdateUI(stackName, stackInfo);
@@ -2992,7 +2990,6 @@ function refreshStackRow(stackId, project) {
                         mergeUpdateStatus(containers, project);
                         // Update cache with fresh data
                         stackContainersCache[stackId] = containers;
-                        stackDefinedServicesCache[stackId] = response.definedServices || containers.length;
                         if (response.startedAt) stackStartedAtCache[stackId] = response.startedAt;
                         // Now update the row using the fresh cache
                         updateParentStackFromContainers(stackId, project);
@@ -3734,7 +3731,6 @@ function ComposeLogs(pathOrProject, profile = "") {
     var currentStackId = null;
     var expandedStacks = {};
     var stackContainersCache = {};
-    var stackDefinedServicesCache = {}; // Cache for defined service counts
     var stackStartedAtCache = {}; // Cache for stack-level started_at timestamps
     // Track stacks currently loading details to prevent concurrent reloads
     var stackDetailsLoading = {};
@@ -4915,7 +4911,6 @@ function loadStackContainerDetails(stackId, project) {
                         mergeUpdateStatus(containers, project);
 
                         stackContainersCache[stackId] = containers;
-                        stackDefinedServicesCache[stackId] = response.definedServices || containers.length;
                         if (response.startedAt) stackStartedAtCache[stackId] = response.startedAt;
                         composeClientDebug('[loadStackContainerDetails] success', {
                             stackId: stackId,
@@ -5227,8 +5222,7 @@ function renderContainerDetails(stackId, containers, project) {
     // Build a condensed stackInfo object from the stackContainersCache for a stack
     function buildStackInfoFromCache(stackId, project) {
         var containers = stackContainersCache[stackId] || [];
-        var definedServices = stackDefinedServicesCache[stackId] || containers.length;
-        return createStackInfo(project, containers, { totalServices: definedServices });
+        return createStackInfo(project, containers);
     }
 
     // Update only the parent stack row using cached container details
@@ -5269,39 +5263,26 @@ function updateParentStackFromContainers(stackId, project) {
             // Update the stack row status icon and state text based on container states
             var $stateEl = $stackRow.find('.state');
             var origText = $stateEl.data('orig-text') || $stateEl.text();
-            // Determine aggregated state
-            var runningCount = stackInfo.containers.filter(function(c) {
-                return c.isRunning;
-            }).length;
-            // Use totalServices (defined services) when available, but never
-            // show a denominator smaller than the currently discovered containers.
-            var totalCount = Math.max(stackInfo.totalServices || 0, stackInfo.containers.length);
+            // Derive state from containers using centralized helper
+            var stateInfo = deriveStackState(stackInfo.containers);
+            var runningCount = stateInfo.runningCount;
+            var totalCount = stateInfo.totalCount;
             var anyRunning = runningCount > 0;
-            var anyPaused = stackInfo.containers.some(function(c) {
-                return !c.isRunning && (c.updateStatus === 'paused' || c.updateStatus === 'paused');
-            });
-            var newState;
-            // If some containers are running but not all, show 'partial' and include counts
-            if (anyRunning && runningCount < totalCount) {
-                newState = 'partial';
-                $stateEl.text('partial (' + runningCount + '/' + totalCount + ')');
-            } else {
-                newState = anyRunning ? 'started' : (anyPaused ? 'paused' : 'stopped');
-                $stateEl.text(newState);
-            }
+            var newState = stateInfo.state;
+            $stateEl.text(stateInfo.label);
 
             // Update the containers count cell to reflect cached values
             try {
                 var $containersCell = $stackRow.find('td.col-containers');
-                var containersClass = (runningCount == totalCount && runningCount > 0) ? 'green-text' : (runningCount > 0 ? 'orange-text' : 'grey-text');
+                var containersClass = stateInfo.colorClass;
                 $containersCell.html('<span class="' + containersClass + '">' + runningCount + ' / ' + totalCount + '</span>');
             } catch (e) {}
 
             // Update the status icon to match the new state and color
             var $icon = $stackRow.find('.compose-status-icon');
             if ($icon.length) {
-                var shape = newState === 'started' ? 'play' : (newState === 'paused' ? 'pause' : (newState === 'partial' ? 'exclamation-circle' : 'square'));
-                var colorClass = newState === 'started' ? 'green-text' : (newState === 'paused' || newState === 'partial' ? 'orange-text' : 'grey-text');
+                var shape = stateInfo.shape;
+                var colorClass = stateInfo.colorClass;
 
                 // Remove spinner / temporary classes and any previous fa-<name> classes
                 $icon.removeClass('fa-refresh fa-spin compose-status-spinner');
diff --git a/source/compose.manager/include/DashboardStacks.php b/source/compose.manager/include/DashboardStacks.php
index 027e59b..4c53e3e 100644
--- a/source/compose.manager/include/DashboardStacks.php
+++ b/source/compose.manager/include/DashboardStacks.php
@@ -34,35 +34,27 @@
 foreach (StackInfo::allFromRoot($compose_root) as $stackInfo) {
     $summary['total']++;
 
-    $projectContainers = $stackInfo->getContainerList();
-    $runningCount = 0;
-    $totalContainers = count($projectContainers);
+    // Centralized stack state
+    $stackState = $stackInfo->getStackState();
+    $state = $stackState['state'];
+    $runningCount = $stackState['running'];
+    $totalContainers = $stackState['total'];
 
     // Read stack started_at timestamp via StackInfo
     $startedAt = $stackInfo->getStartedAt();
 
-    foreach ($projectContainers as $ct) {
-        if (($ct['State'] ?? '') === 'running') {
-            $runningCount++;
-        }
-        // Collect container names for hiding from Docker tile
+    // Collect container names for hiding from Docker tile
+    foreach ($stackInfo->getContainerList() as $ct) {
         $name = ltrim(trim($ct['Names'] ?? ''), '/');
         if ($name) {
             $summary['composeContainerNames'][] = $name;
         }
     }
 
-    $state = 'stopped';
-    if ($totalContainers > 0) {
-        if ($runningCount === $totalContainers) {
-            $state = 'started';
-            $summary['started']++;
-        } elseif ($runningCount > 0) {
-            $state = 'partial';
-            $summary['partial']++;
-        } else {
-            $summary['stopped']++;
-        }
+    if ($state === 'started') {
+        $summary['started']++;
+    } elseif ($state === 'partial' || $state === 'paused') {
+        $summary['partial']++;
     } else {
         $summary['stopped']++;
     }
diff --git a/source/compose.manager/include/Exec.php b/source/compose.manager/include/Exec.php
index 2696660..428c6dd 100644
--- a/source/compose.manager/include/Exec.php
+++ b/source/compose.manager/include/Exec.php
@@ -582,9 +582,8 @@ function getPostScript(): string
             $updateStatusData = json_decode(file_get_contents($updateStatusFile), true) ?: [];
         }
 
-        // Get defined service count via StackInfo
-        $definedServicesList = $stackInfo->getDefinedServices();
-        $definedServices = count($definedServicesList);
+        // Get stack state via centralized StackInfo method
+        $stackState = $stackInfo->getStackState();
 
         foreach ($rows as $rawContainer) {
             // Get additional details using docker inspect
@@ -731,7 +730,7 @@ function getPostScript(): string
             $containers[] = ContainerInfo::fromDockerInspect($rawContainer)->toArray();
         }
 
-        echo json_encode(['result' => 'success', 'containers' => $containers, 'definedServices' => $definedServices, 'projectName' => $stackInfo->projectFolder, 'startedAt' => $stackInfo->getStartedAt()]);
+        echo json_encode(['result' => 'success', 'containers' => $containers, 'stackState' => $stackState, 'projectName' => $stackInfo->projectFolder, 'startedAt' => $stackInfo->getStartedAt()]);
         break;
     case 'getProfileServices':
         // Returns the list of services that docker compose would act on for the
@@ -917,7 +916,6 @@ function getPostScript(): string
 
             $stackUpdates = [];
             $hasStackUpdate = false;
-            $isRunning = false;
 
             if ($rows) {
                 // Load once, batch-clear local SHAs, save once (avoid per-container I/O)
@@ -928,7 +926,6 @@ function getPostScript(): string
                 foreach ($rows as $container) {
                     $state = $container['State'] ?? '';
                     if ($state === 'running') {
-                        $isRunning = true;
                         $image = $container['Image'] ?? '';
                         if ($image) {
                             $image = normalizeImageForUpdateCheck($image);
@@ -995,7 +992,6 @@ function getPostScript(): string
             $allUpdates[$stackName] = [
                 'projectName' => $projectName,
                 'hasUpdate' => $hasStackUpdate,
-                'isRunning' => $isRunning,
                 'containers' => $stackUpdates
             ];
         }
diff --git a/source/compose.manager/include/Helpers.php b/source/compose.manager/include/Helpers.php
index dca7935..5a8a3e3 100644
--- a/source/compose.manager/include/Helpers.php
+++ b/source/compose.manager/include/Helpers.php
@@ -252,10 +252,28 @@ function echoComposeCommandMultiple($action, $paths, $background = false)
             $composeCommand[] = "-e" . $envFilePath;
         }
 
-        // Add default profiles for multi-stack operations
-        $defaultProfiles = $stackInfo->getDefaultProfiles();
-        foreach ($defaultProfiles as $p) {
-            $composeCommand[] = "-g" . $p;
+        // Profile selection per action:
+        //  - up:     use user-configured default profiles (running_profiles
+        //            is stale/absent when the stack isn't running).
+        //  - update: preserve the currently active profile set so the same
+        //            services are recreated; fall back to defaults on first run.
+        //  - down:   wildcard * ensures every profiled service is torn down,
+        //            regardless of what was recorded or configured.
+        if ($action === 'down') {
+            $composeCommand[] = "-g*";
+        } elseif ($action === 'update') {
+            $profiles = $stackInfo->getRunningProfiles();
+            if (empty($profiles)) {
+                $profiles = $stackInfo->getDefaultProfiles();
+            }
+            foreach ($profiles as $p) {
+                $composeCommand[] = "-g" . $p;
+            }
+        } else {
+            // 'up' and any future actions
+            foreach ($stackInfo->getDefaultProfiles() as $p) {
+                $composeCommand[] = "-g" . $p;
+            }
         }
 
         // Pass stack path for timestamp saving
diff --git a/source/compose.manager/include/Util.php b/source/compose.manager/include/Util.php
index cce24c1..d50cd3e 100644
--- a/source/compose.manager/include/Util.php
+++ b/source/compose.manager/include/Util.php
@@ -1044,6 +1044,9 @@ class StackInfo
     /** @var array[]|null Per-instance lazy cache of docker compose ps rows (null = not yet fetched) */
     private ?array $cachedContainerList = null;
 
+    /** @var array|null Cached aggregate container state counts */
+    private ?array $cachedContainerCounts = null;
+
     /**
      * Pre-populate the container list cache for this stack.
      *
@@ -1055,6 +1058,7 @@ class StackInfo
     public function setContainerList(array $containers): void
     {
         $this->cachedContainerList = $containers;
+        $this->cachedContainerCounts = null; // invalidate derived cache
     }
 
     /**
@@ -1358,6 +1362,23 @@ public function getDefaultProfiles(): array
         return array_values(array_filter(array_map('trim', explode(',', $raw))));
     }
 
+    /**
+     * Get the profiles that were active when the stack was last started/updated.
+     *
+     * Reads the `running_profiles` metadata file written by compose.sh on
+     * successful `up` or `update` operations.
+     *
+     * @return string[]
+     */
+    public function getRunningProfiles(): array
+    {
+        $raw = $this->readMetadata('running_profiles');
+        if ($raw === null || $raw === '') {
+            return [];
+        }
+        return array_values(array_filter(array_map('trim', explode(',', $raw))));
+    }
+
     /**
      * Get autostart flag (from `autostart` file).
      * @return bool
@@ -2163,6 +2184,101 @@ public function getContainers(): array
         );
     }
 
+    /**
+     * Get aggregate container state counts for this stack.
+     *
+     * Counts are based on actually created containers (from docker ps),
+     * not on the services defined in the compose file. This means
+     * services in inactive profiles are excluded from the total.
+     *
+     * @return array{running: int, stopped: int, paused: int, restarting: int, total: int}
+     */
+    public function getContainerCounts(): array
+    {
+        if ($this->cachedContainerCounts !== null) {
+            return $this->cachedContainerCounts;
+        }
+
+        $counts = ['running' => 0, 'stopped' => 0, 'paused' => 0, 'restarting' => 0, 'total' => 0];
+
+        foreach ($this->getContainerList() as $ct) {
+            $counts['total']++;
+            $state = $ct['State'] ?? '';
+            if ($state === 'running') {
+                $counts['running']++;
+            } elseif ($state === 'paused') {
+                $counts['paused']++;
+            } elseif ($state === 'restarting') {
+                $counts['restarting']++;
+            } else {
+                // Any created but non-running/non-paused/non-restarting
+                // container state is treated as stopped.
+                $counts['stopped']++;
+            }
+        }
+
+        $this->cachedContainerCounts = $counts;
+        return $counts;
+    }
+
+    /**
+     * Derive the display state of this stack from its container counts.
+     *
+     * Returns everything needed to render the status icon, label, and
+     * colour class in both the stack list and the dashboard tile.
+     *
+     * @return array{state: string, label: string, shape: string, color: string, running: int, total: int}
+     */
+    public function getStackState(): array
+    {
+        $counts = $this->getContainerCounts();
+        $running = $counts['running'];
+        $total   = $counts['total'];
+
+        if ($running > 0 && $running < $total) {
+            $state = 'partial';
+        } elseif ($running > 0) {
+            $state = 'started';
+        } elseif ($counts['paused'] > 0 && $total > 0) {
+            $state = 'paused';
+        } else {
+            $state = 'stopped';
+        }
+
+        $label = $state;
+        if ($state === 'partial') {
+            $label = "partial ($running/$total)";
+        }
+
+        switch ($state) {
+            case 'started':
+                $shape = 'play';
+                $color = 'green-text';
+                break;
+            case 'partial':
+                $shape = 'exclamation-circle';
+                $color = 'orange-text';
+                break;
+            case 'paused':
+                $shape = 'pause';
+                $color = 'orange-text';
+                break;
+            default: // stopped
+                $shape = 'square';
+                $color = 'grey-text';
+                break;
+        }
+
+        return [
+            'state'   => $state,
+            'label'   => $label,
+            'shape'   => $shape,
+            'color'   => $color,
+            'running' => $running,
+            'total'   => $total,
+        ];
+    }
+
     /**
      * Find a StackInfo by its compose source path.
      *
diff --git a/source/compose.manager/javascript/composeStackUtils.js b/source/compose.manager/javascript/composeStackUtils.js
new file mode 100644
index 0000000..1ae5751
--- /dev/null
+++ b/source/compose.manager/javascript/composeStackUtils.js
@@ -0,0 +1,73 @@
+/**
+ * Compose Stack Utilities
+ *
+ * Shared helpers for stack status derivation and related display logic.
+ * Mirrors the PHP StackInfo::getStackState() / getContainerCounts() methods
+ * so the live-refresh JS path stays consistent with server-rendered state.
+ */
+
+/**
+ * Derive the aggregate display state of a stack from its containers.
+ *
+ * @param {Array} containers - Array of normalized container objects (must have `isRunning` boolean)
+ * @returns {{state: string, runningCount: number, totalCount: number, label: string, shape: string, colorClass: string}}
+ */
+function deriveStackState(containers) {
+    containers = containers || [];
+
+    var runningCount = 0;
+    var totalCount = containers.length;
+
+    for (var i = 0; i < totalCount; i++) {
+        if (containers[i] && containers[i].isRunning) {
+            runningCount++;
+        }
+    }
+
+    var state;
+    if (runningCount > 0 && runningCount < totalCount) {
+        state = 'partial';
+    } else if (runningCount > 0) {
+        state = 'started';
+    } else {
+        // Check for paused containers
+        var anyPaused = containers.some(function(c) {
+            return c && !c.isRunning && c.state === 'paused';
+        });
+        state = (anyPaused && totalCount > 0) ? 'paused' : 'stopped';
+    }
+
+    var label = state;
+    if (state === 'partial') {
+        label = 'partial (' + runningCount + '/' + totalCount + ')';
+    }
+
+    var shape, colorClass;
+    switch (state) {
+        case 'started':
+            shape = 'play';
+            colorClass = 'green-text';
+            break;
+        case 'partial':
+            shape = 'exclamation-circle';
+            colorClass = 'orange-text';
+            break;
+        case 'paused':
+            shape = 'pause';
+            colorClass = 'orange-text';
+            break;
+        default: // stopped
+            shape = 'square';
+            colorClass = 'grey-text';
+            break;
+    }
+
+    return {
+        state: state,
+        runningCount: runningCount,
+        totalCount: totalCount,
+        label: label,
+        shape: shape,
+        colorClass: colorClass
+    };
+}
diff --git a/source/compose.manager/scripts/compose.sh b/source/compose.manager/scripts/compose.sh
index fb3a232..1815554 100755
--- a/source/compose.manager/scripts/compose.sh
+++ b/source/compose.manager/scripts/compose.sh
@@ -182,9 +182,20 @@ case $command in
     exit_code=$?
     
     if [ $exit_code -eq 0 ]; then
-      # Save stack started timestamp
+      # Save stack started timestamp and running profiles
       if [ -n "$stack_path" ] && [ -d "$stack_path" ]; then
         date -Iseconds > "$stack_path/started_at"
+        # Persist which profiles were used for this run so update operations
+        # can target the same set of services.
+        running_names=()
+        for (( i=0; i<${#profile_args[@]}; i+=2 )); do
+          running_names+=("${profile_args[$((i+1))]}")
+        done
+        if [ ${#running_names[@]} -gt 0 ]; then
+          printf '%s\n' "$(IFS=,; echo "${running_names[*]}")" > "$stack_path/running_profiles"
+        else
+          rm -f "$stack_path/running_profiles"
+        fi
       fi
       save_result "success" $exit_code "up"
       echo ""
@@ -206,6 +217,10 @@ case $command in
     exit_code=$?
     
     if [ $exit_code -eq 0 ]; then
+      # Clear running profiles on successful down
+      if [ -n "$stack_path" ] && [ -d "$stack_path" ]; then
+        rm -f "$stack_path/running_profiles"
+      fi
       save_result "success" $exit_code "down"
       echo ""
       echo "✓ Stack $name stopped successfully"
@@ -306,9 +321,18 @@ case $command in
         docker rmi "${images[@]}" 2>/dev/null || true
       fi
       
-      # Save stack started timestamp after update
+      # Save stack started timestamp and running profiles after update
       if [ -n "$stack_path" ] && [ -d "$stack_path" ]; then
         date -Iseconds > "$stack_path/started_at"
+        running_names=()
+        for (( i=0; i<${#profile_args[@]}; i+=2 )); do
+          running_names+=("${profile_args[$((i+1))]}")
+        done
+        if [ ${#running_names[@]} -gt 0 ]; then
+          printf '%s\n' "$(IFS=,; echo "${running_names[*]}")" > "$stack_path/running_profiles"
+        else
+          rm -f "$stack_path/running_profiles"
+        fi
       fi
       save_result "success" 0 "update"
       echo ""
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 00181c9..18093a0 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -49,6 +49,30 @@ function clientDebug($message, $data = null, $type = 'daemon', $level = 'info'):
     ]
 );
 
+// Map compose.manager writable support paths to a temp-backed plugin root.
+// The framework auto-maps PHP source files under include/, but tests that
+// create helper scripts or cron files under plugin_root need explicit file
+// mappings in CI where /usr/local/emhttp/... does not exist on disk.
+$pluginTempRoot = sys_get_temp_dir() . '/compose_manager_plugin_testfs';
+$pluginTempScripts = $pluginTempRoot . '/scripts';
+$pluginTempPhp = $pluginTempRoot . '/php';
+
+foreach ([$pluginTempRoot, $pluginTempScripts, $pluginTempPhp] as $dir) {
+    if (!is_dir($dir)) {
+        mkdir($dir, 0755, true);
+    }
+}
+
+UnraidStreamWrapper::addMappings([
+    '/usr/local/emhttp/plugins/compose.manager' => $pluginTempRoot,
+    '/usr/local/emhttp/plugins/compose.manager/scripts' => $pluginTempScripts,
+    '/usr/local/emhttp/plugins/compose.manager/php' => $pluginTempPhp,
+    '/usr/local/emhttp/plugins/compose.manager/autoupdate.json' => $pluginTempRoot . '/autoupdate.json',
+    '/usr/local/emhttp/plugins/compose.manager/compose_manager_autoupdate' => $pluginTempRoot . '/compose_manager_autoupdate',
+    '/usr/local/emhttp/plugins/compose.manager/scripts/compose_autoupdate.sh' => $pluginTempScripts . '/compose_autoupdate.sh',
+    '/usr/local/emhttp/plugins/compose.manager/php/sh_wrapper.php' => $pluginTempPhp . '/sh_wrapper.php',
+]);
+
 // Set up test compose projects directory
 $testComposeRoot = sys_get_temp_dir() . '/compose_test_projects';
 if (!is_dir($testComposeRoot)) {
diff --git a/tests/framework b/tests/framework
index 75cf325..01aac4b 160000
--- a/tests/framework
+++ b/tests/framework
@@ -1 +1 @@
-Subproject commit 75cf3250c22fd31bf123fdee7a44ea601da7379c
+Subproject commit 01aac4b586ce269c4149ef9e87b6f5763276deee
diff --git a/tests/unit/AutoupdateTest.php b/tests/unit/AutoupdateTest.php
index 6c21525..fbb4c35 100644
--- a/tests/unit/AutoupdateTest.php
+++ b/tests/unit/AutoupdateTest.php
@@ -9,6 +9,8 @@
 
 class AutoupdateTest extends TestCase
 {
+    private ?string $wrapperPath = null;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -19,16 +21,16 @@ protected function setUp(): void
         if (is_file($plugin_root . 'autoupdate.json')) unlink($plugin_root . 'autoupdate.json');
         // Ensure scripts path exists
         if (!is_dir($plugin_root . 'scripts')) mkdir($plugin_root . 'scripts', 0755, true);
-        // Ensure php helper path exists for test shim
-        if (!is_dir($plugin_root . 'php')) mkdir($plugin_root . 'php', 0755, true);
-        // create a simple PHP shim that will be invoked instead of a real `sh` during tests
+
+        // Use a real temp file for the shell wrapper so child processes can execute it in CI.
+        $this->wrapperPath = sys_get_temp_dir() . '/autoupdate_test_wrapper_' . getmypid() . '_' . uniqid('', true) . '.php';
         $shim = <<<'PHP'
     <?php
     $marker = getenv('AUTOTEST_MARKER');
     if ($marker) file_put_contents($marker, "OK\n");
     exit(0);
     PHP;
-        file_put_contents($plugin_root . 'php/sh_wrapper.php', $shim);
+        file_put_contents($this->wrapperPath, $shim);
         // redirect cron writes to plugin root in tests
         putenv('COMPOSE_MANAGER_CRON_DIR=' . $plugin_root);
     }
@@ -39,6 +41,10 @@ protected function tearDown(): void
         putenv('COMPOSE_MANAGER_SH');
         putenv('AUTOTEST_MARKER');
         putenv('COMPOSE_MANAGER_AUTOUPDATE_FILE');
+        if ($this->wrapperPath !== null && is_file($this->wrapperPath)) {
+            unlink($this->wrapperPath);
+        }
+        $this->wrapperPath = null;
         $_POST = [];
         parent::tearDown();
     }
@@ -82,8 +88,7 @@ public function testRunNowExecutesScript(): void
 
         // configure test shim so the autoupdate code executes our PHP wrapper instead of a system sh
         putenv('AUTOTEST_MARKER=' . $marker);
-        $wrapper = $plugin_root . 'php/sh_wrapper.php';
-        putenv('COMPOSE_MANAGER_SH=' . PHP_BINARY . ' ' . escapeshellarg($wrapper));
+        putenv('COMPOSE_MANAGER_SH=' . PHP_BINARY . ' ' . escapeshellarg((string)$this->wrapperPath));
 
         $_POST = ['action' => 'runNow', 'path' => $tmp];
         ob_start(); include '/usr/local/emhttp/plugins/compose.manager/include/AutoUpdate.php'; $out = ob_get_clean();
diff --git a/tests/unit/ComposeListHtmlTest.php b/tests/unit/ComposeListHtmlTest.php
index 7623b92..4e771a0 100644
--- a/tests/unit/ComposeListHtmlTest.php
+++ b/tests/unit/ComposeListHtmlTest.php
@@ -163,4 +163,22 @@ public function testStatusIconHasDataAttribute(): void
         $this->assertStringContainsString("data-status='", $source);
         $this->assertStringContainsString('compose-status-icon', $source);
     }
+
+    // ===========================================
+    // Regression Tests
+    // ===========================================
+
+    /**
+     * Regression: Container ID/name collection must use $stackInfo->getContainerList(),
+     * not an undefined $projectContainers variable. Without this, data-ctids is empty
+     * and CPU/memory stats don't display on page load.
+     */
+    public function testContainerIterationUsesStackInfoGetContainerList(): void
+    {
+        $source = $this->getPageSource();
+        $this->assertStringContainsString('$stackInfo->getContainerList()', $source,
+            'Container loop must use $stackInfo->getContainerList(), not $projectContainers');
+        $this->assertStringNotContainsString('$projectContainers', $source,
+            '$projectContainers is undefined in ComposeList.php — use $stackInfo->getContainerList()');
+    }
 }
diff --git a/tests/unit/ComposeManagerMainSourceTest.php b/tests/unit/ComposeManagerMainSourceTest.php
index 3bc4ace..24a4e2e 100644
--- a/tests/unit/ComposeManagerMainSourceTest.php
+++ b/tests/unit/ComposeManagerMainSourceTest.php
@@ -83,4 +83,38 @@ public function testLabelSaveBlocksTaggedOverrideRewrite(): void
         $this->assertStringContainsString('WebUI labels cannot be saved because compose.override.yaml uses !override, !reset, or !merge tags.', $source);
     }
 
+    // ===========================================
+    // Regression Tests
+    // ===========================================
+
+    /**
+     * Regression: Running stacks with no update data must show "check for updates"
+     * (triggers checkStackUpdates) not "pull updates" (triggers showUpdateWarning).
+     */
+    public function testUncheckedRunningStackShowsCheckForUpdates(): void
+    {
+        $source = $this->getPageSource();
+        // The else branch for no containers must call checkStackUpdates
+        $this->assertStringContainsString(
+            "onclick=\"checkStackUpdates(\\'' + composeEscapeAttr(stackName) + '\\');\"",
+            $source,
+            'Unchecked running stacks must trigger checkStackUpdates, not showUpdateWarning'
+        );
+        $this->assertStringContainsString('check for updates</a>', $source);
+    }
+
+    /**
+     * Regression: Stopped stacks must always show "stopped" in the update column,
+     * regardless of whether prior update check data exists. The early return
+     * must be unconditional on !isRunning.
+     */
+    public function testStoppedStacksReturnEarlyUnconditionally(): void
+    {
+        $source = $this->getPageSource();
+        // The stopped check should NOT reference hasCheckedData — it must be
+        // a simple !isRunning guard.
+        $this->assertStringNotContainsString('!isRunning && !hasCheckedData', $source,
+            'Stopped stack early return must be unconditional (!isRunning only, not gated on hasCheckedData)');
+    }
+
 }
diff --git a/tests/unit/DashboardStacksTest.php b/tests/unit/DashboardStacksTest.php
index 0aff076..5e6acb1 100644
--- a/tests/unit/DashboardStacksTest.php
+++ b/tests/unit/DashboardStacksTest.php
@@ -14,6 +14,8 @@
 use PluginTests\TestCase;
 use PluginTests\Mocks\FunctionMocks;
 
+require_once '/usr/local/emhttp/plugins/compose.manager/include/Util.php';
+
 class DashboardStacksTest extends TestCase
 {
     private string $testComposeRoot;
@@ -189,24 +191,31 @@ public function testIgnoreNonStackDirectories(): void
     // Stack State Calculation Tests
     // ===========================================
 
+    /**
+     * Helper: create a StackInfo with injected container data for state tests.
+     */
+    private function createStackInfoWithContainers(array $containers): \StackInfo
+    {
+        \StackInfo::clearCache();
+        $stackName = 'dashboard-state-test';
+        $stackPath = $this->testComposeRoot . '/' . $stackName;
+        if (!is_dir($stackPath)) {
+            mkdir($stackPath, 0755, true);
+            file_put_contents($stackPath . '/compose.yaml', "services:\n  web:\n    image: nginx\n");
+        }
+        $info = \StackInfo::fromProject($this->testComposeRoot, $stackName);
+        $info->setContainerList($containers);
+        return $info;
+    }
+
     /**
      * Test state is stopped when no containers
      */
     public function testStateIsStoppedWhenNoContainers(): void
     {
-        $runningCount = 0;
-        $totalContainers = 0;
-        
-        $state = 'stopped';
-        if ($totalContainers > 0) {
-            if ($runningCount === $totalContainers) {
-                $state = 'started';
-            } elseif ($runningCount > 0) {
-                $state = 'partial';
-            }
-        }
-        
-        $this->assertEquals('stopped', $state);
+        $info = $this->createStackInfoWithContainers([]);
+        $state = $info->getStackState();
+        $this->assertEquals('stopped', $state['state']);
     }
 
     /**
@@ -214,19 +223,15 @@ public function testStateIsStoppedWhenNoContainers(): void
      */
     public function testStateIsStartedWhenAllRunning(): void
     {
-        $runningCount = 3;
-        $totalContainers = 3;
-        
-        $state = 'stopped';
-        if ($totalContainers > 0) {
-            if ($runningCount === $totalContainers) {
-                $state = 'started';
-            } elseif ($runningCount > 0) {
-                $state = 'partial';
-            }
-        }
-        
-        $this->assertEquals('started', $state);
+        $info = $this->createStackInfoWithContainers([
+            ['State' => 'running'],
+            ['State' => 'running'],
+            ['State' => 'running'],
+        ]);
+        $state = $info->getStackState();
+        $this->assertEquals('started', $state['state']);
+        $this->assertSame(3, $state['running']);
+        $this->assertSame(3, $state['total']);
     }
 
     /**
@@ -234,19 +239,16 @@ public function testStateIsStartedWhenAllRunning(): void
      */
     public function testStateIsPartialWhenSomeRunning(): void
     {
-        $runningCount = 2;
-        $totalContainers = 4;
-        
-        $state = 'stopped';
-        if ($totalContainers > 0) {
-            if ($runningCount === $totalContainers) {
-                $state = 'started';
-            } elseif ($runningCount > 0) {
-                $state = 'partial';
-            }
-        }
-        
-        $this->assertEquals('partial', $state);
+        $info = $this->createStackInfoWithContainers([
+            ['State' => 'running'],
+            ['State' => 'running'],
+            ['State' => 'exited'],
+            ['State' => 'exited'],
+        ]);
+        $state = $info->getStackState();
+        $this->assertEquals('partial', $state['state']);
+        $this->assertSame(2, $state['running']);
+        $this->assertSame(4, $state['total']);
     }
 
     /**
@@ -254,19 +256,37 @@ public function testStateIsPartialWhenSomeRunning(): void
      */
     public function testStateIsStoppedWhenNoneRunning(): void
     {
-        $runningCount = 0;
-        $totalContainers = 3;
-        
-        $state = 'stopped';
-        if ($totalContainers > 0) {
-            if ($runningCount === $totalContainers) {
-                $state = 'started';
-            } elseif ($runningCount > 0) {
-                $state = 'partial';
-            }
+        $info = $this->createStackInfoWithContainers([
+            ['State' => 'exited'],
+            ['State' => 'exited'],
+            ['State' => 'exited'],
+        ]);
+        $state = $info->getStackState();
+        $this->assertEquals('stopped', $state['state']);
+        $this->assertSame(0, $state['running']);
+        $this->assertSame(3, $state['total']);
+    }
+
+    /**
+     * Dashboard summary groups paused stacks with partial to avoid
+     * counting a non-stopped state as stopped.
+     */
+    public function testSummaryMapsPausedStateToPartialBucket(): void
+    {
+        $summary = ['started' => 0, 'partial' => 0, 'stopped' => 0];
+        $state = 'paused';
+
+        if ($state === 'started') {
+            $summary['started']++;
+        } elseif ($state === 'partial' || $state === 'paused') {
+            $summary['partial']++;
+        } else {
+            $summary['stopped']++;
         }
-        
-        $this->assertEquals('stopped', $state);
+
+        $this->assertSame(0, $summary['started']);
+        $this->assertSame(1, $summary['partial']);
+        $this->assertSame(0, $summary['stopped']);
     }
 
     // ===========================================
diff --git a/tests/unit/StackInfoTest.php b/tests/unit/StackInfoTest.php
index bb600e5..7d2882b 100644
--- a/tests/unit/StackInfoTest.php
+++ b/tests/unit/StackInfoTest.php
@@ -557,6 +557,29 @@ public function testGetDefaultProfilesEmptyWhenNoFile(): void
         $this->assertSame([], $info->getDefaultProfiles());
     }
 
+    public function testGetRunningProfiles(): void
+    {
+        $stack = 'running-profiles-stack';
+        $stackDir = $this->tempRoot . '/' . $stack;
+        mkdir($stackDir);
+        file_put_contents("$stackDir/compose.yaml", "services:\n");
+        file_put_contents("$stackDir/running_profiles", "debug,monitoring");
+
+        $info = \StackInfo::fromProject($this->tempRoot, $stack);
+
+        $this->assertSame(['debug', 'monitoring'], $info->getRunningProfiles());
+    }
+
+    public function testGetRunningProfilesEmptyWhenNoFile(): void
+    {
+        $stack = 'no-running-profiles';
+        mkdir($this->tempRoot . '/' . $stack);
+        file_put_contents($this->tempRoot . '/' . $stack . '/compose.yaml', "services:\n");
+        $info = \StackInfo::fromProject($this->tempRoot, $stack);
+
+        $this->assertSame([], $info->getRunningProfiles());
+    }
+
     public function testGetAutostartTrue(): void
     {
         $stack = 'autostart-stack';
@@ -892,4 +915,184 @@ public function testCreateNewCollisionSuffixDoesNotCompound(): void
         // The suffix should be a dash followed by digits (from collision avoidance)
         $this->assertMatchesRegularExpression('/^-\d+$/', $suffix);
     }
+
+    // ===========================================
+    // Container Counts & Stack State Tests
+    // ===========================================
+
+    /**
+     * Helper: create a StackInfo and inject mock container data.
+     *
+     * @param array[] $containers Raw docker ps rows (each must have at least 'State')
+     */
+    private function createStackWithContainers(array $containers): \StackInfo
+    {
+        $stack = 'state-test';
+        mkdir($this->tempRoot . '/' . $stack);
+        file_put_contents($this->tempRoot . '/' . $stack . '/compose.yaml', "services:\n");
+        $info = \StackInfo::fromProject($this->tempRoot, $stack);
+        $info->setContainerList($containers);
+        return $info;
+    }
+
+    public function testGetContainerCountsEmpty(): void
+    {
+        $info = $this->createStackWithContainers([]);
+        $counts = $info->getContainerCounts();
+
+        $this->assertSame(0, $counts['running']);
+        $this->assertSame(0, $counts['stopped']);
+        $this->assertSame(0, $counts['paused']);
+        $this->assertSame(0, $counts['restarting']);
+        $this->assertSame(0, $counts['total']);
+    }
+
+    public function testGetContainerCountsAllRunning(): void
+    {
+        $info = $this->createStackWithContainers([
+            ['State' => 'running'],
+            ['State' => 'running'],
+            ['State' => 'running'],
+        ]);
+        $counts = $info->getContainerCounts();
+
+        $this->assertSame(3, $counts['running']);
+        $this->assertSame(0, $counts['stopped']);
+        $this->assertSame(3, $counts['total']);
+    }
+
+    public function testGetContainerCountsMixedStates(): void
+    {
+        $info = $this->createStackWithContainers([
+            ['State' => 'running'],
+            ['State' => 'exited'],
+            ['State' => 'paused'],
+            ['State' => 'restarting'],
+        ]);
+        $counts = $info->getContainerCounts();
+
+        $this->assertSame(1, $counts['running']);
+        $this->assertSame(1, $counts['stopped']);
+        $this->assertSame(1, $counts['paused']);
+        $this->assertSame(1, $counts['restarting']);
+        $this->assertSame(4, $counts['total']);
+    }
+
+    public function testGetContainerCountsTreatsUnknownNonRunningAsStopped(): void
+    {
+        $info = $this->createStackWithContainers([
+            ['State' => 'created'],
+            ['State' => 'dead'],
+            ['State' => 'removing'],
+        ]);
+        $counts = $info->getContainerCounts();
+
+        $this->assertSame(0, $counts['running']);
+        $this->assertSame(3, $counts['stopped']);
+        $this->assertSame(0, $counts['paused']);
+        $this->assertSame(0, $counts['restarting']);
+        $this->assertSame(3, $counts['total']);
+    }
+
+    public function testGetStackStateStartedWhenAllRunning(): void
+    {
+        $info = $this->createStackWithContainers([
+            ['State' => 'running'],
+            ['State' => 'running'],
+        ]);
+        $state = $info->getStackState();
+
+        $this->assertSame('started', $state['state']);
+        $this->assertSame('started', $state['label']);
+        $this->assertSame('play', $state['shape']);
+        $this->assertSame('green-text', $state['color']);
+        $this->assertSame(2, $state['running']);
+        $this->assertSame(2, $state['total']);
+    }
+
+    public function testGetStackStatePartialWhenSomeRunning(): void
+    {
+        $info = $this->createStackWithContainers([
+            ['State' => 'running'],
+            ['State' => 'exited'],
+            ['State' => 'exited'],
+        ]);
+        $state = $info->getStackState();
+
+        $this->assertSame('partial', $state['state']);
+        $this->assertSame('partial (1/3)', $state['label']);
+        $this->assertSame('exclamation-circle', $state['shape']);
+        $this->assertSame('orange-text', $state['color']);
+        $this->assertSame(1, $state['running']);
+        $this->assertSame(3, $state['total']);
+    }
+
+    public function testGetStackStateStoppedWhenNoneRunning(): void
+    {
+        $info = $this->createStackWithContainers([
+            ['State' => 'exited'],
+            ['State' => 'exited'],
+        ]);
+        $state = $info->getStackState();
+
+        $this->assertSame('stopped', $state['state']);
+        $this->assertSame('stopped', $state['label']);
+        $this->assertSame('square', $state['shape']);
+        $this->assertSame('grey-text', $state['color']);
+        $this->assertSame(0, $state['running']);
+        $this->assertSame(2, $state['total']);
+    }
+
+    public function testGetStackStateStoppedWhenEmpty(): void
+    {
+        $info = $this->createStackWithContainers([]);
+        $state = $info->getStackState();
+
+        $this->assertSame('stopped', $state['state']);
+        $this->assertSame(0, $state['running']);
+        $this->assertSame(0, $state['total']);
+    }
+
+    public function testGetStackStatePausedWhenAllPausedNoneRunning(): void
+    {
+        $info = $this->createStackWithContainers([
+            ['State' => 'paused'],
+            ['State' => 'paused'],
+        ]);
+        $state = $info->getStackState();
+
+        $this->assertSame('paused', $state['state']);
+        $this->assertSame('paused', $state['label']);
+        $this->assertSame('pause', $state['shape']);
+        $this->assertSame('orange-text', $state['color']);
+    }
+
+    public function testGetStackStatePartialTrumpsRestarting(): void
+    {
+        // If some containers are running and one is restarting, it's partial
+        $info = $this->createStackWithContainers([
+            ['State' => 'running'],
+            ['State' => 'restarting'],
+        ]);
+        $state = $info->getStackState();
+
+        $this->assertSame('partial', $state['state']);
+        $this->assertSame('partial (1/2)', $state['label']);
+    }
+
+    public function testGetStackStateCountsOnlyCreatedContainers(): void
+    {
+        // This is the core bug fix: total should be created containers (3),
+        // not services defined in compose file (which could be higher with profiles).
+        $info = $this->createStackWithContainers([
+            ['State' => 'running'],
+            ['State' => 'running'],
+            ['State' => 'exited'],
+        ]);
+        $state = $info->getStackState();
+
+        $this->assertSame(3, $state['total']);
+        $this->assertSame(2, $state['running']);
+        $this->assertSame('partial (2/3)', $state['label']);
+    }
 }