coilyco-flight-deck/agentic-os
Watch
2
0
Code Issues 70 Pull requests Projects Releases 592 Packages 1 Activity Actions

Fix native normalization when another worktree owns main #798

Merged
coilysiren merged 1 commit from aos/codex/20260730t084741z-45517-86cec5d4 into main 2026-07-30 09:19:58 +00:00
Conversation 0 Commits 1 Files changed 2 +30 -1
coilyco-ops commented 2026-07-30 08:53:03 +00:00
Owner
Copy link

Closes #796. Reorders the existing safe inactive-worktree cleanup so a recoverable linked worktree can release main before the canonical checkout switches to it. The remote-recoverability check still runs before cleanup, and dirty, unpushed, leased, and human workdirs remain preserved. Validation: focused regression test, full AOS test suite, Go vet, and full pre-commit suite.

Closes #796. Reorders the existing safe inactive-worktree cleanup so a recoverable linked worktree can release main before the canonical checkout switches to it. The remote-recoverability check still runs before cleanup, and dirty, unpushed, leased, and human workdirs remain preserved. Validation: focused regression test, full AOS test suite, Go vet, and full pre-commit suite.
fix(aos): reclaim main worktree before normalization, closes #796
All checks were successful
ci / ward-doctor (pull_request) Successful in 31s
Details
ci / gate (pull_request) Successful in 1m12s
Details
ci / build-dev-base (pull_request) Successful in 15m10s
Details
7ebd7e07bd 
Co-authored-by: Kai Siren <coilysiren@gmail.com>
Co-authored-by: Codex <noreply@openai.com>
coilysiren deleted branch aos/codex/20260730t084741z-45517-86cec5d4 2026-07-30 09:19:58 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
coilysiren
Labels
Clear labels   
burndown-2026-06
Backlog burndown June 2026

  
burndown-2026-08
Closed in the 2026-08-26 backlog burn-down. Reopen freely: state:closed label:burndown-2026-08 recovers the whole set.

  
autonomy
async-consult
 A human needs to consult on the issue to upgrade it to headless

  
autonomy
epic
 This issue has many units of sub work - its size makes it meaningfully exclusive with other autonomy types

  
autonomy
headless
 The agent can perform the work on its own

  
autonomy
live-collab
 The agent and the human need to work together in realtime

  
coherence-core
Core review set for the warded control plane coherence milestone. These issues form the release spine; adjacent milestone issues are stretch or supporting work.

  
priority
P0
 priority tier

  
priority
P1
 priority tier

  
priority
P2
 priority tier

  
priority
P3
 priority tier

  
priority
P4
 priority tier

  
qa-fixture
Disposable issue admitted to the bounded Ward QA verification lane.

  
role/advocate
requires work from the Developer Advocate seat

  
role/director
requires work from the Portfolio Director seat

  
role/exec
requires work from the exec role

  
role/frontend
requires work from the Frontend Engineer seat

  
role/gamedev
requires work from the Game Developer seat

  
role/human
requires a person, and specifically not an agent seat

  
role/platform
requires work from the Platform Engineer seat

  
role/qa
requires work from the QA role

  
role/science
requires work from the Applied Scientist seat

  
role/sysadmin
requires work from the Systems Administrator seat

  
state
ambient
 ambient and ephemeral work, held as a maintained document rather than a queue

No labels
burndown-2026-06
burndown-2026-08
autonomy
async-consult
autonomy
epic
autonomy
headless
autonomy
live-collab
coherence-core
priority
P0
priority
P1
priority
P2
priority
P3
priority
P4
qa-fixture
role/advocate
role/director
role/exec
role/frontend
role/gamedev
role/human
role/platform
role/qa
role/science
role/sysadmin
state
ambient
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
coilyco-flight-deck/agentic-os!798
No description provided.