From 2a37f191b5c062137cef13a0673bb97e7305f209 Mon Sep 17 00:00:00 2001
From: Mohamed Elkholy <melkholy@techmatrix.com>
Date: Tue, 2 Jun 2026 19:29:49 -0400
Subject: [PATCH 1/2] fix(ci): handle initial WinGet submission with
 wingetcreate new

---
 .github/workflows/winget.yml | 42 +++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
index e0365637..76dfb4cd 100644
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -35,7 +35,7 @@ jobs:
             exit 1
           fi
 
-      - name: Submit manifest update with wingetcreate
+      - name: Submit manifest to WinGet (new or update)
         shell: pwsh
         env:
           WINGET_TOKEN: ${{ secrets.WINGET_SUBMIT_TOKEN }}
@@ -53,10 +53,36 @@ jobs:
           if ($actualHash -ne $wingetCreateSha256) {
             throw "wingetcreate.exe SHA-256 mismatch: expected $wingetCreateSha256, got $actualHash"
           }
-          # PackageIdentifier must match the existing winget-pkgs entry; create it
-          # once manually via `wingetcreate new` before the first automated update.
-          .\wingetcreate.exe update PythoughtsLabs.PythinkerCode `
-            --version $env:VERSION `
-            --urls "$installerUrl" `
-            --submit `
-            --token $env:WINGET_TOKEN
+
+          # Detect whether the package already exists in winget-pkgs.
+          # Use `update` for subsequent releases; `new` for the initial submission.
+          $manifestPath = "manifests/p/PythoughtsLabs/PythinkerCode"
+          $headers = @{
+            Authorization = "token $env:WINGET_TOKEN"
+            Accept = "application/vnd.github+json"
+            "X-GitHub-Api-Version" = "2022-11-28"
+          }
+          $packageExists = $false
+          try {
+            $null = Invoke-WebRequest -Uri "https://api.github.com/repos/microsoft/winget-pkgs/contents/$manifestPath" `
+              -Headers $headers -ErrorAction Stop
+            $packageExists = $true
+          } catch {
+            $packageExists = $false
+          }
+
+          if ($packageExists) {
+            Write-Host "Package exists in winget-pkgs — running wingetcreate update"
+            .\wingetcreate.exe update PythoughtsLabs.PythinkerCode `
+              --version $env:VERSION `
+              --urls "$installerUrl" `
+              --submit `
+              --token $env:WINGET_TOKEN
+          } else {
+            Write-Host "Package not found in winget-pkgs — running wingetcreate new (initial submission)"
+            .\wingetcreate.exe new "$installerUrl" `
+              --id PythoughtsLabs.PythinkerCode `
+              --version $env:VERSION `
+              --submit `
+              --token $env:WINGET_TOKEN
+          }

From ce10b0dcde61b1ff920f9ec076f59d0b57136c61 Mon Sep 17 00:00:00 2001
From: Mohamed Elkholy <melkholy@techmatrix.com>
Date: Tue, 2 Jun 2026 19:39:11 -0400
Subject: [PATCH 2/2] fix(ci): harden winget catch block and remove interactive
 wingetcreate new from CI

---
 .github/workflows/winget.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
index 76dfb4cd..49420d0a 100644
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -55,7 +55,6 @@ jobs:
           }
 
           # Detect whether the package already exists in winget-pkgs.
-          # Use `update` for subsequent releases; `new` for the initial submission.
           $manifestPath = "manifests/p/PythoughtsLabs/PythinkerCode"
           $headers = @{
             Authorization = "token $env:WINGET_TOKEN"
@@ -68,7 +67,14 @@ jobs:
               -Headers $headers -ErrorAction Stop
             $packageExists = $true
           } catch {
-            $packageExists = $false
+            # Only treat 404 as "package not yet submitted". Any other status
+            # (401, 403, 5xx) or network failure means something is wrong — fail loudly.
+            $response = $_.Exception.Response
+            if ($null -ne $response -and [int]$response.StatusCode -eq 404) {
+              $packageExists = $false
+            } else {
+              throw
+            }
           }
 
           if ($packageExists) {
@@ -79,10 +85,12 @@ jobs:
               --submit `
               --token $env:WINGET_TOKEN
           } else {
-            Write-Host "Package not found in winget-pkgs — running wingetcreate new (initial submission)"
-            .\wingetcreate.exe new "$installerUrl" `
-              --id PythoughtsLabs.PythinkerCode `
-              --version $env:VERSION `
-              --submit `
-              --token $env:WINGET_TOKEN
+            # wingetcreate new is interactive and not safe to run in CI.
+            # The initial submission must be done once manually:
+            #   wingetcreate new <installerUrl> --token <PAT>
+            # After that PR is merged into winget-pkgs, this workflow handles
+            # all subsequent updates automatically via wingetcreate update.
+            throw "Package 'PythoughtsLabs.PythinkerCode' not found in winget-pkgs. " + `
+                  "Submit the initial manifest manually: " + `
+                  "wingetcreate new $installerUrl --token <WINGET_SUBMIT_TOKEN>"
           }