mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-08-28 05:27:41 +00:00
Integrates origin's worker-JWT-auth work (commits 8a6f83bb0..c847a828d) with the config-boundary refactor that landed locally. Conflicts resolved: - commands/dump.rs: take origin's removal of the 500-line in-process test block (replaced by real-server integration coverage). - commands/run/runner.rs: keep local's dense WorkflowSettings import, drop dead SettingsLayer import, pull in origin's ActorRef. - manifest_builder.rs: adopt origin's lifted working_directory resolution (fixes #159 - manifest git detection in nested repos), but via local's resolve_working_directory_from_run API that takes the dense RunNamespace. Update the regression test's ManifestBuildInput literal to local's run_overrides/cli_overrides field shape. - server.rs: keep origin's jwt_auth_mode/jwt_auth_state/ test_user_subject/issue_test_user_jwt/issue_test_worker_token/ create_run_with_bearer/bearer_request test helpers, adapt jwt_auth_state to local's create_test_app_state_with_session_key signature (ServerSettings + RunLayer), keep local's dense canonical_origin_settings that returns ServerSettings via server_settings_from_toml. Rewrite build_app_state_requires_session_secret_for_worker_tokens against the dense AppStateConfig (resolved_settings + resolved_runtime_settings_for_tests). Post-merge verification: workspace builds clean, cargo +nightly fmt --check all clean, cargo +nightly clippy --workspace --all-targets -- -D warnings clean, cargo nextest run --workspace 4560 tests passed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| crates | ||
| packages/fabro-api-client | ||