[DananzMolt]

Brings Ivrix up from its 2026-07-26 base (015b603d) to current cmux main (2d93494c, 2026-09-21). Companion ghostty PR: Dananz/ghostty#1.

Base is ivrix-prompt-selection-edit-app (the v1.1.3 line) because that is the real parent of this work. Note hebrew-bidi is stale: its only unique commits are 3 merge commits, and every real commit on it is a rebased duplicate of what is on the v1.1.3 line.

Approach

A real git merge -X diff-algorithm=histogram, not the squash-onto-a-fresh-base of previous syncs (86f946a9b7). That gives future syncs an ancestor, and it resolved far better: Surface.zig on the ghostty side merged clean where a squashed git apply -3 produced 12 conflict hunks.

Conflicts (17 files)

• Info.plist — rebuilt from upstream, then re-ran the Ivrix rebrand rule. Upstream had grown from 4 "A program running within cmux" strings to 34, so re-deriving the rule beat patching old text.
• InfoPlist.xcstrings — same: 321 new upstream permission strings across all locales arrived naming cmux. Ivrix 1.1.3 had zero left, so all were converted.
• Localizable.xcstrings — needed nothing. Ivrix only rebrands 4 app-name keys (about.appName, dialog.quitCmux.title, menu.app.about, menu.quitCmux); all 4 are still Ivrix in all 19 locales. The other ~2,500 body-copy strings mentioning cmux are deliberately left alone.
• ShortcutAction — upstream split group and displayName into sibling files; toggleTextDirection re-added across all three.
• SettingsNavigation — upstream moved SettingsSearchIndex to its own file; the two Ivrix rows follow it there.
• UpdateFeedResolver — kept upstream's hostArchitecture init, defaulting the fallback to Ivrix's appcast, never upstream cmux's.
• GhosttyTerminalView — kept appliedHebrewFont, dropped the stale bellAudioSound field upstream replaced with TerminalBellService.
• project.pbxproj — took upstream and re-applied the 12 Ivrix entries (Fonts resource, HebrewAsciiQuotes + tests).
• Rest (TerminalSection, KeyboardShortcutSettings, shortcuts/schema/docs, updater tests, CHANGELOG): both sides kept.

Two compile breaks the merge could not see

• iconLabel() gained a required foregroundColor; the titlebar direction button now passes it.
• ShortcutAction.dockShortcutRoutingDisposition is an exhaustive switch. toggleTextDirection is .mainContainer: it flips a global UserDefaults value, not a surface tree, so it must not be Dock-scoped.

Verification

• ghostty: 5210/5245 lib-vt (54/54 bidi), 113/113 full-app bidi, xcframework builds. The one lib-vt failure reproduces on clean upstream.
• cmux: every Swift/ObjC/C source compiles, 0 errors. The build then stops in the cmux-cua Run Script phase, which spawns libtool from an Xcode.app toolchain path — this machine has only Command Line Tools, no Xcode.app. That script and crate are pure upstream, untouched here. Link and bundle are therefore unverified locally and need a machine with Xcode.

Deliberately not done

Version left at Ivrix 1.1.3 / 104 — this is a sync, not a release.