pika-git-service-1

The new forge_service.rs file introduces ForgeService, a Clone-able struct that bundles all dependencies required by forge operations: Store, Config, CiLiveUpdates, and Arc<ForgeRuntime>. A constructor (ForgeService::new) accepts these four parameters.

Alongside the service struct, a ForgeServiceError enum with three variants (NotFound, Conflict, Internal) replaces the ad-hoc (StatusCode, String) tuples that were previously scattered across web handlers. Each forge operation returns a dedicated result struct (MergeBranchResult, CloseBranchResult, BranchLaneRerunResult, NightlyLaneRerunResult, BranchLaneMutationResult, NightlyLaneMutationResult, BranchRunRecoveryResult, NightlyRunRecoveryResult, BranchDetailAndRuns) that carries only the domain-relevant fields. This makes the API boundary explicit and testable without any HTTP framework dependency.

branch_detail_and_runs replaces the old load_branch_detail_and_runs free function that lived in web.rs. It clones the store, spawns two spawn_blocking tasks (one for get_branch_detail, one for list_branch_ci_runs), and wraps all error cases into ForgeServiceError. The method returns Option<BranchDetailAndRuns> so callers can distinguish "not found" from errors.

resolve_branch_by_name encapsulates the config lookup for the effective forge repo and the store query find_branch_by_name, removing this logic from the API handler.

nightly_run is a thin wrapper around store.get_nightly_run with spawn_blocking, replacing identical inline code in both the HTML page handler and the API detail handler.

The merge_branch method consolidates a complex multi-step workflow that was previously inline in merge_handler: config validation, loading the branch action target, verifying the current head SHA against the forge, calling forge::merge_branch, marking the branch merged in the store, and requesting a mirror. Each step maps errors to the appropriate ForgeServiceError variant (Internal for infrastructure failures, Conflict for state mismatches, NotFound for missing branches).

close_branch follows the same pattern for branch deletion. Both methods share a private helper branch_action_target that loads and validates the branch exists.

The lane mutation methods (rerun_branch_ci_lane, rerun_nightly_lane, fail_branch_ci_lane, requeue_branch_ci_lane, fail_nightly_lane, requeue_nightly_lane) each follow a consistent pattern: spawn a blocking store call, on success emit a live-update notification and wake the CI scheduler, then return a typed result. The nightly equivalents mirror the branch methods.

Recovery methods (recover_branch_ci_run, recover_nightly_run) handle bulk lane recovery with the same pattern. A wake_ci pass-through method is also exposed for the simple wake endpoint.

In main.rs, the mod forge_service; declaration is added in alphabetical order among the existing module declarations.

In web.rs, the AppState struct gains a forge_service: Arc<ForgeService> field. During serve() initialization, ForgeService::new is constructed with clones of the store, config, live_updates, and a shared reference to the forge runtime. The resulting Arc<ForgeService> is stored in AppState and becomes available to every handler via State(state).

Two helper functions are introduced in web.rs:

• map_forge_service_error converts a ForgeServiceError into a (StatusCode, String) tuple, mapping NotFound to 404, Conflict to 409, and Internal to 500. This is used by HTML-rendering handlers that return (StatusCode, String) pairs.

• forge_service_json_error wraps the above to produce a full axum::response::Response with a JSON {"error": "..."} body. This is used by all JSON API handlers.

These two functions replace dozens of inline error-to-response conversions that were previously duplicated across handlers.

The nightly_handler previously contained a full spawn_blocking + triple-match error handling block (Ok/Ok/Some, Ok/Ok/None, Ok/Err, Err). This is replaced with a single state.forge_service.nightly_run(nightly_run_id).await call and a three-arm match.

branch_ci_page_handler and detail_page both called the now-deleted load_branch_detail_and_runs free function. They now call state.forge_service.branch_detail_and_runs(branch_id, 8) and destructure the BranchDetailAndRuns result directly.

The load_branch_detail_and_runs function (approximately 50 lines) is completely removed from web.rs since its logic now lives in ForgeService::branch_detail_and_runs.

Similarly, load_branch_ci_summary_snapshot, load_branch_ci_live_snapshot, and load_nightly_live_snapshot all switch from inline spawn_blocking calls to the corresponding ForgeService methods, each saving 10-20 lines of boilerplate.

The merge_handler shrinks from ~120 lines to ~15. Previously it inlined config checks, store queries via spawn_blocking, forge HEAD verification, the merge API call, store updates, and mirror requests—each with its own multi-arm error match. Now it calls state.forge_service.merge_branch(branch_id, &npub), destructures the typed MergeBranchResult, and calls forge_service_json_error on failure.

close_handler follows the same pattern, dropping from ~110 lines to ~12.

Each of the lane-level handlers (rerun_branch_ci_lane_handler, rerun_nightly_lane_handler, fail_branch_ci_lane_handler, requeue_branch_ci_lane_handler, fail_nightly_lane_handler, requeue_nightly_lane_handler) and the recovery handlers (recover_branch_ci_run_handler, recover_nightly_run_handler) are similarly reduced. The handlers no longer call state.live_updates or state.forge_runtime.wake_ci() directly—those side effects are encapsulated within the ForgeService methods.

The wake_ci_handler switches from state.forge_runtime.wake_ci() to state.forge_service.wake_ci(), maintaining the abstraction boundary.

api_forge_branch_resolve_handler previously inlined the config lookup for the forge repo name and a spawn_blocking store query. It now calls state.forge_service.resolve_branch_by_name(&branch_name) and uses forge_service_json_error for the error path, cutting the handler by ~15 lines.

api_forge_branch_detail_handler and api_forge_branch_logs_handler both switch from the now-deleted load_branch_detail_and_runs to state.forge_service.branch_detail_and_runs, destructuring BranchDetailAndRuns. Error handling changes from Err((status, message)) to Err(err) => forge_service_json_error(err).

api_forge_nightly_detail_handler replaces its inline spawn_blocking + double-Result unwrap with state.forge_service.nightly_run(nightly_run_id).await, collapsing the nested Ok(Ok(Some(...))) pattern into a flat Ok(Some(...)).