Keep the Windows cmd.exe harness for apply_patch_cli_can_use_shell_command_output_as_patch_input, but make the nested PowerShell read deterministic by silencing progress output, switching to ReadAllText, and running non-interactively.
Co-authored-by: Codex <noreply@openai.com>
Keep the Windows cmd.exe harness for apply_patch_cli, but encode the nested PowerShell read so cmd does not pass the script through as a quoted string literal. This preserves the test coverage while making the file-read path deterministic again.
Update the flaky-test ledger with the c14493260 CI failure and the new quoting diagnosis.
Co-authored-by: Codex <noreply@openai.com>
Restore the parser subprocess stdin behavior that Command::output() provided so safe PowerShell wrapper commands do not time out on Windows, and add the argument-name comments required by the stale lint failure.
Co-authored-by: Codex <noreply@openai.com>
Add a test-only user shell override so the Windows-flaky shell command
integration tests can pin cmd.exe without changing live session state.
Use that seam in the apply_patch and websocket shell-chain suites, and
trim the redundant live PowerShell discovery from the safe-command
handler regression test. Update the flaky-test triage notes with the
latest Windows-only CI failure pair and this follow-up.
Co-authored-by: Codex <noreply@openai.com>
GitHub stopped enqueuing pull_request workflows once the PR head became merge-conflicted against main. Merge main into the branch, preserve the flaky-test fixes, and record the CI trigger issue in the triage ledger.
Co-authored-by: Codex <noreply@openai.com>
Document the fully green CI result for cc4785e3f and continue the streak toward five consecutive passing commits on this PR.
Co-authored-by: Codex <noreply@openai.com>
Preserve out-of-order fuzzy-search notifications in the in-process test harness so session completion events are not dropped while waiting for a later matching update.
Co-authored-by: Codex <noreply@openai.com>
Avoid exposing a private type alias through the app-server public API so the fuzzy-search request-order fix builds cleanly across the rust-ci matrix.
Co-authored-by: Codex <noreply@openai.com>
Capture nextest output in rust-ci and emit parsed FAIL/LEAK lines as annotations and step-summary text when tests fail.
Also record the isolated Linux test failure on b6e18d2e8 in the flaky-test ledger.
Co-authored-by: Codex <noreply@openai.com>
Use exact selected preset names in the permissions popup tests and restore the correct Windows expectation for the default unelevated popup opening on Read Only instead of Default.
Co-authored-by: Codex <noreply@openai.com>
Match the selected permissions preset by the row name prefix instead of a loose substring search so the Smart Approvals description cannot masquerade as Default during popup navigation.
Co-authored-by: Codex <noreply@openai.com>
Handle the Windows-only Read Only preset in the generic helper and drive the permission history snapshot tests by the selected label instead of hard-coded key counts.
Co-authored-by: Codex <noreply@openai.com>
Match the selected permission preset label directly in the generic history tests instead of assuming the popup always renders a suffix.
Co-authored-by: Codex <noreply@openai.com>
Restrict the selection helper to permission preset rows so popup assertions cannot bind to unrelated rendered lines.
Co-authored-by: Codex <noreply@openai.com>
Replace the approval-matrix shell redirection write path with deterministic Python file I/O and keep scenario-level diagnostics in CI while the flake is being verified.
Co-authored-by: Codex <noreply@openai.com>
## PR Notes
This PR adds a project-scoped `babysit-pr` skill for ongoing PR
monitoring (CI, reviews, mergeability).
Simply invoke this skill after creating a PR, and codex will do its best
to get it to a mergeable state:
### What the skill does
* Fixes CI failures related to the PR
* Retries CI failures due to flaky tests
* Addresses code review comments if it agrees with them
* Addresses merge conflicts on main branch
### How the skill works
- Polls PR status on a loop (CI checks, workflow runs, review activity,
mergeability, and review decision).
- Detects new review feedback (including inline comments and automated
Codex review comments) and prompts/handles follow-up work.
- Distinguishes pending vs failed vs passed CI and identifies likely
flaky failures.
- Can retry failed checks/workflows when appropriate.
- Prioritizes actionable code review feedback over flaky CI retries (to
avoid rerunning CI on a SHA that is about to be replaced).
- Continues monitoring after fixes are applied and pushed, rather than
stopping after a progress update.
- Uses a slower backoff polling cadence once CI is green, while still
watching for new review feedback or state changes.
- Treats required review/approval as a blocking condition and keeps
watching until the PR is actually merge-ready (or merged/closed, or
human intervention is needed).
### Intended outcome
Keep the PR moving with minimal manual babysitting by continuously
watching for CI failures, reviewer feedback, and merge blockers, and
responding in the right order until the PR is ready to merge.