Merge pull request #4 from EUCPilots/improve

Refactor: bundle NerdioShellApps and improve observability

Author: aaronparker

.claude/settings.local.json

@@ -15,7 +15,9 @@
       "Bash(pwsh -NoProfile -Command \"Invoke-ScriptAnalyzer -Path ./EvergreenUI -Recurse -Severity Error,Warning | Where-Object { $_.ScriptName -match ''Format-LogEntry|Merge-ConfigSection|Get-SafeFolderName|Get-UIConfig|Write-UILog|Write-UpdateOutput|Invoke-IntunePackageBuild|Invoke-FilterUpdate|Invoke-LocalPackageInstall|Test-LocalPackageDetection|Get-InstallPackage|Set-UIConfig|Invoke-AzureSignIn|Invoke-IntuneGraphWin32Import'' } | Format-Table RuleName,Severity,ScriptName,Line -AutoSize\")",
       "Bash(pwsh -NoProfile -Command \"Invoke-Pester -Path ./tests/EvergreenUI.tests.ps1 -Output Detailed\")",
       "Bash(git stash:*)",
-      "Bash(pwsh -NoProfile -Command \"Invoke-Pester -Path ./tests/EvergreenUI.tests.ps1 -Output Normal\")"
+      "Bash(pwsh -NoProfile -Command \"Invoke-Pester -Path ./tests/EvergreenUI.tests.ps1 -Output Normal\")",
+      "Bash(xargs grep:*)",
+      "Bash(python3 -c \":*)"
     ]
   }
 }

.gitignore

@@ -18,7 +18,7 @@ coverage.xml
 *.psprojs
 
 # ── Evergreen runtime artefacts ─────────────────────────────────────────────
-# Config written by EvergreenUI at runtime — not committed; each user has their own
+# Config written by EvergreenUI at runtime - not committed; each user has their own
 EvergreenUI/Private/settings.json
 **/settings.json
 

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [1.0.14] - 2026-03-30
+
+### Added
+- Progress log entries are now written to a per-session log file at `%LocalAppData%\EvergreenUI\logs\EvergreenUI-<timestamp>.log` (UTF-8, no BOM); a new file is created on each launch of the Workbench
+- `Format-LogEntry` private function: shared timestamp and level-prefix formatting used by `Write-UILog` and `Write-UpdateOutput`, eliminating duplicated formatting logic
+- `Merge-ConfigSection` private function: merges missing default properties into a loaded config section, replacing six identical `foreach`/`Add-Member` blocks in `Get-UIConfig`
+- `Get-SafeFolderName` private function: sanitises a definition file's parent directory name for use as a working folder name; applied in `Invoke-IntunePackageBuild` and `Invoke-LocalPackageInstall`
+
+### Changed
+- Navigation rail is now collapsible via a hamburger toggle button; nav items show icon and label when expanded (180 px) and icon only when collapsed (64 px); label visibility is toggled via named `TextBlock` controls (`NavAppsLabel`, `NavDownloadLabel`, etc.)
+- NerdioShellApps PowerShell module moved from `support/` into `Resources/` and is loaded automatically from the bundled path at runtime; the Nerdio Manager module-path setting and its associated Settings page controls have been removed
+- `Write-UILog` and `Write-UpdateOutput` now delegate to `Format-LogEntry` for consistent `[HH:mm:ss] [LEVEL]` formatting
+- `Get-UIConfig` simplified by replacing repeated merge loops with `Merge-ConfigSection` calls
+- `Format-LogEntry.ps1` is now dot-sourced into every background runspace before `Write-UILog.ps1` so log formatting is available in all runspaces
+- `Get-SafeFolderName.ps1` is now dot-sourced into the Intune import and Install runspaces so the helper is available where needed
+- Post-import Nerdio verification context (`PendingNerdioPostImportVerifyAppId`, `PendingNerdioPostImportExpectedEvergreenVersion`) is now stored in `$syncHash` at dispatch time rather than being re-read from captured local variables in the completion timer tick, fixing a strict-mode variable-not-set error after a successful Shell App version add
+- Install tab: elevation/UAC status indicator right-aligned to match sign-in status indicators on the Import tabs (DockPanel `LastChildFill` changed from `True` to `False`)
+- Download queue list view: padding removed from the wrapping border to tighten spacing
+- `GridViewColumnHeader` style extracted to a single shared style in `Window.Resources`, removing duplicated per-`ListView` header style definitions
+
+### Fixed
+- Background runspaces (Download All, Library Update, Update-Evergreen, Install resolve/run, Intune import, M365 package build) all failed silently because `Format-LogEntry` was not dot-sourced into the runspace session; every `Write-UILog` call threw a "term not recognised" error that was caught and swallowed, leaving no log output and no work performed
+- Intune Win32 import and Install run runspaces failed with "term not recognised" for `Get-SafeFolderName` after the function was extracted in the observability refactor
+- Install tab "Find latest versions" logged an error (`Format-LogEntry` not recognised) and performed no version resolution
+- Nerdio Shell App "Add version" logged a strict-mode error (`$shellAppId` cannot be retrieved) when attempting to set post-import verification context in the completion handler
+- Install tab elevation status indicator no longer stretches across the full status bar width
+- NerdioShellApps module updated for Windows PowerShell 5.1 compatibility: PS 7-only ternary and null-coalescing operators replaced, temp directory detection rewritten using Windows-compatible environment checks, `PSStyle` fallback added for informational logging
+- Em dash characters (`—`) replaced with hyphens in string literals across private functions; UTF-8 em dashes were misread by PowerShell 5.1 as Windows-1252, causing the middle byte (`0x94`) to be interpreted as a closing double-quote and breaking script parsing on import
+
 ## [1.0.13] - 2026-03-29
 
 ### Added
@@ -17,13 +46,13 @@
 ### Changed
 - Import tab: Microsoft 365 Apps sub-tab inserted between Nerdio Manager Shell Apps and Authentication tabs
 - Import tab / Microsoft 365 Apps: Channel and Company Name XML placeholders (`#Channel`) are resolved at packaging time from the user's dropdown selection; Channel is no longer read from the XML for display purposes
-- Import tab / Intune and Nerdio Manager: connection status indicators updated to match the Microsoft 365 Apps tab — 9×9 ellipse with border stroke, service-name prefix label ("Intune:" / "Nerdio Manager:"), and status text right-aligned in the count bar
+- Import tab / Intune and Nerdio Manager: connection status indicators updated to match the Microsoft 365 Apps tab - 9×9 ellipse with border stroke, service-name prefix label ("Intune:" / "Nerdio Manager:"), and status text right-aligned in the count bar
 - Import tab / Intune and Nerdio Manager: count bar `DockPanel` changed to `LastChildFill="False"` so the right-docked status indicators correctly snap to the right edge
 - Import tab / Microsoft Intune Win32 Apps: Import Win32 app button height pinned to 32 px to match the Nerdio Manager Shell Apps tab
 - Nerdio Manager authentication: `Connect-Nme` called with `-ErrorAction Stop` so non-terminating errors are promoted to terminating and caught by the existing error handler; return value checked for null with an explicit failure message; `Set-NmeCredentials` also called with `-ErrorAction Stop`; module-load failure path now writes to the progress log
 
 ### Fixed
-- Nerdio Manager authentication: failures produced no log output when the NerdioShellApps module could not be loaded silently (empty path) or when `Connect-Nme` wrote non-terminating errors rather than throwing — both cases are now logged
+- Nerdio Manager authentication: failures produced no log output when the NerdioShellApps module could not be loaded silently (empty path) or when `Connect-Nme` wrote non-terminating errors rather than throwing - both cases are now logged
 
 ## [1.0.12] - 2026-03-28
 
@@ -38,17 +67,17 @@
 ## [1.0.11] - 2026-03-27
 
 ### Added
-- Import tab / Microsoft Intune: `DisplayName` property added to all comparison rows and used as the **App** column — matched rows show the Intune app name, unmatched rows show the definition name
+- Import tab / Microsoft Intune: `DisplayName` property added to all comparison rows and used as the **App** column - matched rows show the Intune app name, unmatched rows show the definition name
 - Import tab / Nerdio Shell Apps: **Versions** column shows the total count of versions present on the Shell App
 
 ### Changed
-- Import tab / Microsoft Intune: columns reduced from 9 to 6 — **App**, **Publisher**, **Intune Version**, **Latest**, **Status**, **Action**; removed Definition, Matched, Update Required, and Definition Version columns
-- Import tab / Microsoft Intune: Action column values rationalised — `Import new app` (definition not in Intune), `Import new version and supersede` (matched app with update available), `Fix in definition` (duplicate GUID across definitions), `-` (no action required)
-- Import tab / Microsoft Intune: row colours updated — green tint for matched apps that are current; amber tint for matched apps with an update available; transparent background for all other rows
-- Import tab / Nerdio Shell Apps: columns restructured — **App**, **Publisher**, **Shell App**, **Versions**, **Shell App Version**, **Latest**, **Status**, **Action**; removed Definition App column
-- Import tab / Nerdio Shell Apps: Action column values — `Update`, `Import`, or `-`; same row colour scheme as the Intune tab
+- Import tab / Microsoft Intune: columns reduced from 9 to 6 - **App**, **Publisher**, **Intune Version**, **Latest**, **Status**, **Action**; removed Definition, Matched, Update Required, and Definition Version columns
+- Import tab / Microsoft Intune: Action column values rationalised - `Import new app` (definition not in Intune), `Import new version and supersede` (matched app with update available), `Fix in definition` (duplicate GUID across definitions), `-` (no action required)
+- Import tab / Microsoft Intune: row colours updated - green tint for matched apps that are current; amber tint for matched apps with an update available; transparent background for all other rows
+- Import tab / Nerdio Shell Apps: columns restructured - **App**, **Publisher**, **Shell App**, **Versions**, **Shell App Version**, **Latest**, **Status**, **Action**; removed Definition App column
+- Import tab / Nerdio Shell Apps: Action column values - `Update`, `Import`, or `-`; same row colour scheme as the Intune tab
 - Import tab / Authentication: sign-in buttons are disabled while a session is already authenticated and re-enabled when the user signs out
-- Settings tab: Preferences section reorganised — Theme selector occupies the left half of the row; **Show Import tab** and **Show Install tab** toggle switches are grouped on the right half within the same row
+- Settings tab: Preferences section reorganised - Theme selector occupies the left half of the row; **Show Import tab** and **Show Install tab** toggle switches are grouped on the right half within the same row
 - Import tab / Microsoft Intune: `IsUpdate` flag passed to the import runspace is now derived from `IsMatched` and `UpdateRequired` row properties rather than the `ImportAction` string, making the distinction between a new app and a supersedence update independent of the display label
 
 ### Fixed
@@ -146,7 +175,7 @@
 ### Added
 - **Export CSV**: Apps view results can be exported to a CSV file via the toolbar
 - **Open folder** button in the Downloads view to open the output directory in Explorer
-- Library GridView is now fully dynamic — columns are generated from the properties returned by Evergreen rather than being hardcoded
+- Library GridView is now fully dynamic - columns are generated from the properties returned by Evergreen rather than being hardcoded
 
 ### Fixed
 - Prevented duplicate entries appearing in the download queue when the same app is added multiple times

CLAUDE.md

@@ -13,16 +13,19 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 ## Commands
 
 ### Testing
+
 ```powershell
 Invoke-Pester -Path .\tests\EvergreenUI.tests.ps1 -Output Detailed
 ```
 
 ### Linting
+
 ```powershell
 Invoke-ScriptAnalyzer -Path .\EvergreenUI -Recurse
 ```
 
 ### Running the UI
+
 ```powershell
 Import-Module .\EvergreenUI\EvergreenUI.psd1
 Start-EvergreenWorkbench
@@ -31,6 +34,7 @@ Start-EvergreenWorkbench
 ## Architecture
 
 ### Module Structure
+
 The module exposes a single public function (`Start-EvergreenWorkbench`) that orchestrates everything. All internal logic lives in private helper functions dot-sourced by `EvergreenUI.psm1`.
 
 ```
@@ -50,6 +54,7 @@ EvergreenUI/
 ```
 
 ### Threading Model
+
 WPF requires STA (Single Threaded Apartment). `Start-EvergreenWorkbench` ensures STA thread on startup. Background operations (app downloads, library updates, Intune imports) run in isolated STA runspaces created by `New-WpfRunspace`. Communication between runspaces and the UI uses a `$syncHash` (synchronized hashtable) with `Dispatcher.Invoke` for thread-safe UI updates.
 
 ### Key Private Functions
@@ -73,13 +78,15 @@ WPF requires STA (Single Threaded Apartment). `Start-EvergreenWorkbench` ensures
 | `Test-LocalPackageDetection` | Detect installed app versions for comparison |
 
 ### Providers / Tabs
+
 The UI has four tabs with distinct workflows:
-1. **Apps** — Browse Evergreen app catalog, apply filters, queue downloads
-2. **Library** — Manage local Evergreen app library
-3. **Import** — Nerdio Manager and Intune Win32 packaging workflows
-4. **Install** — Local package installation from definition files
+1. **Apps** - Browse Evergreen app catalog, apply filters, queue downloads
+2. **Library** - Manage local Evergreen app library
+3. **Import** - Nerdio Manager and Intune Win32 packaging workflows
+4. **Install** - Local package installation from definition files
 
 ### Configuration
+
 User settings persist to `$env:APPDATA\EvergreenUI\settings.json`. `Get-UIConfig` creates defaults on first run. Settings include output/library paths, theme, log verbosity, and per-provider config (Nerdio, Intune, Install).
 
 ## Code Conventions
@@ -89,6 +96,10 @@ User settings persist to `$env:APPDATA\EvergreenUI\settings.json`. `Get-UIConfig
 - CRLF line endings for all PowerShell files (enforced via `.gitattributes`)
 - WPF controls are named with a consistent prefix scheme (see `EvergreenUI.xaml`)
 - Always use named parameters for PowerShell cmdlet calls (e.g. `Start-Sleep -Seconds 3`, not `Start-Sleep 3`)
+- Never use em dashes in any code or markdown files
+- Ensure PowerShell commands use compatibility with PowerShell 5.1, for example Join-Path does not support -AdditionalChildPaths on PowerShell 5.1, so use an approach that is compatible on both PowerShell 5.1 or PowerShell 7 and above
+- Never use emojis
+- Never use horizontal lines in markdown files
 
 ### Logging
 
@@ -100,12 +111,12 @@ Log the following at a minimum:
 - Cache hit/miss with age information
 - Version resolution outcomes
 
-`Format-LogEntry` is the shared helper for timestamp+prefix formatting. It is called internally by both `Write-UILog` and `Write-UpdateOutput` — do not inline the formatting in new output functions.
+`Format-LogEntry` is the shared helper for timestamp+prefix formatting. It is called internally by both `Write-UILog` and `Write-UpdateOutput` - do not inline the formatting in new output functions.
 
 ### Error Handling
 
 - Use `-ErrorAction Stop` on all cmdlets inside a `try/catch` block that is intended to catch that cmdlet's errors.
-- Every `catch {}` (empty catch) **must** include a comment that explains why silence is intentional, e.g.: `# best-effort — failure here must not abort the caller`. Also add `Write-Verbose` of the caught exception so failures surface when running with `-Verbose`.
+- Every `catch {}` (empty catch) **must** include a comment that explains why silence is intentional, e.g.: `# best-effort - failure here must not abort the caller`. Also add `Write-Verbose` of the caught exception so failures surface when running with `-Verbose`.
 - Polling/retry loops must log each failed attempt with attempt number and exception message rather than silently swallowing errors.
 
 ### Structured Return Pattern
@@ -123,18 +134,18 @@ $fail = {
 }
 ```
 
-Follow this pattern for new functions that return structured results. The shape is intentionally function-specific — do not try to genericise it.
+Follow this pattern for new functions that return structured results. The shape is intentionally function-specific - do not try to genericise it.
 
 ### Shared Helper Patterns
 
 - **Nested config merging**: use `Merge-ConfigSection -Loaded $json.Section -Default $default.Section` rather than repeating the `foreach`/`Add-Member` pattern.
-- **Definition folder names**: use `Get-SafeFolderName -DefinitionPath $path` (returns the sanitised parent directory name). Only applicable when the folder name derives from a definition file path — for display-name-based names, apply the regex directly.
+- **Definition folder names**: use `Get-SafeFolderName -DefinitionPath $path` (returns the sanitised parent directory name). Only applicable when the folder name derives from a definition file path - for display-name-based names, apply the regex directly.
 - **Log entry formatting**: use `Format-LogEntry -Message $msg -Level Info` if writing a new log-output helper function.
 
 ## Release Process
 
 Releases are automated via two GitHub Actions workflows:
-1. **tag-release.yml** — Watches `EvergreenUI.psd1` for version changes; creates a git tag `v{version}` when the version is bumped
-2. **publish-psgallery.yml** — Triggered by tag creation; publishes to PowerShell Gallery using `$env:NUGET_API_KEY`
+1. **tag-release.yml** - Watches `EvergreenUI.psd1` for version changes; creates a git tag `v{version}` when the version is bumped
+2. **publish-psgallery.yml** - Triggered by tag creation; publishes to PowerShell Gallery using `$env:NUGET_API_KEY`
 
 Version format is `Major.Minor.Patch` (e.g., `1.0.9`). Bump the version in `EvergreenUI.psd1` (`ModuleVersion`) to trigger a release.

EvergreenUI/EvergreenUI.psd1

@@ -1,7 +1,7 @@
 #Requires -Version 5.1
 @{
     # Module identity
-    ModuleVersion     = '1.0.13'
+    ModuleVersion     = '1.0.14'
     GUID              = 'e63b3f34-4e6c-433d-8544-fe497c21ad98'
     Author            = 'Aaron Parker (stealthpuppy)'
     CompanyName       = 'EUC Pilots'
@@ -32,6 +32,7 @@
         'EvergreenUI.psm1'
         'en-US\EvergreenUI-help.xml'
         'Resources\EvergreenUI.xaml'
+        'Resources\NerdioShellApps.psm1'
         'Public\Start-EvergreenWorkbench.ps1'
         'Private\Get-EvergreenAppList.ps1'
         'Private\Get-InstallPackageDefinitions.ps1'
@@ -63,7 +64,7 @@
             Tags         = @('Evergreen', 'GUI', 'WPF', 'EUC', 'EvergreenUI', 'Windows')
             LicenseUri   = 'https://github.com/EUCPilots/evergreen-ui/blob/main/LICENSE'
             ProjectUri   = 'https://github.com/EUCPilots/evergreen-ui'
-            ReleaseNotes = 'Pre-release. Adds support for import Microsoft 365 Apps packages into Intune and Nerdio Manager.'
+            ReleaseNotes = 'Pre-release. Adds collapsible sidebar with menu item icons. Integrates NerdioShellApps.psm1. Updates loggin and improved code base.'
             Prerelease   = 'beta'
         }
     }

EvergreenUI/EvergreenUI.psm1

@@ -17,11 +17,6 @@
 Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
-# Guard: Windows and WPF only 
-# if (-not $IsWindows -and $PSVersionTable.PSVersion.Major -ge 6) {
-#    throw 'EvergreenUI requires Windows. This module cannot be used on Linux or macOS.'
-# }
-
 # Dot-source Private functions 
 $privatePath = Join-Path -Path $PSScriptRoot -ChildPath 'Private'