Repository navigation
Restore base: undo 164d65f's stale-tree overwrite, keep its Screen Sharing change - #34890
teamleaderleo wants to merge 1 commit into
Conversation
…en Sharing change 164d65f ("cmux-next iOS: + in a workspace offers Screen Sharing") was committed from a tree based on 12e55d4 (#34455), so it overwrote 339 files with their older contents (+1312 / -14365) and silently reverted every PR merged between 12e55d4 and fe3a6ae: #34866's live line "total" removal and dot gap among them, plus CI workflows, the CEF shim, the sidebar, the personal write ledger, Settings strings and the iOS chat polish. This puts every file back to fe3a6ae (the commit before 164d65f) and re-applies only the intended change, 12e55d4..80ace4f (the Screen Sharing entry, its tests and verify note). scripts/ci/cmux-next-ios-sim.sh keeps base's opt-in `video` recorder, which the branch's own "tmp: base sim script" commit had also restored. #34678 (on top of 164d65f) is kept as is. Check: the tree differs from fe3a6ae only by #34678's 3 files and the 10 Screen Sharing files. Leo-ask: ask-147c151a65 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Agent-Session: https://cmux.com/deeplink/agent?id=aid-9e1bb10a81a0d367d453
GitHub Actions
Inactive
|
Review (subagent claude-opus-5-5 medium): SHIP at de68ea1 |
|
Found 15 test failures on Blacksmith runners: Failures
...and 5 more test failures. View all on Blacksmith: run 41780597414, run 41780597084
|
![Fix with [code]smith](https://pr-comments-assets.blacksmith.sh/codesmith/fix-with-codesmith-light-3x.png)
|
cmux status (one comment, edited in place; each line is updated by the job that owns it) Review App of this head (app.zip, kept 1 day)
Yours to fix: CI failed on
Failures:
Matched log linesNot re-run automatically: Written by red: web / Web status; a job it gathers is red on this change (its line here); do not merge until green; see lane-rules Default changesThis pull request changes 5 defaults at
Signed off on this commit by Regenerate the snapshot with Gallery before/after for
States
Pick other states with a |
|
Review (claude opus-5-5 medium, claude-sr2-coord): SHIP at de68ea1 Checked the tree: across the 339 paths 164d65f touched, this head differs from 164d65f^ (fe3a6ae) in 12 files only:
|
GitHub Actions
Inactive
GitHub Actions
Inactive
GitHub Actions
Inactive
teamleaderleo
left a comment
teamleaderleo
left a comment
There was a problem hiding this comment.
Review (codex gpt-6.1-sol xhigh, next-review, since=20261104T061629Z): SHIP at de68ea1
SHIP at de68ea1
Visual verdict: no images; Leo tries the build
-
[P2] [follow-up] [category:correctness] [finding:F1] [outcome:pending] WorkspacesList.swift:421: Empty group headers depend on their Mac having Recent rows. When every workspace is pinned, New Workspace Group succeeds but its header never appears. Render empty groups independently of Recent.
-
[P2] [follow-up] [category:tests] [finding:F2] [outcome:pending] Thinking.tsx:306: No after screenshots were supplied. Capture the restored live-line alignment and iOS Screen Sharing menu for visual verification.
Follow-ups:
- Display empty groups when their Mac has no Recent rows.
- Supply after screenshots.
|
Review (codex gpt-6.1-sol xhigh, router-review on 3d4d1d7..de68ea1): BLOCK at de68ea1 Visual verdict: no images supplied (range review)
Follow-ups: F2, F3 |
|
Owned by an agent session · session |
|
Closing as superseded: 93703fe ("Restore the files 164d65f reverted by mistake") already restored the same 331 files on feat-cmux-next. Compared over the files this PR changes, this head's tree differs from 93703fe only in Review findings (receipt #34890 (comment)): |
164d65f ("cmux-next iOS: + in a workspace offers Screen Sharing") was committed
from a tree based on 12e55d4 (#34455), so it overwrote 339 files with their older
contents (+1312 / -14365) and silently reverted every PR merged between
12e55d4 and fe3a6ae: #34866's live line "total" removal and dot gap among them,
plus CI workflows, the CEF shim, the sidebar, the personal write ledger, Settings
strings and the iOS chat polish.
This puts every file back to fe3a6ae (the commit before 164d65f) and re-applies
only the intended change, 12e55d4..80ace4f (the Screen Sharing entry, its tests
and verify note). scripts/ci/cmux-next-ios-sim.sh keeps base's opt-in
videorecorder, which the branch's own "tmp: base sim script" commit had also restored.
#34678 (on top of 164d65f) is kept as is.
Check: the tree differs from fe3a6ae only by #34678's 3 files and the 10
Screen Sharing files.
Leo-ask: ask-147c151a65
Leo, on the agent pane's live line showing "· 15s total" again: "this aint aligned also the total is redundant did we remove this yet". We had (#34866); 164d65f undid it along with everything else above.
Risk: wide by file count, but it is a mechanical restore to already-merged content; the only hand merge is WorkspaceTabsSource.swift (both the teams block from base and the Screen Sharing block kept).
🤖 Generated with Claude Code
Agent session: agent session
Open in [code]smith · Need help on this PR? Tag
@codesmith-botwith what you need.Summary by cubic
Restores the tree after a cmux-next iOS Screen Sharing commit was built on a stale base and overwrote 339 files with older contents, silently reverting every change merged in between. Every file returns to the state before that commit, and only the Screen Sharing change (its entry, tests, and verify note) is re-applied. The branch's temporary CI sim-script change and a follow-up PR stacked on the stale commit are kept as they were.
Written for commit de68ea1. Summary will update on new commits.