Repository navigation
fix(desktop): find the shell beside the launcher's real path - #6495
Merged
Merged
Conversation
`maka desktop` located `Maka.app` beside `current_exe()`, which on macOS is the path the launcher was started through. Started through a symlink on PATH (for example `~/.local/bin/maka`), it looked for the shell in the symlink's directory and failed with "No such file or directory". Resolve the launcher path first, as `deployment` already does, so the shell and `MAKA_LAUNCHER` both use the installed executable. Generated-by: Claude Code
a9aae72 moved the Cua dependency to a new revision and added sysinfo, ntapi and the windows 0.57 crates without regenerating DEPENDENCIES.rust.tsv and the third-party notices, so the dependency inventory check fails for every pull request against rust-preview. Regenerated with scripts/rust/dependencies.mjs and scripts/rust/notices.mjs; no new license texts. Generated-by: Claude Code
Astro-Han
force-pushed
the
fix/desktop-symlinked-launcher
branch
from
October 31, 2026 06:36
84718a6 to
dc4944b
Compare
M4n5ter
approved these changes
Oct 31, 2026
M4n5ter
left a comment
Member
There was a problem hiding this comment.
The path resolution fixes symlinked desktop launches with a minimal change. The regression test exercises the actual launcher and reuses the existing fixture. No blocking issues found.
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
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.
Summary
maka desktopfails when the launcher is started through a symlink, which is the usual way to put a source build onPATH:The launcher looks for the shell beside
std::env::current_exe(), and on macOS that is the path it was started through, not the installed executable. This PR resolves the launcher path first, asdeploymentalready does when it compares the running executable with the saved deployment. The shell is then found beside the realmaka, andMAKA_LAUNCHERpasses the same resolved path to the shell, which uses it to start the Root's next Host.Verification
cargo nextest run -p maka-cli -p maka-desktop-shell --test integration -E 'test(/^desktop::/)': 7 passed.maka-desktop-shellis selected so the build unifies itsruntime-shadersfeature;-p maka-clialone needs Xcode'smetalcompiler.desktop_launched_through_a_symlink_runs_the_shell_beside_its_targetfails without the fix with the error above.cargo fmt --all -- --checkpasses.cargo clippy -p maka-cli -p maka-desktop-shell --all-targets --no-deps -- -D warningspasses. I did not runjust check.maka desktopstarted through~/.local/bin/makaopens the Maka window, and stopping the launcher reaps the shell.scripts/asf-license-headers.mjs,scripts/rust/dependencies.mjsandscripts/rust/notices.mjschecks pass.Unrelated CI fix
a9aae72, pushed directly to
rust-preview, moved the Cua dependency to a new revision and addedsysinfo,ntapiand thewindows0.57 crates without regenerating the license inventories, so the dependency inventory check fails for every pull request againstrust-preview. The second commit regeneratesDEPENDENCIES.rust.tsv,THIRD_PARTY_NOTICES.txtandnotices.json; no new license texts are added.AI use
Select exactly one:
Tool(s) and scope: Claude Code diagnosed the failure, wrote the fix and the regression test, and ran the checks above.
Checklist
Does this PR entail a change in behavior?