Repository navigation
Description
Problem
Rebase preflight computes the target and preserves the old range when another workflow started the replay. The lifecycle at packages/agents/source/skills/rebase/shared/scripts/preflight.sh:121 prevents an aborted run from becoming the next comparison point. The recommendation at packages/agents/source/skills/rebase/shared/scripts/preflight.sh:189 resembles commit preflight but differs for missing refs; blindly sharing the answer would change behavior.
Acceptance criteria
- AC1: Given each default-branch and local/remote-ref combination, when preflight runs, then the recommended base and reason match the frozen rebase report.
- AC2: Given fetching is enabled, disabled, fails or reaches its configured deadline, when preflight runs, then it reports the corresponding fetch outcome.
- AC3: Given a replay above the configured commit cap, when preflight reports it, then its listing matches the frozen capped report.
- AC4: Given an active merge-backend rebase started elsewhere, when preflight runs, then durable verification evidence identifies that replay's original tip and target.
- AC5: Given incomplete saved evidence with no active rebase, when preflight runs, then that stale evidence is removed.
- AC6: Given completed saved evidence with no active rebase, when preflight runs, then the evidence is retained.
- AC7: Given staged, unstaged and untracked changes, when preflight runs, then its working-tree report matches the frozen report.
- AC8: Given predicted conflicts and paths changed on both sides, when preflight runs, then its advisory conflict report matches the frozen report.
- AC9: Given Git preferences and available gate tasks, when preflight runs, then it reports their effect without running the tasks.
- AC10: Given worktree readiness refuses, when preflight runs, then it stops with that refusal.
- AC11: Non-functional: preflight leaves tracked contents and the index unchanged; permitted writes are fetched Git data, merge-preview objects and recovery evidence.
- AC12: Non-functional: native preflight cases execute without skips on macOS, Linux and Windows.
Scope and non-goals
Scope: preflight and the rebase evidence lifecycle used by later commands.
Non-goal: shared context (#321), commit readiness and commit base selection (#322), PRs (#323), merges (#324), or guards (#328 and #753). Non-goal: correcting missing-ref recommendations in this parity port. Keep shell and coupled Python frozen through N-2, with no new shell logic. Do not switch callers or retire tests in this child.
Approach
Use packages/agents/source/skills/rebase/shared/scripts/preflight.sh:106 as the report contract and preserve the evidence consumed at packages/agents/source/skills/rebase/shared/scripts/verify-rebase.sh:65. Reuse #321's repository context and #322's readiness deliverable rather than porting them again. Expose preflight through agentrepo rebase. Pin display settings and compare full transcripts, normalizing only fixture roots and commit IDs. Cover active apply/merge backends, interrupted operations, detached state and preview failures.
Dependencies
Blocked by: #753 (before registration), #851 (child 02 of #322, the worktree readiness deliverable).
Prerequisite: #321's repository-context deliverable. This child depends on those deliverables, not on closure of either whole area.
Size
M. Forecast 740 code lines: 320 implementation, 350 tests and fixtures, 70 registration/integration. Measured source baseline: 243 code lines. Prose allowance: 250 lines.
scc could not run in the isolated checkout. Measured baselines count non-blank lines other than full-line # comments, including Python docstrings and embedded code conservatively. Forecasts include implementation, tests, fixtures and registration; they are estimates, not measured future Go. Generated output is excluded only under packages/agents/claude/.apm/skills/, packages/agents/codex/.apm/skills/, .claude/skills/, .agents/skills/ and tokens.json. The source under packages/agents/source/ and copies anywhere else count. The final diff must be at most 800 code lines and 2,000 prose lines, with no exception; split before implementation if either forecast grows beyond its limit.
Verify plan
- AC1, AC2, AC3: compare ref-matrix, fetch-outcome and cap-boundary transcripts with the frozen script; use a bounded timeout stub.
- AC4, AC5, AC6: port the active, aborted and completed-state cases at
tests/skills/rebase/scripts/rebase-workflow.bats:40and inspect evidence after each transition. - AC7, AC8, AC9: compare reports for dirty trees, merge previews, common changed paths, Git preferences and task availability.
- AC10: inject readiness refusals from
packages/agents/source/lib/worktree-ready.sh:13and assert no later work runs. - AC11: snapshot content, index and metadata and account for each permitted write.
- AC12: inspect executing native cases in the three-platform Go CI matrix.
- Definition of done: D1 each AC is verified at the merged head, with the commands and results cited in the pull request's Verification. D2 an independent review approves the exact merged head, and every finding has a recorded disposition. D3 required checks pass with no gate loosened. D4 the leak scans the repository specifies are clean, and every post made for this work passes the per-post leak review before it is posted. D5 every commit is signed. D6 the documentation matches the change or the Verification says why there is no impact. D7 every commit has an
Assisted-bytrailer and the pull request has theprovenance:agent-assistedlabel. D8 the pull request stays within the size limits. D9 follow-ups are filed as issues and listed under Related. D10 the merge closes the issue through a closing reference, the board shows Done, and the finalStatus:comment names the merge commit.
Risks
A changed target or stale original tip can replay or compare the wrong work. Undo: revert this Go-only child; frozen callers remain in use.
Operator authority
None.
Metadata
Metadata
Assignees
Labels
Type
Fields
Priority
Work type
Projects
- StatusShow more project fieldsBacklog
Activity
tbhb-agent commentedon Oct 27, 2026
Refinement: READY — Read rebase preflight and recovery state in Go
Model: gpt-6-astra
Child 01 Read rebase preflight and recovery state in Go
Verdict: READY
Checked: Prior scope, dependencies, verification and 740-line forecast remain consistent; neither correction affects this child.
Gaps: None.
Split: None required.
Definition of done
The definition of done for this issue (Feature). Tick each item and give its evidence.
check-leaks.shwith the repository's private-strings list, and the leak review of each post.docs/, CHANGELOG or help text), or the Verification section says "No doc impact" and why.provenance:agent-assistedlabel.Status:comment names the merge commit.mise run checkis green, and so are the coverage floorsmise run cover-go-checkandmise run cover-py-check, whichcheckdoesn't run.packages/agents/source/commits whatmise run generate-skills, thenmise run skill-tokens, thenapm installrewrite, in that order, andcheck-generated-skills(part oflint) passes.docs/agent-skills-migration.mdor the adoption docs, or the PR's Verification says "No consumer impact" and why.Round: 2 of 3