Skip to content

Commit 915571e

Browse files
Merge branch 'test/win-pro-integration' into main
Windows Pro integration + the Windows GPU fix: - Vault, Clipboard and Replay live on Windows (core shell + wiring; the pro-side code lands in desktop-pro's matching merge). - Windows GPU offload restored: the bundled Vulkan engine died at startup with vk::PhysicalDevice::createDevice: ErrorExtensionNotPresent, so every launch silently fell back to the CPU engine. Fixed by setting ggml-vulkan's own GGML_VK_DISABLE_BFLOAT16 opt-out in the Windows engine spawn env. macOS env composition is byte-identical, asserted by test. - System Health now names a GPU driver extension gap instead of showing a blank 'server is not running'. - A failed engine LAUNCH is no longer treated as a crash, so a fast-failing engine can no longer halve and persist the user's ctxSize. - release.yml / windows-build.yml take a pro_ref input, so a release can pair a core ref with a matching desktop-pro ref instead of silently bundling pro main. Pairs with desktop-pro 169ccb6 - core's Pro shell references that code, so the two land together. Verified: tsc (node + web) clean, 3158 unit tests pass, coverage above the ratchet floor. NOT yet verified: GPU offload through a packaged app on real Windows hardware - that is what the next beta is for.
2 parents 8d18fe2 + 06624a7 commit 915571e

30 files changed

Lines changed: 679 additions & 64 deletions

.github/workflows/release.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ on:
1313
type: choice
1414
options: [beta, stable]
1515
default: beta
16+
pro_ref:
17+
# The pro checkout used to default to desktop-pro's DEFAULT branch with no ref,
18+
# which silently pairs a core feature/integration branch with pro `main`. The
19+
# build stays green and every pro-side change is simply absent — the failure mode
20+
# this input exists to prevent. Leave empty for main; set it to the matching pro
21+
# branch when releasing from a core integration branch.
22+
description: 'desktop-pro branch/tag/sha to bundle (empty = its default branch)'
23+
type: string
24+
required: false
25+
default: ''
1626

1727
permissions:
1828
contents: write
@@ -165,6 +175,11 @@ jobs:
165175
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
166176
with:
167177
repository: off-grid-ai/desktop-pro
178+
# Empty = desktop-pro's default branch (checkout treats '' as unset), so the
179+
# normal main-line release is unchanged. Set pro_ref when the core ref is an
180+
# integration branch, or the build bundles pro `main` and every pro-side change
181+
# goes missing with a green build.
182+
ref: ${{ inputs.pro_ref }}
168183
token: ${{ secrets.PRO_REPO_TOKEN }}
169184
path: pro
170185
fetch-depth: 1
@@ -356,6 +371,7 @@ jobs:
356371
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
357372
with:
358373
repository: off-grid-ai/desktop-pro
374+
ref: ${{ inputs.pro_ref }} # same pro ref as build-mac — one version, one pro tree
359375
token: ${{ secrets.PRO_REPO_TOKEN }}
360376
path: pro
361377
fetch-depth: 1

.github/workflows/windows-build.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ on:
1111
branches:
1212
- feat/windows-support
1313
workflow_dispatch: # lets you trigger a build manually from the Actions tab
14+
inputs:
15+
pro_ref:
16+
# Without this the pro checkout below takes desktop-pro's DEFAULT branch, so
17+
# dispatching from a core integration branch quietly builds against pro `main`
18+
# and every pro-side change is absent from a green build.
19+
description: 'desktop-pro branch/tag/sha to bundle (empty = its default branch)'
20+
type: string
21+
required: false
22+
default: ''
1423

1524
permissions:
1625
contents: read
@@ -44,6 +53,9 @@ jobs:
4453
if: env.HAS_PRO_TOKEN == 'true'
4554
with:
4655
repository: off-grid-ai/desktop-pro
56+
# Empty = default branch (checkout treats '' as unset), so the push-triggered
57+
# build is unchanged; set it on dispatch to pair with a core integration branch.
58+
ref: ${{ inputs.pro_ref }}
4759
token: ${{ secrets.PRO_REPO_TOKEN }}
4860
path: pro
4961
fetch-depth: 1
17.6 KB
Loading
478 Bytes
Loading

e2e/screenshots/chat-screen.png

158 Bytes
Loading
-478 Bytes
Loading
-629 Bytes
Loading
477 Bytes
Loading
616 Bytes
Loading
480 Bytes
Loading

0 commit comments

Comments
 (0)