fix(discovery): inject PATH into Codex adapter planning#2767
Merged
Conversation
cameronhotchkies
marked this pull request as ready for review
July 24, 2026 22:12
Co-authored-by: npub1x4hk035p3p9q39a3fcrd2fe30lpkrhr5dwe0cqzzjphxyyh8m0gsq4vqap <356f67c681884a0897b14e06d527317fc361dc746bb2fc0042906e6212e7dbd1@buzz.block.builderlab.xyz> Signed-off-by: npub1x4hk035p3p9q39a3fcrd2fe30lpkrhr5dwe0cqzzjphxyyh8m0gsq4vqap <356f67c681884a0897b14e06d527317fc361dc746bb2fc0042906e6212e7dbd1@buzz.block.builderlab.xyz> Co-authored-by: Codex <noreply@openai.com> Ai-assisted: true
Co-authored-by: npub1x4hk035p3p9q39a3fcrd2fe30lpkrhr5dwe0cqzzjphxyyh8m0gsq4vqap <356f67c681884a0897b14e06d527317fc361dc746bb2fc0042906e6212e7dbd1@buzz.block.builderlab.xyz> Signed-off-by: npub1x4hk035p3p9q39a3fcrd2fe30lpkrhr5dwe0cqzzjphxyyh8m0gsq4vqap <356f67c681884a0897b14e06d527317fc361dc746bb2fc0042906e6212e7dbd1@buzz.block.builderlab.xyz>
Co-authored-by: npub1x4hk035p3p9q39a3fcrd2fe30lpkrhr5dwe0cqzzjphxyyh8m0gsq4vqap <356f67c681884a0897b14e06d527317fc361dc746bb2fc0042906e6212e7dbd1@buzz.block.builderlab.xyz> Signed-off-by: npub1x4hk035p3p9q39a3fcrd2fe30lpkrhr5dwe0cqzzjphxyyh8m0gsq4vqap <356f67c681884a0897b14e06d527317fc361dc746bb2fc0042906e6212e7dbd1@buzz.block.builderlab.xyz> Co-authored-by: Codex <noreply@openai.com> Ai-assisted: true
cameronhotchkies
force-pushed
the
grumplestiltzkin/fix-codex-probe-flake
branch
from
July 25, 2026 05:16
6589165 to
dabc226
Compare
cameronhotchkies
enabled auto-merge (squash)
July 25, 2026 05:31
wesbillman
approved these changes
Jul 25, 2026
wesbillman
left a comment
wesbillman
left a comment
Collaborator
There was a problem hiding this comment.
Approved. The failure this fixes is test isolation, not a product race: the valid 1.x fixture inherited process-global augmented/login-shell PATH state, so concurrent tests could make its child probe fail and conservatively classify it as outdated. This change injects the probe PATH at the planning seam; production still computes and passes the same augmented PATH, while tests pass a controlled PATH. I found no missed call sites or behavior change.
Reviewed at dabc226. CI is green across Desktop Core, Windows, macOS, smoke, and integration.
tlongwell-block
added a commit
that referenced
this pull request
Jul 25, 2026
Brings the branch up to date with origin/main (2a051a4) so CI and local gates run against the tree that will actually merge. Requested as a merge commit rather than a rebase to keep Duncan's authored history intact. Two ratchet entries in desktop/scripts/check-file-sizes.mjs needed composing, since both sides raised per-file ceilings from a shared base: - src-tauri/src/commands/agent_discovery.rs — textual conflict. BYOH took 1826 -> 2038 (+212); main #2767 took 1826 -> 1836 (+10). Resolved to 2048 with both comment blocks kept, preserving the slack each side intended rather than discarding one growth. - src-tauri/src/managed_agents/discovery.rs — no textual conflict, but the BYOH ceiling of 1715 predates main's +17 and the merged file is 1729 lines, so the check failed on a clean auto-merge. Composed to 1732. The overrides map is a ceiling (violation only when lineCount > limit), so composing deltas is the resolution that matches the file's convention. Verified on the merged tree: desktop file-size check clean, frontend suite 3554/3555 (the one failure is the pre-existing styled-qr-code 'Cannot find package qrcode' local module-resolution fault, which fails identically on pristine heads), presetLogos drift guard 10/10 with all 8 preset ids still parsing out of main's modified discovery.rs, tsc --noEmit clean, biome clean over 1640 files, just test-unit 5/5 crates, and desktop-tauri-test 1691/1691. Co-authored-by: tlongwell-block <109685178+tlongwell-block@users.noreply.github.com> Signed-off-by: tlongwell-block <109685178+tlongwell-block@users.noreply.github.com>
wpfleger96
pushed a commit
that referenced
this pull request
Jul 25, 2026
…chive * origin/main: (112 commits) docs(contributing): trim to goose-scale minimal intake surface (#2780) fix(relay): preserve reconnect backoff (#2759) refactor(relay): expose reconnect timing policy (#2310) fix(desktop): clear stale working badges on agent stop/restart (#2803) fix(desktop): surface agent rename relay profile sync failure as a warning toast (#2279) fix(docker): create /data/git so the compose volume inherits buzz ownership (#2840) fix(mobile): invalidate DM directory providers at the community boundary (#2842) feat(relay): make per-owner community limit configurable via BUZZ_MAX_COMMUNITIES_PER_OWNER (#2599) fix(discovery): inject PATH into Codex adapter planning (#2767) chore(release): release Buzz Desktop version 0.4.26 (#2808) Refine mobile navigation and creation flows (#2810) feat(relay): add author-only-unless-shared read gate for kind 30175 (#2768) fix(core): block IPv6 transition SSRF targets (#2801) Style mobile pairing QR codes (#2775) Refine community management flows (#2738) fix(workflow): bypass system proxies for webhooks (#2800) docs: replace VPN-vendor references with generic wording (#2805) docs: point readme at deploy compose bundle (#2363) fix(desktop): explain macOS local network access (#2263) fix(desktop): clarify CLI runtime setup (#2680) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
The Codex adapter install-plan test depended on the process-global login-shell PATH cache, making it flaky under concurrent or loaded CI runs.
What
Risk Assessment
Low — production behavior keeps using the same augmented PATH; only dependency injection and deterministic tests change.
References
just desktop-tauri-test;cd desktop && pnpm check; full pre-push hooksGenerated with Codex