Consume fjord-core for stack plan and ship gating #191

Merged

stephen merged 1 commit from feat/stack-delegate-plan-to-core into main

2026-06-19 18:08:33 +00:00

stephen commented

2026-06-19 17:53:45 +00:00

Owner

Delegates fj's remaining pure stack planning to fjord_core 0.1.2, which now accepts each surface's command labels (ADR-0001 Phase 3).

validate_items, plan_sync (→ SyncStep), plan_ship (→ ShipStep), shippable (→ ship_blocker), merge_style, and recovery_message call into core; fj supplies its user-facing copy (\fj stack new`, `fj stack ship``) through the new label args.
Forward From conversions (fj stack_state → core model) plus a 1:1 MergeStyle bridge let the on-disk stack be handed to the engine.
Drops the duplicated PlannedOp/ShipPlan structs for core's serializable SyncStep/ShipStep.

pr_base stays local (trivial, hot in loops). Behavior is unchanged except the ship recovery hint now reads ; merged items are skipped in core's tool-agnostic punctuation. All 605 tests pass; clippy and fmt clean.

Delegates fj's remaining pure stack planning to `fjord_core` 0.1.2, which now accepts each surface's command labels (ADR-0001 Phase 3). - `validate_items`, `plan_sync` (→ `SyncStep`), `plan_ship` (→ `ShipStep`), `shippable` (→ `ship_blocker`), `merge_style`, and `recovery_message` call into core; fj supplies its user-facing copy (`\`fj stack new\``, `\`fj stack ship\``) through the new label args. - Forward `From` conversions (fj `stack_state` → core model) plus a 1:1 `MergeStyle` bridge let the on-disk stack be handed to the engine. - Drops the duplicated `PlannedOp`/`ShipPlan` structs for core's serializable `SyncStep`/`ShipStep`. `pr_base` stays local (trivial, hot in loops). Behavior is unchanged except the ship recovery hint now reads `; merged items are skipped` in core's tool-agnostic punctuation. All 605 tests pass; clippy and fmt clean.

stephen added 1 commit

2026-06-19 17:53:45 +00:00

Consume fjord-core for stack plan and ship gating

ci / check (pull_request) Successful in 10m30s

Details

ci / coverage (pull_request) Successful in 1m49s

Details

ci / live-e2e (pull_request) Successful in 1m58s

Details

df3b45afff

Delegate the remaining pure stack planning to fjord_core 0.1.2 now that
it accepts each surface's command labels:

- validate_items, plan_sync (-> SyncStep), plan_ship (-> ShipStep),
  shippable (-> ship_blocker), merge_style, and recovery_message all
  call into core; fj keeps its own user-facing copy via the label args.
- Add forward From conversions (fj stack_state -> core model) plus a
  1:1 MergeStyle bridge so the on-disk stack can be handed to the engine.
- Drop the now-duplicated PlannedOp/ShipPlan structs in favor of core's
  serializable SyncStep/ShipStep.

pr_base stays local (trivial, hot in loops). Behavior is unchanged but
for the ship recovery hint, which now reads '; merged items are skipped'
in core's tool-agnostic punctuation.

ADR-0001 Phase 3.

stephen merged commit 6c70dc0980 into main

2026-06-19 18:08:33 +00:00

stephen deleted branch feat/stack-delegate-plan-to-core

2026-06-19 18:08:33 +00:00

stephen referenced this pull request from a commit

2026-06-19 18:08:34 +00:00

Consume fjord-core for stack plan and ship gating (#191)