Repository navigation
Draft: stack 22 later review PRs on the integration - #2667
Merged
Merged
Conversation
…(UI-OVERLAY-A-8) # Conflicts: # Sources/UI/Overlay/FloatingOverlayController.swift
…sland (UI-OVERLAY-A-3)
… values (APP-DICTATION-7) # Conflicts: # Sources/App/TranscriptedSupportActions.swift
…ertions (UI-OVERLAY-A-10)
…S 26 (SPEECH-A-8)
…ns (MEETING-A-11)
… (UI-SETTINGS-A-4) # Conflicts: # Sources/UI/Settings/AGENTS.md # Sources/UI/Settings/HomePresentation.swift # Tests/HomePresentationTests.swift # docs/repo-layout.md
…ivations (MEETING-A-12)
# Conflicts: # Tests/TranscriptedWritingTests/Runtime/TildeSettingsTests.swift
…Is (WRITING-RUNTIME-6)
(cherry picked from commit 632b19b)
…bility (MEETING-B-3)
PR #2613 deleted HomeFeedbackSheet, the only SettingsInlineActionButton call in the Home surface files, so the UI automation contract pin on it no longer holds.
The FileHandle rule now reads TranscriptFrontmatterScanner.swift, so the test-matrix trigger paths follow it. No rule reads the RetroactiveSpeakerUpdater files any more.
The unannotated tuple from withAudioGraphLock compiled on Swift 6.4 but not on the hosted CI toolchain, which inferred non-optional elements and rejected the if-let bindings that follow (app-build, spm-tests and the full bench all failed in Build dependencies). Use an explicitly typed closure, as the Stop path in the same change already does.
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
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.
What this is
The second batch of review PRs, stacked on the #2530 integration (
e66e3e4). 106 PRs (#2558–#2663) were opened after #2530 was frozen. Each one was triaged against the integration head and then got an independent second read. 83 turned out to be already inside #2530 or to be notes that only record a review finding, so they aren't here. This branch carries the rest.Included (22 PRs)
Merged with
--no-ff, so each PR's exact head is an ancestor: #2558, #2561, #2568, #2570, #2571, #2574, #2605, #2606, #2609, #2610, #2613, #2614, #2618, #2619, #2626, #2634, #2643, #2645, #2647, #2659, #2662.#2646 landed as its child commit only (
632b19bf7, cherry-picked with-x): Stop and recovery read the engine, input node and pinned refs under the audio graph lock. Its parent #2639 is not on this branch.What they do, roughly:
Conflict resolutions and follow-up commits
SettingsInlineActionButton(call in the Home files, so the matching source pin inUIAutomationSurfaceContractTestswas removed.TranscriptFrontmatterScanner.swift.Not included
stop()can return early and leave a start stuck, and it has no hardware proof. A small redo of its real race fixes is being prepared separately.build-beta.shCLI).Checks (on this Mac, by the integrating agent)
bash check.sh quick: PASS (113 passed).bash run-tests.sh: 54,340 of 54,341 passed before the pin fix; the one failure was the pin above. After the fix only the affected filter was rerun (85/85). The full fast suite was not rerun after that one-line test change.bash build.sh --no-open: PASS.TRANSCRIPTED_DISABLE_FILE_LOGGER=1 swift test: one failure in 714 Speaker tests (testInventoryCountsEachPersonsClipsMeetingsAndSpeech, fixture cleanup) while a build ran alongside. It passed 17/17 when rerun alone. Not quarantined and not fixed; none of these PRs touch it.Four area reviewers read the combined diff. Three found nothing; the fourth found the matrix rule above, now fixed.
Not verified: anything on real audio hardware, and CI on this exact head (dispatched separately).
🤖 Generated with Claude Code