Skip to content

Harden worktree start point + push safety against PR #315-class wipes #318

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
subsetpark merged 7 commits into from
May 24, 2026
Merged

Harden worktree start point + push safety against PR #315-class wipes #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9490910
Add --force-if-includes to session-end force-push
subsetpark May 24, 2026
9124794
Plan worktree start point against fresh remote refs
subsetpark May 24, 2026
83fa195
Plan pushes against worktree state, not just lease
subsetpark May 24, 2026
e728c93
Address PR 318 review comments
subsetpark May 24, 2026
996c890
Fix local-missing-remote integration fixture
subsetpark May 24, 2026
e503dbc
Distinguish refused worktree setup
subsetpark May 24, 2026
593c5e5
Route repo-root worktree refusal permanently
subsetpark May 24, 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
10 changes: 6 additions & 4 deletions lib/runner_fiber_impl.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,15 +664,16 @@ struct
~base_ref:(Branch.to_string base_branch)
()
with
| None ->
| Worktree_setup.Missing ->
Runtime.update_orchestrator runtime
(fun orch ->
Orchestrator.apply_session_result
orch patch_id
Orchestrator
.Session_worktree_missing);
`Failed
| Some _wt_path ->
| Worktree_setup.Refused -> `Failed
| Worktree_setup.Path _wt_path ->
(* Capture the initial anchor for this
Start: resolve origin/<base_branch>'s
current tip so the first rebase has
Expand Down Expand Up @@ -1204,8 +1205,9 @@ struct
in
let wt_path =
match wt_path_opt with
| Some p -> p
| None ->
| Worktree_setup.Path p -> p
| Worktree_setup.Missing
| Worktree_setup.Refused ->
Worktree.worktree_dir ~project_name
~patch_id
in
Expand Down
5 changes: 3 additions & 2 deletions lib/session_driver.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,13 @@ module Make (W : Worktree.S) (Env : ENV) = struct
| `Fresh -> (None, true)
in
match WS.ensure_worktree ~patch_id ~agent () with
| None ->
| Worktree_setup.Missing ->
Runtime.update_orchestrator runtime (fun orch ->
Orchestrator.apply_session_result orch patch_id
Orchestrator.Session_worktree_missing);
(`Failed, [])
| Some worktree_path ->
| Worktree_setup.Refused -> (`Failed, [])
| Worktree_setup.Path worktree_path ->
let cwd = Eio.Path.(fs / worktree_path) in
(* Read once at session start so the per-event callback below can
persist the session id to the crash-recovery sidecar without
Expand Down
Loading
Loading