Skip to content

M11: upstream sync (17 commits) - #179

Merged
Jesssullivan merged 19 commits into
mainfrom
sid/m11-upstream-sync
Apr 5, 2026
Merged

Jesssullivan merged 19 commits into
mainfrom
sid/m11-upstream-sync

Conversation

@Jesssullivan

Copy link
Copy Markdown
Owner

Summary

Test plan

  • CI passes (fork-ci, linux-ci)
  • Verify chorded shortcuts work
  • Verify sidebar layout doesn't loop
  • Verify SSH remote workspaces connect

anusheel and others added 19 commits April 1, 2026 20:26
When `new-split` receives a surface UUID that no longer exists (e.g. a
closed teammate pane), fall back to the focused surface instead of
returning a "Surface not found" error. This matches `new-pane` behavior
and fixes agent spawning after team shutdown in Claude Code.
* Add editable workspace descriptions

* Add workspace description focus UI tests

* Include workspace description UI tests in project

* Fix workspace description palette focus

* Stabilize workspace description UI tests

* Force socket mode in description UI tests

* Use tagged socket path in description UI tests

* Fix workspace description UI test socket setup

* Start control socket for UI test launches

* Use socket env overrides in description UI tests

* Rewrite description UI tests without socket access

* Verify saved description by reopening editor

* Add workspace description focus debug logs

* Prevent terminal focus restore during command palette

* Trace workspace description shift-enter handling

* Add failing Shift-Enter description UI test

* Fix Shift-Enter in workspace description editor

* Use live multiline editor state for description submit

* Log submitted and normalized workspace descriptions

* Trace lower-level Shift-Enter editor routing

* Add failing sidebar markdown line-break regression test

* Preserve workspace description line breaks in sidebar

* Add sidebar multiline description UI smoke test

* Expose multiline sidebar descriptions to accessibility

* Fix sidebar description refresh lag

* Add failing workspace description whitespace test

* Preserve workspace description whitespace

* fix: keep multiline palette navigation in editor

* fix: cap workspace description editor growth

---------

Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
…-surface-fallback

fix: new-split falls back to focused surface when target is stale
* Add failing SSH remote port detection regression

* Detect listening ports for remote SSH workspaces

* Retry remote SSH TTY reporting until the target surface exists

* Address relay RPC review comments

* Avoid host-wide remote port leaks for cmux ssh

* Make remote port scans prompt-aware

* Fall back when remote ss omits pid data

* Tighten remote port scan handoff

* Keep raw RPC output intact

* Clean up relay TTY handoff review follow-up

* Fix remote ssh port surfacing

* Fix cmux ssh bootstrap and orphan cleanup

* Address SSH remote review feedback

* Stabilize SSH remote metadata regression

* Fix shell timing and suppressed focus recovery

* Harden suppressed focus recovery in tests

* Stabilize focus recovery regression timing

* Fix SSH relay auth and bootstrap handoff

* Fix SSH metadata cleanup assertion

---------

Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Fix session restore terminal cursor focus race

* Fix terminal ready focus observer key

* wip

* Revert accidental submodule pointer changes from wip commit

The wip commit bumped ghostty and bonsplit pointers alongside the
actual code fix. Revert them to match main so the PR only contains
the session cursor race fix.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
* Support chorded keyboard shortcuts

* Fix escape handling in shortcut recorder

* Add settings.json shortcut overrides

* Add regression test for chord reset on deactivate

* Fix shortcut chord cleanup edge cases

* Add regression tests for chord prefix edge cases

* Fix configurable chord prefix routing

* Add CLI reload-config command

* Simplify reload-config CLI command

* Add regression tests for shortcut reload edges

* Fix shortcut reload and chord edge cases

* Add managed settings.json defaults and schema docs

* fix: harden shortcut routing edge cases

* fix: preserve palette and browser shortcut routing

* chore: retrigger missing PR workflows

* feat: add settings.json entry points

* feat: make workspace color palette a named dictionary

* feat: add textedit button for settings file

* refactor: reorder ghostty menu items

* refactor: restore settings menu ordering

* refactor: restyle settings file entry

* refactor: move settings file actions into header

* refactor: simplify settings file header action

* docs: explain shortcut chords from settings

* refactor: reorder shortcut chord actions

* fix: notify after swapping settings file store

---------

Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
)

* Fix sidebar workspace branch backfill

* Add stale branch sidebar regression

* Patch GhosttyKit header compatibility

* Match Ghostty clipboard callback signature

* Tighten sidebar git metadata polling

* Fix Ghostty clipboard callback bridge

---------

Co-authored-by: austinpower1258 <austinwang115@gmail.com>
* test: cover agent-owned sidebar ports

* fix: track agent dev-server ports in sidebar
…d-auth-before-upload

Fix SSH password auth bootstrap race
* Fix sidebar layout loop and CLI socket deadlocks

* Fix sidebar socket target validation

* Move sidebar tab resolution onto main queue

* Fix sidebar mutation closure parameters
SSH: password auth deferral, control master reuse, hardened escaping
UI: sidebar layout loop fix, git branch metadata, session restore cursor
Features: chorded keyboard shortcuts, workspace descriptions, remote port detection
Tests: SSH foreground-auth regression tests

Rename socketPassword -> socketPassphrase in settings file store
to satisfy pre-commit credential pattern check (false positive).
@Jesssullivan
Jesssullivan merged commit 41e689d into main Apr 5, 2026
8 checks passed
@Jesssullivan
Jesssullivan deleted the sid/m11-upstream-sync branch April 5, 2026 20:06
@Jesssullivan Jesssullivan mentioned this pull request Apr 5, 2026
2 tasks
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.

4 participants