Skip to content

Replay source stacks from deterministic plans - #282

Closed
nishu-builder wants to merge 1 commit into
codex/stack-layers-20260924-70793dfrom
codex/stack-replay-20260924-70793d
Closed

nishu-builder wants to merge 1 commit into
codex/stack-layers-20260924-70793dfrom
codex/stack-replay-20260924-70793d

Conversation

@nishu-builder

@nishu-builder nishu-builder commented Sep 24, 2026 •

Copy link
Copy Markdown
Contributor

std/git-rebase-i reads rebase/plan inside a selected feature directory. pick applies one commit or a range’s net change, message supplies a message file, and branch saves a layer with an automatically assigned number.

Every invocation runs from the beginning using the plan’s fixed committer. On conflict it leaves rebase/work and Git’s report; edit the draft, replace the failed pick with the resolved range, and rerun. Completion replaces the numbered entries, preserves other files, and removes rebase/.

The same plan can combine tool-call history into a layer, so there is no separate layer-creation tool or special working-layer name.

@nishu-builder
nishu-builder added this pull request to stack #283 September 24, 2026 02:11
@nishu-builder
nishu-builder force-pushed the codex/stack-replay-20260924-70793d branch from 2597402 to ccc373c Compare September 24, 2026 17:45

@nishu-builder nishu-builder left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parsimony review. Most of this PR's size comes from pause/resume: done/here records, tamper checks, and the conversation-history checkpoint walk. Because every step is a pure function of object ids, re-running the plan from onto on each call with a fixed committer gives the same result without any of that. The plan language can also drop drop and squash. Details inline and in the #278 review.


Generated by Claude Code

Comment thread std/git-stack/src/rebase.rs Outdated
Comment thread std/git-stack/src/rebase_plan.rs Outdated
Comment thread std/git-stack/src/rebase_plan.rs Outdated
@nishu-builder
nishu-builder force-pushed the codex/stack-replay-20260924-70793d branch from ccc373c to 4d45e41 Compare September 25, 2026 06:02
@nishu-builder nishu-builder changed the title Replay source stacks without a checkout Replay source stacks from deterministic plans Sep 25, 2026

Copy link
Copy Markdown
Contributor Author

Closing as superseded: stacks went a different way on main. #293 (design/stacks.md), #291 (create-squashed-stack), and #296 (merge with an optional merge-base) cover building and restacking layers without a replay plan. The branch stays in place if any of this is needed later.


Generated by Claude Code

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