Repository navigation
Keep Claude Running after clear - #3631
Merged
Merged
Conversation
The regression exercises the Claude hook handler directly with a SessionStart payload whose source is clear, then sends a late Stop for the previous session. The current handler does not promote the clear boundary to Running or reject stale Stop mutations, so this test is expected to fail before the lifecycle fix. Constraint: Tests must exercise the hook handler directly rather than driving the full app. Confidence: high Scope-risk: narrow Directive: Keep this regression on the direct CLI hook path; do not replace it with source-text assertions. Tested: Not run locally per repository policy. Not-tested: CI red/green proof pending on GitHub Actions.
Add hook-level regression coverage for Claude Code /clear. The tests drive the bundled CLI against a mock cmux socket so CI proves SessionStart(source=clear) must set the visible Running status and a prior session Stop must not clobber that fresh lifecycle. Constraint: Local tests are intentionally not run; CI owns test execution for this task. Confidence: high Scope-risk: narrow Tested: Not run locally per instruction Not-tested: Full app UI repro under CI
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughAdds workspace-level active-session tracking (sessionId ± turnId), gates visible Claude hook mutations on session currentness, treats SessionStart with source="clear" as a visible Running boundary, and adds Swift/Python integration tests plus CI/script and wrapper updates. ChangesSession Tracking and Stale-Event Suppression
Estimated code review effort🎯 4 (Complex) | ⏱️ ~60 minutes Possibly related PRs
Caution Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional.
❌ Failed checks (3 errors, 1 warning)
✅ Passed checks (11 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Claude /clear starts a fresh hook lifecycle but the sidebar status key is shared at the workspace level. Persist the active Claude session per workspace, promote clear SessionStart to a visible Running state, and ignore teardown or notification mutations from sessions that are no longer current. Constraint: Claude Code emits /clear as SessionStart(source=clear). Rejected: Only set Running on clear SessionStart | late Stop from the previous lifecycle could still clobber the new status. Confidence: high Scope-risk: narrow Directive: Future Claude hook status mutations must respect the active workspace session before touching claude_code. Tested: Not run locally per instruction Not-tested: Full app UI after CI
The regression exercises the Claude hook handler directly with a SessionStart payload whose source is clear, then sends a late Stop for the previous session. The current handler does not promote the clear boundary to Running or reject stale Stop mutations, so this test is expected to fail before the lifecycle fix. Constraint: Tests must exercise the hook handler directly rather than driving the full app. Confidence: high Scope-risk: narrow Directive: Keep this regression on the direct CLI hook path; do not replace it with source-text assertions. Tested: Not run locally per repository policy. Not-tested: CI red/green proof pending on GitHub Actions.
Claude /clear arrives as a SessionStart source=clear event, but the hook store only remembered routing data. This change makes the store also own the active session for each workspace, promotes clear starts to Running, and ignores visible Stop/Notification/SessionEnd mutations when their session no longer matches the active workspace session. Constraint: Claude Code documents SessionStart source=clear for /clear lifecycle boundaries. Rejected: Only set Running on source=clear | old Stop and SessionEnd events could still clobber the new session afterward. Confidence: high Scope-risk: narrow Directive: Visible Claude hook mutations must pass active-session ownership checks before changing sidebar status or notifications. Tested: Not run locally per repository policy. Not-tested: CI red/green proof pending on GitHub Actions.
austinywang
force-pushed
the
issue-3614-claude-clear-running-status
branch
from
May 6, 2026 07:58
0405340 to
aa2f2fb
Compare
The remote issue branch already carried a hook regression test. Merge it into the fixed branch instead of force-pushing over shared work, preserving both the existing test artifact and the two local test/fix commits. Constraint: origin branch had advanced and force push is not appropriate here. Confidence: high Scope-risk: narrow Directive: Keep origin/issue-3614-claude-clear-running-status as the shared PR branch. Tested: Not run locally per instruction Not-tested: CI impact of the existing remote Python test before GitHub Actions runs
Contributor
Greptile SummaryThis PR fixes the Claude status staying "Running" after
Confidence Score: 4/5Safe to merge; the core lifecycle fix and auth hardening are well-reasoned and all previously flagged critical bugs have been resolved. All previously flagged bugs are addressed in this revision. The remaining findings are a dead loginPollTask field that is always nil and a hardcoded authLogger subsystem string — neither causes incorrect runtime behaviour. CLI/cmux.swift has grown to 21,873 lines and warrants extraction of the hook-store and TOML helpers. Sources/Auth/AuthManager.swift has the dead loginPollTask variable that should be cleaned up. Important Files Changed
Sequence DiagramsequenceDiagram
participant C as Claude Process
participant H as Hook Handler
participant S as SessionStore
participant UI as UI Sidebar
Note over C,UI: Normal turn
C->>H: SessionStart S1 startup
H->>S: "upsert S1 markActive=false"
C->>H: UserPromptSubmit S1 T1
H->>S: isCurrent S1 true
H->>S: "upsert S1 markActive=true turnId=T1"
H->>UI: setStatus Running
C->>H: Stop S1 T1
H->>S: isCurrent S1 true
H->>S: "upsert S1 markActive=true allowsReplacement=true turnId=nil"
H->>UI: setStatus Idle
Note over C,UI: /clear fires new session
C->>H: "SessionStart S2 source=clear"
H->>S: "upsert S2 markActive=true"
H->>UI: setStatus Running immediately
Note over C,UI: Stale pre-clear events arrive
C-->>H: Stop S1 stale
H->>S: isCurrent S1 returns false
H--xUI: dropped stale breadcrumb
C-->>H: SessionEnd S1 stale
H->>S: consume S1 removes record
H->>S: isCurrent S1 returns false
H--xUI: no clear-status stale
Reviews (28): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
A visible hook mutation can only be rejected as stale after the active session boundary is known. Keeping a completed turn id active after Stop made the next prompt in the same Claude session look stale before it could promote its own turn. The Stop path now refreshes the active session with no turn id once the completed turn has been accepted, preserving stale-session protection across /clear while allowing normal multi-turn prompts to re-enter Running. The regression now exercises that two-turn path before the clear boundary. Constraint: Do not run local tests; CI owns verification for this branch. Rejected: Ignore turn id in all current-session checks | would weaken stale turn filtering for late Stop and Notification events. Confidence: high Scope-risk: narrow Directive: Do not persist a completed turn id past Stop without proving the next prompt-submit can promote a new turn. Tested: git diff --check Not-tested: Local unit/regression tests per project policy
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
The origin branch already carried the stronger active-session and turn-aware hook model for issue 3614. This merge keeps that state model while retaining the local direct hook regression coverage added before the branch moved. Constraint: Preserve origin/issue-3614-claude-clear-running-status without force-pushing or rewriting another writer's work Constraint: Local tests are intentionally not run; CI owns verification for this task Rejected: Force-push local two-commit history | would discard the already-pushed authoritative fix and violate shared-branch safety Confidence: medium Scope-risk: narrow Tested: git diff --check Not-tested: Local test execution, per task instruction
The shared branch gained a follow-up that prevents accepted Stop events from freezing the active turn id and making the next prompt in the same Claude session look stale. Keep that behavior while preserving the non-force-push integration history. Constraint: Preserve origin history and push only to manaflow-ai/cmux Constraint: No local tests per task policy Rejected: Force-push over origin | branch moved with a valid follow-up lifecycle fix Confidence: medium Scope-risk: narrow Tested: git diff --check before merge; merge strategy completed without manual code edits if clean Not-tested: Local test execution
The branch integration accidentally kept two isClaudeClearSessionStart definitions in CLI/cmux.swift. The duplicate version referenced a non-existent parsedInput.source property, so Swift would reject the file before CI could exercise the hook lifecycle tests. Keep the existing implementation that reads source from the parsed hook object and delete only the duplicate helper. Constraint: Fix review-reported compile blocker without changing lifecycle behavior. Rejected: Add source to ClaudeHookParsedInput | unnecessary for this compile fix and broader than the failing duplicate. Confidence: high Scope-risk: narrow Directive: Keep exactly one Claude clear source helper unless the parsed input model is intentionally extended. Tested: git diff --check; rg confirms a single isClaudeClearSessionStart definition and no parsedInput.source reference. Not-tested: Local tests per project policy
The active-session merge left behind the old source-property helper alongside the newer compact-payload helper. Removing the duplicate keeps source=clear detection on the JSON payload and avoids both the redeclaration and missing-property errors. Constraint: Do not run local tests; CI owns verification for this branch Rejected: Reintroduce ClaudeHookParsedInput.source | duplicates state already retained in the compact hook payload Confidence: high Scope-risk: narrow Tested: git diff --check; rg verified a single isClaudeClearSessionStart definition and no parsedInput.source references Not-tested: Local compile/test execution per task policy
Origin advanced with the same compile fix for the duplicate Claude clear helper. Merge it instead of force-pushing the local equivalent commit so the shared PR branch remains append-only. Constraint: Preserve origin branch history and push only to manaflow-ai/cmux Rejected: Force-push local equivalent commit | unnecessary and would rewrite the shared branch Confidence: high Scope-risk: narrow Tested: git diff --check before local equivalent commit; origin commit records the same static checks Not-tested: Local tests per project policy
The active-session map is keyed by normalized workspace id, so cleanup after consuming a session must use the same normalized key. Otherwise a record containing incidental whitespace could leave a stale active-session entry behind. Constraint: Address reviewer-reported lifecycle cleanup edge case without changing visible hook behavior. Rejected: Store raw workspace ids as active map keys | inconsistent with existing upsert normalization and lookup guards. Confidence: high Scope-risk: narrow Directive: Any activeSessionsByWorkspace lookup should use the normalized workspace key, matching insertion. Tested: git diff --check Not-tested: Local tests per project policy
CircleCI and the activation workflow both depend on ziglang.org tarballs during remote macOS setup. A transient 500 from that host failed the debug build before any project code compiled, so the install path now retries downloads and avoids unnecessary Homebrew update/cleanup churn on CircleCI. Constraint: CI must be made green remotely without running local tests or local xcodebuild. Rejected: Push an empty commit to rerun CI | would leave the same upstream download flake unchanged. Confidence: high Scope-risk: narrow Directive: Keep Zig installer retries in remote CI setup paths; failures here happen before project build logic runs. Tested: git diff --check Not-tested: Local tests and local builds not run per repository/user policy.
Greptile identified that stale SessionEnd exercises a different clear-state path than stale Stop. The existing active-session guard already blocks the mutation, so the regression now drives that hook directly and asserts the active /clear session keeps its status, PID, and notifications intact. Constraint: Do not run local tests; CI is the verification source for this branch. Rejected: Add another Swift integration test | the existing Python hook harness already executes the CLI handler through the socket path used by CI. Confidence: high Scope-risk: narrow Tested: Not run locally per repo policy. Not-tested: Local test execution.
The activation workflow was cancelled before build because repeated ziglang.org transfers crawled for the full job timeout. Prefer Homebrew's pinned zig@0.15 bottle on macOS runners, then keep the direct tarball path as a bounded fallback with connection, total-time, and minimum-speed limits. Constraint: The failed check never reached project build or tests; the only failing surface was CI tool bootstrap. Rejected: Increase the job timeout | it would hide the bootstrap failure and delay feedback. Confidence: medium Scope-risk: narrow Directive: Keep activation workflow tool bootstrap bounded so performance CI reaches the benchmark or fails quickly. Tested: git diff --check Not-tested: Local workflow execution, per repository and user instruction.
Greptile noted that session-end computed the current-session guard from the fallback workspace while clearing the consumed session's workspace. Move the guard next to the mutation target so stale cleanup and visible cleanup always evaluate the same workspace identity. Constraint: This is follow-up review hardening on the existing active-session model. Rejected: Collapse activeSessionsByWorkspace into sessions in this PR | per-workspace current-session lookup is the intended lifecycle boundary for stale event gating. Confidence: high Scope-risk: narrow Directive: SessionEnd visible cleanup must be gated against the workspace being cleared, not an earlier fallback lookup. Tested: git diff --check Not-tested: Local test execution, per repository and user instruction.
A late SessionEnd can be resolved through fallback surface lookup, so the workspace used to find a record is not always the workspace whose visible state would be cleared. Move the staleness check after consume() and evaluate it against the consumed session's workspace, where the clear_status and notification cleanup actually run. Constraint: Hook events are delivered by short-lived CLI processes and must tolerate stale or partial Claude payloads Rejected: Keep the pre-consume fallback workspace guard | it can validate one workspace while clearing another Confidence: high Scope-risk: narrow Tested: Added Swift integration regression for stale SessionEnd fallback cleanup Not-tested: Local tests not run per repository policy
Contributor
Author
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
Contributor
Author
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (4)
tests/test_claude_wrapper_hooks.py (2)
575-591: 🧹 Nitpick | 🔵 Trivial | ⚡ Quick winCover the full hard-coded builtin subcommand list.
Resources/bin/claudenow special-cases more builtin names than this loop exercises.auto-mode,plugin,plugins, andultrareviewcan drift or be misspelled without any regression here catching it.Minimal coverage extension
subcommands = [ "mcp", "config", "api-key", + "auto-mode", "rc", "remote-control", "agents", "doctor", + "plugin", + "plugins", "update", "upgrade", "auth", "project", "setup-token", "install", "daemon", + "ultrareview", "experimental-next", ]🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@tests/test_claude_wrapper_hooks.py` around lines 575 - 591, The test's hard-coded subcommands list (variable subcommands in tests/test_claude_wrapper_hooks.py) is missing newly special-cased builtin names; update the subcommands array to include "auto-mode", "plugin", "plugins", and "ultrareview" so the loop exercises the full set of builtin names the claude wrapper now special-cases, ensuring the test will catch regressions if any of those names drift or are misspelled.
462-477: 🛠️ Refactor suggestion | 🟠 Major | ⚡ Quick winRe-add a regression for explicit session-entry flags.
This test now only proves injection for a bare prompt. The new parser logic also depends on
-pand value-consuming options before the prompt; those branches can regress without this file noticing.Proposed test shape
-def test_live_socket_injects_supported_hooks_without_unlocking_bypass(failures: list[str]) -> None: - code, real_argv, cmux_log, stderr, claudecode, node_options, runtime_node_options, child_node_options, hook_cmux_bin, _ = run_wrapper( - socket_state="live", - argv=["hello"], - ) - expect(code == 0, f"live socket: wrapper exited {code}: {stderr}", failures) - expect("--settings" in real_argv, f"live socket: missing --settings in args: {real_argv}", failures) - expect("--session-id" in real_argv, f"live socket: missing --session-id in args: {real_argv}", failures) +def test_live_socket_injects_supported_hooks_without_unlocking_bypass(failures: list[str]) -> None: + for original_argv in ( + ["hello"], + ["--print", "hello"], + ["-p", "hello"], + ["--model", "sonnet", "hello"], + ): + code, real_argv, cmux_log, stderr, claudecode, node_options, runtime_node_options, child_node_options, hook_cmux_bin, _ = run_wrapper( + socket_state="live", + argv=original_argv, + ) + expect(code == 0, f"{original_argv} live socket: wrapper exited {code}: {stderr}", failures) + expect("--settings" in real_argv, f"{original_argv} live socket: missing --settings in args: {real_argv}", failures) + expect("--session-id" in real_argv, f"{original_argv} live socket: missing --session-id in args: {real_argv}", failures)🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@tests/test_claude_wrapper_hooks.py` around lines 462 - 477, The test test_live_socket_injects_supported_hooks_without_unlocking_bypass currently only checks a bare prompt path; update it to re-add a regression case that exercises explicit session-entry flags and value-consuming options before the prompt so parsing branches don't regress — call run_wrapper with argv that includes --print (or -p) and a preceding option that consumes a value (e.g., --some-value <val> or an existing value-taking flag used by the CLI) before the final "hello" arg, then assert the same invariants on real_argv (presence of --settings and --session-id, absence of bypass flags, original arg at the end) and that cmux_log contains the ping; ensure the new call uses the same helper (run_wrapper) and the test function name test_live_socket_injects_supported_hooks_without_unlocking_bypass is updated to include this explicit-session-entry scenario or add a new sibling test that references the same checks.Sources/AppDelegate.swift (1)
2516-2602: 🛠️ Refactor suggestion | 🟠 Major | 🏗️ Heavy liftExtract the persisted-window-geometry codec/resolver out of
AppDelegate.The new encode/decode, remap, clamp, and display-resolution logic is standalone enough to live in a dedicated helper instead of growing a 14k-line lifecycle file further.
As per coding guidelines
Sources/**/*.swift: "Flag features implemented directly in the app target/module rootSources/path when their core logic is independent of cmux app lifecycle and can compile/test without AppKit, SwiftUI view state, Ghostty globals, or process-wide singletons."Also applies to: 2777-3110
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Sources/AppDelegate.swift` around lines 2516 - 2602, Extract the persisted-window-geometry codec and resolver into a new helper type (e.g., WindowGeometryStore or PersistedWindowGeometryCodec) and move the implementation of persistedWindowGeometry(_:), persistWindowGeometry(frame:display:defaults:), encodedPersistedWindowGeometryData(frame:display:), decodedPersistedWindowGeometryData(_:), removeLegacyPersistedWindowGeometry(defaults:), currentDisplayGeometries(), persistWindowGeometry(from:), and resolvedPersistedWindowGeometryFrame() into that helper; keep the same signatures (preserve nonisolated/static and UserDefaults default params) so AppDelegate can call the helper (replace Self.* calls with the new type), ensure the helper includes the remap/clamp/resolve logic used by resolvedWindowFrame (or expose a resolver method that accepts availableDisplays/fallbackDisplay), and add unit tests for the helper since it no longer depends on AppKit/AppDelegate globals.Sources/Auth/AuthManager.swift (1)
457-496: 🧹 Nitpick | 🔵 Trivial | 💤 Low valueNon-sentinel errors from
refreshSessionleavelastKnownAccessTokenand persisted tokens populated.The
catchonly matchesAuthManagerError.invalidCallback where !isCurrentAuthMutation(...). Any other throw fromrefreshSession(e.g., transient network failure inclient.currentUser()/client.listTeams()) propagates out ofhandleCallbackURLaftertokenStore.seed(...)succeeded andlastKnownAccessToken = payload.accessTokenwas assigned, but beforeisAuthenticated/didCompleteBrowserSignInare updated. This isn't externally observable becausegetAccessToken()is now gated onisAuthenticated, andrestoreStoredSessionIfNeededwill recover on next launch — but the partial in-memory state (cached access token without an authenticated session and withoutdidCompleteBrowserSignIn) is a minor surprise. Consider clearinglastKnownAccessToken(or routing throughclearSessionState) on the non-sentinel throw path so the in-memory cache stays consistent withisAuthenticated.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Sources/Auth/AuthManager.swift` around lines 457 - 496, handleCallbackURL seeds tokens and assigns lastKnownAccessToken before calling refreshSession, but if refreshSession throws a non-sentinel error the method returns with persisted tokens and lastKnownAccessToken set while didCompleteBrowserSignIn/isAuthenticated remain false; update handleCallbackURL to detect non-sentinel throws from refreshSession and in that path clear the in-memory session state (e.g. reset lastKnownAccessToken and/or call the existing clearSessionState helper) and optionally revert tokenStore changes so the in-memory cache remains consistent; modify the do/catch around refreshSession in handleCallbackURL to catch all errors, distinguish the sentinel AuthManagerError.invalidCallback where !isCurrentAuthMutation(...) (existing behavior) from other errors and perform the clearing before rethrowing or returning.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Sources/AppDelegate.swift`:
- Around line 14503-14510: When cmuxBrowserReturnForwardingDepth > 0 the code
currently returns false and drops the event; instead call the original
implementation so the event is handled normally. In the re-entry branch that
checks cmuxBrowserReturnForwardingDepth, replace the early "return false" path
with a call to cmux_performKeyEquivalent(with: event) and return its Bool result
(i.e., forward to the original performKeyEquivalent implementation) so behavior
matches the fallback used later in performKeyEquivalent.
---
Outside diff comments:
In `@Sources/AppDelegate.swift`:
- Around line 2516-2602: Extract the persisted-window-geometry codec and
resolver into a new helper type (e.g., WindowGeometryStore or
PersistedWindowGeometryCodec) and move the implementation of
persistedWindowGeometry(_:), persistWindowGeometry(frame:display:defaults:),
encodedPersistedWindowGeometryData(frame:display:),
decodedPersistedWindowGeometryData(_:),
removeLegacyPersistedWindowGeometry(defaults:), currentDisplayGeometries(),
persistWindowGeometry(from:), and resolvedPersistedWindowGeometryFrame() into
that helper; keep the same signatures (preserve nonisolated/static and
UserDefaults default params) so AppDelegate can call the helper (replace Self.*
calls with the new type), ensure the helper includes the remap/clamp/resolve
logic used by resolvedWindowFrame (or expose a resolver method that accepts
availableDisplays/fallbackDisplay), and add unit tests for the helper since it
no longer depends on AppKit/AppDelegate globals.
In `@Sources/Auth/AuthManager.swift`:
- Around line 457-496: handleCallbackURL seeds tokens and assigns
lastKnownAccessToken before calling refreshSession, but if refreshSession throws
a non-sentinel error the method returns with persisted tokens and
lastKnownAccessToken set while didCompleteBrowserSignIn/isAuthenticated remain
false; update handleCallbackURL to detect non-sentinel throws from
refreshSession and in that path clear the in-memory session state (e.g. reset
lastKnownAccessToken and/or call the existing clearSessionState helper) and
optionally revert tokenStore changes so the in-memory cache remains consistent;
modify the do/catch around refreshSession in handleCallbackURL to catch all
errors, distinguish the sentinel AuthManagerError.invalidCallback where
!isCurrentAuthMutation(...) (existing behavior) from other errors and perform
the clearing before rethrowing or returning.
In `@tests/test_claude_wrapper_hooks.py`:
- Around line 575-591: The test's hard-coded subcommands list (variable
subcommands in tests/test_claude_wrapper_hooks.py) is missing newly
special-cased builtin names; update the subcommands array to include
"auto-mode", "plugin", "plugins", and "ultrareview" so the loop exercises the
full set of builtin names the claude wrapper now special-cases, ensuring the
test will catch regressions if any of those names drift or are misspelled.
- Around line 462-477: The test
test_live_socket_injects_supported_hooks_without_unlocking_bypass currently only
checks a bare prompt path; update it to re-add a regression case that exercises
explicit session-entry flags and value-consuming options before the prompt so
parsing branches don't regress — call run_wrapper with argv that includes
--print (or -p) and a preceding option that consumes a value (e.g., --some-value
<val> or an existing value-taking flag used by the CLI) before the final "hello"
arg, then assert the same invariants on real_argv (presence of --settings and
--session-id, absence of bypass flags, original arg at the end) and that
cmux_log contains the ping; ensure the new call uses the same helper
(run_wrapper) and the test function name
test_live_socket_injects_supported_hooks_without_unlocking_bypass is updated to
include this explicit-session-entry scenario or add a new sibling test that
references the same checks.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: a0513e21-eb73-44aa-8624-f68b90712f2e
📒 Files selected for processing (15)
CLI/CMUXCLI+AgentHookDefinitions.swiftCLI/cmux.swiftGhosttyTabs.xcodeproj/project.pbxprojResources/bin/claudeSources/AppDelegate.swiftSources/Auth/AuthManager.swiftSources/GhosttyTerminalView.swiftSources/Update/UpdateDriver.swiftSources/Update/UpdateTestSupport.swiftSources/Update/UpdateViewModel.swiftcmuxTests/CLINotifyProcessIntegrationRegressionTests.swiftcmuxTests/ShortcutAndCommandPaletteTests.swiftcmuxTests/SocketControlPasswordStoreTests.swifttests/test_claude_wrapper_hooks.pytests/test_codex_feed_hooks.py
💤 Files with no reviewable changes (1)
- GhosttyTabs.xcodeproj/project.pbxproj
Contributor
Author
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit ceacfd2. Configure here.
There was a problem hiding this comment.
Actionable comments posted: 4
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Sources/AppDelegate.swift`:
- Around line 14497-14517: The reentry guards currently call
cmux_performKeyEquivalent(which invokes the swizzled/original AppKit path) which
can re-enter the SwiftUI/NSWindow performKeyEquivalent flow and lose WKWebView
key handling; update the logic so that when handling the
WKWebView-first-responder case (use symbols:
shouldDispatchBrowserReturnViaFirstResponderKeyDown,
cmuxBrowserReturnForwardingDepth, firstResponderWebView,
firstResponder?.keyDown), you do NOT call cmux_performKeyEquivalent to resolve
the reentry; instead have NSWindow.cmux_performKeyEquivalent directly forward to
firstResponderWebView.performKeyEquivalent(...) and return that Bool
unconditionally, and ensure the same change is applied to the other similar
guard block that checks cmuxBrowserReturnForwardingDepth so both
early-return/reentry paths bypass the original AppKit/swizzled
performKeyEquivalent.
- Around line 2626-2637: The startup code currently skips the persisted-geometry
fallback when a primaryWindowSnapshot exists but its frame resolution yields
nil; update the logic so that when
applySessionWindowSnapshot(primaryWindowSnapshot, ...) does not successfully
restore a usable frame (i.e., returns false or results in no-op), you call
Self.resolvedStartupPrimaryWindowFrame(...) with the persistedWindowGeometry()
values (fallbackGeometry?.frame and fallbackGeometry?.display) and
availableDisplays/currentDisplayGeometries() and, if a restoredFrame is
returned, call primaryWindow.setFrame(restoredFrame, display: true); ensure this
change references applySessionWindowSnapshot, primaryWindowSnapshot,
resolvedStartupPrimaryWindowFrame, persistedWindowGeometry, and
primaryWindow.setFrame so the persisted fallback is attempted when the snapshot
frame is unusable.
In `@tests/test_codex_feed_hooks.py`:
- Around line 531-533: The test creates a fixed directory root / "codex-home"
which collides when tests run sequentially; update
test_install_codex_hooks_only_edits_real_features_table (and the other test that
also uses root / "codex-home") to create a unique CODEX_HOME per test (e.g.,
append a unique suffix from pytest tmp_path/tmp_path_factory or uuid4) or call
mkdir(exist_ok=True) to avoid FileExistsError; ensure any env var or variable
that points to CODEX_HOME in the test points to this unique path so subsequent
calls to main() do not attempt to recreate the same directory.
- Around line 572-575: The test currently asserts that the very next line after
finding "[features]" equals "codex_hooks = true" which is too strict; instead,
after locating features_index (the index of "[features]" in lines from
config_toml), scan subsequent lines until you hit the next section header (a
line starting with "[") or the end and assert that one of those lines equals
"codex_hooks = true" (i.e., check membership in that feature block) so existing
keys/order are allowed while still ensuring the feature was inserted.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: e60d8bda-91ca-4e59-8ba8-a7566ec85ed6
📒 Files selected for processing (3)
CLI/cmux.swiftSources/AppDelegate.swifttests/test_codex_feed_hooks.py
Comment on lines
+2626
to
+2637
| } else { | ||
| let displays = currentDisplayGeometries() | ||
| let fallbackGeometry = persistedWindowGeometry() | ||
| if let restoredFrame = Self.resolvedStartupPrimaryWindowFrame( | ||
| primarySnapshot: nil, | ||
| fallbackFrame: fallbackGeometry?.frame, | ||
| fallbackDisplaySnapshot: fallbackGeometry?.display, | ||
| availableDisplays: displays.available, | ||
| fallbackDisplay: displays.fallback | ||
| ) { | ||
| primaryWindow.setFrame(restoredFrame, display: true) | ||
| } |
There was a problem hiding this comment.
Fallback to persisted geometry when the primary snapshot frame is unusable.
If primaryWindowSnapshot exists but its frame resolves to nil/invalid, applySessionWindowSnapshot(...) becomes a no-op and this branch never tries the new persisted-geometry fallback. Startup then falls back to the default rect instead of the last saved window placement.
Suggested fix
if let primaryWindowSnapshot {
isApplyingSessionRestore = true
`#if` DEBUG
cmuxDebugLog(
"session.restore.start windows=\(startupSnapshot?.windows.count ?? 0) " +
"primaryFrame={\(debugSessionRectDescription(primaryWindowSnapshot.frame))} " +
"primaryDisplay={\(debugSessionDisplayDescription(primaryWindowSnapshot.display))}"
)
`#endif`
applySessionWindowSnapshot(
primaryWindowSnapshot,
to: primaryContext,
window: primaryWindow
)
+ if resolvedWindowFrame(from: primaryWindowSnapshot) == nil {
+ let displays = currentDisplayGeometries()
+ let fallbackGeometry = persistedWindowGeometry()
+ if let restoredFrame = Self.resolvedStartupPrimaryWindowFrame(
+ primarySnapshot: primaryWindowSnapshot,
+ fallbackFrame: fallbackGeometry?.frame,
+ fallbackDisplaySnapshot: fallbackGeometry?.display,
+ availableDisplays: displays.available,
+ fallbackDisplay: displays.fallback
+ ) {
+ primaryWindow.setFrame(restoredFrame, display: true)
+ }
+ }
} else {
let displays = currentDisplayGeometries()
let fallbackGeometry = persistedWindowGeometry()
if let restoredFrame = Self.resolvedStartupPrimaryWindowFrame(
primarySnapshot: nil,🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Sources/AppDelegate.swift` around lines 2626 - 2637, The startup code
currently skips the persisted-geometry fallback when a primaryWindowSnapshot
exists but its frame resolution yields nil; update the logic so that when
applySessionWindowSnapshot(primaryWindowSnapshot, ...) does not successfully
restore a usable frame (i.e., returns false or results in no-op), you call
Self.resolvedStartupPrimaryWindowFrame(...) with the persistedWindowGeometry()
values (fallbackGeometry?.frame and fallbackGeometry?.display) and
availableDisplays/currentDisplayGeometries() and, if a restoredFrame is
returned, call primaryWindow.setFrame(restoredFrame, display: true); ensure this
change references applySessionWindowSnapshot, primaryWindowSnapshot,
resolvedStartupPrimaryWindowFrame, persistedWindowGeometry, and
primaryWindow.setFrame so the persisted fallback is attempted when the snapshot
frame is unusable.
Comment on lines
14497
to
14517
| if shouldDispatchBrowserReturnViaFirstResponderKeyDown( | ||
| keyCode: event.keyCode, | ||
| firstResponderIsBrowser: firstResponderWebView != nil || firstResponderEmbeddedWebView != nil, | ||
| firstResponderIsBrowser: firstResponderWebView != nil, | ||
| firstResponderHasMarkedText: firstResponderHasMarkedText, | ||
| flags: event.modifierFlags | ||
| ) { | ||
| // Forwarding keyDown can re-enter performKeyEquivalent in WebKit/AppKit internals. | ||
| // Consume only the exact forwarded Return/Enter event. A different nested | ||
| // Return should continue through normal dispatch so AppKit can keep its own | ||
| // invalid-input feedback. | ||
| let forwardedReturnEvent = CmuxForwardedBrowserReturnEvent(event) | ||
| // On re-entry, fall back to normal dispatch to avoid an infinite loop. | ||
| if cmuxBrowserReturnForwardingDepth > 0 { | ||
| guard cmuxBrowserForwardedReturnEvent == forwardedReturnEvent else { | ||
| return false | ||
| } | ||
| #if DEBUG | ||
| cmuxDebugLog(" → browser Return/Enter reentry; consumed during forwarded keyDown") | ||
| cmuxDebugLog(" → browser Return/Enter reentry; using normal dispatch") | ||
| #endif | ||
| return true | ||
| return cmux_performKeyEquivalent(with: event) | ||
| } | ||
| cmuxBrowserReturnForwardingDepth += 1 | ||
| cmuxBrowserForwardedReturnEvent = forwardedReturnEvent | ||
| defer { | ||
| cmuxBrowserReturnForwardingDepth = max(0, cmuxBrowserReturnForwardingDepth - 1) | ||
| if cmuxBrowserReturnForwardingDepth == 0 { | ||
| cmuxBrowserForwardedReturnEvent = nil | ||
| } | ||
| } | ||
| defer { cmuxBrowserReturnForwardingDepth = max(0, cmuxBrowserReturnForwardingDepth - 1) } | ||
| #if DEBUG | ||
| cmuxDebugLog(" → browser Return/Enter routed to browser keyDown target") | ||
| cmuxDebugLog(" → browser Return/Enter routed to firstResponder.keyDown") | ||
| #endif | ||
| browserKeyDownTarget?.keyDown(with: event) | ||
| self.firstResponder?.keyDown(with: event) | ||
| return true |
There was a problem hiding this comment.
Keep browser reentry out of the original NSWindow.performKeyEquivalent path.
Both reentry guards call cmux_performKeyEquivalent(with:), which is the original AppKit implementation after swizzling. That reintroduces the SwiftUI/AppKit window-level path for the exact WKWebView-focused reentry case this file is trying to bypass, so Return/arrow handling can still get swallowed on browser surfaces.
Suggested fix
if cmuxBrowserReturnForwardingDepth > 0 {
`#if` DEBUG
cmuxDebugLog(" → browser Return/Enter reentry; using normal dispatch")
`#endif`
- return cmux_performKeyEquivalent(with: event)
+ return firstResponderWebView?.performKeyEquivalent(with: event) ?? false
}
@@
if cmuxBrowserArrowForwardingDepth > 0 {
`#if` DEBUG
cmuxDebugLog(" → browser arrow reentry; using normal dispatch")
`#endif`
- return cmux_performKeyEquivalent(with: event)
+ return firstResponderWebView?.performKeyEquivalent(with: event) ?? false
}Based on learnings, ensure that NSWindow.cmux_performKeyEquivalent forwards to firstResponderWebView.performKeyEquivalent and returns its Bool unconditionally to prevent re-entry into SwiftUI’s performKeyEquivalent path when WKWebView has focus.
Also applies to: 14523-14543
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Sources/AppDelegate.swift` around lines 14497 - 14517, The reentry guards
currently call cmux_performKeyEquivalent(which invokes the swizzled/original
AppKit path) which can re-enter the SwiftUI/NSWindow performKeyEquivalent flow
and lose WKWebView key handling; update the logic so that when handling the
WKWebView-first-responder case (use symbols:
shouldDispatchBrowserReturnViaFirstResponderKeyDown,
cmuxBrowserReturnForwardingDepth, firstResponderWebView,
firstResponder?.keyDown), you do NOT call cmux_performKeyEquivalent to resolve
the reentry; instead have NSWindow.cmux_performKeyEquivalent directly forward to
firstResponderWebView.performKeyEquivalent(...) and return that Bool
unconditionally, and ensure the same change is applied to the other similar
guard block that checks cmuxBrowserReturnForwardingDepth so both
early-return/reentry paths bypass the original AppKit/swizzled
performKeyEquivalent.
Comment on lines
+531
to
533
| def test_install_codex_hooks_only_edits_real_features_table(cli_path: str, root: Path) -> None: | ||
| codex_home = root / "codex-home" | ||
| codex_home.mkdir() |
There was a problem hiding this comment.
Use unique CODEX_HOME directories per test to avoid deterministic collisions.
Line 532 and Line 678 both call mkdir() on root / "codex-home", and main() executes these tests sequentially with the same root. This will raise FileExistsError before the test body can run.
💡 Suggested fix
def test_install_codex_hooks_only_edits_real_features_table(cli_path: str, root: Path) -> None:
- codex_home = root / "codex-home"
+ codex_home = root / "codex-home-features-edit"
codex_home.mkdir() def test_install_codex_hooks_preserves_config_when_toml_read_fails(cli_path: str, root: Path) -> None:
- codex_home = root / "codex-home"
+ codex_home = root / "codex-home-invalid-utf8"
codex_home.mkdir()Also applies to: 676-678
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/test_codex_feed_hooks.py` around lines 531 - 533, The test creates a
fixed directory root / "codex-home" which collides when tests run sequentially;
update test_install_codex_hooks_only_edits_real_features_table (and the other
test that also uses root / "codex-home") to create a unique CODEX_HOME per test
(e.g., append a unique suffix from pytest tmp_path/tmp_path_factory or uuid4) or
call mkdir(exist_ok=True) to avoid FileExistsError; ensure any env var or
variable that points to CODEX_HOME in the test points to this unique path so
subsequent calls to main() do not attempt to recreate the same directory.
Comment on lines
+572
to
+575
| lines = config_toml.splitlines() | ||
| features_index = lines.index("[features]") | ||
| if lines[features_index + 1] != "codex_hooks = true": | ||
| raise AssertionError(f"codex_hooks should be inserted into [features]: {config_toml!r}") |
There was a problem hiding this comment.
🧹 Nitpick | 🔵 Trivial | ⚡ Quick win
Relax the [features] insertion assertion to avoid false negatives.
Line 574 currently requires codex_hooks = true to be immediately after [features]. That’s stricter than the test intent and can fail valid implementations that preserve existing key order.
💡 Suggested assertion update
lines = config_toml.splitlines()
features_index = lines.index("[features]")
- if lines[features_index + 1] != "codex_hooks = true":
+ end_index = next(
+ (i for i in range(features_index + 1, len(lines)) if lines[i].startswith("[") and lines[i].endswith("]")),
+ len(lines),
+ )
+ features_body = lines[features_index + 1 : end_index]
+ if "codex_hooks = true" not in features_body:
raise AssertionError(f"codex_hooks should be inserted into [features]: {config_toml!r}")🧰 Tools
🪛 Ruff (0.15.12)
[warning] 575-575: Avoid specifying long messages outside the exception class
(TRY003)
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/test_codex_feed_hooks.py` around lines 572 - 575, The test currently
asserts that the very next line after finding "[features]" equals "codex_hooks =
true" which is too strict; instead, after locating features_index (the index of
"[features]" in lines from config_toml), scan subsequent lines until you hit the
next section header (a line starting with "[") or the end and assert that one of
those lines equals "codex_hooks = true" (i.e., check membership in that feature
block) so existing keys/order are allowed while still ensuring the feature was
inserted.
…ar-running-status
lawrencecchen
added a commit
that referenced
this pull request
May 14, 2026
* feat: improve markdown viewer
* fix: address markdown review feedback
* fix: clean up markdown review issues
* fix: address markdown review feedback
* fix: address latest markdown review
* Fix #3807: bring notification CLI to panel parity (#3811)
* Prove notification CLI parity is missing
Add behavior-level coverage for the missing notification socket and CLI actions before implementing them. The tests drive V2 notification action methods, CLI subcommands, extended list fields, and the UI open-notification flow so CI can show the pre-fix gap.
Constraint: Regression tests must be committed before the implementation for issue #3807
Constraint: Local Swift tests are not run in this repo; verification is through CI
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Not-tested: Swift/XCUITest execution; intentionally deferred to CI
* Make notification actions scriptable from the CLI
The notifications panel already owned the behavior for dismissing, marking read, opening, and jumping to unread rows. This wires the socket and CLI to those existing store/AppDelegate paths, extends list output with panel metadata, and documents the new command surface without introducing a second notification action model.
Constraint: Existing Notifications page behavior must remain the source of truth
Constraint: Direct xcodebuild and local Swift/XCUITest runs are forbidden in this workspace
Rejected: Duplicate CLI-side focus or read-state logic | would diverge from AppDelegate.openNotification and TerminalNotificationStore semantics
Confidence: medium
Scope-risk: moderate
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Tested: python3 -m json.tool Resources/Localizable.xcstrings
Not-tested: Swift unit/UI execution; deferred to CI per repo policy
* Make notification CI compile under strict concurrency
The notification parity implementation introduced a shared formatter on a main-actor type and a test helper that crossed actor boundaries through escaping closures. This keeps the socket behavior unchanged while making date formatting local to the main-actor call path and keeping the XCTest socket request helper from capturing actor-isolated state in the background request closure.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Run xcodebuild locally to confirm | user explicitly warned direct xcodebuild can deadlock the machine
Confidence: medium
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Make notification parity actions atomic and exact
Review feedback exposed two behavior risks in the notification parity path: bulk dismissal was implemented as client-side list-and-loop work, and jump-to-unread could report one unread notification while opening a later valid one. The server now owns already-read dismissal as a single V2 action, the jump helper returns the notification it actually opened, and event/list parsing details match those server semantics.
Constraint: Notification action logic must reuse the existing store and AppDelegate paths
Rejected: Split TerminalController into new controllers in this PR | broad refactor is unrelated to issue #3807 and would obscure the parity fix
Confidence: medium
Scope-risk: moderate
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace instructions
* Expose app test symbols to CLI notification coverage
The integration regression exercises real app-backed notification state through the CLI harness, so the test target must import the built app module the same way the socket action tests do.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Verify with xcodebuild locally | user explicitly forbids direct xcodebuild
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Make notification list and dismiss payloads stable
Review caught two small contract hazards in the new notification RPC surface: the dismiss result used mixed JSON types, and a pipe in the appended tab title could shift the legacy list parser. The server now reports dismissals as counts consistently and escapes only the new trailing list field, with the CLI decoding it after structural parsing.
Constraint: The V1 list response remains pipe-delimited for backward compatibility, so only newly appended trailing fields can be encoded without changing old parser behavior
Rejected: Replace list_notifications with JSON-only output | existing V1 parsers depend on the line format
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace policy
* Return async notification socket responses from tests
CircleCI caught a compile-only issue in the async V2 test helper: the continuation result was awaited but not returned from the method that promises a response dictionary. Returning the continuation value restores the helper contract without changing the exercised socket behavior.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Verify with local xcodebuild | user explicitly forbids direct xcodebuild
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Avoid blocking notification CLI integration sockets
The integration regression has to create AppKit-backed notification state on the main actor, but running the CLI subprocess synchronously there can block the socket handler's main-actor store mutations. The test now awaits subprocess work on a background queue and verifies read state through the same CLI list path.
Constraint: Socket notification handlers intentionally hop to the main actor for store and AppDelegate work
Rejected: Run the CLI synchronously from the main actor | it can deadlock the in-process socket server during tests
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace policy
* Harden notification CLI response contracts
The notification parity path now distinguishes new list-notification trailer fields from old pipe-heavy bodies, rejects surface-only mark-read selectors, and returns post-open read state by marking through the shared store path after a successful focus action.
Constraint: list_notifications remains a legacy pipe-delimited protocol, so the new trailer needs its own discriminator while older body parsing keeps joining payload[6...]
Rejected: Add a third list_notifications sentinel field | the issue asked for exactly the two appended fields
Rejected: Rely on AppDelegate delayed mark-read for socket JSON | CLI callers need the open response and subsequent list output to reflect the explicit action
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace policy
* Make CLI integration helper capture explicit self
CircleCI's Swift compile step requires explicit self when the background subprocess closure calls the test helper method. This keeps the deadlock fix intact while satisfying Swift capture rules.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Verify with local xcodebuild | user explicitly forbids direct xcodebuild
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Make CLI presentation flags order-independent
Users naturally put presentation flags next to the command they are inspecting. Normalize --json and --id-format after command selection so docs examples such as cmux list-notifications --json produce JSON while still preserving literal flag-looking values for command options.
Constraint: Do not run reload.sh before CI is green; never run bare xcodebuild.
Rejected: Documentation-only correction | leaves copy-pasted command behavior surprising.
Rejected: Notification-only --json handling | repeats the same parser split for future JSON-capable commands.
Confidence: medium
Scope-risk: moderate
Directive: Keep presentation flag parsing centralized; update commandOptionsWithValues when adding value-taking command options.
Tested: git diff --check
Not-tested: Local XCTest/build per repo policy; CI will verify.
* Fix notification surface selector error message
* Make notification open mark read synchronously
* Fix CLI presentation flag parsing
* Test notification mark-read missing id
* Reject missing notification mark-read ids
* fix: polish markdown viewer dogfood
* Fix shared WebView task manager attribution
Fixes shared WebContent resource attribution in task manager rows and adds regression coverage.
* Prevent display-link crash from terminal portal layout reentry (#3885)
* Pin portal sync deferral during SwiftUI host callbacks
The silent-exit crash path points at SwiftUI/AppKit layout recursion reaching a CATransaction display-link flush. This test locks the intended invariant: geometry callbacks originating from the SwiftUI NSViewRepresentable host must defer portal reconciliation instead of forcing immediate AppKit layout, even while an interactive resize is active.
Constraint: Local tests are intentionally not run in this repository; CI owns regression proof.\nRejected: Assert on source text or unified-log contents | timing-dependent and not executable through the policy seam.\nConfidence: medium\nScope-risk: narrow\nDirective: Keep immediate portal flushing owned by external AppKit resize observers, not SwiftUI host callbacks.\nTested: Not run locally per repository policy and user instruction.\nNot-tested: Full multi-session crash reproduction is timing-dependent and not deterministic.
* Prevent portal layout reentry from terminal host callbacks
The terminal NSViewRepresentable host was allowed to bind into the window portal and synchronously flush AppKit layout from update/layout callbacks. That made SwiftUI's own host layout and the external terminal portal both believe they could drive geometry in the same render turn, matching the NSHostingView reentrant-layout warnings reported before the CATransaction display-link abort.\n\nThe portal now treats SwiftUI host callbacks as state capture only: they register the binding and schedule the portal owner to reconcile geometry after the current render turn. Immediate geometry flushing remains available to the portal's external AppKit resize observers, which are outside SwiftUI body/layout evaluation. The launch path also records clean exits and posts a one-time TerminalNotificationStore breadcrumb when a newer ghostty Breakpad envelope is found after an unclean exit.
Constraint: Local tests and app builds are not run before CI for this branch; verification is delegated to CI, then the required tagged reload.\nRejected: Wrap the CATransaction/display-link exception in @try/@catch | it would hide AppKit's abort symptom without removing the reentrant layout owner split.\nRejected: Keep immediate sync during interactive SwiftUI host callbacks | still allows layoutSubtreeIfNeeded inside the representable layout/update path.\nConfidence: medium\nScope-risk: moderate\nDirective: SwiftUI/AppKit host callbacks must not force terminal portal layout synchronously; add external observer paths for any future immediate resize flushing.\nTested: git diff --check; jq empty Resources/Localizable.xcstrings\nNot-tested: Local XCTest/build/repro per repository and user instructions; 75-minute multi-session crash reproduction is not deterministic.
* Record clean-exit breadcrumb after teardown
The crash breadcrumb should compare Breakpad envelopes against the last successfully completed termination path. Recording the timestamp after teardown avoids marking an exit clean before session persistence, process cleanup, and notification cleanup have finished.
Constraint: This is a follow-up correctness tweak before CI settled.\nRejected: Keep the timestamp at the start of applicationWillTerminate | a crash during termination cleanup could suppress the next-launch breadcrumb.\nConfidence: high\nScope-risk: narrow\nDirective: Only update the clean-exit timestamp after teardown work that must complete for a clean quit.\nTested: git diff --check; jq empty Resources/Localizable.xcstrings\nNot-tested: Local tests/builds per repository and user instructions.
* Defer first portal install from SwiftUI callbacks
A deferred SwiftUI host bind could still create the WindowTerminalPortal for the first time, and the initializer previously installed the host with an immediate layout flush. Threading the same deferral flag through portal creation keeps the invariant complete: representable update/layout callbacks never synchronously flush terminal portal layout, even on first bind.
Constraint: Must preserve immediate install behavior for non-SwiftUI external portal callers
Rejected: Assume portals already exist before host callbacks | first terminal bind in a new window can create one
Confidence: high
Scope-risk: narrow
Directive: Any future portal creation path from SwiftUI callbacks must carry deferred synchronization through initialization
Tested: git diff --check; jq empty Resources/Localizable.xcstrings
Not-tested: Local tests/builds per repository and user instructions
* Move crash breadcrumb work out of launch hot path
The crash breadcrumb scanner is pure Foundation logic, so it now lives in its own source file and performs the crash-directory scan from a detached utility task. App launch only schedules the check once, then posts the existing localized notification after the background scan returns to the main actor. The terminal host geometry policy is also simplified to make the always-deferred invariant explicit at the call site.
Constraint: Local build/tests are intentionally skipped until CI completes per issue instructions
Rejected: Keep synchronous directory enumeration in AppDelegate.configure | startup should not block on crash artifact I/O
Rejected: Preserve the dead immediate portal sync branch | host callbacks are never allowed to force layout synchronously
Confidence: high
Scope-risk: narrow
Directive: Do not reintroduce synchronous crash-directory scans or immediate portal layout flushes from SwiftUI host callbacks
Tested: git diff --check; jq empty Resources/Localizable.xcstrings; plutil -lint GhosttyTabs.xcodeproj/project.pbxproj
Not-tested: Local build/tests per repository and user instructions
* Tighten portal geometry regression seam
* Fix crash breadcrumb actor isolation
* Mark crash breadcrumb async helper nonisolated
* Make crash breadcrumb scan concurrent
* fix: remove inert crash breadcrumb cooldown key
* fix: use renamed crash breadcrumb annotation
* fix: own crash breadcrumb scan task
* Hide sidebar descriptions in title-only mode (#4040)
* Hide sidebar descriptions in title-only mode
* Add sidebar description visibility toggle
* Let sidebar titles use trailing slack
* Float sidebar shortcut hints over rows
* Remove unused sidebar width helper
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add Pi agent icon
PR: https://github.com/manaflow-ai/cmux/pull/4057
* Keep Claude Running after clear (#3631)
* Prove Claude clear hook loses running status
The regression exercises the Claude hook handler directly with a SessionStart payload whose source is clear, then sends a late Stop for the previous session. The current handler does not promote the clear boundary to Running or reject stale Stop mutations, so this test is expected to fail before the lifecycle fix.
Constraint: Tests must exercise the hook handler directly rather than driving the full app.
Confidence: high
Scope-risk: narrow
Directive: Keep this regression on the direct CLI hook path; do not replace it with source-text assertions.
Tested: Not run locally per repository policy.
Not-tested: CI red/green proof pending on GitHub Actions.
* Prove Claude clear should own running status
Add hook-level regression coverage for Claude Code /clear. The tests drive the bundled CLI against a mock cmux socket so CI proves SessionStart(source=clear) must set the visible Running status and a prior session Stop must not clobber that fresh lifecycle.
Constraint: Local tests are intentionally not run; CI owns test execution for this task.
Confidence: high
Scope-risk: narrow
Tested: Not run locally per instruction
Not-tested: Full app UI repro under CI
* Ignore stale Claude hook events after clear
Claude /clear starts a fresh hook lifecycle but the sidebar status key is shared at the workspace level. Persist the active Claude session per workspace, promote clear SessionStart to a visible Running state, and ignore teardown or notification mutations from sessions that are no longer current.
Constraint: Claude Code emits /clear as SessionStart(source=clear).
Rejected: Only set Running on clear SessionStart | late Stop from the previous lifecycle could still clobber the new status.
Confidence: high
Scope-risk: narrow
Directive: Future Claude hook status mutations must respect the active workspace session before touching claude_code.
Tested: Not run locally per instruction
Not-tested: Full app UI after CI
* Prove Claude clear hook loses running status
The regression exercises the Claude hook handler directly with a SessionStart payload whose source is clear, then sends a late Stop for the previous session. The current handler does not promote the clear boundary to Running or reject stale Stop mutations, so this test is expected to fail before the lifecycle fix.
Constraint: Tests must exercise the hook handler directly rather than driving the full app.
Confidence: high
Scope-risk: narrow
Directive: Keep this regression on the direct CLI hook path; do not replace it with source-text assertions.
Tested: Not run locally per repository policy.
Not-tested: CI red/green proof pending on GitHub Actions.
* Keep Claude clear sessions authoritative
Claude /clear arrives as a SessionStart source=clear event, but the hook store only remembered routing data. This change makes the store also own the active session for each workspace, promotes clear starts to Running, and ignores visible Stop/Notification/SessionEnd mutations when their session no longer matches the active workspace session.
Constraint: Claude Code documents SessionStart source=clear for /clear lifecycle boundaries.
Rejected: Only set Running on source=clear | old Stop and SessionEnd events could still clobber the new session afterward.
Confidence: high
Scope-risk: narrow
Directive: Visible Claude hook mutations must pass active-session ownership checks before changing sidebar status or notifications.
Tested: Not run locally per repository policy.
Not-tested: CI red/green proof pending on GitHub Actions.
* Allow Claude sessions to advance turns
A visible hook mutation can only be rejected as stale after the active session boundary is known. Keeping a completed turn id active after Stop made the next prompt in the same Claude session look stale before it could promote its own turn.
The Stop path now refreshes the active session with no turn id once the completed turn has been accepted, preserving stale-session protection across /clear while allowing normal multi-turn prompts to re-enter Running. The regression now exercises that two-turn path before the clear boundary.
Constraint: Do not run local tests; CI owns verification for this branch.
Rejected: Ignore turn id in all current-session checks | would weaken stale turn filtering for late Stop and Notification events.
Confidence: high
Scope-risk: narrow
Directive: Do not persist a completed turn id past Stop without proving the next prompt-submit can promote a new turn.
Tested: git diff --check
Not-tested: Local unit/regression tests per project policy
* Remove duplicate Claude clear helper
The branch integration accidentally kept two isClaudeClearSessionStart definitions in CLI/cmux.swift. The duplicate version referenced a non-existent parsedInput.source property, so Swift would reject the file before CI could exercise the hook lifecycle tests.
Keep the existing implementation that reads source from the parsed hook object and delete only the duplicate helper.
Constraint: Fix review-reported compile blocker without changing lifecycle behavior.
Rejected: Add source to ClaudeHookParsedInput | unnecessary for this compile fix and broader than the failing duplicate.
Confidence: high
Scope-risk: narrow
Directive: Keep exactly one Claude clear source helper unless the parsed input model is intentionally extended.
Tested: git diff --check; rg confirms a single isClaudeClearSessionStart definition and no parsedInput.source reference.
Not-tested: Local tests per project policy
* Restore Claude hook compileability after lifecycle merge
The active-session merge left behind the old source-property helper alongside the newer compact-payload helper. Removing the duplicate keeps source=clear detection on the JSON payload and avoids both the redeclaration and missing-property errors.
Constraint: Do not run local tests; CI owns verification for this branch
Rejected: Reintroduce ClaudeHookParsedInput.source | duplicates state already retained in the compact hook payload
Confidence: high
Scope-risk: narrow
Tested: git diff --check; rg verified a single isClaudeClearSessionStart definition and no parsedInput.source references
Not-tested: Local compile/test execution per task policy
* Normalize Claude active-session cleanup keys
The active-session map is keyed by normalized workspace id, so cleanup after consuming a session must use the same normalized key. Otherwise a record containing incidental whitespace could leave a stale active-session entry behind.
Constraint: Address reviewer-reported lifecycle cleanup edge case without changing visible hook behavior.
Rejected: Store raw workspace ids as active map keys | inconsistent with existing upsert normalization and lookup guards.
Confidence: high
Scope-risk: narrow
Directive: Any activeSessionsByWorkspace lookup should use the normalized workspace key, matching insertion.
Tested: git diff --check
Not-tested: Local tests per project policy
* Harden CI Zig downloads against transient upstream failures
CircleCI and the activation workflow both depend on ziglang.org tarballs during remote macOS setup. A transient 500 from that host failed the debug build before any project code compiled, so the install path now retries downloads and avoids unnecessary Homebrew update/cleanup churn on CircleCI.
Constraint: CI must be made green remotely without running local tests or local xcodebuild.
Rejected: Push an empty commit to rerun CI | would leave the same upstream download flake unchanged.
Confidence: high
Scope-risk: narrow
Directive: Keep Zig installer retries in remote CI setup paths; failures here happen before project build logic runs.
Tested: git diff --check
Not-tested: Local tests and local builds not run per repository/user policy.
* Cover stale Claude session-end lifecycle
Greptile identified that stale SessionEnd exercises a different clear-state path than stale Stop. The existing active-session guard already blocks the mutation, so the regression now drives that hook directly and asserts the active /clear session keeps its status, PID, and notifications intact.
Constraint: Do not run local tests; CI is the verification source for this branch.
Rejected: Add another Swift integration test | the existing Python hook harness already executes the CLI handler through the socket path used by CI.
Confidence: high
Scope-risk: narrow
Tested: Not run locally per repo policy.
Not-tested: Local test execution.
* Stop activation CI from stalling on Zig downloads
The activation workflow was cancelled before build because repeated ziglang.org transfers crawled for the full job timeout. Prefer Homebrew's pinned zig@0.15 bottle on macOS runners, then keep the direct tarball path as a bounded fallback with connection, total-time, and minimum-speed limits.
Constraint: The failed check never reached project build or tests; the only failing surface was CI tool bootstrap.
Rejected: Increase the job timeout | it would hide the bootstrap failure and delay feedback.
Confidence: medium
Scope-risk: narrow
Directive: Keep activation workflow tool bootstrap bounded so performance CI reaches the benchmark or fails quickly.
Tested: git diff --check
Not-tested: Local workflow execution, per repository and user instruction.
* Gate Claude session-end cleanup on the consumed workspace
Greptile noted that session-end computed the current-session guard from the fallback workspace while clearing the consumed session's workspace. Move the guard next to the mutation target so stale cleanup and visible cleanup always evaluate the same workspace identity.
Constraint: This is follow-up review hardening on the existing active-session model.
Rejected: Collapse activeSessionsByWorkspace into sessions in this PR | per-workspace current-session lookup is the intended lifecycle boundary for stale event gating.
Confidence: high
Scope-risk: narrow
Directive: SessionEnd visible cleanup must be gated against the workspace being cleared, not an earlier fallback lookup.
Tested: git diff --check
Not-tested: Local test execution, per repository and user instruction.
* Gate Claude session-end cleanup on consumed workspace
A late SessionEnd can be resolved through fallback surface lookup, so the workspace used to find a record is not always the workspace whose visible state would be cleared. Move the staleness check after consume() and evaluate it against the consumed session's workspace, where the clear_status and notification cleanup actually run.
Constraint: Hook events are delivered by short-lived CLI processes and must tolerate stale or partial Claude payloads
Rejected: Keep the pre-consume fallback workspace guard | it can validate one workspace while clearing another
Confidence: high
Scope-risk: narrow
Tested: Added Swift integration regression for stale SessionEnd fallback cleanup
Not-tested: Local tests not run per repository policy
* Make stale Claude session-end test consume the seeded session
Greptile caught that the Swift regression used an unknown session id, so the hook returned before reaching the intended consumed-session visibility guard. Use the seeded stale session id in the SessionEnd payload so the test exercises consume(), then verifies that stale visible cleanup is blocked.
Constraint: Address high-priority review feedback without running local tests.
Rejected: Leave Python-only coverage | the Swift regression would continue passing for the wrong reason.
Confidence: high
Scope-risk: narrow
Directive: Stale session-end regressions should consume a known stale session before asserting visible cleanup is skipped.
Tested: git diff --check
Not-tested: Local tests per repository and user instruction
* Cover fallback Claude session-end consumption
The stale SessionEnd regression should prove the handler consumed the stale session through fallback lookup before deciding whether visible state may be cleared. Use an unknown late session id and assert the seeded stale session is removed from the store, so the test cannot pass without exercising the consumed-workspace guard.
Constraint: Review feedback flagged the prior Swift regression as able to pass without covering the intended guard
Rejected: Use the stored stale session id directly | that only covers the ordinary mapped-session stale path
Confidence: high
Scope-risk: narrow
Tested: Not run locally per repository policy; CI will run the Swift regression
Not-tested: Local XCTest execution
* Keep Claude clear ownership panel-scoped
The clear SessionStart path now owns the active Claude boundary only for explicit clear events, so late startup/resume SessionStart events from the previous session cannot reclaim the workspace before their stale Stop or SessionEnd arrives. The same clear path now passes the resolved surface id into status updates so split panels receive the Running state in the intended pane.
Constraint: Local test execution is disallowed by repository policy; CI remains the behavioral gate.
Rejected: Let every SessionStart mark active | late non-clear events can overwrite the clear boundary.
Rejected: Drop fail-open isCurrent behavior | transient store errors should not hide legitimate current status updates.
Confidence: medium
Scope-risk: moderate
Directive: Do not let non-clear Claude SessionStart events replace an explicit /clear active boundary without adding event ordering metadata.
Tested: python3 -m py_compile tests/test_claude_hook_clear_running_status.py; git diff --check; conflict marker scan.
Not-tested: Local Swift/unit/UI test execution per repo policy.
* Protect Claude clear state from stale session cleanup
Late hook events can arrive after an explicit /clear boundary. The SessionStart handler now skips PID registration when the event is stale against the active session, and SessionEnd consumption preserves the active session when the incoming turn id is older than the stored active turn.
Constraint: Local test execution is disallowed by repository policy; CI remains the behavioral gate.
Rejected: Clear active ownership before checking currentness | same-session stale SessionEnd would fail open and apply cleanup.
Rejected: Keep prefix-only command assertions | option ordering changes would make the regression test brittle.
Confidence: medium
Scope-risk: moderate
Directive: Do not consume a Claude session or replace its PID from a hook event that is stale relative to active session/turn state.
Tested: python3 -m py_compile tests/test_claude_hook_clear_running_status.py; git diff --check; conflict marker scan.
Not-tested: Local Swift/unit/UI test execution per repo policy.
* Allow new Claude sessions to replace stopped owners
A stopped Claude turn must keep the same session eligible for the next turn, but it must not strand the workspace if that process exits before session-end. Mark stopped ownership as replaceable and let only session activation paths use that escape hatch; clear-session ownership remains non-replaceable so stale pre-clear events stay blocked. Session-end fallback cleanup now checks the consumed session id so missing input session ids do not fail open.\n\nConstraint: /clear SessionStart must continue to suppress stale pre-clear startup, stop, and session-end events\nRejected: Clear active ownership on Stop | breaks same-session multi-turn prompt-submit currentness\nConfidence: medium\nScope-risk: narrow\nTested: git diff --check; conflict-marker scan\nNot-tested: local XCTest per repo policy; CI will run cmux unit regressions
* test: cover codex hooks TOML features section
* fix: harden hook config and auth token cache
* test: cover sign-out browser auth loading cleanup
* fix: cancel browser auth on sign-out
* test: cover codex config read failures
* fix: fail closed on codex config read errors
* test: cover auth sign-out callback race
* fix: discard auth callback after sign-out
* fix: keep claude subcommands out of hook injection
* fix: dismiss stale sparkle update replies
* fix: redact auth logs while preserving observability
* fix: reset update checks and guard sign-out races
* fix: preserve update metadata from driver state
* fix: await auth token assertions before comparing
* fix: address wrapper and auth review feedback
* fix: address session and config review feedback
* ci: retrigger pending checks
* fix: clear stale ime and auth token state
* fix: clean legacy codex hooks config
* test: cover legacy codex hooks markers
* fix: clean empty codex features table
* fix: preserve browser key reentry dispatch
* Fix new-workspace caller window routing (#4042)
* test: cover new workspace caller routing
* fix: route new workspace to caller context
* Add iMessage workspace insertion regression test
* Reset Kitty keyboard mode at shell prompt boundaries (#3870)
* Prove stale Kitty keyboard state leaks CSI-u key bytes
The regression exercises a hosted Ghostty terminal, leaves Kitty keyboard protocol enabled as a crashed TUI would, mirrors the clear-history socket handler clear_screen path, and captures raw PTY stdin bytes for a plain c key. Current behavior should encode CSI-u instead of a single ASCII byte, making the test fail until the protocol state is reset at the shell prompt boundary.
Constraint: Regression must cover PTY input bytes, not source text shape
Confidence: high
Scope-risk: narrow
Directive: Keep this test on the real ghostty_surface_key path; sendText alone bypasses the keyboard encoder
Tested: Manual current-main repro captured c9;1:3uc9;1:3uc9;1:3u after Kitty enable plus clear-history
Not-tested: Local unit execution deferred to CI per requested red/green workflow
* Reset stale Kitty keyboard mode at prompt boundaries
A crashed TUI can leave Ghostty's Kitty keyboard protocol stack pushed after clear-history, causing normal shell input to be encoded as CSI-u. Resetting the stack from the shell prompt hook makes the prompt boundary the ownership point for returning interactive shells to plain byte input.
Constraint: Fix must run through shell integration because Ghostty keeps protocol state inside the terminal surface
Rejected: Reset only in clear-history socket path | stale state also leaks after any crashed TUI returns to prompt
Confidence: high
Scope-risk: narrow
Directive: Keep prompt-boundary reset paired across bash and zsh integrations
Tested: Not run locally per repository testing policy; regression added in prior commit
Not-tested: CI not yet completed
* Clarify Kitty reset fixture failures
The stale keyboard regression now fails at the fixture boundary if the zsh integration does not emit the expected reset bytes, instead of falling through to a misleading PTY byte mismatch.
Constraint: Repository policy forbids local test execution for this PR loop
Confidence: high
Scope-risk: narrow
Tested: Not run locally per repository policy; CI will run the affected XCTest
Not-tested: Local XCTest execution
* chore: retrigger Vercel checks
* Add Kitty reset shell hook coverage
* Reset all terminal keyboard protocols at prompt
* Fix terminal keyboard reset test expectations
* Clarify disabling agent session auto-resume for #3640 (#3991)
* docs: explain disabling agent auto resume
* docs: name auto resume config path
* Fix stale restored agent resume state
* Harden restored agent hook liveness
* refactor: share restored agent normalization
* Honor iMessage workspace ordering and previews
* Add workspace cwd inheritance setting (#3921)
* feat: add workspace cwd inheritance setting
* fix: align workspace cwd setting key naming
* fix: apply workspace cwd setting to detached creation
* fix: expose workspace cwd inheritance setting
* fix: route pane break through detached workspace creation
* fix: keep pane break response pane ids non-null
* fix: distinguish pane break resolution errors
* Approve installed Codex hooks (#4035)
* Approve installed Codex hooks
* Address Codex hook trust review feedback
* Avoid tomllib in Codex hook tests
* Align Codex hook trust test mirror
* Harden Codex hook trust ownership
* Preserve legacy Codex hook cleanup
* Fix workspace unit test after merge
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Revert "Approve installed Codex hooks (#4035)" (#4074)
This reverts commit e4546b7675a4ffa5a41a5429218b60f4e7644e21.
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Fix workspace unit test transfer resume state (#4076)
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Clarify in cmux --help that reload-config covers Ghostty config too (#4060)
* Clarify cmux help that reload-config covers Ghostty config too
`cmux reload-config` reloads BOTH ~/.config/cmux/cmux.json and Ghostty
config (~/.config/ghostty/config) and refreshes terminals in place, but
the help/docs only mentioned cmux.json. Agents (and humans) reading the
help would think they had to restart cmux after editing Ghostty config.
- cmux --help "Agent Help" now tells agents where Ghostty config lives
and that reload-config picks it up live.
- cmux docs settings, cmux settings path, cmux config --help now list
~/.config/ghostty/config as a related (not cmux-owned) location and
describe reload-config's actual scope.
- cmux schema sidebarAppearance.tintOpacity description now notes it's
sidebar-only, and points to Ghostty background-opacity / blur for
terminal transparency.
- skills/cmux/SKILL.md mirrors the wording.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Align ghostty_config JSON shape across CLI surfaces
Cursor Bugbot and Greptile both flagged that `cmux settings path --json`
emitted `ghostty_config` as a string while `cmux docs settings --json`
emitted it as an object {path, note}. An agent reading both outputs with
the same key expectation would have to special-case the type.
Standardize on the object shape with `path` and `note` in both, matching
docsPayload. This is the agent-discoverability path the PR is trying to
make reliable, so making the shape consistent is on-purpose.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Use canonical Ghostty config key background-blur (not background-blur-radius)
CodeRabbit flagged that `background-blur-radius` is outdated. Verified
against the Ghostty submodule at ghostty/src/config/Config.zig: line 70
declares `background-blur-radius` as a compatibilityRenamed alias for
`background-blur`. The current canonical key is `background-blur` and it
accepts the same integer value (e.g. `background-blur = 20`).
Update the two docs that introduced the alias name:
- skills/cmux/SKILL.md
- web/data/cmux.schema.json (sidebarAppearance.tintOpacity description)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Add nucleo FFI command palette benchmark
* Open right sidebar tools as panes (#4065)
* Open right sidebar tools as panes
* Remove unreachable sidebar pane commands
* Fix sidebar pane unit test build
* Address sidebar pane review feedback
* Fix vault pane focus tracking
* Address right sidebar pane review followups
* Use modern sidebar pane flash observer
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Save crash diagnostics under cmux state (#4077)
* Save crash diagnostics under cmux state
* fix: key GhosttyKit artifacts by crash path
* fix: pin cmux crash GhosttyKit archive
* fix: mark crash breadcrumb scan concurrent
* fix: keep crash scan compatible with Xcode 16
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Menubar global search P1 (#3908)
* Ship local global search as a remappable menubar flow
Phase 1 needs browser and markdown value without terminal scrollback, so the index owns durable FTS5 upserts while AppDelegate keeps one navigation path from palette rows to focused panels. The global shortcut is wired through the existing shortcut settings instead of a standalone Carbon shim so Settings and cmux.json remain authoritative.
Constraint: Phase 1 excludes Ghostty terminal scrollback capture
Constraint: User required no local test execution and no reload before CI is green
Rejected: Hardcoded GlobalSearchHotkey shim | violates KeyboardShortcutSettings policy
Confidence: medium
Scope-risk: broad
Directive: Keep future terminal capture feeding SearchIndex documents through GlobalSearchCoordinator rather than adding another palette/navigation path
Tested: git diff --check; python3 -m json.tool Resources/Localizable.xcstrings; python3 -m json.tool web/data/cmux.schema.json; plutil -lint GhosttyTabs.xcodeproj/project.pbxproj
Not-tested: Local unit/UI tests and tagged app launch per task constraints
* Remove duplicate search refresh work
Cursor review pointed out that the menubar toggle and palette onAppear both refreshed the live index. Keeping the refresh in the palette lifecycle avoids resetting browser debounce tasks while still indexing each time the palette opens, and removing the unused workspace delete API keeps the storage surface honest.
Constraint: Review feedback came from PR #3908 after the first CI pass started
Rejected: Keep both refresh calls | causes avoidable debounce cancellation and slower browser result availability
Confidence: high
Scope-risk: narrow
Directive: Add workspace-level deletion only when a real workspace teardown caller is wired
Tested: git diff --check; python3 -m json.tool Resources/Localizable.xcstrings; python3 -m json.tool web/data/cmux.schema.json; plutil -lint GhosttyTabs.xcodeproj/project.pbxproj
Not-tested: Local tests/build per task constraints
* Fix global search stale index entries
* Address global search review feedback
* Fix search query token mapping compile error
* Fix global search CI failures
* Fix stale unavailable markdown search entries
* Cancel stale markdown search captures
* Cancel global search refresh on dismiss
* Fix global search review followups
* Address global search post-CI feedback
* Preserve markdown panel title search on read failure
* Address global search lifecycle feedback
* Address global search review lifecycle feedback
* Refine global search capture ownership
* fix: address global search review blockers
* feat: show open panels in global search
* fix: cover right sidebar tool panel in search
* Fix cmuxTests: rename restorableAgentAutoResumePending to restorableAgentResumeState (#4068)
* fix: handle repeated assistant imessage completions
* Open supported files in cmux on cmd-click (#4041)
* Open supported files in cmux on cmd-click
* Add cmd-click file preview verification script
* Reuse right pane for cmd-click file previews
* Keep cmd-click UI test terminal after preview focus
* Accept numeric cmd-click test payload values
* Capture cmd-click UI test window snapshots
* Add file-type-aware external open actions
* Address supported file routing review feedback
* Fix external open menu sendability warnings
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Suppress native proxy icon on cmux main windows (#3973)
* Add proxy icon regression test
* Suppress native proxy icon on cmux windows
* chore: retrigger preview deployments
* Refine native proxy icon suppression
* fix: keep titlebar folder icon aligned
* fix: restore titlebar folder icon leading offset
* test: cover folder icon frame replacement
* fix: resync folder icon on frame replacement
* test: cover folder icon ancestor movement
* fix: track folder icon ancestor movement
* fix: address folder icon review feedback
* test: stabilize folder icon ancestor sync
* fix: handle sidebar tool panels in global search
---------
Co-authored-by: austinpower1258 <austinwang115@gmail.com>
* Close browser panels when pages request window close (#4070)
* Add browser self-close restore regression test
* Close browser panels from WebKit close callbacks
* fix: index right sidebar tool panels as titles
* fix: keep web close callback synchronous
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add notification policy hooks
Merged https://github.com/manaflow-ai/cmux/pull/4054
* Fix sidebar unread badge after re-marking notifications (#4084)
* Add sidebar unread notification regression test
* Keep sidebar notification badge live during menu freeze
* Cover sidebar presentation fallback cases
* Limit Cloud VMs by active provider state (#4046)
* test: cover active vm limit with paused freestyle vms
* fix: enforce cloud vm limits by active state
* fix: parallelize cloud vm status refresh
* chore: update web security dependencies
* fix: handle right sidebar tools in global search
* fix: guard cloud vm status refresh races
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Fix Settings search synonyms (#4082)
* Add settings search synonym regressions
* Fix settings search synonyms
* Add shortcut bindings anchor regression
* Cover clickable PR settings search alias
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add tagged debug CLI helper (#4092)
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add unread defer shortcut (#4086)
* Add unread defer shortcut
* fix: address unread defer feedback
* fix: keep manual unread jump explicit
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Document notification hooks default off
Document that notification hooks are off by default and style the config key in localized docs.
* Approve installed Codex hooks after dogfood (#4075)
* Reapply Codex hook approval changes for dogfood
* Notify on Codex plan input requests
* Handle Codex plan question transcript items
* Address Codex hook review feedback
* Recover malformed Codex hook trust blocks
* Avoid duplicate consecutive cmux hook reinserts
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Document session restore behavior
Adds session restore docs, blog, README updates, and review cleanup.
* Use nucleo for command palette search
* Skip unrestorable Claude startup sessions
PR: https://github.com/manaflow-ai/cmux/pull/4079
* Revert "Suppress native proxy icon on cmux main windows" (#4099)
* Revert "Suppress native proxy icon on cmux main windows (#3973)"
This reverts commit 5048440ff44b4edbe328b65403724ff79476b2e6.
* Fix titlebar proxy icon without detached panel sync
* Apply proxy icon override to fallback config
* Restore key regain redraw invariant
* Tune nucleo palette initialism ranking
* Fix terminal portal resize lag (#4102)
* Fix Korean 2-Set terminal arrows (#4095)
* Add Korean 2-Set arrow IME regression
* Restore Korean 2-Set arrow forwarding
* Restore Zhuyin IME command routing
* Address IME review feedback
* Fix Korean IME regression test compile
* Address IME review follow-ups
* Address Bopomofo preedit review feedback
* Avoid idle Zhuyin key suppression
* Remove dead text input wrapper
* Address IME suppression review feedback
* Fix palette stitched highlight precedence
* Add Codex Teams subagent panes
* Open markdown files in preview panels from cmux open (#4085)
* fix: open markdown files in preview panels
* fix: preserve markdown viewer transparency
* fix: mute markdown open-with header button
* fix: align markdown header controls
* fix: align file header controls
* fix: address markdown review feedback
* test: cover opaque text editor alpha
* fix: align header open fallback
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add task manager sorting and program aggregates (#4066)
* Add task manager sorting and program aggregates
* Add sorting to cmux top output
* Add flat TSV cmux top output
* Add coding agent task manager totals
* Make task manager program totals payload-backed
* Recognize agent launcher process names in task manager
* Fix task manager test build helpers
* Recognize Claude versioned launcher processes
* Show loading state before task manager sample
* Recognize versioned agent process names
* Use agent totals for task manager hierarchy icons
* fix: address task manager review feedback
* fix: address follow-up task manager review
* fix: address final task manager review
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Keep manual unread sticky until terminal interaction (#4104)
* test: cover sticky manual unread state
* fix: keep manual unread sticky until terminal input
* fix: show workspace manual unread pane ring
* fix: sync manual unread badge on focus changes
* fix: stabilize manual unread representative fallback
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: austinpower1258 <austinwang115@gmail.com>
* Bump version to 0.64.5 (#4107)
* Fix Pi Vault icon and JSONL titles (#4120)
* test: cover Pi JSONL content block titles
* fix: parse Pi JSONL text blocks for Vault titles
* fix: align Pi JSONL title role handling
* fix: require typed text blocks for Pi titles
* Improve Cloud VM error guidance (#4094)
* Improve Cloud VM error guidance
* Address final Cloud VM review feedback
* Narrow Cloud VM sanitizer env var block
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Keep selected workspace visible after sidebar reorders
* Add sidebar scroll regression for workspace move to top
* Reveal selected workspace after sidebar reorders
* Handle right sidebar tool panels in global search
* Test workspace move to top visibility only
* Refine sidebar reorder scroll trigger
* Add move-to-top notification regression
* Skip no-op move-to-top notifications
* Assert no-op move-to-top keeps order
* Require matching manager for reorder scroll
* Scroll selected workspace on index shifts
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Use transparent backgrounds for file preview panels (#4088)
* Handle right sidebar tools in global search browse hits
* Use transparent backgrounds for file preview panels
* Cover panel theme background preservation
* Fix PDF file preview open menu
* Make file open menu button compact
* Fix PDF open menu chrome button
* Fix PDF open-with chrome click target
* Address file preview chrome review feedback
* Fix PDF background cache invalidation
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Inherit stdin in backgrounded ssh inside startup wrapper (#4135)
* Add regression test for SSH startup wrapper dropping stdin
After PR #3786 backgrounded the ssh invocation inside the startup
wrapper for signal/reconnect handling, `cmux ssh <host>` sessions
stopped forwarding keystrokes from the surface PTY to the remote
shell. Output flowed back (the remote prompt rendered in cmux UI),
but anything typed never reached zsh on the other side, which sat
blocked in `do_poll` on the remote pts.
Root cause: POSIX sh redirects stdin of an async command (`&`) to
/dev/null when job control is off — the default for the `/bin/sh -c …`
that runs the startup wrapper. Without an explicit `<&0` on the
`&`'d ssh line, the local PTY stdin is silently dropped.
This commit adds the failing regression test. The fix follows in
the next commit so CI can prove the test catches the bug.
* Inherit stdin in backgrounded ssh inside startup wrapper
PR #3786 wrapped the ssh invocation in `while :; do … & wait` to enable
SIGHUP/INT/TERM trap handling and reconnect-on-exit-255. Backgrounding
ssh, however, drops its stdin: POSIX sh redirects fd 0 of any async
command to /dev/null when job control is off, which is the default for
the `/bin/sh -c …` host that runs this wrapper.
As a result, output from the remote still flowed back to the surface
PTY (ssh's stdout/stderr stayed wired) but the user's keystrokes never
reached the remote — they hit ttysNNN on the Mac side, kernel echoed
them locally, but ssh's stdin was /dev/null so nothing was forwarded.
zsh on the far side sat in `do_poll` forever.
Explicit `<&0` on both the `command` line and the `( … )` shell-snippet
form overrides the POSIX default and re-attaches the wrapper's own
stdin to the backgrounded ssh process.
Verified with the regression test added in the previous commit, plus
manual repro on Darwin:
/bin/sh -c 'cat & wait' # cat's fd 0 → /dev/null (bug)
/bin/sh -c 'cat <&0 & wait' # cat's fd 0 → parent stdin (fix)
* Add docs search
Adds localized Pagefind docs search with heading anchors and section-aware results.
* Fix Swift interpolation escape in SSH stdin regression test (#4154)
`testSSHStartupForwardsStdinToBackgroundedSSH` used `\"<empty>\"` inside a
`\(...)` string interpolation. Swift parses `\"` as the end of the outer
literal, breaking compilation of cmuxTests on main:
Cannot find ')' to match opening '(' in string interpolation
Unterminated string literal
That kept `ci/circleci: macos-unit-tests` red on main after #4135 even
though `macos-debug-build` and `macos-release-build` still passed (the
test target was the only thing affected). The runtime fix (`<&0` on the
backgrounded ssh) is unchanged and was verified end-to-end on a cloud Mac.
Inside an interpolation, the string is already a Swift expression and
literal quotes are unescaped; drop the four backslashes.
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Add command palette settings toggles
Adds command palette toggles for boolean Settings rows, including iMessage Mode.
* Ensure Rust toolchain is installed for nucleo FFI builds
* Document nucleo FFI thread and ABI assumptions
* Reuse nucleo index in preview search test helper
* Install Rust for activation perf builds
---------
Co-authored-by: Tobi Lutke <tobi@shopify.com>
Co-authored-by: Austin Wang <austinwang115@gmail.com>
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Kevin Peng <48529172+kays0x@users.noreply.github.com>
lawrencecchen
added a commit
that referenced
this pull request
May 15, 2026
* Optimize command palette search
* Reduce command palette typing frame work
* Fix command palette result rendering
* Ignore stale command palette row snapshots
* Use command ids for palette row identity
* Match Zed-style palette result limiting
* Reduce palette preview search frame misses
* Use nucleo for command palette search (#4078)
* feat: improve markdown viewer
* fix: address markdown review feedback
* fix: clean up markdown review issues
* fix: address markdown review feedback
* fix: address latest markdown review
* Fix #3807: bring notification CLI to panel parity (#3811)
* Prove notification CLI parity is missing
Add behavior-level coverage for the missing notification socket and CLI actions before implementing them. The tests drive V2 notification action methods, CLI subcommands, extended list fields, and the UI open-notification flow so CI can show the pre-fix gap.
Constraint: Regression tests must be committed before the implementation for issue #3807
Constraint: Local Swift tests are not run in this repo; verification is through CI
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Not-tested: Swift/XCUITest execution; intentionally deferred to CI
* Make notification actions scriptable from the CLI
The notifications panel already owned the behavior for dismissing, marking read, opening, and jumping to unread rows. This wires the socket and CLI to those existing store/AppDelegate paths, extends list output with panel metadata, and documents the new command surface without introducing a second notification action model.
Constraint: Existing Notifications page behavior must remain the source of truth
Constraint: Direct xcodebuild and local Swift/XCUITest runs are forbidden in this workspace
Rejected: Duplicate CLI-side focus or read-state logic | would diverge from AppDelegate.openNotification and TerminalNotificationStore semantics
Confidence: medium
Scope-risk: moderate
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Tested: python3 -m json.tool Resources/Localizable.xcstrings
Not-tested: Swift unit/UI execution; deferred to CI per repo policy
* Make notification CI compile under strict concurrency
The notification parity implementation introduced a shared formatter on a main-actor type and a test helper that crossed actor boundaries through escaping closures. This keeps the socket behavior unchanged while making date formatting local to the main-actor call path and keeping the XCTest socket request helper from capturing actor-isolated state in the background request closure.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Run xcodebuild locally to confirm | user explicitly warned direct xcodebuild can deadlock the machine
Confidence: medium
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Make notification parity actions atomic and exact
Review feedback exposed two behavior risks in the notification parity path: bulk dismissal was implemented as client-side list-and-loop work, and jump-to-unread could report one unread notification while opening a later valid one. The server now owns already-read dismissal as a single V2 action, the jump helper returns the notification it actually opened, and event/list parsing details match those server semantics.
Constraint: Notification action logic must reuse the existing store and AppDelegate paths
Rejected: Split TerminalController into new controllers in this PR | broad refactor is unrelated to issue #3807 and would obscure the parity fix
Confidence: medium
Scope-risk: moderate
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace instructions
* Expose app test symbols to CLI notification coverage
The integration regression exercises real app-backed notification state through the CLI harness, so the test target must import the built app module the same way the socket action tests do.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Verify with xcodebuild locally | user explicitly forbids direct xcodebuild
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Make notification list and dismiss payloads stable
Review caught two small contract hazards in the new notification RPC surface: the dismiss result used mixed JSON types, and a pipe in the appended tab title could shift the legacy list parser. The server now reports dismissals as counts consistently and escapes only the new trailing list field, with the CLI decoding it after structural parsing.
Constraint: The V1 list response remains pipe-delimited for backward compatibility, so only newly appended trailing fields can be encoded without changing old parser behavior
Rejected: Replace list_notifications with JSON-only output | existing V1 parsers depend on the line format
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace policy
* Return async notification socket responses from tests
CircleCI caught a compile-only issue in the async V2 test helper: the continuation result was awaited but not returned from the method that promises a response dictionary. Returning the continuation value restores the helper contract without changing the exercised socket behavior.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Verify with local xcodebuild | user explicitly forbids direct xcodebuild
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Avoid blocking notification CLI integration sockets
The integration regression has to create AppKit-backed notification state on the main actor, but running the CLI subprocess synchronously there can block the socket handler's main-actor store mutations. The test now awaits subprocess work on a background queue and verifies read state through the same CLI list path.
Constraint: Socket notification handlers intentionally hop to the main actor for store and AppDelegate work
Rejected: Run the CLI synchronously from the main actor | it can deadlock the in-process socket server during tests
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace policy
* Harden notification CLI response contracts
The notification parity path now distinguishes new list-notification trailer fields from old pipe-heavy bodies, rejects surface-only mark-read selectors, and returns post-open read state by marking through the shared store path after a successful focus action.
Constraint: list_notifications remains a legacy pipe-delimited protocol, so the new trailer needs its own discriminator while older body parsing keeps joining payload[6...]
Rejected: Add a third list_notifications sentinel field | the issue asked for exactly the two appended fields
Rejected: Rely on AppDelegate delayed mark-read for socket JSON | CLI callers need the open response and subsequent list output to reflect the explicit action
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI per workspace policy
* Make CLI integration helper capture explicit self
CircleCI's Swift compile step requires explicit self when the background subprocess closure calls the test helper method. This keeps the deadlock fix intact while satisfying Swift capture rules.
Constraint: Local Swift tests and direct xcodebuild are explicitly forbidden in this workspace
Rejected: Verify with local xcodebuild | user explicitly forbids direct xcodebuild
Confidence: high
Scope-risk: narrow
Tested: git diff --check
Tested: jq empty Resources/Localizable.xcstrings
Not-tested: Swift compilation and XCTest execution; deferred to CI
* Make CLI presentation flags order-independent
Users naturally put presentation flags next to the command they are inspecting. Normalize --json and --id-format after command selection so docs examples such as cmux list-notifications --json produce JSON while still preserving literal flag-looking values for command options.
Constraint: Do not run reload.sh before CI is green; never run bare xcodebuild.
Rejected: Documentation-only correction | leaves copy-pasted command behavior surprising.
Rejected: Notification-only --json handling | repeats the same parser split for future JSON-capable commands.
Confidence: medium
Scope-risk: moderate
Directive: Keep presentation flag parsing centralized; update commandOptionsWithValues when adding value-taking command options.
Tested: git diff --check
Not-tested: Local XCTest/build per repo policy; CI will verify.
* Fix notification surface selector error message
* Make notification open mark read synchronously
* Fix CLI presentation flag parsing
* Test notification mark-read missing id
* Reject missing notification mark-read ids
* fix: polish markdown viewer dogfood
* Fix shared WebView task manager attribution
Fixes shared WebContent resource attribution in task manager rows and adds regression coverage.
* Prevent display-link crash from terminal portal layout reentry (#3885)
* Pin portal sync deferral during SwiftUI host callbacks
The silent-exit crash path points at SwiftUI/AppKit layout recursion reaching a CATransaction display-link flush. This test locks the intended invariant: geometry callbacks originating from the SwiftUI NSViewRepresentable host must defer portal reconciliation instead of forcing immediate AppKit layout, even while an interactive resize is active.
Constraint: Local tests are intentionally not run in this repository; CI owns regression proof.\nRejected: Assert on source text or unified-log contents | timing-dependent and not executable through the policy seam.\nConfidence: medium\nScope-risk: narrow\nDirective: Keep immediate portal flushing owned by external AppKit resize observers, not SwiftUI host callbacks.\nTested: Not run locally per repository policy and user instruction.\nNot-tested: Full multi-session crash reproduction is timing-dependent and not deterministic.
* Prevent portal layout reentry from terminal host callbacks
The terminal NSViewRepresentable host was allowed to bind into the window portal and synchronously flush AppKit layout from update/layout callbacks. That made SwiftUI's own host layout and the external terminal portal both believe they could drive geometry in the same render turn, matching the NSHostingView reentrant-layout warnings reported before the CATransaction display-link abort.\n\nThe portal now treats SwiftUI host callbacks as state capture only: they register the binding and schedule the portal owner to reconcile geometry after the current render turn. Immediate geometry flushing remains available to the portal's external AppKit resize observers, which are outside SwiftUI body/layout evaluation. The launch path also records clean exits and posts a one-time TerminalNotificationStore breadcrumb when a newer ghostty Breakpad envelope is found after an unclean exit.
Constraint: Local tests and app builds are not run before CI for this branch; verification is delegated to CI, then the required tagged reload.\nRejected: Wrap the CATransaction/display-link exception in @try/@catch | it would hide AppKit's abort symptom without removing the reentrant layout owner split.\nRejected: Keep immediate sync during interactive SwiftUI host callbacks | still allows layoutSubtreeIfNeeded inside the representable layout/update path.\nConfidence: medium\nScope-risk: moderate\nDirective: SwiftUI/AppKit host callbacks must not force terminal portal layout synchronously; add external observer paths for any future immediate resize flushing.\nTested: git diff --check; jq empty Resources/Localizable.xcstrings\nNot-tested: Local XCTest/build/repro per repository and user instructions; 75-minute multi-session crash reproduction is not deterministic.
* Record clean-exit breadcrumb after teardown
The crash breadcrumb should compare Breakpad envelopes against the last successfully completed termination path. Recording the timestamp after teardown avoids marking an exit clean before session persistence, process cleanup, and notification cleanup have finished.
Constraint: This is a follow-up correctness tweak before CI settled.\nRejected: Keep the timestamp at the start of applicationWillTerminate | a crash during termination cleanup could suppress the next-launch breadcrumb.\nConfidence: high\nScope-risk: narrow\nDirective: Only update the clean-exit timestamp after teardown work that must complete for a clean quit.\nTested: git diff --check; jq empty Resources/Localizable.xcstrings\nNot-tested: Local tests/builds per repository and user instructions.
* Defer first portal install from SwiftUI callbacks
A deferred SwiftUI host bind could still create the WindowTerminalPortal for the first time, and the initializer previously installed the host with an immediate layout flush. Threading the same deferral flag through portal creation keeps the invariant complete: representable update/layout callbacks never synchronously flush terminal portal layout, even on first bind.
Constraint: Must preserve immediate install behavior for non-SwiftUI external portal callers
Rejected: Assume portals already exist before host callbacks | first terminal bind in a new window can create one
Confidence: high
Scope-risk: narrow
Directive: Any future portal creation path from SwiftUI callbacks must carry deferred synchronization through initialization
Tested: git diff --check; jq empty Resources/Localizable.xcstrings
Not-tested: Local tests/builds per repository and user instructions
* Move crash breadcrumb work out of launch hot path
The crash breadcrumb scanner is pure Foundation logic, so it now lives in its own source file and performs the crash-directory scan from a detached utility task. App launch only schedules the check once, then posts the existing localized notification after the background scan returns to the main actor. The terminal host geometry policy is also simplified to make the always-deferred invariant explicit at the call site.
Constraint: Local build/tests are intentionally skipped until CI completes per issue instructions
Rejected: Keep synchronous directory enumeration in AppDelegate.configure | startup should not block on crash artifact I/O
Rejected: Preserve the dead immediate portal sync branch | host callbacks are never allowed to force layout synchronously
Confidence: high
Scope-risk: narrow
Directive: Do not reintroduce synchronous crash-directory scans or immediate portal layout flushes from SwiftUI host callbacks
Tested: git diff --check; jq empty Resources/Localizable.xcstrings; plutil -lint GhosttyTabs.xcodeproj/project.pbxproj
Not-tested: Local build/tests per repository and user instructions
* Tighten portal geometry regression seam
* Fix crash breadcrumb actor isolation
* Mark crash breadcrumb async helper nonisolated
* Make crash breadcrumb scan concurrent
* fix: remove inert crash breadcrumb cooldown key
* fix: use renamed crash breadcrumb annotation
* fix: own crash breadcrumb scan task
* Hide sidebar descriptions in title-only mode (#4040)
* Hide sidebar descriptions in title-only mode
* Add sidebar description visibility toggle
* Let sidebar titles use trailing slack
* Float sidebar shortcut hints over rows
* Remove unused sidebar width helper
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add Pi agent icon
PR: https://github.com/manaflow-ai/cmux/pull/4057
* Keep Claude Running after clear (#3631)
* Prove Claude clear hook loses running status
The regression exercises the Claude hook handler directly with a SessionStart payload whose source is clear, then sends a late Stop for the previous session. The current handler does not promote the clear boundary to Running or reject stale Stop mutations, so this test is expected to fail before the lifecycle fix.
Constraint: Tests must exercise the hook handler directly rather than driving the full app.
Confidence: high
Scope-risk: narrow
Directive: Keep this regression on the direct CLI hook path; do not replace it with source-text assertions.
Tested: Not run locally per repository policy.
Not-tested: CI red/green proof pending on GitHub Actions.
* Prove Claude clear should own running status
Add hook-level regression coverage for Claude Code /clear. The tests drive the bundled CLI against a mock cmux socket so CI proves SessionStart(source=clear) must set the visible Running status and a prior session Stop must not clobber that fresh lifecycle.
Constraint: Local tests are intentionally not run; CI owns test execution for this task.
Confidence: high
Scope-risk: narrow
Tested: Not run locally per instruction
Not-tested: Full app UI repro under CI
* Ignore stale Claude hook events after clear
Claude /clear starts a fresh hook lifecycle but the sidebar status key is shared at the workspace level. Persist the active Claude session per workspace, promote clear SessionStart to a visible Running state, and ignore teardown or notification mutations from sessions that are no longer current.
Constraint: Claude Code emits /clear as SessionStart(source=clear).
Rejected: Only set Running on clear SessionStart | late Stop from the previous lifecycle could still clobber the new status.
Confidence: high
Scope-risk: narrow
Directive: Future Claude hook status mutations must respect the active workspace session before touching claude_code.
Tested: Not run locally per instruction
Not-tested: Full app UI after CI
* Prove Claude clear hook loses running status
The regression exercises the Claude hook handler directly with a SessionStart payload whose source is clear, then sends a late Stop for the previous session. The current handler does not promote the clear boundary to Running or reject stale Stop mutations, so this test is expected to fail before the lifecycle fix.
Constraint: Tests must exercise the hook handler directly rather than driving the full app.
Confidence: high
Scope-risk: narrow
Directive: Keep this regression on the direct CLI hook path; do not replace it with source-text assertions.
Tested: Not run locally per repository policy.
Not-tested: CI red/green proof pending on GitHub Actions.
* Keep Claude clear sessions authoritative
Claude /clear arrives as a SessionStart source=clear event, but the hook store only remembered routing data. This change makes the store also own the active session for each workspace, promotes clear starts to Running, and ignores visible Stop/Notification/SessionEnd mutations when their session no longer matches the active workspace session.
Constraint: Claude Code documents SessionStart source=clear for /clear lifecycle boundaries.
Rejected: Only set Running on source=clear | old Stop and SessionEnd events could still clobber the new session afterward.
Confidence: high
Scope-risk: narrow
Directive: Visible Claude hook mutations must pass active-session ownership checks before changing sidebar status or notifications.
Tested: Not run locally per repository policy.
Not-tested: CI red/green proof pending on GitHub Actions.
* Allow Claude sessions to advance turns
A visible hook mutation can only be rejected as stale after the active session boundary is known. Keeping a completed turn id active after Stop made the next prompt in the same Claude session look stale before it could promote its own turn.
The Stop path now refreshes the active session with no turn id once the completed turn has been accepted, preserving stale-session protection across /clear while allowing normal multi-turn prompts to re-enter Running. The regression now exercises that two-turn path before the clear boundary.
Constraint: Do not run local tests; CI owns verification for this branch.
Rejected: Ignore turn id in all current-session checks | would weaken stale turn filtering for late Stop and Notification events.
Confidence: high
Scope-risk: narrow
Directive: Do not persist a completed turn id past Stop without proving the next prompt-submit can promote a new turn.
Tested: git diff --check
Not-tested: Local unit/regression tests per project policy
* Remove duplicate Claude clear helper
The branch integration accidentally kept two isClaudeClearSessionStart definitions in CLI/cmux.swift. The duplicate version referenced a non-existent parsedInput.source property, so Swift would reject the file before CI could exercise the hook lifecycle tests.
Keep the existing implementation that reads source from the parsed hook object and delete only the duplicate helper.
Constraint: Fix review-reported compile blocker without changing lifecycle behavior.
Rejected: Add source to ClaudeHookParsedInput | unnecessary for this compile fix and broader than the failing duplicate.
Confidence: high
Scope-risk: narrow
Directive: Keep exactly one Claude clear source helper unless the parsed input model is intentionally extended.
Tested: git diff --check; rg confirms a single isClaudeClearSessionStart definition and no parsedInput.source reference.
Not-tested: Local tests per project policy
* Restore Claude hook compileability after lifecycle merge
The active-session merge left behind the old source-property helper alongside the newer compact-payload helper. Removing the duplicate keeps source=clear detection on the JSON payload and avoids both the redeclaration and missing-property errors.
Constraint: Do not run local tests; CI owns verification for this branch
Rejected: Reintroduce ClaudeHookParsedInput.source | duplicates state already retained in the compact hook payload
Confidence: high
Scope-risk: narrow
Tested: git diff --check; rg verified a single isClaudeClearSessionStart definition and no parsedInput.source references
Not-tested: Local compile/test execution per task policy
* Normalize Claude active-session cleanup keys
The active-session map is keyed by normalized workspace id, so cleanup after consuming a session must use the same normalized key. Otherwise a record containing incidental whitespace could leave a stale active-session entry behind.
Constraint: Address reviewer-reported lifecycle cleanup edge case without changing visible hook behavior.
Rejected: Store raw workspace ids as active map keys | inconsistent with existing upsert normalization and lookup guards.
Confidence: high
Scope-risk: narrow
Directive: Any activeSessionsByWorkspace lookup should use the normalized workspace key, matching insertion.
Tested: git diff --check
Not-tested: Local tests per project policy
* Harden CI Zig downloads against transient upstream failures
CircleCI and the activation workflow both depend on ziglang.org tarballs during remote macOS setup. A transient 500 from that host failed the debug build before any project code compiled, so the install path now retries downloads and avoids unnecessary Homebrew update/cleanup churn on CircleCI.
Constraint: CI must be made green remotely without running local tests or local xcodebuild.
Rejected: Push an empty commit to rerun CI | would leave the same upstream download flake unchanged.
Confidence: high
Scope-risk: narrow
Directive: Keep Zig installer retries in remote CI setup paths; failures here happen before project build logic runs.
Tested: git diff --check
Not-tested: Local tests and local builds not run per repository/user policy.
* Cover stale Claude session-end lifecycle
Greptile identified that stale SessionEnd exercises a different clear-state path than stale Stop. The existing active-session guard already blocks the mutation, so the regression now drives that hook directly and asserts the active /clear session keeps its status, PID, and notifications intact.
Constraint: Do not run local tests; CI is the verification source for this branch.
Rejected: Add another Swift integration test | the existing Python hook harness already executes the CLI handler through the socket path used by CI.
Confidence: high
Scope-risk: narrow
Tested: Not run locally per repo policy.
Not-tested: Local test execution.
* Stop activation CI from stalling on Zig downloads
The activation workflow was cancelled before build because repeated ziglang.org transfers crawled for the full job timeout. Prefer Homebrew's pinned zig@0.15 bottle on macOS runners, then keep the direct tarball path as a bounded fallback with connection, total-time, and minimum-speed limits.
Constraint: The failed check never reached project build or tests; the only failing surface was CI tool bootstrap.
Rejected: Increase the job timeout | it would hide the bootstrap failure and delay feedback.
Confidence: medium
Scope-risk: narrow
Directive: Keep activation workflow tool bootstrap bounded so performance CI reaches the benchmark or fails quickly.
Tested: git diff --check
Not-tested: Local workflow execution, per repository and user instruction.
* Gate Claude session-end cleanup on the consumed workspace
Greptile noted that session-end computed the current-session guard from the fallback workspace while clearing the consumed session's workspace. Move the guard next to the mutation target so stale cleanup and visible cleanup always evaluate the same workspace identity.
Constraint: This is follow-up review hardening on the existing active-session model.
Rejected: Collapse activeSessionsByWorkspace into sessions in this PR | per-workspace current-session lookup is the intended lifecycle boundary for stale event gating.
Confidence: high
Scope-risk: narrow
Directive: SessionEnd visible cleanup must be gated against the workspace being cleared, not an earlier fallback lookup.
Tested: git diff --check
Not-tested: Local test execution, per repository and user instruction.
* Gate Claude session-end cleanup on consumed workspace
A late SessionEnd can be resolved through fallback surface lookup, so the workspace used to find a record is not always the workspace whose visible state would be cleared. Move the staleness check after consume() and evaluate it against the consumed session's workspace, where the clear_status and notification cleanup actually run.
Constraint: Hook events are delivered by short-lived CLI processes and must tolerate stale or partial Claude payloads
Rejected: Keep the pre-consume fallback workspace guard | it can validate one workspace while clearing another
Confidence: high
Scope-risk: narrow
Tested: Added Swift integration regression for stale SessionEnd fallback cleanup
Not-tested: Local tests not run per repository policy
* Make stale Claude session-end test consume the seeded session
Greptile caught that the Swift regression used an unknown session id, so the hook returned before reaching the intended consumed-session visibility guard. Use the seeded stale session id in the SessionEnd payload so the test exercises consume(), then verifies that stale visible cleanup is blocked.
Constraint: Address high-priority review feedback without running local tests.
Rejected: Leave Python-only coverage | the Swift regression would continue passing for the wrong reason.
Confidence: high
Scope-risk: narrow
Directive: Stale session-end regressions should consume a known stale session before asserting visible cleanup is skipped.
Tested: git diff --check
Not-tested: Local tests per repository and user instruction
* Cover fallback Claude session-end consumption
The stale SessionEnd regression should prove the handler consumed the stale session through fallback lookup before deciding whether visible state may be cleared. Use an unknown late session id and assert the seeded stale session is removed from the store, so the test cannot pass without exercising the consumed-workspace guard.
Constraint: Review feedback flagged the prior Swift regression as able to pass without covering the intended guard
Rejected: Use the stored stale session id directly | that only covers the ordinary mapped-session stale path
Confidence: high
Scope-risk: narrow
Tested: Not run locally per repository policy; CI will run the Swift regression
Not-tested: Local XCTest execution
* Keep Claude clear ownership panel-scoped
The clear SessionStart path now owns the active Claude boundary only for explicit clear events, so late startup/resume SessionStart events from the previous session cannot reclaim the workspace before their stale Stop or SessionEnd arrives. The same clear path now passes the resolved surface id into status updates so split panels receive the Running state in the intended pane.
Constraint: Local test execution is disallowed by repository policy; CI remains the behavioral gate.
Rejected: Let every SessionStart mark active | late non-clear events can overwrite the clear boundary.
Rejected: Drop fail-open isCurrent behavior | transient store errors should not hide legitimate current status updates.
Confidence: medium
Scope-risk: moderate
Directive: Do not let non-clear Claude SessionStart events replace an explicit /clear active boundary without adding event ordering metadata.
Tested: python3 -m py_compile tests/test_claude_hook_clear_running_status.py; git diff --check; conflict marker scan.
Not-tested: Local Swift/unit/UI test execution per repo policy.
* Protect Claude clear state from stale session cleanup
Late hook events can arrive after an explicit /clear boundary. The SessionStart handler now skips PID registration when the event is stale against the active session, and SessionEnd consumption preserves the active session when the incoming turn id is older than the stored active turn.
Constraint: Local test execution is disallowed by repository policy; CI remains the behavioral gate.
Rejected: Clear active ownership before checking currentness | same-session stale SessionEnd would fail open and apply cleanup.
Rejected: Keep prefix-only command assertions | option ordering changes would make the regression test brittle.
Confidence: medium
Scope-risk: moderate
Directive: Do not consume a Claude session or replace its PID from a hook event that is stale relative to active session/turn state.
Tested: python3 -m py_compile tests/test_claude_hook_clear_running_status.py; git diff --check; conflict marker scan.
Not-tested: Local Swift/unit/UI test execution per repo policy.
* Allow new Claude sessions to replace stopped owners
A stopped Claude turn must keep the same session eligible for the next turn, but it must not strand the workspace if that process exits before session-end. Mark stopped ownership as replaceable and let only session activation paths use that escape hatch; clear-session ownership remains non-replaceable so stale pre-clear events stay blocked. Session-end fallback cleanup now checks the consumed session id so missing input session ids do not fail open.\n\nConstraint: /clear SessionStart must continue to suppress stale pre-clear startup, stop, and session-end events\nRejected: Clear active ownership on Stop | breaks same-session multi-turn prompt-submit currentness\nConfidence: medium\nScope-risk: narrow\nTested: git diff --check; conflict-marker scan\nNot-tested: local XCTest per repo policy; CI will run cmux unit regressions
* test: cover codex hooks TOML features section
* fix: harden hook config and auth token cache
* test: cover sign-out browser auth loading cleanup
* fix: cancel browser auth on sign-out
* test: cover codex config read failures
* fix: fail closed on codex config read errors
* test: cover auth sign-out callback race
* fix: discard auth callback after sign-out
* fix: keep claude subcommands out of hook injection
* fix: dismiss stale sparkle update replies
* fix: redact auth logs while preserving observability
* fix: reset update checks and guard sign-out races
* fix: preserve update metadata from driver state
* fix: await auth token assertions before comparing
* fix: address wrapper and auth review feedback
* fix: address session and config review feedback
* ci: retrigger pending checks
* fix: clear stale ime and auth token state
* fix: clean legacy codex hooks config
* test: cover legacy codex hooks markers
* fix: clean empty codex features table
* fix: preserve browser key reentry dispatch
* Fix new-workspace caller window routing (#4042)
* test: cover new workspace caller routing
* fix: route new workspace to caller context
* Add iMessage workspace insertion regression test
* Reset Kitty keyboard mode at shell prompt boundaries (#3870)
* Prove stale Kitty keyboard state leaks CSI-u key bytes
The regression exercises a hosted Ghostty terminal, leaves Kitty keyboard protocol enabled as a crashed TUI would, mirrors the clear-history socket handler clear_screen path, and captures raw PTY stdin bytes for a plain c key. Current behavior should encode CSI-u instead of a single ASCII byte, making the test fail until the protocol state is reset at the shell prompt boundary.
Constraint: Regression must cover PTY input bytes, not source text shape
Confidence: high
Scope-risk: narrow
Directive: Keep this test on the real ghostty_surface_key path; sendText alone bypasses the keyboard encoder
Tested: Manual current-main repro captured c9;1:3uc9;1:3uc9;1:3u after Kitty enable plus clear-history
Not-tested: Local unit execution deferred to CI per requested red/green workflow
* Reset stale Kitty keyboard mode at prompt boundaries
A crashed TUI can leave Ghostty's Kitty keyboard protocol stack pushed after clear-history, causing normal shell input to be encoded as CSI-u. Resetting the stack from the shell prompt hook makes the prompt boundary the ownership point for returning interactive shells to plain byte input.
Constraint: Fix must run through shell integration because Ghostty keeps protocol state inside the terminal surface
Rejected: Reset only in clear-history socket path | stale state also leaks after any crashed TUI returns to prompt
Confidence: high
Scope-risk: narrow
Directive: Keep prompt-boundary reset paired across bash and zsh integrations
Tested: Not run locally per repository testing policy; regression added in prior commit
Not-tested: CI not yet completed
* Clarify Kitty reset fixture failures
The stale keyboard regression now fails at the fixture boundary if the zsh integration does not emit the expected reset bytes, instead of falling through to a misleading PTY byte mismatch.
Constraint: Repository policy forbids local test execution for this PR loop
Confidence: high
Scope-risk: narrow
Tested: Not run locally per repository policy; CI will run the affected XCTest
Not-tested: Local XCTest execution
* chore: retrigger Vercel checks
* Add Kitty reset shell hook coverage
* Reset all terminal keyboard protocols at prompt
* Fix terminal keyboard reset test expectations
* Clarify disabling agent session auto-resume for #3640 (#3991)
* docs: explain disabling agent auto resume
* docs: name auto resume config path
* Fix stale restored agent resume state
* Harden restored agent hook liveness
* refactor: share restored agent normalization
* Honor iMessage workspace ordering and previews
* Add workspace cwd inheritance setting (#3921)
* feat: add workspace cwd inheritance setting
* fix: align workspace cwd setting key naming
* fix: apply workspace cwd setting to detached creation
* fix: expose workspace cwd inheritance setting
* fix: route pane break through detached workspace creation
* fix: keep pane break response pane ids non-null
* fix: distinguish pane break resolution errors
* Approve installed Codex hooks (#4035)
* Approve installed Codex hooks
* Address Codex hook trust review feedback
* Avoid tomllib in Codex hook tests
* Align Codex hook trust test mirror
* Harden Codex hook trust ownership
* Preserve legacy Codex hook cleanup
* Fix workspace unit test after merge
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Revert "Approve installed Codex hooks (#4035)" (#4074)
This reverts commit e4546b7675a4ffa5a41a5429218b60f4e7644e21.
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Fix workspace unit test transfer resume state (#4076)
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Clarify in cmux --help that reload-config covers Ghostty config too (#4060)
* Clarify cmux help that reload-config covers Ghostty config too
`cmux reload-config` reloads BOTH ~/.config/cmux/cmux.json and Ghostty
config (~/.config/ghostty/config) and refreshes terminals in place, but
the help/docs only mentioned cmux.json. Agents (and humans) reading the
help would think they had to restart cmux after editing Ghostty config.
- cmux --help "Agent Help" now tells agents where Ghostty config lives
and that reload-config picks it up live.
- cmux docs settings, cmux settings path, cmux config --help now list
~/.config/ghostty/config as a related (not cmux-owned) location and
describe reload-config's actual scope.
- cmux schema sidebarAppearance.tintOpacity description now notes it's
sidebar-only, and points to Ghostty background-opacity / blur for
terminal transparency.
- skills/cmux/SKILL.md mirrors the wording.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Align ghostty_config JSON shape across CLI surfaces
Cursor Bugbot and Greptile both flagged that `cmux settings path --json`
emitted `ghostty_config` as a string while `cmux docs settings --json`
emitted it as an object {path, note}. An agent reading both outputs with
the same key expectation would have to special-case the type.
Standardize on the object shape with `path` and `note` in both, matching
docsPayload. This is the agent-discoverability path the PR is trying to
make reliable, so making the shape consistent is on-purpose.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Use canonical Ghostty config key background-blur (not background-blur-radius)
CodeRabbit flagged that `background-blur-radius` is outdated. Verified
against the Ghostty submodule at ghostty/src/config/Config.zig: line 70
declares `background-blur-radius` as a compatibilityRenamed alias for
`background-blur`. The current canonical key is `background-blur` and it
accepts the same integer value (e.g. `background-blur = 20`).
Update the two docs that introduced the alias name:
- skills/cmux/SKILL.md
- web/data/cmux.schema.json (sidebarAppearance.tintOpacity description)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Add nucleo FFI command palette benchmark
* Open right sidebar tools as panes (#4065)
* Open right sidebar tools as panes
* Remove unreachable sidebar pane commands
* Fix sidebar pane unit test build
* Address sidebar pane review feedback
* Fix vault pane focus tracking
* Address right sidebar pane review followups
* Use modern sidebar pane flash observer
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Save crash diagnostics under cmux state (#4077)
* Save crash diagnostics under cmux state
* fix: key GhosttyKit artifacts by crash path
* fix: pin cmux crash GhosttyKit archive
* fix: mark crash breadcrumb scan concurrent
* fix: keep crash scan compatible with Xcode 16
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Menubar global search P1 (#3908)
* Ship local global search as a remappable menubar flow
Phase 1 needs browser and markdown value without terminal scrollback, so the index owns durable FTS5 upserts while AppDelegate keeps one navigation path from palette rows to focused panels. The global shortcut is wired through the existing shortcut settings instead of a standalone Carbon shim so Settings and cmux.json remain authoritative.
Constraint: Phase 1 excludes Ghostty terminal scrollback capture
Constraint: User required no local test execution and no reload before CI is green
Rejected: Hardcoded GlobalSearchHotkey shim | violates KeyboardShortcutSettings policy
Confidence: medium
Scope-risk: broad
Directive: Keep future terminal capture feeding SearchIndex documents through GlobalSearchCoordinator rather than adding another palette/navigation path
Tested: git diff --check; python3 -m json.tool Resources/Localizable.xcstrings; python3 -m json.tool web/data/cmux.schema.json; plutil -lint GhosttyTabs.xcodeproj/project.pbxproj
Not-tested: Local unit/UI tests and tagged app launch per task constraints
* Remove duplicate search refresh work
Cursor review pointed out that the menubar toggle and palette onAppear both refreshed the live index. Keeping the refresh in the palette lifecycle avoids resetting browser debounce tasks while still indexing each time the palette opens, and removing the unused workspace delete API keeps the storage surface honest.
Constraint: Review feedback came from PR #3908 after the first CI pass started
Rejected: Keep both refresh calls | causes avoidable debounce cancellation and slower browser result availability
Confidence: high
Scope-risk: narrow
Directive: Add workspace-level deletion only when a real workspace teardown caller is wired
Tested: git diff --check; python3 -m json.tool Resources/Localizable.xcstrings; python3 -m json.tool web/data/cmux.schema.json; plutil -lint GhosttyTabs.xcodeproj/project.pbxproj
Not-tested: Local tests/build per task constraints
* Fix global search stale index entries
* Address global search review feedback
* Fix search query token mapping compile error
* Fix global search CI failures
* Fix stale unavailable markdown search entries
* Cancel stale markdown search captures
* Cancel global search refresh on dismiss
* Fix global search review followups
* Address global search post-CI feedback
* Preserve markdown panel title search on read failure
* Address global search lifecycle feedback
* Address global search review lifecycle feedback
* Refine global search capture ownership
* fix: address global search review blockers
* feat: show open panels in global search
* fix: cover right sidebar tool panel in search
* Fix cmuxTests: rename restorableAgentAutoResumePending to restorableAgentResumeState (#4068)
* fix: handle repeated assistant imessage completions
* Open supported files in cmux on cmd-click (#4041)
* Open supported files in cmux on cmd-click
* Add cmd-click file preview verification script
* Reuse right pane for cmd-click file previews
* Keep cmd-click UI test terminal after preview focus
* Accept numeric cmd-click test payload values
* Capture cmd-click UI test window snapshots
* Add file-type-aware external open actions
* Address supported file routing review feedback
* Fix external open menu sendability warnings
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Suppress native proxy icon on cmux main windows (#3973)
* Add proxy icon regression test
* Suppress native proxy icon on cmux windows
* chore: retrigger preview deployments
* Refine native proxy icon suppression
* fix: keep titlebar folder icon aligned
* fix: restore titlebar folder icon leading offset
* test: cover folder icon frame replacement
* fix: resync folder icon on frame replacement
* test: cover folder icon ancestor movement
* fix: track folder icon ancestor movement
* fix: address folder icon review feedback
* test: stabilize folder icon ancestor sync
* fix: handle sidebar tool panels in global search
---------
Co-authored-by: austinpower1258 <austinwang115@gmail.com>
* Close browser panels when pages request window close (#4070)
* Add browser self-close restore regression test
* Close browser panels from WebKit close callbacks
* fix: index right sidebar tool panels as titles
* fix: keep web close callback synchronous
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add notification policy hooks
Merged https://github.com/manaflow-ai/cmux/pull/4054
* Fix sidebar unread badge after re-marking notifications (#4084)
* Add sidebar unread notification regression test
* Keep sidebar notification badge live during menu freeze
* Cover sidebar presentation fallback cases
* Limit Cloud VMs by active provider state (#4046)
* test: cover active vm limit with paused freestyle vms
* fix: enforce cloud vm limits by active state
* fix: parallelize cloud vm status refresh
* chore: update web security dependencies
* fix: handle right sidebar tools in global search
* fix: guard cloud vm status refresh races
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Fix Settings search synonyms (#4082)
* Add settings search synonym regressions
* Fix settings search synonyms
* Add shortcut bindings anchor regression
* Cover clickable PR settings search alias
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add tagged debug CLI helper (#4092)
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add unread defer shortcut (#4086)
* Add unread defer shortcut
* fix: address unread defer feedback
* fix: keep manual unread jump explicit
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Document notification hooks default off
Document that notification hooks are off by default and style the config key in localized docs.
* Approve installed Codex hooks after dogfood (#4075)
* Reapply Codex hook approval changes for dogfood
* Notify on Codex plan input requests
* Handle Codex plan question transcript items
* Address Codex hook review feedback
* Recover malformed Codex hook trust blocks
* Avoid duplicate consecutive cmux hook reinserts
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Document session restore behavior
Adds session restore docs, blog, README updates, and review cleanup.
* Use nucleo for command palette search
* Skip unrestorable Claude startup sessions
PR: https://github.com/manaflow-ai/cmux/pull/4079
* Revert "Suppress native proxy icon on cmux main windows" (#4099)
* Revert "Suppress native proxy icon on cmux main windows (#3973)"
This reverts commit 5048440ff44b4edbe328b65403724ff79476b2e6.
* Fix titlebar proxy icon without detached panel sync
* Apply proxy icon override to fallback config
* Restore key regain redraw invariant
* Tune nucleo palette initialism ranking
* Fix terminal portal resize lag (#4102)
* Fix Korean 2-Set terminal arrows (#4095)
* Add Korean 2-Set arrow IME regression
* Restore Korean 2-Set arrow forwarding
* Restore Zhuyin IME command routing
* Address IME review feedback
* Fix Korean IME regression test compile
* Address IME review follow-ups
* Address Bopomofo preedit review feedback
* Avoid idle Zhuyin key suppression
* Remove dead text input wrapper
* Address IME suppression review feedback
* Fix palette stitched highlight precedence
* Add Codex Teams subagent panes
* Open markdown files in preview panels from cmux open (#4085)
* fix: open markdown files in preview panels
* fix: preserve markdown viewer transparency
* fix: mute markdown open-with header button
* fix: align markdown header controls
* fix: align file header controls
* fix: address markdown review feedback
* test: cover opaque text editor alpha
* fix: align header open fallback
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Add task manager sorting and program aggregates (#4066)
* Add task manager sorting and program aggregates
* Add sorting to cmux top output
* Add flat TSV cmux top output
* Add coding agent task manager totals
* Make task manager program totals payload-backed
* Recognize agent launcher process names in task manager
* Fix task manager test build helpers
* Recognize Claude versioned launcher processes
* Show loading state before task manager sample
* Recognize versioned agent process names
* Use agent totals for task manager hierarchy icons
* fix: address task manager review feedback
* fix: address follow-up task manager review
* fix: address final task manager review
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Keep manual unread sticky until terminal interaction (#4104)
* test: cover sticky manual unread state
* fix: keep manual unread sticky until terminal input
* fix: show workspace manual unread pane ring
* fix: sync manual unread badge on focus changes
* fix: stabilize manual unread representative fallback
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: austinpower1258 <austinwang115@gmail.com>
* Bump version to 0.64.5 (#4107)
* Fix Pi Vault icon and JSONL titles (#4120)
* test: cover Pi JSONL content block titles
* fix: parse Pi JSONL text blocks for Vault titles
* fix: align Pi JSONL title role handling
* fix: require typed text blocks for Pi titles
* Improve Cloud VM error guidance (#4094)
* Improve Cloud VM error guidance
* Address final Cloud VM review feedback
* Narrow Cloud VM sanitizer env var block
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Keep selected workspace visible after sidebar reorders
* Add sidebar scroll regression for workspace move to top
* Reveal selected workspace after sidebar reorders
* Handle right sidebar tool panels in global search
* Test workspace move to top visibility only
* Refine sidebar reorder scroll trigger
* Add move-to-top notification regression
* Skip no-op move-to-top notifications
* Assert no-op move-to-top keeps order
* Require matching manager for reorder scroll
* Scroll selected workspace on index shifts
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Use transparent backgrounds for file preview panels (#4088)
* Handle right sidebar tools in global search browse hits
* Use transparent backgrounds for file preview panels
* Cover panel theme background preservation
* Fix PDF file preview open menu
* Make file open menu button compact
* Fix PDF open menu chrome button
* Fix PDF open-with chrome click target
* Address file preview chrome review feedback
* Fix PDF background cache invalidation
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
* Inherit stdin in backgrounded ssh inside startup wrapper (#4135)
* Add regression test for SSH startup wrapper dropping stdin
After PR #3786 backgrounded the ssh invocation inside the startup
wrapper for signal/reconnect handling, `cmux ssh <host>` sessions
stopped forwarding keystrokes from the surface PTY to the remote
shell. Output flowed back (the remote prompt rendered in cmux UI),
but anything typed never reached zsh on the other side, which sat
blocked in `do_poll` on the remote pts.
Root cause: POSIX sh redirects stdin of an async command (`&`) to
/dev/null when job control is off — the default for the `/bin/sh -c …`
that runs the startup wrapper. Without an explicit `<&0` on the
`&`'d ssh line, the local PTY stdin is silently dropped.
This commit adds the failing regression test. The fix follows in
the next commit so CI can prove the test catches the bug.
* Inherit stdin in backgrounded ssh inside startup wrapper
PR #3786 wrapped the ssh invocation in `while :; do … & wait` to enable
SIGHUP/INT/TERM trap handling and reconnect-on-exit-255. Backgrounding
ssh, however, drops its stdin: POSIX sh redirects fd 0 of any async
command to /dev/null when job control is off, which is the default for
the `/bin/sh -c …` host that runs this wrapper.
As a result, output from the remote still flowed back to the surface
PTY (ssh's stdout/stderr stayed wired) but the user's keystrokes never
reached the remote — they hit ttysNNN on the Mac side, kernel echoed
them locally, but ssh's stdin was /dev/null so nothing was forwarded.
zsh on the far side sat in `do_poll` forever.
Explicit `<&0` on both the `command` line and the `( … )` shell-snippet
form overrides the POSIX default and re-attaches the wrapper's own
stdin to the backgrounded ssh process.
Verified with the regression test added in the previous commit, plus
manual repro on Darwin:
/bin/sh -c 'cat & wait' # cat's fd 0 → /dev/null (bug)
/bin/sh -c 'cat <&0 & wait' # cat's fd 0 → parent stdin (fix)
* Add docs search
Adds localized Pagefind docs search with heading anchors and section-aware results.
* Fix Swift interpolation escape in SSH stdin regression test (#4154)
`testSSHStartupForwardsStdinToBackgroundedSSH` used `\"<empty>\"` inside a
`\(...)` string interpolation. Swift parses `\"` as the end of the outer
literal, breaking compilation of cmuxTests on main:
Cannot find ')' to match opening '(' in string interpolation
Unterminated string literal
That kept `ci/circleci: macos-unit-tests` red on main after #4135 even
though `macos-debug-build` and `macos-release-build` still passed (the
test target was the only thing affected). The runtime fix (`<&0` on the
backgrounded ssh) is unchanged and was verified end-to-end on a cloud Mac.
Inside an interpolation, the string is already a Swift expression and
literal quotes are unescaped; drop the four backslashes.
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Add command palette settings toggles
Adds command palette toggles for boolean Settings rows, including iMessage Mode.
* Ensure Rust toolchain is installed for nucleo FFI builds
* Document nucleo FFI thread and ABI assumptions
* Reuse nucleo index in preview search test helper
* Install Rust for activation perf builds
---------
Co-authored-by: Tobi Lutke <tobi@shopify.com>
Co-authored-by: Austin Wang <austinwang115@gmail.com>
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Kevin Peng <48529172+kays0x@users.noreply.github.com>
* Address command palette review feedback
* Address command palette review follow-ups
* Fix command palette preview responsiveness
* Build command palette search index off main actor
* Keep small cold palette searches synchronous
* fix: clear panel badges when marking notifications read
* fix: preserve nucleo normalized matches
* fix: preserve typo fallback with nucleo search
* fix: keep search fallback semantics
* fix: keep nucleo aliases authoritative
* fix: preserve typo fallback without ffi contention
* fix: avoid stale palette reset snapshot
* fix: narrow nucleo typo fallback
* fix: address command palette review bots
* fix: preserve palette activation during index refresh
* test: cover nucleo multi-token field matching
* fix: tokenize nucleo ffi queries
* fix: preserve palette activations during index refresh
* fix: sync palette pending state before async search
* fix: keep long keyword matches below title matches
* fix: keep nucleo fuzzy matches within fields
* fix: guard palette preview reuse by fingerprint
* test: skip optional nucleo bundle check without cargo
* fix: keep final palette results uncapped
* fix: respect optional nucleo fallback
* fix: initialize rustup toolchain in release workflow
* fix: run pending palette activation after sync refresh
* Fix command palette duplicate ID indexing
* Remove stale command palette label helpers
---------
Co-authored-by: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Co-authored-by: Tobi Lutke <tobi@shopify.com>
Co-authored-by: Austin Wang <austinwang115@gmail.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Kevin Peng <48529172+kays0x@users.noreply.github.com>
This branch was successfully deployed
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
1 participant
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.
Closes #3614.
Summary
Architecture choice
I chose the robust active-session model over the narrow source=clear patch. The narrow patch would restore Running at the clear boundary, but a late pre-clear Stop or SessionEnd could still overwrite the fresh session. Making the hook store the owner of the current workspace session eliminates that class of stale lifecycle clobbers.
References
Testing
Note
Medium Risk
Touches Claude hook session lifecycle and auth token mutation handling; incorrect gating or mutation generation bugs could cause missed status updates or sign-in/out inconsistencies.
Overview
Prevents Claude sidebar/status from being clobbered by late hook events after
/clearby tracking an active Claude session (and optional turn) per workspace and gating visible mutations (stop,notification,pre-tool-use,session-end, PID/status writes) to the current session;/clearSessionStartnow clears notifications and immediately setsRunning.Refactors Codex hook install/uninstall to toggle
codex_hooksinconfig.toml(with legacy marker cleanup), adds a new regression test for the/clearlifecycle, and wires it into CircleCI/GitHub Actions; CI Zig install is stabilized via Homebrew no-update flags.Also tightens auth and UI plumbing: auth sign-in/out becomes mutation-aware (cancel/ignore stale callbacks, conditional token clears, redacted logging), window geometry persistence is moved to app-managed defaults as a fallback, update state transitions go through
UpdateViewModel.applyDriverState, and several input/IME and first-mouse/key forwarding paths are simplified/adjusted.Reviewed by Cursor Bugbot for commit 035e374. Bugbot is set up for automated code reviews on this repo. Configure here.
Summary by cubic
Keeps Claude Running after a
/clearby tracking the active Claude session (+turn) per workspace and ignoring stale events. Adds a direct regression test for #3614 and tightens auth, updates, IME, theclaudewrapper, browser key forwarding, and CI.Bug Fixes
SessionStart(source=clear)to Running; track active session/turn per workspace; ignore stalestop,prompt-submit,notification,pre-tool-use, andsession-end; clear activeturnIdafterstop; guardsession-endagainst the consumed workspace; normalize workspace keys; keep panel‑scoped PID/status updates; allow new sessions to replace stopped owners while keeping/clearnon‑replaceable.UpdateViewModel.applyDriverState, preserve detected update metadata for a stable pill, and dismiss stale Sparkle replies.claudewrapper: bypass hook/session injection for built‑in subcommands,--help/--version, and command‑like invocations discovered from real CLI help.Dependencies
codex_hooks = trueinconfig.toml, cleans legacy hooks config, and removes an empty[features]table if present; tests cover legacy marker and empty‑table cleanup.Written for commit 035e374. Summary will update on new commits.
Summary by CodeRabbit
New Features
Bug Fixes
Tests
CI / Chores