Expand support bundle render diagnostics

Author: FolderView Plus Test

archive/folderview.plus-2026.04.05.09.txz.sha256

@@ -0,0 +1 @@
+df4deb9beff0cf6fd46b3bc2aa3d75e03226bf87093a8e4fdb1dcd23c0f2d385  folderview.plus-2026.04.08.02.txz

archive/folderview.plus-2026.04.05.09.txz archive/folderview.plus-2026.04.08.02.txzarchive/folderview.plus-2026.04.05.09.txz renamed to archive/folderview.plus-2026.04.08.02.txz

@@ -6,13 +6,19 @@
 <!ENTITY launch "Settings/FolderViewPlus">
 <!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
 <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/dev/folderview.plus.plg">
-<!ENTITY version "2026.04.08.01">
-<!ENTITY md5 "f8bd49f4ec7fe2d7d3e59b38e23205ee">
+<!ENTITY version "2026.04.08.02">
+<!ENTITY md5 "c4b6b577c7e5cbd144bfe2c0167e57ea">
 ]>
 
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" icon="folder-icon.png" support="https://forums.unraid.net/topic/197631-plugin-folderview-plus/" min="7.0.0">
     <CHANGES>
 
+###2026.04.08.02
+- Fix: Docker runtime rows, folder state, and container interactions.
+- Fix: Server endpoints, runtime payloads, and persistence or validation paths.
+- Quality: Release automation, CI smoke coverage, and packaging guards.
+
+
 ###2026.04.08.01
 - Fix: Docker advanced view now resyncs both hidden and expanded folder member rows from per-container runtime state, so `force update` stays visible for dockerman-managed containers after expand.
 - Feature: Support bundle runtime diagnostics now capture per-entity manager, managed/update state, and manager counts to make update-column issues diagnosable from one export.

archive/folderview.plus-2026.04.08.02.txz.sha256

@@ -1388,6 +1388,9 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
             $started = 0;
             $paused = 0;
             $stopped = 0;
+            $folderManagerTypes = [];
+            $folderManagedCount = 0;
+            $folderUpToDate = true;
             foreach ($members as $name) {
                 $item = $infoByName[$name] ?? null;
                 if (!is_array($item)) {
@@ -1404,6 +1407,19 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
                 } else {
                     $stopped++;
                 }
+                if ($type === 'docker') {
+                    $memberManager = trim((string)($item['info']['State']['manager'] ?? ($item['manager'] ?? '')));
+                    if ($memberManager !== '') {
+                        $folderManagerTypes[$memberManager] = true;
+                    }
+                    if ($memberManager === 'dockerman') {
+                        $folderManagedCount++;
+                        $memberUpdated = $item['info']['State']['Updated'] ?? ($item['Updated'] ?? null);
+                        if ($memberUpdated === false) {
+                            $folderUpToDate = false;
+                        }
+                    }
+                }
             }
 
             $total = count($members);
@@ -1423,6 +1439,8 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
             } elseif ($statusKind === 'stopped') {
                 $badgeVisible = $showStoppedBadge;
             }
+            $hideUpdateColumn = diagnosticsFolderSettingBool(is_array($folder) ? $folder : [], 'update_column', false);
+            $previewUpdate = diagnosticsFolderSettingBool(is_array($folder) ? $folder : [], 'preview_update', false);
 
             $folderStatusTotals[$statusKind]++;
             $memberTotals['started'] += $started;
@@ -1448,8 +1466,21 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
                     'text' => $statusText,
                     'badgeVisible' => $badgeVisible,
                     'colors' => diagnosticsFolderStatusColors(is_array($folder) ? $folder : [])
+                ],
+                'settings' => [
+                    'previewUpdate' => $previewUpdate,
+                    'hideUpdateColumn' => $hideUpdateColumn
                 ]
             ];
+            if ($type === 'docker') {
+                $snapshotFolders[$safeFolderId]['renderExpectations'] = diagnosticsDockerFolderRenderExpectations(
+                    array_keys($folderManagerTypes),
+                    $folderUpToDate,
+                    $folderManagedCount,
+                    $showUpdateBadge,
+                    $hideUpdateColumn
+                );
+            }
         }
 
         $entityDetails = [];
@@ -1477,6 +1508,22 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
             if ($entityDetailsTotal > $entityDetailsMaxEntries) {
                 continue;
             }
+            $provenance = [
+                'managerSource' => 'missing',
+                'updateSource' => 'missing'
+            ];
+            $renderExpectations = [
+                'statusToken' => $updated === true ? 'upToDate' : ($updated === false ? 'available' : 'unknown'),
+                'action' => 'none',
+                'forceUpdateEligible' => false
+            ];
+            if ($type === 'docker') {
+                $provenance = [
+                    'managerSource' => diagnosticsDockerStateFieldSource($item, 'manager'),
+                    'updateSource' => diagnosticsDockerStateFieldSource($item, 'updated')
+                ];
+                $renderExpectations = diagnosticsDockerMemberRenderExpectations($manager !== '' ? $manager : null, $updated);
+            }
             $entityDetails[] = [
                 'name' => normalizeDiagnosticsPrivacyMode($privacyMode) === 'full' ? (string)$name : null,
                 'nameHash' => diagnosticsHashShort((string)$name),
@@ -1485,7 +1532,9 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
                 'manager' => $manager !== '' ? $manager : null,
                 'managed' => $manager === 'dockerman',
                 'updated' => $updated,
-                'updateState' => $updated === true ? 'upToDate' : ($updated === false ? 'available' : 'unknown')
+                'updateState' => $updated === true ? 'upToDate' : ($updated === false ? 'available' : 'unknown'),
+                'provenance' => $provenance,
+                'renderExpectations' => $renderExpectations
             ];
         }
         if (!empty($managerCounts)) {
@@ -1633,6 +1682,105 @@ function diagnosticsBuildIntegrityIssueDetail(array $integrity): string {
         return '';
     }
 
+    function diagnosticsFolderSettingBool(array $folder, string $key, bool $default = false): bool {
+        $settings = is_array($folder['settings'] ?? null) ? $folder['settings'] : [];
+        if (!array_key_exists($key, $settings)) {
+            return $default;
+        }
+        return normalizeBool($settings[$key], $default);
+    }
+
+    function diagnosticsDockerStateFieldSource(array $item, string $field): string {
+        $state = is_array($item['info']['State'] ?? null) ? $item['info']['State'] : [];
+        if ($field === 'manager') {
+            if (trim((string)($state['manager'] ?? '')) !== '') {
+                return 'infoState';
+            }
+            if (trim((string)($item['manager'] ?? '')) !== '') {
+                return 'topLevelFallback';
+            }
+            return 'missing';
+        }
+        if ($field === 'updated') {
+            if (is_bool($state['Updated'] ?? null)) {
+                return 'infoState';
+            }
+            if (is_bool($item['Updated'] ?? null)) {
+                return 'topLevelFallback';
+            }
+            return 'missing';
+        }
+        return 'missing';
+    }
+
+    function diagnosticsDockerMemberRenderExpectations(?string $manager, ?bool $updated): array {
+        $safeManager = trim((string)($manager ?? ''));
+        if ($safeManager === 'composeman') {
+            return [
+                'statusToken' => 'compose',
+                'action' => 'none',
+                'forceUpdateEligible' => false
+            ];
+        }
+        if ($safeManager !== '' && $safeManager !== 'dockerman') {
+            return [
+                'statusToken' => 'thirdParty',
+                'action' => 'none',
+                'forceUpdateEligible' => false
+            ];
+        }
+        if ($safeManager === 'dockerman' && $updated === false) {
+            return [
+                'statusToken' => 'updateReady',
+                'action' => 'applyUpdate',
+                'forceUpdateEligible' => false
+            ];
+        }
+        return [
+            'statusToken' => 'upToDate',
+            'action' => 'forceUpdate',
+            'forceUpdateEligible' => true
+        ];
+    }
+
+    function diagnosticsDockerFolderRenderExpectations(array $managerTypes, bool $upToDate, int $managedCount, bool $showUpdateBadge, bool $hideUpdateColumn): array {
+        $safeManagerTypes = array_values(array_filter(array_map('strval', $managerTypes), static function ($value): bool {
+            return trim($value) !== '';
+        }));
+        $safeManagerTypes = array_values(array_unique($safeManagerTypes));
+        sort($safeManagerTypes);
+
+        $hasDockerMan = in_array('dockerman', $safeManagerTypes, true);
+        $hasCompose = in_array('composeman', $safeManagerTypes, true);
+        $hasThirdParty = count(array_filter($safeManagerTypes, static function ($value): bool {
+            return $value !== 'dockerman' && $value !== 'composeman';
+        })) > 0;
+
+        $statusToken = 'upToDate';
+        $action = 'none';
+        if (!$hasDockerMan && $hasCompose && $hasThirdParty) {
+            $statusToken = 'composeAndThirdParty';
+        } elseif (!$hasDockerMan && $hasCompose) {
+            $statusToken = 'compose';
+        } elseif (!$hasDockerMan) {
+            $statusToken = 'thirdParty';
+        } elseif (!$upToDate) {
+            $statusToken = 'updateReady';
+            $action = 'applyUpdate';
+        } elseif ($managedCount > 0) {
+            $action = 'forceUpdate';
+        }
+
+        return [
+            'updateColumnVisible' => $showUpdateBadge && !$hideUpdateColumn,
+            'statusToken' => $statusToken,
+            'action' => $action,
+            'actionRequiresAdvancedView' => in_array($action, ['applyUpdate', 'forceUpdate'], true),
+            'forceUpdateEligible' => $action === 'forceUpdate',
+            'managerTypes' => $safeManagerTypes
+        ];
+    }
+
     function diagnosticsBuildRecommendedActions(array $typesData, array $customIcons): array {
         $actions = [];
         $addAction = static function (string $action, string $label, string $reason) use (&$actions): void {
@@ -2201,7 +2349,24 @@ function diagnosticsBuildSupportBundleRuntimeEntityDetails(string $type, array $
                 'updated' => $updated,
                 'updateState' => in_array((string)($entry['updateState'] ?? ''), ['available', 'upToDate', 'unknown'], true)
                     ? (string)$entry['updateState']
-                    : 'unknown'
+                    : 'unknown',
+                'provenance' => [
+                    'managerSource' => in_array((string)($entry['provenance']['managerSource'] ?? ''), ['infoState', 'topLevelFallback', 'missing'], true)
+                        ? (string)$entry['provenance']['managerSource']
+                        : 'missing',
+                    'updateSource' => in_array((string)($entry['provenance']['updateSource'] ?? ''), ['infoState', 'topLevelFallback', 'missing'], true)
+                        ? (string)$entry['provenance']['updateSource']
+                        : 'missing'
+                ],
+                'renderExpectations' => [
+                    'statusToken' => in_array((string)($entry['renderExpectations']['statusToken'] ?? ''), ['compose', 'thirdParty', 'updateReady', 'upToDate', 'available', 'unknown'], true)
+                        ? (string)$entry['renderExpectations']['statusToken']
+                        : 'unknown',
+                    'action' => in_array((string)($entry['renderExpectations']['action'] ?? ''), ['none', 'applyUpdate', 'forceUpdate'], true)
+                        ? (string)$entry['renderExpectations']['action']
+                        : 'none',
+                    'forceUpdateEligible' => (bool)($entry['renderExpectations']['forceUpdateEligible'] ?? false)
+                ]
             ];
         }
         if ((bool)($details['truncated'] ?? false)) {
@@ -2235,6 +2400,26 @@ function diagnosticsBuildSupportBundleRuntimeTypeSection(string $type, array $ty
             if (!isset($folder['members']) || !is_array($folder['members'])) {
                 $folder['members'] = [];
             }
+            $folder['settings'] = [
+                'previewUpdate' => (bool)($folder['settings']['previewUpdate'] ?? false),
+                'hideUpdateColumn' => (bool)($folder['settings']['hideUpdateColumn'] ?? false)
+            ];
+            if ($type === 'docker') {
+                $folder['renderExpectations'] = [
+                    'updateColumnVisible' => (bool)($folder['renderExpectations']['updateColumnVisible'] ?? false),
+                    'statusToken' => in_array((string)($folder['renderExpectations']['statusToken'] ?? ''), ['compose', 'composeAndThirdParty', 'thirdParty', 'updateReady', 'upToDate'], true)
+                        ? (string)$folder['renderExpectations']['statusToken']
+                        : 'upToDate',
+                    'action' => in_array((string)($folder['renderExpectations']['action'] ?? ''), ['none', 'applyUpdate', 'forceUpdate'], true)
+                        ? (string)$folder['renderExpectations']['action']
+                        : 'none',
+                    'actionRequiresAdvancedView' => (bool)($folder['renderExpectations']['actionRequiresAdvancedView'] ?? false),
+                    'forceUpdateEligible' => (bool)($folder['renderExpectations']['forceUpdateEligible'] ?? false),
+                    'managerTypes' => array_values(array_filter(array_map('strval', is_array($folder['renderExpectations']['managerTypes'] ?? null) ? $folder['renderExpectations']['managerTypes'] : []), static function ($value): bool {
+                        return trim($value) !== '';
+                    }))
+                ];
+            }
             if (($redactor['mode'] ?? FVPLUS_DIAGNOSTICS_DEFAULT_PRIVACY) === 'full') {
                 $folder['members']['items'] = array_slice(array_map('strval', $memberItems), 0, 40);
             } else {
@@ -2254,7 +2439,8 @@ static function ($name) use (&$redactor, $fieldPath): ?string {
         $prefsPath = (string)($typeData['prefsPath'] ?? '');
 
         return [
-            'hostPageDetected' => true,
+            'runtimeSnapshotAvailable' => !empty($stateSnapshot),
+            'snapshotSource' => 'serverDiagnostics',
             'entitySummary' => [
                 'total' => (int)($stateSnapshot['totalItems'] ?? 0),
                 'assigned' => (int)($stateSnapshot['assignedItems'] ?? 0),