Merge origin/main into feature branch. Resolved conflicts in:
- packages/core/types/agent.ts (keep both custom_args and custom_env_redacted)
- apps/web/test/helpers.tsx (keep both fields in mock)
- server/internal/handler/agent.go (keep both fields in AgentResponse)