You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
A POSIX desktop app launched from the GUI could not find an Android SDK configured only in the login-shell profile. Read ANDROID_HOME and ANDROID_SDK_ROOT during the existing shell probe and carry them into the desktop environment before the backend starts.
Treat the two names as one SDK selection: hydrate them only when neither is inherited. This prevents a shell ANDROID_HOME from overriding an inherited ANDROID_SDK_ROOT. Windows, WSL forwarding and standalone server startup are unchanged.
Retains the fix by @thelonewander3r in #11648, with the pinned main revision merged and the original commits preserved.
24 focused DesktopShellEnvironment tests pass. The original single added test is replaced by two behavioral cases covering normal hydration and inherited SDK selection; 22 existing tests remain unchanged.
The inherited-selection case fails before the fix and passes afterward. Script-text assertions were removed.
Changed-file formatting and lint, plus the desktop typecheck, pass.
This is nonvisual environment handling. No packaged GUI launch was performed; tests exercise the existing shell-environment service, and the environment path through the backend to the device host was reviewed.
Independent Opus and Sol full-diff reviews found no code blockers after the SDK-precedence correction.
Current-head CI will run after this update; previous checks cover the original head only.
Implementation: Claude Fable 5.1. Test assessment and independent review: Claude Opus 5.5. Independent review and coordination: GPT-6.1 Sol, through Claude Code and Codex in T3 Code.
Takeover
Credits @thelonewander3r for #11648. Rebuilt on current main because the contribution is on a fork; the SDK group-precedence implementation is retained. Ported the two behavioral tests with distinct paths to catch swapped values. The validation above describes the original fork head; replacement validation follows.
Evidence
Linux x86_64, Electron 44.9.3 under headless-desktop/Xvfb; GUI-like env -i, isolated HOME/T3 home per run, T3CODE_DEV_SEED=0. Synthetic SDK discovery only, no emulator launch.
Tests: vp test run apps/desktop/src/shell/DesktopShellEnvironment.test.ts, 12 existing → 14 passing. Removing the fix or capture names fails hydration; per-variable filling fails inherited-selection protection.
Changed-file lint/format and desktop typecheck pass. No new parser/regex; fixed two-name loop.
Review round 1: Sol FIX_FIRST for pending captures/coverage requests, Opus MERGE; no code defects. Round 2: Sol MERGE and Opus MERGE; focused coverage accepted after runtime evidence.
Proof audit pass 2: SUFFICIENT; independently rebuilt/replayed HEAD A1. C11-after final process-tree snapshot is empty after shutdown; exec-time tuple, child sentinels, UI and recording support the row. Audit scripts/replay.
All 44 Linux before/after runs passed; all 88 stills opened and pixel-stable, all 44 recordings decoded. Captured backend exec environment prevents terminal-profile masking.
Windows/macOS runtime and actual emulator boot unverified; no platform-specific branch added. Shared POSIX code verified on Linux desktop; standalone server, web/mobile startup and remote host provisioning unchanged.
Replacement-head CI pending; dispatcher owns CI and merge.
Models/harnesses: Claude Opus 5.5 (tests, implementation, reviews) and GPT-6.1 Sol (coordination, reviews, evidence, proof audit), through Claude Agent and Codex in T3 Code.
Final merged-head verification
The historical 44/44 matrix and PASS2 replay above were captured at e90cc01e4b, with before shell source from 843f4e3529; those captures are not attributed to the merged head. Earlier PASS1 labeling at b6c944c9b8 differs only in tests.
Final local head 131173e0f4 merges the reviewed head with main 3eb836664e. Desktop/web/shared shell and local device source are unchanged; the complete patch against main remains byte-identical, two files and 47 additions.
Fresh web/backend/Electron rebuild at that exact final head passed, followed by real Electron A1-after and critical inherited-ROOT C3-after captures. A1 backend inherits (h,r) from profile; C3 retains (absent,j), selects j and does not fill HOME from profile. Both show SDK installed/no AVD; both still pairs are stable, recordings fully decode, focused tests pass 14/14, and cleanup reports no remaining recorded live PIDs. Historical C11-after empty final-tree caveat remains unchanged.
Macroscope's review found this PR approvable — The desktop now honors login-shell Android SDK selections and refreshes the local device host's SDK environment when used. Existing inherited selections and discovery defaults are preserved, keeping the change limited to local tool selection.
You can add or adjust custom eligibility rules. Learn more.
No actionable comments were generated in the recent review.
Walkthrough
The desktop shell environment captures ANDROID_HOME and ANDROID_SDK_ROOT from the login shell. On POSIX systems, it copies shell values only when neither variable is inherited. The local device host resolves the current SDK-derived environment during startup, shutdown, readiness checks, and command execution.
Changes: Android SDK Environment Handling
Layer / File(s)
Summary
Capture and hydrate Android SDK variables packages/contracts/src/resourceTelemetry.ts, apps/desktop/src/shell/DesktopShellEnvironment.ts, apps/desktop/src/shell/DesktopShellEnvironment.test.ts
ShellEnvironmentPatch accepts optional nullable Android SDK variables. Login-shell capture includes both variables. POSIX installation copies nonblank shell values only when both inherited values are blank or unset. macOS tests cover hydration and preservation of an inherited ANDROID_SDK_ROOT.
Resolve current SDK environment for host operations apps/server/src/device/LocalDeviceHost.ts, apps/server/src/device/LocalDeviceHost.test.ts
Host operations resolve the Android SDK environment when used. The test changes ANDROID_HOME after host creation and checks readiness, agent launch, and a later emulator command, including the platform-tools path.
This change lets desktop launches pick up an Android SDK configured only in a login-shell profile, and the device host now follows the current SDK selection. No actionable merge-blocking risk was found. Windows and macOS runtime behavior was not verified.
Pre-merge checks: 4
Check name
Status
Explanation
Title check
The title "fix(desktop): inherit login-shell Android SDK selection" matches the main change in the changeset. The changes hydrate ANDROID_HOME and ANDROID_SDK_ROOT from the login-shell capture in Desk…
Description check
The description follows the repository template. It has a Problem section (a POSIX desktop app launched from the GUI could not find an Android SDK set only in the login-shell profile), a Change sectio…
Linked Issues check
Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check
Check skipped because no linked issues were found for this pull request.
Full details: Title check
Explanation
The title "fix(desktop): inherit login-shell Android SDK selection" matches the main change in the changeset. The changes hydrate ANDROID_HOME and ANDROID_SDK_ROOT from the login-shell capture in DesktopShellEnvironment.ts, only when neither is inherited, and add tests for that behavior. The title is specific and follows conventional commit style. The LocalDeviceHost.ts resolution change is a secondary change that the title does not mention, which is acceptable for a title.
Full details: Description check
Explanation
The description follows the repository template. It has a Problem section (a POSIX desktop app launched from the GUI could not find an Android SDK set only in the login-shell profile), a Change section (read both variables during the shell probe and hydrate them only when neither is inherited), a Scope section (it does not link a bug issue directly; it references PR #11648 as the retained fix, and the author does not explain why no issue is needed or whether a maintainer requested it), and a Verification section with focused tests, lint/format, typecheck, and Linux runtime evidence. The description is long and includes a lot of matrix and evidence detail that goes beyond the template. It also contains a 'Takeover' section and the author attribution. Scope is the main gap: the template asks for a linked issue that shows the bug, or a reason for skipping one. The description also reports that Windows and macOS runtime were not verified, and the LocalDeviceHost.ts change is not explained in the Change section.
Resolution
Optionally: link the issue that shows the bug, or say why no issue is needed. Briefly explain the LocalDeviceHost.ts per-use SDK resolution change in the Change section. Shorten the evidence matrix, since the template asks for focused verification.
Finishing Touches
Generate unit tests (beta)
Commit to this branch
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Reviewing files that changed from the base of the PR and between 35ff8e9 and 364ca6d.
Files selected for processing: 2
apps/server/src/device/LocalDeviceHost.test.ts
apps/server/src/device/LocalDeviceHost.ts
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 0 remain after this review.
Main now forwards the login-shell environment to the backend as a ShellEnvironmentPatch, which only carries the fields its schema lists. Add ANDROID_HOME and ANDROID_SDK_ROOT so the hydrated SDK selection reaches the server's device tools.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
… later
The desktop shell environment reaches the server after startup, but LocalDeviceHost resolved the Android SDK and copied the process environment once at construction. The hub, the agent-device daemon and emulator commands kept a standard-location SDK even after the login shell selected another one. Resolve the SDK and helper environment each time a helper starts or a command runs.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Built and ran both commits as real Electron desktop apps on Linux under headless-desktop. Every capture uses fresh isolated state, a 1280×900 window, and dark theme.
Create a custom SDK outside default discovery locations with the three executable tool stubs used by the triage reproduction.
Export ANDROID_HOME only in .bash_profile; keep adb out of PATH. Confirm the interactive login shell sees the SDK and no adb.
Launch Electron without ANDROID_HOME or ANDROID_SDK_ROOT inherited.
Open Settings → Devices, enable Use devices, and open the Android popover.
The base reports “Android not available — Android SDK was not found”; the head reports “Android available.” Stills were captured only after two screenshots 500 ms apart matched.
Additional controls all displayed Android available:
Verified by gpt-6.1-sol through the Codex harness.
Not shown:
Real AVD creation, emulator launch, adb operation, and agent-device commands were not exercised: the reproduction uses executable SDK tool stubs, matching triage.
The late shell-selection behavior of individual device helper subprocesses was not independently exercised beyond the real desktop availability flow.
macOS and Windows desktop behavior was not exercised; these captures establish the result on Linux.
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
bugfixFix PR opened by an issue lead; enters the PR looppr:needs-verificationReviewed and green; needs a run on a desktop, Android or iOS device and captures postedsize:M30-99 changed lines (additions + deletions).vouch:trustedAuthor is trusted by repo permissions or the VOUCHED list.
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.
github-actions
Bot
added
vouch:trusted
![macroscopeapp[bot]](https://avatars.githubusercontent.com/in/900172?s=60&v=4){kind=small}
juliusmarminge
added
bugfix
A POSIX desktop app launched from the GUI could not find an Android SDK configured only in the login-shell profile. Read
ANDROID_HOMEandANDROID_SDK_ROOTduring the existing shell probe and carry them into the desktop environment before the backend starts.Treat the two names as one SDK selection: hydrate them only when neither is inherited. This prevents a shell
ANDROID_HOMEfrom overriding an inheritedANDROID_SDK_ROOT. Windows, WSL forwarding and standalone server startup are unchanged.Retains the fix by @thelonewander3r in #11648, with the pinned main revision merged and the original commits preserved.
Validation at c4c9ff1ee9:
DesktopShellEnvironmenttests pass. The original single added test is replaced by two behavioral cases covering normal hydration and inherited SDK selection; 22 existing tests remain unchanged.Independent Opus and Sol full-diff reviews found no code blockers after the SDK-precedence correction.
Current-head CI will run after this update; previous checks cover the original head only.
Implementation: Claude Fable 5.1. Test assessment and independent review: Claude Opus 5.5. Independent review and coordination: GPT-6.1 Sol, through Claude Code and Codex in T3 Code.
Takeover
Credits @thelonewander3r for #11648. Rebuilt on current main because the contribution is on a fork; the SDK group-precedence implementation is retained. Ported the two behavioral tests with distinct paths to catch swapped values. The validation above describes the original fork head; replacement validation follows.
Evidence
Linux x86_64, Electron 44.9.3 under
headless-desktop/Xvfb; GUI-likeenv -i, isolated HOME/T3 home per run,T3CODE_DEV_SEED=0. Synthetic SDK discovery only, no emulator launch.Fixture matrix, 44/44 runtime results, all scripts, manifests, filtered backend environments, stills and recordings. U=absent, E=empty, W=whitespace; h/r are profile roots, i/j inherited roots. Each linked tuple opens its real Electron still; raw tuples and selected-root sentinels are in the archive.
843f4e3529
e90cc01e4b
Before — profile-only SDK unavailable:
After — profile-only SDK discovered:
Verification log
vp test run apps/desktop/src/shell/DesktopShellEnvironment.test.ts, 12 existing → 14 passing. Removing the fix or capture names fails hydration; per-variable filling fails inherited-selection protection.Final merged-head verification
The historical 44/44 matrix and PASS2 replay above were captured at e90cc01e4b, with before shell source from 843f4e3529; those captures are not attributed to the merged head. Earlier PASS1 labeling at b6c944c9b8 differs only in tests.
Final local head 131173e0f4 merges the reviewed head with main 3eb836664e. Desktop/web/shared shell and local device source are unchanged; the complete patch against main remains byte-identical, two files and 47 additions.
Fresh web/backend/Electron rebuild at that exact final head passed, followed by real Electron A1-after and critical inherited-ROOT C3-after captures. A1 backend inherits (h,r) from profile; C3 retains (absent,j), selects j and does not fill HOME from profile. Both show SDK installed/no AVD; both still pairs are stable, recordings fully decode, focused tests pass 14/14, and cleanup reports no remaining recorded live PIDs. Historical C11-after empty final-tree caveat remains unchanged.
Final-head addendum — SUFFICIENT, new capture/log/script bundle. Synthetic Linux discovery only; Windows/macOS runtime and actual emulator boot remain unverified. No new code review or CI result is claimed by this addendum.