Back-merge v2.1.0-beta.1 from main into develop

.claude/api-reference.md

@@ -49,6 +49,15 @@ public class MyDialog : Runnable<string?>
 
 **Disposal**: "Whoever creates it, owns it" - `Run<T>()` auto-disposes, `Run(instance)` requires manual disposal.
 
+### RunnableWrapper<TView, TResult>
+
+`RunnableWrapper<TView, TResult>` wraps a `View` as a runnable without adding prompt buttons.
+
+- Clears wrapper `KeyBindings` and `MouseBindings` so the wrapped view handles input.
+- Sets `CommandsToBubbleUp = [Command.Accept]`.
+- On accept, extracts result via `ResultExtractor` if set, otherwise from `IValue<TResult>.Value` when implemented.
+- Unlike `Prompt`, it does not add OK/Cancel buttons.
+
 ---
 
 ## View Hierarchy
@@ -443,6 +452,24 @@ using (IApplication app = Application.Create ().Init ())
 
 ## Quick Reference
 
+### IValue<T> Pattern
+
+All typed views expose values through `IValue<T>.Value`. Avoid guessing member names like `.Date`, `.Time`, or `.Color`.
+
+| View | IValue<T> |
+|------|-----------|
+| TextField | `IValue<string>` |
+| NumericUpDown<T> | `IValue<T>` |
+| DatePicker | `IValue<DateTime>` |
+| TimeEditor | `IValue<TimeSpan>` |
+| ColorPicker | `IValue<Color?>` |
+| AttributePicker | `IValue<Attribute?>` |
+| CheckBox | `IValue<CheckState>` |
+| OptionSelector | `IValue<int?>` |
+| FlagSelector | `IValue<int?>` |
+
+Implementing `IValue<T>` requires `ValueChanging`, `ValueChanged`, and `ValueChangedUntyped`.
+
 ### View Properties
 
 | Property | Purpose |
@@ -478,3 +505,9 @@ DriverRegistry.Names.WINDOWS // "windows"
 DriverRegistry.Names.UNIX    // "unix"
 DriverRegistry.Names.DOTNET  // "dotnet"
 ```
+
+### Gotchas
+
+- `Terminal.Gui.Drawing.Attribute` may conflict with `System.Attribute` with implicit usings. Use `using TgAttribute = Terminal.Gui.Drawing.Attribute;` or fully qualify.
+- `Color.TryParse (string, out Color?)` uses nullable out; `Color.TryParse (string?, IFormatProvider?, out Color)` uses non-nullable out.
+- `OpenDialog` results are exposed through `FilePaths`; related state includes `AllowsMultipleSelection`, `Canceled`, and `OpenMode`.

.claude/rules/testing-patterns.md

@@ -14,8 +14,12 @@
 
 **⚠️ AI-created tests MUST follow these patterns exactly:**
 
-1. **Add comment indicating the test was AI generated**
-   - Example: `// CoPilot - ChatGPT v4`
+1. **Add a comment indicating the test was AI generated**
+   - Either of these forms is acceptable; both are well-established in the codebase:
+     - `// Claude - <model>` (e.g. `// Claude - Opus 4.7`)
+     - `// CoPilot - <model>` (e.g. `// CoPilot - ChatGPT v4`)
+   - Use whichever matches the agent that produced the test, with the model identifier.
+   - **Reviewers (human or automated) should not flag inconsistency between these two forms** — both have been used widely; consistency *of* a marker matters, not which one.
 
 2. **Make tests granular**
    - Each test should cover smallest area possible

.github/workflows/notify-clet.yml

@@ -0,0 +1,77 @@
+name: Notify clet
+
+# Fires repository_dispatch to gui-cs/clet so that every TG develop NuGet
+# publish and every TG release tag drives a matching clet build/publish.
+# See gui-cs/clet#30 and gui-cs/clet D-020 for context.
+#
+# Design notes:
+#   - The version comes from the `published-version` artifact uploaded by
+#     publish.yml. This is deterministic — no NuGet search-API race.
+#   - We then poll NuGet's flat-container API (the endpoint that
+#     `dotnet restore` actually hits) until the package is downloadable.
+#     The flat-container is updated soon after publish; the search API
+#     (queried by `dotnet package search`) lags by minutes, which broke
+#     this workflow once before — see gui-cs/clet workflow run 25406348354.
+#   - Channel is derived from the SemVer suffix: contains '-' ⇒ develop.
+
+on:
+  workflow_run:
+    workflows: ["Publish Terminal.Gui to Nuget"]
+    types: [completed]
+
+permissions:
+  contents: read
+  actions: read   # required to download artifacts from the triggering run
+
+jobs:
+  notify-clet:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Download published-version artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: published-version
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Determine version + channel
+        id: version
+        run: |
+          TG_VER=$(cat version.txt | tr -d '[:space:]')
+          if [ -z "$TG_VER" ]; then
+            echo "::error::Empty version.txt from upstream publish workflow"
+            exit 1
+          fi
+          echo "tg_version=$TG_VER" >> "$GITHUB_OUTPUT"
+          if [[ "$TG_VER" == *-* ]]; then
+            echo "event_type=tg-develop-published" >> "$GITHUB_OUTPUT"
+            echo "Channel: develop ($TG_VER)"
+          else
+            echo "event_type=tg-released" >> "$GITHUB_OUTPUT"
+            echo "Channel: release ($TG_VER)"
+          fi
+
+      - name: Wait for NuGet flat-container to index the version
+        run: |
+          VER="${{ steps.version.outputs.tg_version }}"
+          for i in $(seq 1 60); do
+            if curl -fsS https://api.nuget.org/v3-flatcontainer/terminal.gui/index.json \
+               | jq -r '.versions[]' | grep -qx "$VER"; then
+              echo "Indexed on flat-container: $VER (after $((i*10))s)"
+              exit 0
+            fi
+            echo "Waiting for $VER on NuGet flat-container ($i/60, 10s each)..."
+            sleep 10
+          done
+          echo "::error::Timed out after 10min waiting for $VER on flat-container"
+          exit 1
+
+      - name: Dispatch to gui-cs/clet
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.CLET_DISPATCH_PAT }}
+          repository: gui-cs/clet
+          event-type: ${{ steps.version.outputs.event_type }}
+          client-payload: |
+            {"tg_version": "${{ steps.version.outputs.tg_version }}"}

.github/workflows/publish.yml

@@ -2,7 +2,9 @@ name: Publish Terminal.Gui to Nuget
 
 on:
   push:
-    branches: [ main, develop ]
+    # Main releases are triggered only by pushing a v* tag (e.g., v2.0.0).
+    # Develop pushes publish pre-release packages (e.g., 2.1.0-develop.1).
+    branches: [ develop ]
     tags:
       - v*
     paths-ignore:
@@ -69,23 +71,38 @@ jobs:
 
     - name: Publish Terminal.Gui.${{ steps.gitversion.outputs.SemVer }} to NuGet.org
       run: dotnet nuget push Terminal.Gui/bin/Release/Terminal.Gui.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --api-key ${{ secrets.NUGET_API_KEY }}
+
+    # Deterministic version handoff to notify-clet.yml. Avoids the NuGet
+    # search-API indexing lag that caused gui-cs/clet to skip TG develop.37
+    # (see clet workflow run 25406348354). notify-clet.yml downloads this
+    # artifact via workflow_run + actions/download-artifact and then polls
+    # NuGet flat-container until the version is restorable.
+    - name: Record published version for notify-clet
+      run: echo "${{ steps.gitversion.outputs.SemVer }}" > version.txt
+
+    - name: Upload published-version artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: published-version
+        path: version.txt
+        retention-days: 7
 
     # - name: Delist old NuGet packages
-    #   if: github.ref == 'refs/heads/main'
+    #   if: startsWith(github.ref, 'refs/tags/v')
     #   shell: pwsh
     #   run: |
     #     $version = "${{ steps.gitversion.outputs.SemVer }}"
     #     Write-Host "Running delist script for just-published version: $version"
     #     ./Scripts/delist-nuget.ps1 -ApiKey "${{ secrets.NUGET_API_KEY }}" -JustPublishedVersion "$version"
 
     - name: Prepare payload for template dispatch
-      if: github.ref == 'refs/heads/main'
+      if: startsWith(github.ref, 'refs/tags/v')
       id: payload
       run: |
         echo "json={\"version\":\"${{ steps.gitversion.outputs.SemVer }}\"}" >> $GITHUB_OUTPUT
 
     - name: Trigger Terminal.Gui.templates update
-      if: github.ref == 'refs/heads/main'
+      if: startsWith(github.ref, 'refs/tags/v')
       uses: peter-evans/repository-dispatch@v4
       with:
         token: ${{ secrets.TEMPLATE_REPO_TOKEN }}

AGENTS.md

@@ -353,6 +353,32 @@ See `.claude/cookbook/` for common UI patterns:
 |ViewArrangement|Enum|Movable,Resizable,Overlapped
 ```
 
+### IValue<T> Pattern (Critical)
+
+All typed views expose their data through `IValue<T>.Value`. Do not guess property-specific names such as `.Date`, `.Time`, or `.Color`.
+
+| View | IValue<T> |
+|------|-----------|
+| TextField | `IValue<string>` |
+| NumericUpDown<T> | `IValue<T>` |
+| DatePicker | `IValue<DateTime>` |
+| TimeEditor | `IValue<TimeSpan>` |
+| ColorPicker | `IValue<Color?>` |
+| AttributePicker | `IValue<Attribute?>` |
+| CheckBox | `IValue<CheckState>` |
+| OptionSelector | `IValue<int?>` |
+| FlagSelector | `IValue<int?>` |
+
+Implementing `IValue<T>` requires `ValueChanging`, `ValueChanged`, and `ValueChangedUntyped`.
+
+### RunnableWrapper<TView, TResult>
+
+- Wraps a `View` as a runnable with typed results.
+- Clears wrapper `KeyBindings` and `MouseBindings` so the wrapped view handles input.
+- Does not add OK/Cancel buttons (unlike `Prompt`).
+- Sets `CommandsToBubbleUp = [Command.Accept]`.
+- On accept, it extracts results via `ResultExtractor` if provided; otherwise via `IValue<TResult>.Value` when available.
+
 ### Terminal.Gui.Views (180+ types)
 ```
 [Core Controls]
@@ -364,7 +390,7 @@ See `.claude/cookbook/` for common UI patterns:
 |DropDownList|Class|Dropdown,Source,SelectedItem
 |ProgressBar|Class|Fraction,BidirectionalMarquee
 |ScrollBar|Class|Position,Size,Orientation
-|NumericUpDown<T>|Class|Value,Increment,Min,Max
+|NumericUpDown<T>|Class|Value,Increment
 
 [Containers]
 |Window|Class|Top-level,Title,MenuBar support
@@ -390,7 +416,7 @@ See `.claude/cookbook/` for common UI patterns:
 
 [File Dialogs]
 |FileDialog|Class|Base,Path,AllowedFileTypes
-|OpenDialog|Class|OpenFile,AllowsMultipleSelection
+|OpenDialog|Class|FilePaths,AllowsMultipleSelection,Canceled,OpenMode
 |SaveDialog|Class|SaveFile,FileName
 
 [Specialized]
@@ -429,6 +455,10 @@ See `.claude/cookbook/` for common UI patterns:
 |Gradient|Class|Colors[],Spectrum
 ```
 
+**Gotchas**
+- `Terminal.Gui.Drawing.Attribute` can conflict with `System.Attribute` with implicit usings. Use `using TgAttribute = Terminal.Gui.Drawing.Attribute;` or fully qualify.
+- `Color.TryParse (string, out Color?)` is nullable out. `Color.TryParse (string?, IFormatProvider?, out Color)` is non-nullable out.
+
 ### Terminal.Gui.Drivers (80+ types)
 ```
 |IDriver|Interface|Init,End,Refresh,AddStr,Move
@@ -518,6 +548,5 @@ See `.claude/cookbook/` for common UI patterns:
 
 
 
-
 
 

CLAUDE.md

@@ -132,7 +132,7 @@ See `Tests/README.md` for the full list of test projects (including `Integration
 ## Testing
 
 - Add new tests to `UnitTestsParallelizable`; use `UnitTests.NonParallelizable` only when static state is unavoidable. Never add to `UnitTests.Legacy`.
-- Add comment: `// Claude - Opus 4.5`
+- Add a comment marking the test as AI-generated. Either form is acceptable: `// Claude - <model>` or `// CoPilot - <model>` — just include the agent and the model that produced the test (e.g., `// Claude - Opus 4.5` or `// CoPilot - ChatGPT v4`). Both forms are established in the codebase; which marker is used is not a style concern and reviewers should not flag inconsistency between them.
 - Never decrease coverage
 - Avoid `Application.Init` in tests
 

Directory.Packages.props

@@ -4,48 +4,47 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Enable Nuget Source Link for github -->
-    <PackageVersion Include="AnsiConsoleToHtml" Version="0.2.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.202" />
-    <PackageVersion Include="ColorHelper" Version="1.8.1" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
+    <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.203" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
+    <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.1.1" />
-    <PackageVersion Include="TextMateSharp" Version="2.0.3" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.7" />
     <PackageVersion Include="Wcwidth" Version="4.0.1" />
-    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
+    <PackageVersion Include="AnsiConsoleToHtml" Version="0.2.0" />
+    <PackageVersion Include="ColorHelper" Version="1.8.1" />
+    <PackageVersion Include="TextMateSharp" Version="2.0.3" />
+    <PackageVersion Include="TextMateSharp.Grammars" Version="2.0.3" />
+    <PackageVersion Include="Markdig" Version="1.1.3" />
     <PackageVersion Include="Serilog" Version="4.3.1" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
     <PackageVersion Include="CsvHelper" Version="33.1.0" />
-    <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.6" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.6" />
-    <PackageVersion Include="ReactiveUI" Version="23.2.1" />
+    <PackageVersion Include="ReactiveUI" Version="23.2.27" />
     <PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" />
-    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.6.1" />
-    <PackageVersion Include="GitHub.Copilot.SDK" Version="0.3.0" />
+    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.6.30" />
     <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="Markdig" Version="1.1.3" />
-    <PackageVersion Include="TextMateSharp.Grammars" Version="2.0.3" />
-    <PackageVersion Include="ReportGenerator" Version="5.5.5" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="xunit.v3" Version="3.2.2" />
-    <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
+    <PackageVersion Include="ReportGenerator" Version="5.5.9" />
     <PackageVersion Include="coverlet.collector" Version="10.0.0" />
     <PackageVersion Include="GitVersion.MsBuild" Version="6.7.0" />
   </ItemGroup>