From ef926e4fe7c74bbb33b45d0eeba74e5f80786a29 Mon Sep 17 00:00:00 2001
From: Jonathan Liebig <jonathan.liebig@gmail.com>
Date: Mon, 7 Sep 2026 20:40:50 +0200
Subject: [PATCH] test: require the invalid conpty bundle diagnostic

refs #3651
---
 .github/workflows/ci.yml              | 3 +--
 scripts/windows_smoke_conpty_path.ps1 | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e084eea6..096743a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -240,8 +240,7 @@ jobs:
                 -ExePath $exe `
                 -Session "ci-conpty-invalid-windows-2022-$env:GITHUB_RUN_ID-$env:GITHUB_RUN_ATTEMPT"
             } catch {
-              if ($_.Exception.Message -notlike "workspace create failed with exit code*" -and
-                  $_.Exception.Message -notlike "server exited with exit code*") {
+                if ($_.Exception.Message -notlike "*Herdr's app-local ConPTY bundle is invalid:*") {
                 throw
               }
               $rejected = $true
diff --git a/scripts/windows_smoke_conpty_path.ps1 b/scripts/windows_smoke_conpty_path.ps1
index 263ae00d..15cb54e0 100644
--- a/scripts/windows_smoke_conpty_path.ps1
+++ b/scripts/windows_smoke_conpty_path.ps1
@@ -101,7 +101,8 @@ try {
         $ErrorActionPreference = $savedErrorActionPreference
     }
     if ($createdExitCode -ne 0) {
-        throw "workspace create failed with exit code $createdExitCode`: $($created -join "`n")"
+        $serverError = Get-Content -LiteralPath $serverErrorPath -Raw
+        throw "workspace create failed with exit code $createdExitCode`: $($created -join "`n")`n$serverError"
     }
     $paneId = (($created -join "`n") | ConvertFrom-Json).result.root_pane.pane_id
     if ([string]::IsNullOrWhiteSpace($paneId)) {