Merge remote-tracking branch 'github/main' into fix/agent-help-trails-availability

main

Commit

dipree2mo ago

Conflicts:

cmd/entire/cli/trail_context_cache.go