Skip to content

chore: consolidate active fixes into one integration branch - #35

Closed
dzianisv wants to merge 31 commits into
mainfrom
consolidated/all-current-fixes
Closed

dzianisv wants to merge 31 commits into
mainfrom
consolidated/all-current-fixes

Conversation

@dzianisv

Copy link
Copy Markdown
Owner

Closes #34

Summary

  • consolidate the active local fixes onto a single integration branch based on the latest CI/workflow branch
  • carry forward the cached source installer work from issue-22
  • carry forward the provider/model switching guardrail docs and merged test coverage from issue-21 and issue-26
  • keep issue-27 and issue-28 as the integration spine because they already contain the current CI/workflow fixes

Validation

  • sh scripts/install/test-source-build-install.sh
  • targeted codex-tui model switching coverage in progress on the consolidated worktree
  • targeted shared core harness coverage queued behind the current test build lock

Notes

  • this branch is intended to replace the local branch/worktree sprawl with one practical working default
  • the root worktree was left untouched because it still contains unrelated untracked state

engineer and others added 30 commits March 9, 2026 20:30
… a String (currently holds reqwest::Error, which isn't available at the

  api_bridge layer): pub struct ConnectionFailedError { pub message: String }
   2. codex-rs/core/src/api_bridge.rs:109 — Route Network to ConnectionFailed: TransportError::Network(msg) =>
  CodexErr::ConnectionFailed(ConnectionFailedError { message: msg }),
    TransportError::Build(msg) => CodexErr::Stream(msg, None),  // build errors aren't transport disconnects
   3. codex-rs/core/src/codex.rs — The three string patterns in should_retry_once_on_transport_disconnect can be removed for the "error sending
  request for url" case (now structural). The remaining two ("connection closed before message completed", "connection reset") cover SSE mid-stream
  drops — a separate code path through codex-api SSE processing that doesn't go through transport.rs:map_error(). Those could remain as a narrower
  fallback, or be addressed in a follow-up by adding classification in the SSE layer.
…lot models

The GitHub Copilot /models endpoint filters results based on the
Openai-Intent header. When 'conversation-edits' was sent, only GPT
models were returned — Gemini and Claude models were silently excluded.

Fix: strip the openai-intent header before making the /models GET
request so the API returns all subscription models.

Also fix the TUI model popup to show non-auto models as individual
items instead of collapsing them into an 'All models' submenu.

Tests added at three layers:
- Unit test verifying /models request omits openai-intent header
- In-process E2E test via TestCodexBuilder with mock copilot server
- CLI binary E2E test spawning actual codex binary against mock server

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: preserve provider-backed model switching
@OpenCodeEngineer

Copy link
Copy Markdown

Superseded by origin/dev.

I rebuilt the consolidation branch fresh off origin/main and pushed dev with the currently relevant fixes only:

  • Fix runtime model switching and normalize Copilot Claude tool wrappers
  • Fix reasoning selection for Azure model aliases
  • ci: avoid expired upstream npm staging artifacts

I intentionally did not continue with the old divergent history from consolidated/all-current-fixes, because most of the intended integration work is already in main and the remaining unique commits include unrelated/obsolete baggage that conflicts heavily on replay.

Recommendation: use dev as the clean integration branch instead of merging this PR into main.

@dzianisv

Copy link
Copy Markdown
Owner Author

Superseded by #38, which now carries the consolidated branch with the rebased model-switching fixes plus the CI npm-staging fix. Please do not merge this branch separately.

@dzianisv

Copy link
Copy Markdown
Owner Author

Superseded by #38, which now carries the consolidated dev -> main branch with the rebased model-switching fixes plus the CI npm-staging fix. Please do not merge this branch separately.

@dzianisv

Copy link
Copy Markdown
Owner Author

Superseded by direct landing on main at 1328bae.

@dzianisv dzianisv closed this Mar 21, 2026
@dzianisv
dzianisv deleted the consolidated/all-current-fixes branch March 21, 2026 18:19
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.

Consolidate active local fixes into one integration branch and retire superseded worktrees

2 participants