base red: Move to Cloud's text is CmuxNextCloudUI's CloudMoveStrings (arch app_lines +74 from #33567)

Merged
LA
2d ago
+3874-3863

Fixes the #33567 part of the arch-ratchet red over the last green arch tip 6500d46a95f4 ([app_lines] CmuxNextApp Swift lines: +195). Culprits per commit (arch-ratchet.py --base PARENT --head COMMIT): e8fc11865f8 (#33567) +74, 84aa409a31c (#33324) +141, a848b28fded (#33155) +1 (fixed by #33610), f0db13630a7 -17, 891c596da7a -2. This PR is the #33567 one; #33324 gets its own.

Takes back #33567: only CloudMoveStrings moves package with its keys; every text and locale is the same.

Cause

#33567 added 74 CmuxNextApp lines: 13 in CloudMoveStrings (the failed link step's text) and the rest in the Cloud move, start and session code that shows it.

Fix

Move to Cloud's text belongs with the Cloud UI strings. CloudMoveStrings moves whole from CmuxNextApp to CmuxNextCloudUI, as a public struct (the form of CloudPortStrings), and its 29 keys move from the App's Cloud.xcstrings to CmuxNextCloudUI's Cloud.xcstrings, every locale unchanged (checked: the App catalog minus the 29 keys and the CloudUI catalog plus them are equal, key by key, to the base). The 7 App files and 3 App tests that use it import CmuxNextCloudUI (the App already depends on it). No arch exception.

arch-ratchet.py --base HEAD^ --head HEAD: app_lines -104 (CmuxNextApp -104).

Red at the base, green at the head

Command: python3 scripts/cmux-next/arch-ratchet.py --base PARENT --head COMMIT

  • Red at e8fc11865f8 over its parent: +74.
  • This PR's commit: -104, no count rises. The row over 6500d46a95f4 stays red until #33324's lines move (+141).

Changelog

none

Observed / Not run

Observed: the ratchet runs above; prepush-gate.py, lint-ios-package-conventions.sh, check-xcstrings-keys.py and lint-xcstrings.py --catalog on both catalogs passed.
Fleet: compile-check CmuxNext (job 28698af681cf37ddcfe805c0) stops on the base Release compile red in CmuxNextSidebar/Logic/GroupJoinHold.swift:85 (from #33578; fixes #33653 and #33680 are open), before the files of this PR. The suites CloudMoveTests, CloudHintCommandsTests and CloudStartChatMachineTests run after that fix lands; result in a comment.
Not run: no local Swift build (rule).

Autofix with [code]smith
Open in [code]smith · Need help on this PR? Tag @codesmith-bot with what you need.

Summary by cubic

Fixes the #33567 arch-ratchet red by moving Move to Cloud's text from CmuxNextApp to CmuxNextCloudUI, where it belongs with the rest of the Cloud UI strings.

All of CloudMoveStrings moves into CmuxNextCloudUI as a public struct (matching CloudPortStrings), and its 29 keys move from the App's Cloud.xcstrings to CmuxNextCloudUI's, with every locale unchanged. The 7 App source files and 3 App test files that use the strings now import CmuxNextCloudUI. Net result: CmuxNextApp loses 104 architecture lines and no count rises. Merging in the latest feat-cmux-next doesn't change the diff or counts.