pika-orch-incus-cleanup-23

Two files in jerichoci define test-only enums that replicate the shape of production staged-Linux catalogs. The project enforces architecture invariants that restrict where catalog definitions may live.

A two-line comment is added above each enum declaration inside #[cfg(test)] mod tests:

// Test-only fixture catalog for model behavior checks. This is not production
// JerichoCI catalog data and should not count against architecture invariants.

This appears in three locations:

1. model.rs — StagedLinuxRustTarget (line 454)
2. model.rs — StagedLinuxRustLane (line 479)
3. run.rs — StagedLinuxRustLane (line 4473)

The comments serve as anchors for the invariant checker's exclusion rules (configured in a later step).

The following functions are removed from main.rs and relocated to crates/pikaci/src/output.rs:

main.rs now imports these through the new module:

use output::{
    format_status_lines, prepared_output_consumer_label, print_json, print_json_line,
    print_run_human_summary, status_text,
};

The functions are moved verbatim — no signature or logic changes.

The new crates/pikaci/src/targets.rs receives:

Struct

• TargetSpec — the central type describing a CI target (id, description, filters, jobs).

Runtime helpers

• remote_incus_runtime() — build an Incus JobRuntimeConfig
• tart_runtime() — build a Tart JobRuntimeConfig
• remote_incus_job_base(), host_local_job_base(), tart_job_base() — default JobSpec scaffolds
• TART_HOST_SETUP_COMMAND constant

Job-group factories (each returns Vec<JobSpec>)

• agent_contract_jobs, pika_rust_jobs, notification_jobs, pikachat_rust_jobs, pika_followup_jobs, pikachat_openclaw_e2e_jobs, pikachat_typescript_jobs, fixture_rust_jobs, pikachat_apple_followup_jobs, rmp_jobs
• Individual Tart job builders: tart_agent_button_job, tart_ios_unit_jobs, tart_ios_unit_suite_job, tart_ios_ui_test_job, tart_ios_ui_note_to_self_job, tart_desktop_package_tests_job

Dispatchers

• target_spec(name) -> Result<TargetSpec> — the main match-based target resolver
• staged_linux_target(target_id) — parse a target ID into PikaStagedLinuxTarget
• staged_linux_target_spec, single_job_target_spec, static_filters — helpers

In main.rs the import list shrinks from pulling individual jerichoci types for job construction to only the types needed for the CLI entrypoint:

use targets::{TargetSpec, staged_linux_target, target_spec};

All call-sites in main.rs that previously referenced these functions now resolve through the module re-export. No behavioral changes are introduced.

Before the refactor main.rs imported 16 types/functions from jerichoci (including GuestCommand, HostProcessRuntimeConfig, IncusRuntimeConfig, JobExecutionConfig, JobRuntimeConfig, JobSpec, StagedLinuxCommandConfig, TartRuntimeConfig). After extraction, only the types used by CLI dispatch and run lifecycle remain:

use jerichoci::{
    LogKind, RunLifecycleEvent, RunMetadata, RunOptions, RunRecord, RunStatus,
    StagedLinuxRemoteDefaults, fulfill_prepared_output_request, gc_runs, git_changed_files,
    list_runs, load_logs, load_logs_metadata, load_prepared_outputs_record, load_run_record,
    record_skipped_run_with_reporter, rerun_jobs_with_metadata_and_reporter,
    run_jobs_with_metadata_and_reporter, staged_linux_remote_defaults,
};

The removed imports are now consumed exclusively inside targets.rs.

Although the diff for invariants/invariants.toml was truncated in the payload, it is listed as a changed file. Based on the doc-comments added in step 1 and the new module files created in steps 2–3, the invariants file is expected to contain:

1. Exclusion entries for crates/pikaci/src/output.rs and crates/pikaci/src/targets.rs — these files now contain patterns (e.g., catalog lane references, job-spec constructors) that previously lived in the already-exempted main.rs.
2. Exclusion entries for test-only fixture enums in crates/jerichoci/src/model.rs and crates/jerichoci/src/run.rs — keyed on the comment sentinel added in step 1.

Without these updates, the invariant checker would flag the extracted code as violating the architecture rules, since the patterns moved to files not previously in its allow-list.

When reviewing this file, verify that each new exclusion is scoped as narrowly as possible (file path + test module context) rather than blanket-disabling the invariant.