Integrate all fork features and current upstream changes - #6
Merged
Merged
Conversation
- Send unsupported files as readable local paths - Revert failed attachment turns when resuming affected sessions - Add protocol and live recovery coverage
* Window inbox card rendering * Simplify progressive list windowing
- Normalize usage and cache metrics across harness providers - Persist and display turn metrics with coverage tests
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
Integrate every outstanding fork branch and current upstream work into main, preserving the original commits and merge history:
All source branches merged without textual conflicts. All seven worktrees were clean, and every local/remote branch tip was verified as an ancestor of this integration. Three feature worktrees had no commits beyond the original main.
Why
Consolidate the outstanding work into a validated main, preserving both fork features and upstream changes in shared files.
Closes #3.
Integration corrections
Review found two behavior gaps, now covered by regression tests:
Windows CI also exposed two pre-existing Clippy failures in worktree setup. Box the large setup-operation enum variant and remove a needless return; the corrected native code passes local Clippy and all 346 Rust tests.
The Windows test run additionally caught a worktree protection mismatch for nonexistent nested paths: canonicalization added a verbatim prefix only to the existing parent. Normalize both Windows paths through the existing path conversion before component comparison. The existing shared-session protection test exercises this case. Test repositories now disable automatic CRLF conversion locally, and Windows uses a space-containing external path while Unix retains newline-path coverage.
Added a manual trigger to the existing CI workflow after automatic PR events failed to start checks. Validation runs on the final commit, with branch protection unchanged.
Standards
No documented-standard violations. One nonblocking maintenance observation remains in the upstream change: FX and Grok duplicate ACP token-metrics parsing. A shared parser can be considered separately.
Spec
Both identified requirements gaps are fixed and re-reviewed. No remaining concrete mismatches found. Primary sources were the original PR descriptions, linked issue #3, naming design documents, upstream commit messages, and upstream PR hardbeat920#209.
UI
Combines the UI changes documented in #2, #4, #5, and upstream hardbeat920#209. No additional UI redesign.
Validation
npm run check: passed; 191 web test files, 2,096 web tests, and 346 Rust tests. Includes TypeScript, rustfmt, and Clippy with warnings denied.cargo check: passed.npm run build: passed; existing bundle-size warnings remain.git diff --check: passed.2fdcded3329f9b141acad4dbb19c5203d90be685).Checklist
CI activation fix and merge status
Merged normally into
mainat9f5ed69398a87953142bf49c6d85d78111bf25ab. Local main is synced with origin/main; all seven worktrees are clean and included. Original PRs #2, #4, and #5 are marked merged, and issue #3 is closed. All three platforms passed the normal pull_request CI run on the exact head commit.The missing automatic checks were traced to GitHub's fork activation gate. The authenticated Actions page displayed “Workflows aren't being run on this forked repository”, even though the repository permissions API reported enabled and the individual workflows reported active. This corrects the earlier suspicion of a generic status-reporting outage.
Reapplying enabled Actions permissions through the API and reopening the PR activated normal pull_request CI. Run https://github.com/EricRasputin/monocode-eric/actions/runs/34853766029 passed on macOS, Linux, and Windows, and the required macOS check is recognized by the PR.
gh pr checks --requirednow passes. All branch-protection settings remain unchanged; no administrator override was used. The merge also automatically triggered push CI on main.