mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-10-12 03:51:01 +00:00
600720423c
Merge origin's fabro-config types boundary refactor (dense settings
migration: WorkflowSettings/UserSettings/ServerSettings moved to
fabro-types; SettingsLayer made pub(crate) inside fabro-config) into
local PR-refactor branch.
Conflict resolution intent:
- lib/crates/fabro-cli/src/commands/pr/{create,mod}.rs — kept HEAD's
server-side PR command implementations; origin still carried the
pre-refactor client-side helpers (build_github_credentials,
load_pr_record, branch_exists pre-check) that local commits had
already migrated to the server.
- lib/crates/fabro-cli/src/user_config.rs — took origin's resolution
(load_resolved_settings_from_toml + storage_dir_from_document tests),
which implements the same dead-storage_dir-wrapper cleanup local had
done via local_server::storage_dir.
- lib/crates/fabro-server/src/server.rs — kept HEAD's PullRequestRecord
import alongside origin's added ServerSettings; rewrote test helpers
github_token_settings + create_github_token_app_state to use origin's
ServerSettingsBuilder + AppStateConfig dense-settings shape (replaces
HEAD's parse_settings_layer + Arc<RwLock<SettingsLayer>>); switched
RunSpec.settings fixture from SettingsLayer::default() to
WorkflowSettings::default() per origin's RunSpec retype.
- Suppressed dead_code on CommandContext::storage_dir() and
::server_settings() (added by origin for use by client-side PR
commands that no longer exist after local's server-side migration);
gated load_resolved_settings_from_toml on cfg(test).
Verified post-merge: workspace fmt clean, clippy --all-targets
-D warnings clean, cargo nextest run --workspace 4587 passed,
182 skipped.
|
||
|---|---|---|
| .. | ||
| 2026-04-02-001-feat-server-daemon-management-plan.md | ||
| 2026-04-02-002-feat-http-store-client-auto-start-plan.md | ||
| 2026-04-04-run-event-simplification-plan.md | ||
| 2026-04-04-shared-nextest-test-daemon-plan.md | ||
| 2026-04-05-cli-deglobalize-server-url-and-storage-dir-plan.md | ||
| 2026-04-05-cli-exec-explicit-local-and-mode-removal-plan.md | ||
| 2026-04-05-cli-model-server-canonical-and-llm-removal-plan.md | ||
| 2026-04-05-cli-run-lifecycle-cleanup-compaction-plan.md | ||
| 2026-04-05-run-adjacent-server-only-cleanup-plan.md | ||
| 2026-04-05-run-create-server-target-plan.md | ||
| 2026-04-05-run-manifest-and-preflight-plan.md | ||
| 2026-04-05-server-canonical-secrets-doctor-repo-plan.md | ||
| 2026-04-06-cli-config-socket-storage-separation-plan.md | ||
| 2026-04-06-object-backed-artifact-uploads.md | ||
| 2026-04-06-settings-command-server-local-merge-plan.md | ||
| 2026-04-06-subprocess-run-workers-signal-control-plan.md | ||
| 2026-04-07-fix-attach-terminal-authoritative-stream-plan.md | ||
| 2026-04-07-global-cas-blob-refs-plan.md | ||
| 2026-04-07-interview-control-channel-and-server-slack-plan.md | ||
| 2026-04-07-run-manifest-blobs-and-bundle-removal-plan.md | ||
| 2026-04-07-run-state-projection-consolidation-plan.md | ||
| 2026-04-07-store-dump-server-owned-export-plan.md | ||
| 2026-04-07-worker-http-only-run-store-migration-plan.md | ||
| 2026-04-08-001-feat-fabro-uninstall-command-plan.md | ||
| 2026-04-08-cli-services-command-context-refactor-plan.md | ||
| 2026-04-08-fabro-spa-asset-crate-plan.md | ||
| 2026-04-08-optional-web-ui-server-plan.md | ||
| 2026-04-08-production-web-ui-test-plan.md | ||
| 2026-04-08-production-web-ui.md | ||
| 2026-04-08-settings-toml-redesign-implementation-plan.md | ||
| 2026-04-09-settings-toml-redesign-handoff-2.md | ||
| 2026-04-09-settings-toml-redesign-handoff-3.md | ||
| 2026-04-09-settings-toml-redesign-handoff-4.md | ||
| 2026-04-09-settings-toml-redesign-handoff.md | ||
| 2026-04-15-002-feat-ip-allowlist-plan.md | ||
| 2026-04-15-canonical-blocked-run-status-plan.md | ||
| 2026-04-18-001-feat-webhook-strategy-plan.md | ||
| 2026-04-19-001-feat-archived-run-status-plan.md | ||
| 2026-04-19-002-feat-run-files-changed-tab-plan.md | ||
| 2026-04-19-002-feat-web-ui-lifecycle-actions-plan.md | ||
| 2026-04-19-003-feat-cli-auth-login-plan.md | ||
| 2026-04-19-home-storage-path-ownership-cleanup-plan.md | ||
| 2026-04-19-remove-inbound-tls-termination-plan.md | ||
| 2026-04-20-001-fix-cli-server-same-host-assumptions-plan.md | ||
| 2026-04-20-002-refactor-extract-fabro-client-crate-plan.md | ||
| 2026-04-20-003-refactor-fabro-store-record-abstractions-plan.md | ||
| 2026-04-20-003-refactor-unify-run-vocabulary-metadata-plan.md | ||
| 2026-04-22-001-refactor-settings-api-entrypoints-plan.md | ||
| 2026-04-22-002-feat-web-install-object-store-step-plan.md | ||
| 2026-04-22-003-refactor-lock-down-server-secrets-plan.md | ||
| 2026-04-22-004-refactor-worker-jwt-auth-plan.md | ||
| 2026-04-23-001-refactor-collapse-settings-resolve-indirection-plan.md | ||
| 2026-04-23-001-refactor-command-context-alignment-plan.md | ||
| 2026-04-23-002-refactor-combine-trait-uv-pattern-plan.md | ||
| 2026-04-23-003-refactor-config-types-boundary-and-dense-migration-plan.md | ||
| 2026-04-23-003-refactor-pr-commands-server-side-plan.md | ||