Skip to content

Fix upstream merge regressions for cmux#59

Merged
lawrencecchen merged 1 commit into
mainfrom
cmux-upstream-20260519-review-fixes
May 19, 2026
Merged

Fix upstream merge regressions for cmux#59
lawrencecchen merged 1 commit into
mainfrom
cmux-upstream-20260519-review-fixes

Conversation

@lawrencecchen
Copy link
Copy Markdown

@lawrencecchen lawrencecchen commented May 19, 2026

Fixes review findings from the cmux Ghostty upstream update.\n\nChanges:\n- Preserve command-palette-entry = clear when formatting cleared command palette config.\n- Parse +toggle-quick-terminal --class and pass the target through IPC.\n- Flush +toggle-quick-terminal stderr before returning.\n\nMakes fffdaad available for the cmux submodule update after merge.


Summary by cubic

Fix merge regressions from the Ghostty upstream update in cmux. Preserve command-palette-entry = clear, add --class support to +toggle-quick-terminal, and flush stderr reliably.

  • Bug Fixes
    • Config formatter now outputs clear when a command palette list is empty, preserving command-palette-entry = clear.
    • +toggle-quick-terminal parses --class and passes it through IPC to target the specified instance (instead of always using detect).
    • Flush stderr before exit, and print CLI parse errors to stderr with a non-zero status.

Written for commit fffdaad. Summary will update on new commits. Review in cubic

@chatgpt-codex-connector
Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, add credits to your account and enable them for code reviews in your settings.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 19, 2026

Warning

Rate limit exceeded

@lawrencecchen has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 34 minutes and 51 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: d24ccb19-4dbe-43a5-b946-c96b3c3259fe

📥 Commits

Reviewing files that changed from the base of the PR and between 8e38e10 and fffdaad.

📒 Files selected for processing (2)
  • src/cli/toggle_quick_terminal.zig
  • src/config/Config.zig
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch cmux-upstream-20260519-review-fixes

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@lawrencecchen lawrencecchen merged commit cec20c5 into main May 19, 2026
104 checks passed
@greptile-apps
Copy link
Copy Markdown

greptile-apps Bot commented May 19, 2026

Greptile Summary

This PR addresses three regression fixes for the cmux Ghostty upstream integration: it adds --class flag parsing to +toggle-quick-terminal so the target instance is passed through IPC, ensures the buffered stderr writer is flushed before the command returns, and corrects the empty RepeatableCommand formatter to emit = clear rather than a blank value.

  • toggle_quick_terminal.zig is refactored to extract a runArgs helper (mirroring the existing new_window.zig pattern), parse --class via the standard args.parse machinery, and flush the buffered stderr writer before propagating the result.
  • Config.zig fixes RepeatableCommand.formatEntry to write clear when the list is empty, preserving round-trip correctness for command-palette-entry = clear.

Confidence Score: 5/5

Both changes are safe to merge: targeted bug fixes with no new logic paths beyond what already exists in parallel commands.

The toggle_quick_terminal refactor mirrors the identical pattern already used in new_window.zig, memory lifetimes are correct (arena outlives performIpc), and stderr flushing is unconditional. The Config.zig change fixes a round-trip serialization bug and has a passing test to back it up.

No files require special attention.

Important Files Changed

Filename Overview
src/cli/toggle_quick_terminal.zig Adds --class argument parsing via runArgs refactor, passes the class to performIpc, and flushes buffered stderr — mirrors the established new_window.zig pattern correctly.
src/config/Config.zig Fixes RepeatableCommand.formatEntry to emit = clear for an empty list instead of a blank value, with the matching test expectation updated.

Sequence Diagram

sequenceDiagram
    participant CLI as +toggle-quick-terminal
    participant run as run()
    participant runArgs as runArgs()
    participant args as args.parse()
    participant IPC as apprt.App.performIpc()

    CLI->>run: invoke with alloc
    run->>run: build argsIterator
    run->>run: create buffered stderr writer
    run->>runArgs: "runArgs(alloc, &iter, stderr)"
    runArgs->>args: "parse(Options, alloc, &opts, iter)"
    args-->>runArgs: opts.class set (or null)
    runArgs->>IPC: "performIpc(alloc, .{.class=class}|.detect, .toggle_quick_terminal)"
    IPC-->>runArgs: success / IPCFailed / other error
    runArgs-->>run: !u8 result
    run->>run: stderr.flush() [always]
    run-->>CLI: return result
Loading

Reviews (1): Last reviewed commit: "Fix upstream merge regressions for cmux" | Re-trigger Greptile

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant