Audit local fork branches, clean merged branches, and document fork deltas vs upstream #50

Activity

1. OpenCodeEngineer commented on Mar 28, 2026

   

   OpenCodeEngineer

   on Mar 28, 2026

   Author

   More actions

   Status update:

   • audited local branches against origin/main and upstream/main
   • fast-forwarded the clean main worktree to origin/main
   • deleted stale local branches dev-rebase and backup/dev-rebase-pre-upstream-main-20260325-1
   • left rebase/dev-rebase-upstream-main-20260325 untouched because it is checked out in a dirty worktree
   • identified issue-41-retry-transport-disconnects and issue-47-recover-reasoning-items as the two active unmerged local work branches with open PRs
   • opened README PR docs: clarify fork deltas vs upstream #51 for the fork-vs-upstream documentation update
   • current blocker to final merge decisions: validating the active branches locally and separating branch-specific correctness from fork-wide CI failures (cargo-deny, argument-comment lint, and existing TUI/Bazel regressions)
2. dzianisv

   closed this as completedin #51on Mar 28, 2026
3. dzianisv commented on Mar 28, 2026

   

   dzianisv

   on Mar 28, 2026

   Owner

   More actions

   Status update:

   • merged PR fix(ci): remove unsupported 'version' input from taiki-e/install-action #46 (fix(ci): remove unsupported version input from taiki-e/install-action)
   • merged PR docs: clarify fork deltas vs upstream #51 (docs: clarify fork deltas vs upstream)
   • fast-forwarded local main to origin/main at 32d8d76a6
   • removed the merged local docs branch/worktree issue-50-document-fork-deltas
   • rebased and force-pushed active PR branches issue-41-retry-transport-disconnects and issue-47-recover-reasoning-items onto the new main
   • validated branch-local behavior locally:
     • PR fix: retry repeated transient stream disconnects #42: retry-budget unit tests, replayed-stream integration test, replayed-stream CLI test
     • PR fix: preserve reasoning lineage across interrupted retries #48: reasoning-history unit/integration tests plus real CLI streaming test
   • documented a previously-undocumented fork-wide blocker as issue Fix fork-wide argument-comment lint failures in TUI files #52 (Argument comment lint failures in untouched TUI files)

   Current state:

   • ready and merged: fix(ci): remove unsupported 'version' input from taiki-e/install-action #46, docs: clarify fork deltas vs upstream #51
   • locally validated but still blocked by fork-wide CI debt: fix: retry repeated transient stream disconnects #42, fix: preserve reasoning lineage across interrupted retries #48
   • not safe to delete or merge yet: dev, fix/36-azure-reasoning-effort-alias, rebase/dev-rebase-upstream-main-20260325
4. dzianisv commented on Mar 28, 2026

   

   dzianisv

   on Mar 28, 2026

   Owner

   More actions

   Final status update:

   • merged PR fix: preserve reasoning lineage across interrupted retries #48 at 9965237b41dafb5a659244458cd89dc8f09b2124
   • merged PR fix: retry repeated transient stream disconnects #42 at 5afed61e97f6f04d15e4a2323c562e307e8b5f93
   • discovered and fixed one real integration issue before merge: #48 had removed the shared sse_incomplete() helper needed by #42 when both branches were combined
   • validated the exact combined merge result on a temporary mergecheck-42-48 branch with these passing tests:
     • cargo test -p codex-core --lib effective_stream_retry_budget
     • cargo test -p codex-core --lib context_manager::history::tests::record_items_replaces_reasoning_item_with_same_non_empty_id -- --exact
     • cargo test -p codex-core --test all suite::abort_tasks::interrupt_tool_records_history_entries -- --exact
     • cargo test -p codex-core --test all suite::stream_no_completed::retries_on_early_close -- --exact
     • cargo test -p codex-core --test all suite::stream_no_completed::retries_replayed_stream_request_when_stream_retries_are_disabled -- --exact
     • cargo test -p codex-core --test all suite::cli_stream::responses_mode_stream_cli -- --exact
     • cargo test -p codex-core --test all suite::cli_stream::responses_mode_stream_cli_retries_replayed_stream_request_when_stream_retries_disabled -- --exact
   • confirmed that origin/main matches the validated mergecheck tree exactly
   • cleaned up merged local worktrees/branches for issue-41-retry-transport-disconnects and the temporary mergecheck branch

   Remaining local branch follow-up is tracked separately in #53. Fork-wide CI debt remains tracked in #43, #44, and #52.