Merge branch 'main' into zt/476-smart-init

Author: zateutsch

docs/README.md

@@ -83,7 +83,7 @@ Additional guides:
 | **Setup** | [init](usage.md#init), [restore](usage.md#restore), [update](usage.md#update) |
 | **Identity & Debugging** | [run](usage.md#run), [create-debug-identity](usage.md#create-debug-identity), [unregister](usage.md#unregister) |
 | **Packaging** | [pack](usage.md#pack) |
-| **Manifests** | [manifest generate](usage.md#manifest-generate), [manifest update-assets](usage.md#manifest), [manifest add-alias](usage.md#manifest-add-alias) |
+| **Manifests** | [manifest generate](usage.md#manifest-generate), [manifest update-assets](usage.md#manifest-update-assets), [manifest add-alias](usage.md#manifest-add-alias) |
 | **Certificates & Signing** | [cert generate](usage.md#cert-generate), [cert install](usage.md#cert-install), [sign](usage.md#sign), [create-external-catalog](usage.md#create-external-catalog) |
 | **Utilities** | [tool](usage.md#tool), [store](usage.md#store), [get-winapp-path](usage.md#get-winapp-path), [complete](usage.md#shell-completion) |
 | **UI Automation** | [ui](usage.md#ui) |

docs/guides/cpp.md

@@ -1,7 +1,7 @@
 <!-- mslearn: true -->
 # Using winapp CLI with C++ and CMake
 
-This guide demonstrates how to use `winappcli` with a C++ application to debug with package identity and package your application as an MSIX.
+This guide demonstrates how to use the `winapp` CLI with a C++ application to debug with package identity and package your application as an MSIX.
 
 Package identity is a core concept in the Windows app model. It allows your application to access specific Windows APIs (like Notifications, Security, AI APIs, etc), have a clean install/uninstall experience, and more.
 

docs/guides/dotnet.md

@@ -1,9 +1,9 @@
 <!-- mslearn: true -->
 # Using winapp CLI with .NET 
 
-> This guide should work for most .NET projects types. The steps have been tested with both console and UI-based projects like WPF. For working examples, check out the [dotnet-app](../../samples/dotnet-app) (console) and [wpf-app](../../samples/wpf-app) (WPF) samples in the samples folder.
+> This guide should work for most .NET project types. The steps have been tested with both console and UI-based projects like WPF. For working examples, check out the [dotnet-app](../../samples/dotnet-app) (console) and [wpf-app](../../samples/wpf-app) (WPF) samples in the samples folder.
 
-This guide demonstrates how to use `winappcli` with a .NET application to debug with package identity and package your application as an MSIX.
+This guide demonstrates how to use the `winapp` CLI with a .NET application to debug with package identity and package your application as an MSIX.
 
 Package identity is a core concept in the Windows app model. It allows your application to access specific Windows APIs (like Notifications, Security, AI APIs, etc), have a clean install/uninstall experience, and more.
 

docs/guides/electron/cpp-notification-addon.md

@@ -17,7 +17,7 @@ npx winapp node create-addon
 ```
 
 > [!NOTE]
-> This command might prompt your to install Python or required Visual Studio tools if you don't already have them installed.
+> This command might prompt you to install Python or required Visual Studio tools if you don't already have them installed.
 
 This creates a `nativeWindowsAddon/` folder with:
 - `nativeWindowsAddon.cc` - Your C++ code that will call Windows APIs

docs/guides/electron/packaging.md

@@ -86,7 +86,7 @@ The `--manifest` option is optional. If not provided, it will look for a Package
 
 The `--cert` option is also optional. If not provided, the msix will not be signed.
 
-The `--out` option is also optional. If not provided, the current directory will be used.
+The `--output` option is also optional. If not provided, the current directory will be used.
 
 The MSIX package will be created as `./out/<your-app-name>.msix`.
 

docs/guides/flutter.md

@@ -3,7 +3,7 @@
 
 For a complete working example, check out the [Flutter sample](../../samples/flutter-app) in this repository.
 
-This guide demonstrates how to use `winappcli` with a Flutter application to add package identity and package your app as an MSIX.
+This guide demonstrates how to use the `winapp` CLI with a Flutter application to add package identity and package your app as an MSIX.
 
 Package identity is a core concept in the Windows app model. It allows your application to access specific Windows APIs (like Notifications, Security, AI APIs, etc), have a clean install/uninstall experience, and more.
 

docs/guides/rust.md

@@ -1,7 +1,7 @@
 <!-- mslearn: true -->
 # Using winapp CLI with Rust
 
-This guide demonstrates how to use `winappcli` with a Rust application to debug with package identity and package your application as an MSIX.
+This guide demonstrates how to use the `winapp` CLI with a Rust application to debug with package identity and package your application as an MSIX.
 
 For a complete working example, check out the [Rust sample](../../samples/rust-app) in this repository.
 

docs/guides/tauri.md

@@ -1,7 +1,7 @@
 <!-- mslearn: true -->
 # Using winapp CLI with Tauri
 
-This guide demonstrates how to use `winappcli` with a Tauri application to debug with package identity and package your application as an MSIX.
+This guide demonstrates how to use the `winapp` CLI with a Tauri application to debug with package identity and package your application as an MSIX.
 
 Package identity is a core concept in the Windows app model. It allows your application to access specific Windows APIs (like Notifications, Security, AI APIs, etc), have a clean install/uninstall experience, and more.
 

docs/usage.md

@@ -44,7 +44,7 @@ winapp init [base-directory] [options]
 - Creates Package.appxmanifest
 - Sets up build tools and enables developer mode
 - Updates .gitignore to exclude generated files
-- Stores sharable files in the global cache directory
+- Stores shareable files in the global cache directory
 
 **Automatic project detection:**
 
@@ -123,7 +123,7 @@ winapp restore [options]
 - Reads existing `winapp.yaml` configuration
 - Downloads/updates SDK packages to specified versions
 - Regenerates C++/WinRT headers and binaries
-- Stores sharable files in the global cache directory
+- Stores shareable files in the global cache directory
 
 > [!NOTE]
 > For .NET projects initialized with `winapp init`, there is no `winapp.yaml`. Use `dotnet restore` to restore NuGet packages instead.
@@ -253,7 +253,7 @@ winapp create-debug-identity [entrypoint] [options]
 
 **Options:**
 
-- `--manifest <path>` - Path to AppxManifest.xml (default: auto-detect `Package.appxmanifest` or `appxmanifest.xml` in the current directory)
+- `--manifest <path>` - Path to the app manifest file, either `Package.appxmanifest` or `appxmanifest.xml` (default: auto-detect `Package.appxmanifest` or `appxmanifest.xml` in the current directory)
 - `--no-install` - Don't install the package after creation
 - `--keep-identity` - Keep the manifest identity as-is, without appending `.debug` to the package name and application ID
 
@@ -339,6 +339,100 @@ winapp manifest generate
 winapp manifest generate ./src --package-name MyApp --publisher-name "CN=My Company" --if-exists overwrite
 ```
 
+#### manifest add-alias
+
+Add an execution alias (`uap5:AppExecutionAlias`) to a Package.appxmanifest. This allows launching the packaged app from the command line by typing the alias name.
+
+```bash
+winapp manifest add-alias [options]
+```
+
+**Options:**
+
+- `--name <alias>` - Alias name (e.g. `myapp.exe`). Default: inferred from the `Executable` attribute in the manifest.
+- `--manifest <path>` - Path to Package.appxmanifest (default: search current directory)
+- `--app-id <id>` - Application Id to add the alias to (default: first Application element)
+
+**What it does:**
+
+- Reads the manifest and infers the alias from the `Executable` attribute (preserving placeholders like `$targetnametoken$.exe`)
+- Adds the `uap5` namespace declaration if not already present
+- Adds an `<Extensions>` block with `<uap5:AppExecutionAlias>` inside the target Application element
+- If the alias already exists, reports it and exits successfully
+
+**Examples:**
+
+```bash
+# Add alias inferred from Executable attribute (e.g. $targetnametoken$.exe)
+winapp manifest add-alias
+
+# Add alias with explicit name
+winapp manifest add-alias --name myapp.exe
+
+# Add alias to specific manifest
+winapp manifest add-alias --manifest ./dist/Package.appxmanifest
+```
+
+#### manifest update-assets
+
+Generate all required MSIX image assets from a single source image.
+
+```bash
+winapp manifest update-assets <image-path> [options]
+```
+
+**Arguments:**
+
+- `image-path` - Path to source image file (PNG, JPG, SVG, ICO, GIF, BMP, etc.)
+
+**Options:**
+
+- `--manifest <path>` - Path to Package.appxmanifest file (default: search current directory)
+- `--light-image <path>` - Path to a separate source image for light theme variants
+
+**Description:**
+
+Takes a single source image and generates a comprehensive set of MSIX image assets based on the manifest's asset references:
+
+For each asset referenced in the manifest:
+- **5 scale variants** — base (no suffix), `.scale-125`, `.scale-150`, `.scale-200`, `.scale-400`
+
+For the app icon (Square44x44Logo / AppList, 44×44 base):
+- **14 plated targetsize variants** — `.targetsize-{16,20,24,30,32,36,40,48,60,64,72,80,96,256}`
+- **14 unplated targetsize variants** — `.targetsize-{size}_altform-unplated`
+
+Additionally:
+- **app.ico** — Multi-resolution ICO file (16, 24, 32, 48, 256) for shell integration. If an existing `.ico` file is found in the assets directory (e.g. `AppIcon.ico` from a project template), it is replaced in-place rather than creating a duplicate
+
+With `--light-image`:
+- **Light theme targetsize variants** — `.targetsize-{size}_altform-lightunplated` (app icon)
+- **Light theme scale variants** — `.scale-{factor}_altform-colorful_theme-light` (tiles, store logo)
+
+**SVG support:** SVG files are fully supported as source images. They are rendered as vectors directly at each target size, producing pixel-perfect results at all resolutions.
+
+The command scales images proportionally while maintaining aspect ratio, centering them with transparent backgrounds when needed. Assets are saved to the `Assets` directory relative to the manifest location.
+
+**Examples:**
+
+```bash
+# Generate assets with auto-detected manifest
+winapp manifest update-assets mylogo.png
+
+# Use an SVG source for best quality at all sizes
+winapp manifest update-assets mylogo.svg
+
+# Specify manifest location explicitly
+winapp manifest update-assets mylogo.png --manifest ./dist/Package.appxmanifest
+
+# Generate light theme variants from a separate image
+winapp manifest update-assets mylogo.png --light-image mylogo-light.png
+
+# Use the same image for both (generates all MRT light theme qualifiers)
+winapp manifest update-assets mylogo.png --light-image mylogo.png
+
+# With verbose output
+winapp manifest update-assets mylogo.png --verbose
+```
 
 ---
 
@@ -368,6 +462,7 @@ winapp run <input-folder> [options]
 - `--unregister-on-exit` - Unregister the development package after the application exits. Only removes packages registered in development mode. Cannot be combined with `--no-launch`.
 - `--detach` - Launch the application and return immediately without waiting for it to exit. Useful for CI/automation where you need to interact with the app after launch. Prints the PID to stdout (or in JSON with `--json`). Cannot be combined with `--no-launch`, `--debug-output`, `--with-alias`, or `--unregister-on-exit`.
 - `--clean` - Remove the existing package's application data (LocalState, settings, etc.) before re-deploying. By default, application data is preserved across re-deployments.
+- `--json` - Format output as JSON for programmatic consumption (e.g. CI/automation). Useful with `--detach` to capture the PID. Cannot be combined with `--with-alias` or `--debug-output`.
 
 **Application data persistence:**
 
@@ -487,101 +582,6 @@ winapp unregister --json
 
 ---
 
-#### manifest add-alias
-
-Add an execution alias (`uap5:AppExecutionAlias`) to a Package.appxmanifest. This allows launching the packaged app from the command line by typing the alias name.
-
-```bash
-winapp manifest add-alias [options]
-```
-
-**Options:**
-
-- `--name <alias>` - Alias name (e.g. `myapp.exe`). Default: inferred from the `Executable` attribute in the manifest.
-- `--manifest <path>` - Path to Package.appxmanifest (default: search current directory)
-- `--app-id <id>` - Application Id to add the alias to (default: first Application element)
-
-**What it does:**
-
-- Reads the manifest and infers the alias from the `Executable` attribute (preserving placeholders like `$targetnametoken$.exe`)
-- Adds the `uap5` namespace declaration if not already present
-- Adds an `<Extensions>` block with `<uap5:AppExecutionAlias>` inside the target Application element
-- If the alias already exists, reports it and exits successfully
-
-**Examples:**
-
-```bash
-# Add alias inferred from Executable attribute (e.g. $targetnametoken$.exe)
-winapp manifest add-alias
-
-# Add alias with explicit name
-winapp manifest add-alias --name myapp.exe
-
-# Add alias to specific manifest
-winapp manifest add-alias --manifest ./dist/Package.appxmanifest
-```
-
-Generate all required MSIX image assets from a single source image.
-
-```bash
-winapp manifest update-assets <image-path> [options]
-```
-
-**Arguments:**
-
-- `image-path` - Path to source image file (PNG, JPG, SVG, ICO, GIF, BMP, etc.)
-
-**Options:**
-
-- `--manifest <path>` - Path to Package.appxmanifest file (default: search current directory)
-- `--light-image <path>` - Path to a separate source image for light theme variants
-
-**Description:**
-
-Takes a single source image and generates a comprehensive set of MSIX image assets based on the manifest's asset references:
-
-For each asset referenced in the manifest:
-- **5 scale variants** — base (no suffix), `.scale-125`, `.scale-150`, `.scale-200`, `.scale-400`
-
-For the app icon (Square44x44Logo / AppList, 44×44 base):
-- **14 plated targetsize variants** — `.targetsize-{16,20,24,30,32,36,40,48,60,64,72,80,96,256}`
-- **14 unplated targetsize variants** — `.targetsize-{size}_altform-unplated`
-
-Additionally:
-- **app.ico** — Multi-resolution ICO file (16, 24, 32, 48, 256) for shell integration. If an existing `.ico` file is found in the assets directory (e.g. `AppIcon.ico` from a project template), it is replaced in-place rather than creating a duplicate
-
-With `--light-image`:
-- **Light theme targetsize variants** — `.targetsize-{size}_altform-lightunplated` (app icon)
-- **Light theme scale variants** — `.scale-{factor}_altform-colorful_theme-light` (tiles, store logo)
-
-**SVG support:** SVG files are fully supported as source images. They are rendered as vectors directly at each target size, producing pixel-perfect results at all resolutions.
-
-The command scales images proportionally while maintaining aspect ratio, centering them with transparent backgrounds when needed. Assets are saved to the `Assets` directory relative to the manifest location.
-
-**Examples:**
-
-```bash
-# Generate assets with auto-detected manifest
-winapp manifest update-assets mylogo.png
-
-# Use an SVG source for best quality at all sizes
-winapp manifest update-assets mylogo.svg
-
-# Specify manifest location explicitly
-winapp manifest update-assets mylogo.png --manifest ./dist/Package.appxmanifest
-
-# Generate light theme variants from a separate image
-winapp manifest update-assets mylogo.png --light-image mylogo-light.png
-
-# Use the same image for both (generates all MRT light theme qualifiers)
-winapp manifest update-assets mylogo.png --light-image mylogo.png
-
-# With verbose output
-winapp manifest update-assets mylogo.png --verbose
-```
-
----
-
 ### cert
 
 Generate, inspect, and install development certificates.
@@ -781,7 +781,7 @@ winapp tool signtool verify /pa MyApp.msix
 
 ### store
 
-Run a Microsoft Store Developer CLI command. This command will download the Microsoft Store Developer CLI if not already downloaded. Learn more about the Microsoft Store Developer CLI here: ([https://aka.ms/msstoredevcli](https://aka.ms/msstoredevcli)).
+Run a Microsoft Store Developer CLI command. This command will download the Microsoft Store Developer CLI if not already downloaded. Learn more about the [Microsoft Store Developer CLI](https://aka.ms/msstoredevcli).
 
 ```bash
 winapp store [args...]
@@ -951,13 +951,37 @@ REM Set a custom location for winapp's global cache
 set WINAPP_CLI_CACHE_DIRECTORY=d:\temp\.winapp
 ```
 
-In **Powershell** and **pwsh**:
+In **PowerShell** and **pwsh**:
 ```pwsh
 # Set a custom location for winapp's global cache
 $env:WINAPP_CLI_CACHE_DIRECTORY=d:\temp\.winapp
 ```
 
 Winapp will create this directory automatically when you run commands like `init` or `restore`.
+
+### Update Checks
+
+The winapp CLI periodically checks for new versions and displays a one-line notice when an update is available. This check runs in the background and adds no latency to commands.
+
+Update checks are automatically disabled in CI environments (GitHub Actions, Azure Pipelines, etc.).
+
+To manually disable update checks, set the `WINAPP_CLI_UPDATE_CHECK` environment variable to `0`.
+
+In **cmd**:
+```cmd
+set WINAPP_CLI_UPDATE_CHECK=0
+```
+
+In **PowerShell** and **pwsh**:
+```pwsh
+$env:WINAPP_CLI_UPDATE_CHECK = "0"
+```
+
+To make this permanent:
+```powershell
+[System.Environment]::SetEnvironmentVariable('WINAPP_CLI_UPDATE_CHECK', '0', 'User')
+```
+
 ### ui
 
 Inspect and interact with running Windows app UIs using UI Automation (UIA).

scripts/port-mslearn-docs.ps1

@@ -346,7 +346,20 @@ foreach ($entry in $FileMapping.GetEnumerator()) {
 
     # Escape bare <placeholder> patterns that MS Learn treats as HTML tags.
     # Matches <word>, <word-word>, <word word> not already inside backticks or code blocks.
-    $content = [regex]::Replace($content, '<([\w][\w\s-]*)>', '&lt;$1&gt;')
+    # Skip legitimate HTML tags whose closing form (</tag>) wouldn't be escaped by this rule,
+    # which would otherwise produce mismatched &lt;tag&gt; ... </tag> pairs in the output.
+    # Compare only the tag name (first token), so allowed tags with attributes like
+    # <details open> are preserved as HTML instead of being partially escaped.
+    $htmlPassthroughTags = @('details', 'summary', 'br', 'hr', 'sub', 'sup', 'kbd', 'b')
+    $content = [regex]::Replace($content, '<([\w][\w\s-]*)>', {
+        param($match)
+        $tag = $match.Groups[1].Value
+        $tagName = ($tag -split '\s+', 2)[0]
+        if ($htmlPassthroughTags -contains $tagName.ToLowerInvariant()) {
+            return $match.Value
+        }
+        return "&lt;$tag&gt;"
+    })
 
     # Rewrite image links first (before regular links, since ![...]() also matches [...]() regex)
     $content = [regex]::Replace($content, '!\[([^\]]*)\]\(([^)]+)\)', {