[eyeveil]

Why

The fork was 211 commits behind upstream main. This merges upstream through 6577c6b6 with real merge commits and keeps the fork's Home, dictation, provider homes, and Android navigation behavior.

What changed

• Merge upstream through 6577c6b6. 27 files conflicted. Most kept both sides. Upstream's rewritten mobile thread header and settings routing were taken whole, with the fork's Keyboard page and Home shortcuts re-applied.
• Dictation merges the fork's sentence-start capitals and detected-language transcripts with upstream's streaming transcription and its spacing rules for non-English text.
• Fork code follows upstream API changes: SecretResolver.label, EventSink.consumeProviderEvents, ProjectInvalidError, the moved keybinding matcher, and settingsPage(...).

Scope

• Covers the merge, its conflict fixes, and test updates for upstream API changes.
• The fork keeps pushing a thread over a pull request on Android, so Back returns to the diff. Upstream's new useOpenWorkspaceDetail replaces the page on Android, and the fork did not adopt that.

Tradeoffs

• Upstream's environment dictation now gets the fork's capital letter at the start of a draft, because both paths share resolveTranscriptCommit. The speech input test expects "Dictated" instead of "dictated".

Blast Radius

This touches most of the app, as any large sync does. The MCP tool list grows by the same 1364 fork-only bytes as before, so the agent context budget moves to 49483.

Verification

• vp run typecheck passes for every package. Three packages first exited 137 under memory pressure on the Mac and then passed when run alone.
• Tests beside each conflict pass, including voice input, keybindings, RunExecutionService, provider registry, and Android navigation.
• The remaining Mac-only failures come from /private/var temp paths and a symlink fixture. They also fail on a clean checkout on macOS.

Model and harness: Claude Opus 5.5 (lead, merge, review) via Claude Code in T3 Code.

---

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

[greptile-apps]

Confidence Score: 5/5

[High impact] The latest fixes appear safe to merge, with both previous findings addressed.

Summary

This PR merges upstream through 6577c6b6 while keeping the fork’s Home, dictation, provider homes, and Android navigation behavior.

• Composers can send microphone audio to a chosen environment for transcription.
• Mobile composers can start fresh sessions and side chats.
• Mobile workspace screens use shared route settings across layouts.
• Pull-request text fields offer completions and refreshed provider choices.
• The marketing site publishes clearer identity and search information.
• CI and release workflows change how app builds and artifacts are prepared.

_{Reviews (2) · Last reviewed commit: "Keep Android composer edits on their own..." · Reviewed by Greptile}