8000 feat(sessions): patch source/policies home expansion by evanspearman · Pull Request #372 · gominimal/minimal · GitHub
[go: up one dir, main page]
Skip to content

feat(sessions): patch source/policies home expansion #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evanspearman merged 2 commits into from
Jun 12, 2026
Merged

feat(sessions): patch source/policies home expansion #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce635db
feat(sessions): patch source/policies home expansion
evanspearman Jun 3, 2026
dc11611
fix(sessions): coderabbit fixes to be squashed on merge
evanspearman Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/sessions/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ publish.workspace = true

[dependencies]
common.workspace = true
dirs.workspace = true
globset.workspace = true
camino.workspace = true
nutype.workspace = true
Expand Down
22 changes: 22 additions & 0 deletions crates/sessions/docs/RESOLUTION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ declarative sources (loadout, project, packages) to the final
│ (policy-gated) │ │ (policy-gated) │ │ (pass-through; no │
└───────┬────────┘ └────────┬─────────┘ │ policy gate) │
│ │ └─────────┬──────────┘
│ │ pre-walk: │
│ │ expand `~` in each │
│ │ FileSet source │
│ │ pattern, and in │
│ │ each PatchPolicy │
│ │ allow/deny/ignore │
│ │ pattern, against │
│ │ the host home. │
│ │ │
│ │ for each Patch: │
│ │ FileSet::resolve() │
│ │ ── walkdir + glob ►│
Expand Down Expand Up @@ -157,6 +166,19 @@ declarative sources (loadout, project, packages) to the final
surface as `ResolveError::PatchConfig` and take priority over
transient IO failures, which surface as `ResolveError::PatchWalk`.
Nothing is silently dropped.
- **Source `~` is expanded at resolution; dest has no `~` to expand.**
Patch source `FileSet` patterns and `PatchPolicy` patterns have
their leading `~` expanded against the host home (via `Composer`'s
home lookup — `dirs::home_dir` by default) before the walker runs.
Patch *destination* paths (`PatchDest`) are always relative to the
sandbox user's home directory; `~` and absolute paths are rejected
at construction, so nothing needs to be expanded for dests. Patterns
retain their `~` form in returned policies, so save/load is
lossless. When any `~`-prefixed pattern is in scope, the home
lookup is invoked once up-front; failures surface as
`ResolveError::HomeUnresolved` (with an inner
`HomeResolutionFailure::{Unavailable, NotUtf8, NotAbsolute}`
distinguishing the cause) rather than silently matching nothing.
- **`Composer::merge` is pure aggregation today.** Two contributors
pushing the same var name both survive into `Resolution.vars()`.
Conflict resolution (precedence, dedup, error-on-conflict) will live
Expand Down
Loading
Loading
0