fix(desktop): use public re-export path for ensure_client_node_for_model#824
Merged
Conversation
The mesh_llm module in commands/mod.rs is private — its contents are accessible only through the pub use re-export. Fixes compilation with --features=mesh-llm introduced in #823.
tlongwell-block
pushed a commit
that referenced
this pull request
Jun 2, 2026
Rebased onto main, which feature-gated mesh-llm-sdk (optional dep + "mesh-llm" feature, #823) and changed the ensure_client_node_for_model re-export (#824). Resolved by carrying both: fork pin tlongwell-block/mesh-llm@bc2f1106 stays, now also `optional = true`; restore.rs mesh preflight keeps the #[cfg(feature="mesh-llm")] wrapper with our 3-arg ensure_client_node_for_model(..., None) signature. Add no-op stubs for mesh_dial_endpoint_addr + mesh_status_report_payload to the cfg(not(feature="mesh-llm")) stub module — the generate_handler! list references them in all builds, so the default (feature-off) build needs the stubs (they were present for the other mesh commands but not these two new ones). Lockfiles regenerated. Verified: default build + with-feature build + desktop clippy (-D warnings) + mesh-compute e2e (3/3) + relay suite (271/0) all green. Signed-off-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@sprout-oss.stage.blox.sqprod.co> Co-authored-by: Max <d8473ee32b973aa31a21a65adddcc4b69cc2a8a4dee8121ecd51926e0cddbc02@sprout-oss.stage.blox.sqprod.co>
michaelneale
added a commit
that referenced
this pull request
Jun 4, 2026
* origin/main: (36 commits) fix: use immutable commit-SHA URLs in screenshot PR comments (#842) feat(mobile+desktop): two-tier Slack-style app icon badge (#802) chore: simplify file-size check to a flat 1000-line limit (#839) fix(desktop): robust emoji picker — unify picker + fix custom emoji in editing, status, reactions (#837) feat(desktop): reusable screenshot workflow for agents (#826) desktop(mesh-llm): let a serving node route a different model (#833) chore(release): release version 0.3.9 (#832) fix: native arbitrary-file download + image context-menu flash (#830) fix(desktop): custom emoji reaction rendering + picker autofocus (#831) Mesh-LLM v1: relay-gated direct-iroh inference between users (WAN) (#822) chore(release): release version 0.3.8 (#829) chore(release): release version 0.3.7 (#825) feat: code block rendering, syntax highlighting, and compose fixes (#803) feat: custom emoji — user-owned NIP-30 sets with a client-side union (#816) Install sprout-cli skill at repo root + fix desktop clippy (#818) fix(desktop): use public re-export path for ensure_client_node_for_model (#824) refactor(desktop): feature-gate mesh-llm-sdk behind optional Cargo feature (#823) fix(desktop): align workflow read/save commands to the frontend contract (#820) fix(desktop): disable mesh-llm auto-build to prevent git config corruption (#819) fix(desktop): clear clippy lints in agents/mesh_llm commands (#817) ... # Conflicts: # Cargo.lock # desktop/scripts/check-file-sizes.mjs # desktop/src-tauri/Cargo.toml # desktop/src/app/AppShell.tsx # desktop/src/app/AppTopChrome.tsx # desktop/src/features/messages/hooks.ts # desktop/src/features/workspaces/useWorkspaceInit.ts # desktop/src/shared/api/tauri.ts
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
1 participant
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.
One-line fix for a compilation failure with
--features=mesh-llmintroduced in #823. Themesh_llmmodule incommands/mod.rsis private —restore.rswas referencingcrate::commands::mesh_llm::ensure_client_node_for_modelthrough the private module path instead of thepub use mesh_llm::*re-export atcrate::commands::ensure_client_node_for_model.Only affects builds with
--features=mesh-llm(just dev,just staging,just desktop-release-build). Default builds are unaffected.