Skip to content

Add planning worktree setup targets - #16

Merged
oubiwann merged 1 commit into
mainfrom
codex/planning-make-targets
Oct 28, 2026
Merged

oubiwann merged 1 commit into
mainfrom
codex/planning-make-targets

Conversation

@oubiwann

Copy link
Copy Markdown
Contributor

Fresh clones currently need manual Git commands to attach the separate planning documents. Add make planning (and planning-worktree alias), adapting Vlajmaji's helper to fetch and attach planning history at .worktrees/planning while preserving the implementation checkout and staging index.

The helper fast-forwards clean planning checkouts, preserves local-ahead commits, and refuses dirty, locked, divergent, or occupied targets. If no remote planning branch exists, it publishes an existing local planning branch or creates and publishes an empty orphan root. Contributor notes and Make help describe that behavior; the README is unchanged.

Add make test-tools and run it in the existing CI check job. Its 23 real-Git cases use disposable repositories and local bare remotes, including fresh clones, idempotence, preservation guards, rejected pushes, and retry recovery.

Validation:

  • make format
  • CARGO_NET_OFFLINE=true make lint
  • make test-tools — 23 passed, 0 failed
  • shellcheck --shell=bash scripts/planning-worktree.sh tests/test-planning-worktree.sh
  • git diff --check

Adapt the Vlajmaji helper for fresh clones and planning worktree setup,
with preservation checks and disposable-repository tests run in CI.
Document the workflow and its branch-publication behavior for contributors.

Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Billo AI <ai-engineering@billo.systems>
@oubiwann
oubiwann merged commit 57da638 into main Oct 28, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant