Conflicts, and how each was resolved:
* crates/buzz-agent/src/mesh.rs + tests/mesh_auto.rs — DELETED. main's
#5289 removed buzz-agent's client-side mesh catalog probe on purpose:
MeshLLM v0.75 decides per request, the desktop resolves the wire model
before spawn (relay_mesh_wire_model), and BUZZ_AGENT_PREFER_MESH_FOR_AUTO
is no longer set by anything. Keeping my MeshAutoProvider would have
resurrected policy main deliberately retired.
* crates/buzz-agent/src/llm.rs — stays deleted; goose owns the transport.
main's changes to it were the Databricks OAuth hardening (#5534), which
applies to auth.rs, now living in buzz-model-catalog.
* crates/buzz-agent/src/config.rs — ours; main's only change was dropping
prefer_mesh_for_auto, which this branch had already dropped.
* buzz-model-catalog: picked up #5534's O_NOFOLLOW/0600 token-cache
hardening, which needs the nix dep the extraction had left behind.
Co-authored-by: Michael Neale <michael.neale@gmail.com>
Signed-off-by: Michael Neale <michael.neale@gmail.com>
3190102efb