Bryan Helmkamp 2b2f158c16 feat(settings): run.goal tagged union (inline | file) ... `--goal-file` was broken in the v2 path: `TryFrom<&RunArgs> for ConfigLayer` did `let _ = &args.goal_file;`, so clap accepted the flag listed in `--help` and then silently dropped it. Users running `fabro run demo --goal-file prompts/goal.md` ended up with no goal at all (or the DOT graph-level fallback), a regression from the legacy flat `Settings` shape. This commit adds first-class support for both inline and file-sourced goals via a tagged union on `run.goal`. Greenfield decisions: - **Single field, two variants.** `RunGoalLayer` is an untagged enum of `Inline(InterpString)` and `File { file: InterpString }`. Makes `goal XOR goal_file` un-representable in the type system and lets the v2 merge matrix treat `run.goal` as a single scalar (last-writer-wins) instead of needing a custom mutual-exclusion merge rule. Matches the existing `DaytonaDockerfileLayer` pattern. - **Relative paths are anchored at the file that declared them.** `ConfigLayer::load(path)` walks the just-parsed `SettingsFile` and rewrites any literal relative `run.goal.file` path to absolute using `path.parent()` as the base, via new `fabro_config::config::resolve_goal_file_paths`. CLI-sourced paths via `--goal-file` are anchored at CWD in `overrides::goal_layer_from_args`. Env-interpolated paths (`${env.GOALS_DIR}/goal.md`) are left unresolved until consume time and then resolved against the run's working_directory. - **New accessors, no shims.** - `run_goal_layer() -> Option<&RunGoalLayer>` — raw variant access. - `run_goal_inline_str() -> Option<String>` — inline-only, returns `None` for file-sourced goals. - `resolve_run_goal(base_dir) -> Result<Option<ResolvedRunGoal>>` — reads the file from disk if needed, returns text + provenance (`ResolvedGoalSource::Inline | File { path }`). - New `ResolveGoalError` enum covers env-lookup and I/O failures. - Old `run_goal() / run_goal_str()` are **deleted** outright; every call site has been updated to pick the right variant. - **CLI wiring (the actual bug fix).** `overrides::goal_layer_from_args` replaces the two `let _ = &args.goal_file;` lines with real resolution: `(Some(text), None)` → `Inline`, `(None, Some(path))` → `File { file: absolute }`. Both-set is rejected by a helper error and clap already had `conflicts_with = "goal"` as a belt-and- braces check. Applied to both `RunArgs` and `PreflightArgs`. - **Manifest builder.** `resolve_manifest_goal` now calls `args_layer.as_v2().resolve_run_goal()` and `settings.resolve_run_goal()` in precedence order, then falls through to the graph-level `@file` sugar if both are absent. The resolved goal is translated to a `ManifestGoal { text, type_, path }` by a new `resolved_goal_to_manifest` helper — inline goals get `type = Value`, file-sourced goals get `type = File` with the absolute path echoed for provenance. - **Workflow pipeline.** `fabro-workflow::operations::source:: resolve_goal_override` is rewritten to use `resolve_run_goal` against the working_directory. The orphaned helper `resolve_goal_file` (a stub from Stage 4 that was always called with `None`) is deleted. - **Server-side manifest.** `fabro-server::run_manifest:: prepare_manifest` stores the CLI-resolved goal as `RunGoalLayer::Inline`, matching the Stage 4 plan's "CLI owns goal file reads; server never touches the filesystem for goals" contract. ## Tests **Schema** (`fabro-types::settings::accessors`): - `run_goal_inline_str_returns_source_value` — literal inline variant - `run_goal_inline_str_is_none_for_file_variant` — file variant explicitly yields `None` from the inline accessor - `resolve_run_goal_reads_file_variant_from_disk` — end-to-end file read with provenance assertion - `resolve_run_goal_inline_passes_text_through` — inline passthrough **Config load** (`fabro-config::config`): - `parse_accepts_inline_goal` + `parse_accepts_file_variant` - `parse_rejects_goal_with_unknown_sibling_fields` — untagged enum correctly rejects mixed-shape TOML - `combine_replaces_file_goal_with_inline_from_higher_layer` and the reverse — confirms the tagged union merges as a single scalar with no custom rule needed - `load_rewrites_relative_goal_file_to_absolute` - `load_leaves_absolute_goal_file_untouched` - `load_leaves_env_interpolated_goal_file_untouched` **CLI overrides** (`fabro-cli::commands::run::overrides`): - `goal_and_goal_file_together_is_rejected` - `goal_file_is_anchored_at_cwd_when_relative` - `absolute_goal_file_is_preserved` - `inline_goal_builds_inline_variant` - `empty_args_produce_no_goal_layer` **CLI integration** (`fabro-cli::tests:🇮🇹:cmd::run`): - `dry_run_with_goal_file_reads_contents_into_goal` — end-to-end `fabro run --dry-run --auto-approve --goal-file <path>` and asserts the file contents appear in the preflight summary. Explicit regression test for the silently-ignored flag. - `dry_run_rejects_goal_and_goal_file_together` — clap conflicts_with ## Callsite churn Every `run_goal() / run_goal_str()` call site updated: - `fabro-config/src/effective_settings.rs` — 2 test assertions → `run_goal_inline_str()` - `fabro-cli/tests/it/cmd/{config,create}.rs` — 3 sites → inline - `fabro-cli/src/manifest_builder.rs` — rewritten to use `resolve_run_goal` - `fabro-workflow/src/operations/create.rs` — 2 sites, test + set - `fabro-workflow/src/operations/source.rs` — rewritten - `fabro-server/src/{run_manifest,server}.rs` — set + test assertion 3,782 workspace tests pass (was 3,765, +17 new). `cargo fmt --check --all` and `cargo clippy --workspace -- -D warnings` are clean. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>		2026-04-09 19:47:12 -04:00
..
crates	feat(settings): run.goal tagged union (inline | file)	2026-04-09 19:47:12 -04:00
packages/fabro-api-client	refactor(api): stage 6.6 collapse settings DTOs to freeform v2 shape	2026-04-09 17:04:33 -04:00