Skip to content

feat(rebase): add bounded interactive sequence editor - #87

Draft
xuewill wants to merge 22 commits into
mainfrom
codex/v1.2-interactive-rebase
Draft

xuewill wants to merge 22 commits into
mainfrom
codex/v1.2-interactive-rebase

Conversation

@xuewill

@xuewill xuewill commented Oct 31, 2026 •

Copy link
Copy Markdown
Contributor

Implements the first V12-07 increment on top of the V12-05 feature branch.

The initial built-in action set is deliberately bounded to pick, reword, and drop for a clean linear range. It validates repository identity, branch/HEAD/upstream/index/write paths, rejects all-drop before writes, supports reordered independent picks, and uses private sequence/message editors. Merge histories, arbitrary todo commands, implicit autostash, update-refs, edit pauses, squash/fixup, and unbounded ranges remain outside this increment.

Validation:

  • swift build --build-tests passed; no local XCTest ran.
  • macOS build-for-testing passed for Core/UI; no local XCTest ran.
  • Private disposable Git checker passed 9/9, including all-drop refusal, reordered picks, drop/reword output, clean worktree, and stale identity protection.
  • Earlier required CI for the then-current head passed; new commits require a fresh required CI run.
  • Evidence: docs/acceptance/2026-10-31/interactive-rebase/.

This remains a development increment, not complete V12-07. Edit pause/recovery, squash/fixup message and tree semantics, repeated conflicts, cancellation/timeout/unknown replies, external sequence mutation, trusted native UI acceptance for this feature, and final v1.2 gates remain open.

Related to #86; the issue remains open until its full acceptance list is verified.

@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Oct 31, 2026 •

Copy link
Copy Markdown

🚀 Deploying Preview to Cloudflare 🚀

Preview Deployments by commit

Status Deployment URL Commit Updated (UTC) See this deployment's details
  • Build: Failed ❌

View logs ↗
93bccf1 2026-10-31T12:48:33.200Z View logs ↗
  • Build: Failed ❌

View logs ↗
e126ec0 2026-10-31T08:16:42.426Z View logs ↗
  • Build: Failed ❌

View logs ↗
f3dae2a 2026-10-31T07:59:56.176Z View logs ↗
  • Build: Failed ❌

View logs ↗
7461016 2026-10-31T04:17:56.765Z View logs ↗

Base automatically changed from codex/v1.2-conflict-editor to main October 31, 2026 12:42

This branch has not been deployed

No deployments
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