fix: join soft-wrapped rows when copying terminal text - #6923

@mvanhorn is attempting to deploy a commit to the Manaflow Team on Vercel.

A member of the Team first needs to authorize it.

sequenceDiagram
  participant User
  participant GhosttyTerminalView
  participant CmuxCopyReflow
  participant TerminalPasteboardService
  participant SystemClipboard
  User->>GhosttyTerminalView: Copy terminal selection
  GhosttyTerminalView->>CmuxCopyReflow: Classify and reflow eligible text
  CmuxCopyReflow-->>GhosttyTerminalView: Reflowed text
  GhosttyTerminalView->>TerminalPasteboardService: Rewrite text representations
  TerminalPasteboardService->>SystemClipboard: Publish replacement pasteboard item
  User->>GhosttyTerminalView: Invoke Copy Raw
  GhosttyTerminalView->>SystemClipboard: Publish verbatim selection

❌ Failed checks (1 error, 3 warnings)

_{Comment @coderabbitai help to get the list of available commands.}

Greptile Summary

This PR adds a "clean copy" reflow transform that rejoins hard-wrapped terminal text on Cmd+C, while preserving code fences, tables, blockquotes, lists, and URLs. All reflow logic lives in a new pure, dependency-free CmuxCopyReflow SwiftPM package (49 unit tests), integrated into the copy path with a 256 KB / 4 000-line guard so main-thread work stays bounded.

• New CmuxCopyReflow package — ReflowOptions.reflow(_:terminalWidth:) runs a two-pass classifier + paragraph joiner; heuristics are deliberately conservative and tested against real failing clipboard payloads.
• UI integration — GhosttyNSView tracks activeSelectionMayBeRectangular on Option-drag to bypass reflow for columnar selections (best-effort); copyRaw action (Cmd+Shift+C + context-menu item) always copies verbatim; the terminal.reflowCopy setting (default true) controls the default behaviour.
• Localization — all five new user-facing strings are translated across all 20 app locales in Localizable.xcstrings and all 20 web locales in web/messages/.

Confidence Score: 5/5

Safe to merge. The reflow transform is bounded, runs on the AppKit event thread where copy already occurs, and is guarded by a user-facing setting with a verbatim-copy escape hatch. Localization is complete across all 20 app and web locales.

All new production paths are bounded and conservative. The reflow engine lives in a well-tested, dependency-free package with 49 unit tests. The UI integration correctly gates reflow behind setting, line-count, and byte-count checks. No new blocking issues were found beyond what was already addressed in previous review threads.

No files require special attention. The most complex new file, CopyReflow.swift, is well-commented and has direct unit-test coverage for its edge cases.

Important Files Changed

Sequence Diagram

%%{init: {'theme': 'neutral'}}%%
sequenceDiagram
    participant User
    participant AppDelegate
    participant GhosttyNSView
    participant Ghostty as libghostty
    participant NSPasteboard
    participant ReflowEngine as CmuxCopyReflow

    User->>AppDelegate: Cmd+C (copy)
    AppDelegate->>GhosttyNSView: copyKeyboardCopyModeSelectionToClipboard / copy(_:)
    GhosttyNSView->>GhosttyNSView: activeSelectionShouldBypassCopyReflow()
    GhosttyNSView->>Ghostty: ghostty_surface_selection_screen_rows()
    Ghostty-->>GhosttyNSView: (topRow, bottomRow) or nil
    GhosttyNSView->>Ghostty: performBindingAction(copy_to_clipboard)
    Ghostty->>NSPasteboard: write formatted text
    GhosttyNSView->>GhosttyNSView: reflowCopySettings.value(for: reflowCopyKey)
    alt reflow enabled and bounds present and within limits
        GhosttyNSView->>NSPasteboard: string(forType: .string)
        NSPasteboard-->>GhosttyNSView: original text
        GhosttyNSView->>ReflowEngine: ReflowOptions.default.reflow(text, terminalWidth:)
        ReflowEngine-->>GhosttyNSView: reflowed text
        GhosttyNSView->>NSPasteboard: rewriteTextRepresentations(reflowed)
    else reflow off / raw / rectangular / too large
        Note over GhosttyNSView,NSPasteboard: original text left on pasteboard
    end
    User->>AppDelegate: Cmd+Shift+C (Copy Raw)
    AppDelegate->>GhosttyNSView: copyRawSelectionToClipboard()
    GhosttyNSView->>Ghostty: performBindingAction(copy_to_clipboard)
    Note over GhosttyNSView: reflow=false, pasteboard unchanged

%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
sequenceDiagram
    participant User
    participant AppDelegate
    participant GhosttyNSView
    participant Ghostty as libghostty
    participant NSPasteboard
    participant ReflowEngine as CmuxCopyReflow

    User->>AppDelegate: Cmd+C (copy)
    AppDelegate->>GhosttyNSView: copyKeyboardCopyModeSelectionToClipboard / copy(_:)
    GhosttyNSView->>GhosttyNSView: activeSelectionShouldBypassCopyReflow()
    GhosttyNSView->>Ghostty: ghostty_surface_selection_screen_rows()
    Ghostty-->>GhosttyNSView: (topRow, bottomRow) or nil
    GhosttyNSView->>Ghostty: performBindingAction(copy_to_clipboard)
    Ghostty->>NSPasteboard: write formatted text
    GhosttyNSView->>GhosttyNSView: reflowCopySettings.value(for: reflowCopyKey)
    alt reflow enabled and bounds present and within limits
        GhosttyNSView->>NSPasteboard: string(forType: .string)
        NSPasteboard-->>GhosttyNSView: original text
        GhosttyNSView->>ReflowEngine: ReflowOptions.default.reflow(text, terminalWidth:)
        ReflowEngine-->>GhosttyNSView: reflowed text
        GhosttyNSView->>NSPasteboard: rewriteTextRepresentations(reflowed)
    else reflow off / raw / rectangular / too large
        Note over GhosttyNSView,NSPasteboard: original text left on pasteboard
    end
    User->>AppDelegate: Cmd+Shift+C (Copy Raw)
    AppDelegate->>GhosttyNSView: copyRawSelectionToClipboard()
    GhosttyNSView->>Ghostty: performBindingAction(copy_to_clipboard)
    Note over GhosttyNSView: reflow=false, pasteboard unchanged

_{Reviews (35): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile}

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
cmux	Canceled	Comment	Jul 16, 2026 12:25am

Ping on this one @austinywang - thanks for the earlier look. The red checks (tests / activation-session) look like they just need a rebase, which I'm glad to push. Is there anything about the reflow behavior itself you'd want changed before it can go in?

Deployment failed with the following error:

The provided GitHub repository does not contain the requested branch or commit reference. Please ensure the repository is not empty.

@mvanhorn I’ve taken this through the maintainer-update pass and pushed the result to your fork branch. The reflow behavior itself is now in the shape I’d want before merge:

• merged current origin/main without dropping any of the existing follow-up commits
• added behavioral coverage for command/token continuations, URL-led prose, markdown-table detection, CJK terminators, and settings/shortcut wiring
• centralized reflow eligibility across copy entrypoints
• replaced the ambient static settings namespace with the typed CmuxSettings client/catalog path
• preserved Ghostty clipboard flavor availability and, on reflow, now regenerates existing HTML/RTF from the transformed text so rich editors cannot paste stale hard-wrapped content
• kept rectangular selections on the conservative verbatim path; Ghostty’s current C ABI does not expose the active selection shape, which was confirmed in the resolved review thread
• linked the package/tests into the Xcode targets and retained the tracked lockfiles

All nine inline review threads are resolved. The branch is currently MERGEABLE; fresh CI and activation runs are in progress on 6de0da03ed. I’m continuing to watch those and the final automated review pass.

@coderabbitai review

Addressing the remaining Greptile summary note: Swift already classifies U+00A0 (NO-BREAK SPACE) as whitespace on this PR's pinned toolchain. Verified directly with:

$ swift -e 'print(Character("\u{00A0}").isWhitespace)'
true

nextNonWhitespaceToken uses Character.isWhitespace, so it already treats decoded   / U+00A0 as a token boundary. The rich-text rewrite alignment therefore covers this case as written; no code change is needed.

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

@coderabbitai review

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

Final review reconciliation on the current branch:

• Fixed the wall-clock correctness-test finding in 29d3909; the 4,000-row case is now deterministic.
• Fixed the outside-diff quadratic Markdown-table scan finding in 6856132; promotion is single-pass and has 4,000-row stress coverage.
• The stale lockfile warning does not apply: CmuxCopyReflow is a dependency-free local package, and scripts/check-package-resolved-policy.py passes.
• The stale ambient-global warning is already resolved: table promotion is scoped to ReflowOptions and terminal-cell helpers are private to their file.
• Merged current main again in 9b1f4a2. Static Swift checks and the cmux policy gate are clean.

Appreciate you carrying this all the way to mergeable @austinywang - the continuation/table/CJK coverage covers the edges I was unsure about. Let me know if you need anything from me before it lands.

Thanks for all the work here, and sorry it sat so long. The soft-wrap part of #3096 is a real bug, and people hit it constantly.

I'm not going to merge this as-is, for two reasons:

• The default behavior. It makes heuristic reflow of hard-wrapped text the default for Cmd+C. That goes well beyond the soft-wrap bug, and it's a product call we'd want to make on purpose.
• Main has moved. The copy path in GhosttyTerminalView (configuredCopyToClipboardAction, captureNextStandardClipboardRepresentations) and mouse-up handling were rewritten, so the hook would need re-plumbing across about 10 files.

If you're up for it, a smaller PR would be easy to land: just fix soft-wrapped lines (join rows Ghostty marks as wrapped) on the current copy path, with hard-wrap reflow behind a setting that's off by default. Please leave out the plan doc, the ci.yml edit and the CmxIrohEndpointServerTests reorder. I'll review it quickly :)

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

Thanks @teamleaderleo, took you up on the smaller version and reworked this PR in place rather than opening another (b83f771, one commit on current main).

It now only joins rows Ghostty marks as soft-wrapped, on the current copy path, and leaves rectangular selections alone. Hard-wrap reflow is behind a Terminal setting that's off by default. The plan doc, the ci.yml edit and the test reorder are gone. The description has the testing details, including what I couldn't verify locally.

Thanks for this! I pushed the localization entries plus a few small fixes (catalog key read, keeping rich clipboard formats) to your branch :)

Merge receipt for ed0f1ca73a: every check was green at merge (33 verified; 19 skipped by policy). Full suite runs on main after merge.

Merged, thanks @mvanhorn :)

Thanks for the review and merge @teamleaderleo!