refactor: discriminated union for transport metadata, remove iOS proxy setup#23776
Merged
noanflaherty merged 1 commit intoApr 6, 2026
Conversation
noanflaherty
merged commit cdad2ac
into
noanflaherty/host-env-transport-hints
12 checks passed
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a882b15480
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Comment on lines
1156
to
+1157
| const preservingProxies = | ||
| conversation.isProcessing() && | ||
| sourceInterface !== "macos" && | ||
| sourceInterface !== "ios"; | ||
| conversation.isProcessing() && sourceInterface !== "macos"; |
There was a problem hiding this comment.
This update removes iOS proxy setup, but this condition now preserves existing proxies for any non-macOS interface during active turns. In a mixed-client scenario (macOS turn in flight, then iOS message queued on the same conversation), those preserved proxies are later re-enabled because drainQueueImpl still treats "ios" as desktop (assistant/src/daemon/conversation-process.ts around sourceInterface === "macos" || sourceInterface === "ios"). The queued iOS turn can therefore still execute host_bash/host_file/computer-use through the preserved desktop proxy, which contradicts the iOS removal and can run tools on the host unexpectedly.
Useful? React with 👍 / 👎.
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Devin Review found 2 potential issues.
🐛 1 issue in files not directly in the diff
🐛 Incomplete removal of iOS from host proxy restoration in queue drain path (assistant/src/daemon/conversation-process.ts:304)
The PR removes "ios" from the host bash/file/CU proxy creation checks in three locations (conversations.ts:304, server.ts:1078, conversation-routes.ts:1120) but misses a fourth location at assistant/src/daemon/conversation-process.ts:304. During queue draining, iOS-originating turns will still restore proxy availability and preactivate the "computer-use" skill via conversation.restoreProxyAvailability() and conversation.addPreactivatedSkillId("computer-use"), contradicting the PR's intent to restrict host proxies to macOS only. The comment on line 298 also still references "(macos/ios)" which should be updated to "(macos)" only.
View 2 additional findings in Devin Review.
Comment on lines
+34
to
+36
| hostHomeDir?: string; | ||
| /** Username of the host macOS user. */ | ||
| hostUsername?: string; |
Contributor
There was a problem hiding this comment.
🚩 New hostHomeDir/hostUsername fields are defined but not consumed server-side
The MacosTransportMetadata type adds hostHomeDir and hostUsername optional fields (assistant/src/daemon/message-types/conversations.ts:34-36), and the Swift client adds matching properties (clients/shared/Network/Generated/GeneratedAPITypes.swift:3591-3602). However, no server-side code currently reads these fields from the transport metadata. This is likely intentional scaffolding for future use — the fields are optional so nothing breaks — but the reviewer should confirm that a follow-up PR will consume them.
Was this helpful? React with 👍 or 👎 to provide feedback.
noanflaherty
added a commit
that referenced
this pull request
Apr 6, 2026
* Increase teleport import timeout from 2 to 5 minutes (#23749) * increase teleport import timeout from 2 to 5 minutes * fix: update platform import timeout error message to say 5 minutes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Update billing tab copy: referral subtitle, remove earning cap note, move credit info to card subtitle (#23751) * fix(macos): always collapse thinking blocks by default (#23750) Thinking blocks were auto-expanding during streaming, showing a wall of text. Remove the auto-expand logic so blocks always start collapsed. Users can still manually expand them. The header already shows "Thinking..." vs "Thought process" as a streaming indicator. Closes LUM-729 Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> * [LUM-684/LUM-726] Fix dictation crash: pass nil format to installTap (#23754) * Fix dictation crash: pass nil format to installTap, consolidate audio engine calls Pass nil for the format parameter in AVAudioNode.installTap(onBus:bufferSize:format:block:) so AVAudioEngine uses its own internal hardware format, which is always self-consistent. This prevents NSInternalInconsistencyException crashes caused by format.sampleRate != hwFormat.sampleRate when the cached format from outputFormat(forBus:) diverges from the engine's internal hardware format after audio route changes (Bluetooth, USB mic, AirPods mode switch). AudioEngineController.swift: - installTapAndStart() now passes nil instead of explicit format to installTap - Removed 6 now-unused methods: inputNodeFormat(), installTap(bufferSize:format:block:), removeTap(), prepare(), start(), prepareAndStart() OpenAIVoiceService.swift: - startRecording(): replaced separate inputNodeFormat/installTap/prepare/start chain with single installTapAndStart() call - startBargeInMonitor(): same migration to installTapAndStart() - Removed error-path removeTap() call (handled internally by installTapAndStart) Resolves: LUM-684, LUM-726 Co-Authored-By: tkheyfets <timur@vellum.ai> * fix: use explicit block: parameter in guard statements for installTapAndStart Swift doesn't support trailing closure syntax with guard statements, causing compilation errors. Use explicit block: parameter label instead. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace contrast buttons with primary style (#23753) Remove all production usages of .contrast button style in favor of .primary. Fixes white-on-white button visibility issues in chat composer. Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Inject host environment via transport hints (#23779) * refactor: discriminated union for transport metadata, remove iOS proxy setup (#23776) * feat: inject interface ID and macOS host environment into transport hints (#23777) * feat: send hostHomeDir and hostUsername from macOS client (#23778) * fix: remove iOS from proxy restoration in conversation-process.ts (#23782) --------- Co-authored-by: Carson Shaar <carson.s.shaar@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Tirman Sidhu <tirmansidhu@gmail.com>
dvargasfuertes
pushed a commit
that referenced
this pull request
Apr 6, 2026
* Increase teleport import timeout from 2 to 5 minutes (#23749) * increase teleport import timeout from 2 to 5 minutes * fix: update platform import timeout error message to say 5 minutes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Update billing tab copy: referral subtitle, remove earning cap note, move credit info to card subtitle (#23751) * fix(macos): always collapse thinking blocks by default (#23750) Thinking blocks were auto-expanding during streaming, showing a wall of text. Remove the auto-expand logic so blocks always start collapsed. Users can still manually expand them. The header already shows "Thinking..." vs "Thought process" as a streaming indicator. Closes LUM-729 Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> * [LUM-684/LUM-726] Fix dictation crash: pass nil format to installTap (#23754) * Fix dictation crash: pass nil format to installTap, consolidate audio engine calls Pass nil for the format parameter in AVAudioNode.installTap(onBus:bufferSize:format:block:) so AVAudioEngine uses its own internal hardware format, which is always self-consistent. This prevents NSInternalInconsistencyException crashes caused by format.sampleRate != hwFormat.sampleRate when the cached format from outputFormat(forBus:) diverges from the engine's internal hardware format after audio route changes (Bluetooth, USB mic, AirPods mode switch). AudioEngineController.swift: - installTapAndStart() now passes nil instead of explicit format to installTap - Removed 6 now-unused methods: inputNodeFormat(), installTap(bufferSize:format:block:), removeTap(), prepare(), start(), prepareAndStart() OpenAIVoiceService.swift: - startRecording(): replaced separate inputNodeFormat/installTap/prepare/start chain with single installTapAndStart() call - startBargeInMonitor(): same migration to installTapAndStart() - Removed error-path removeTap() call (handled internally by installTapAndStart) Resolves: LUM-684, LUM-726 Co-Authored-By: tkheyfets <timur@vellum.ai> * fix: use explicit block: parameter in guard statements for installTapAndStart Swift doesn't support trailing closure syntax with guard statements, causing compilation errors. Use explicit block: parameter label instead. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace contrast buttons with primary style (#23753) Remove all production usages of .contrast button style in favor of .primary. Fixes white-on-white button visibility issues in chat composer. Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Inject host environment via transport hints (#23779) * refactor: discriminated union for transport metadata, remove iOS proxy setup (#23776) * feat: inject interface ID and macOS host environment into transport hints (#23777) * feat: send hostHomeDir and hostUsername from macOS client (#23778) * fix: remove iOS from proxy restoration in conversation-process.ts (#23782) --------- Co-authored-by: Carson Shaar <carson.s.shaar@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Tirman Sidhu <tirmansidhu@gmail.com>
dvargasfuertes
pushed a commit
that referenced
this pull request
Apr 6, 2026
* Release v0.6.1 * Cherry-pick fixes for v0.6.1 (#23785) * Increase teleport import timeout from 2 to 5 minutes (#23749) * increase teleport import timeout from 2 to 5 minutes * fix: update platform import timeout error message to say 5 minutes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Update billing tab copy: referral subtitle, remove earning cap note, move credit info to card subtitle (#23751) * fix(macos): always collapse thinking blocks by default (#23750) Thinking blocks were auto-expanding during streaming, showing a wall of text. Remove the auto-expand logic so blocks always start collapsed. Users can still manually expand them. The header already shows "Thinking..." vs "Thought process" as a streaming indicator. Closes LUM-729 Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> * [LUM-684/LUM-726] Fix dictation crash: pass nil format to installTap (#23754) * Fix dictation crash: pass nil format to installTap, consolidate audio engine calls Pass nil for the format parameter in AVAudioNode.installTap(onBus:bufferSize:format:block:) so AVAudioEngine uses its own internal hardware format, which is always self-consistent. This prevents NSInternalInconsistencyException crashes caused by format.sampleRate != hwFormat.sampleRate when the cached format from outputFormat(forBus:) diverges from the engine's internal hardware format after audio route changes (Bluetooth, USB mic, AirPods mode switch). AudioEngineController.swift: - installTapAndStart() now passes nil instead of explicit format to installTap - Removed 6 now-unused methods: inputNodeFormat(), installTap(bufferSize:format:block:), removeTap(), prepare(), start(), prepareAndStart() OpenAIVoiceService.swift: - startRecording(): replaced separate inputNodeFormat/installTap/prepare/start chain with single installTapAndStart() call - startBargeInMonitor(): same migration to installTapAndStart() - Removed error-path removeTap() call (handled internally by installTapAndStart) Resolves: LUM-684, LUM-726 Co-Authored-By: tkheyfets <timur@vellum.ai> * fix: use explicit block: parameter in guard statements for installTapAndStart Swift doesn't support trailing closure syntax with guard statements, causing compilation errors. Use explicit block: parameter label instead. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace contrast buttons with primary style (#23753) Remove all production usages of .contrast button style in favor of .primary. Fixes white-on-white button visibility issues in chat composer. Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Inject host environment via transport hints (#23779) * refactor: discriminated union for transport metadata, remove iOS proxy setup (#23776) * feat: inject interface ID and macOS host environment into transport hints (#23777) * feat: send hostHomeDir and hostUsername from macOS client (#23778) * fix: remove iOS from proxy restoration in conversation-process.ts (#23782) --------- Co-authored-by: Carson Shaar <carson.s.shaar@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Tirman Sidhu <tirmansidhu@gmail.com> * [skip ci] Cherry-pick fixes for v0.6.1 (#23820) * revert: disable Teleport feature flag by default (#23744) (#23815) * fix: replace auxWhite-on-primaryBase with VButton across the app (#23802) * fix: use VButton for inline surface action buttons Replace raw Button with manual color functions in InlineSurfaceRouter with the design system VButton component. The manual buttonForeground used VColor.auxWhite (always #FFFFFF) against VColor.primaryBase which resolves to #FDFDFC in dark mode, producing invisible white-on-white text. Closes LUM-730 Co-Authored-By: ashlee@vellum.ai <ashlee@vellum.ai> * fix: replace auxWhite-on-primaryBase with VButton in additional locations FileUploadSurfaceView: Upload/Cancel buttons used raw Button with VColor.auxWhite on VColor.primaryBase — white-on-white in dark mode. Replaced with VButton(.primary) and VButton(.outlined). JITPermissionView: Permission buttons used the same auxWhite pattern. Replaced with VButton(.primary/.outlined, isFullWidth: true). ImproveExperienceStepView: ToS checkbox checkmark used auxWhite on primaryBase fill. Changed to VColor.contentInset which adapts per color scheme. ChatGallerySection: Gallery demo of surface action pills mirrored the old buggy pattern. Updated to use VButton so the gallery accurately represents production rendering. Co-Authored-By: ashlee@vellum.ai <ashlee@vellum.ai> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> * Make dictation engine start non-blocking with audio route resilience (#23811) * Make dictation engine start non-blocking and improve audio resilience - Add installTapAndStartAsync to AudioEngineController for non-blocking engine start using Swift concurrency (withCheckedContinuation) - Extract installTapAndStartImpl to share logic between sync/async paths - Listen for AVAudioEngineConfigurationChange to re-prewarm inputNode after Bluetooth device connect/disconnect and AirPods mode switches - Restructure VoiceInputManager.beginRecording() to show recording UI and play activation chime immediately, then start engine async via Task - Move DictationContextCapture off the critical path: engine starts concurrently on its audio queue while context capture runs on main - Add SFSpeechRecognizer transient unavailability retry (recreate if isAvailable returns false after sleep/wake or heavy use) - Handle edge case where PTT is released before async engine start completes (stopRecordingForDictation cleans up directly) Co-Authored-By: tkheyfets <timur@vellum.ai> * Tear down engine when async startup outlives recording session When PTT is released before installTapAndStartAsync completes, the isRecording guard now stops and removes the tap if the engine started successfully, preventing the mic path from staying alive with no active recording session. Co-Authored-By: tkheyfets <timur@vellum.ai> * Add recording generation token and gate context capture on start success Co-Authored-By: tkheyfets <timur@vellum.ai> * Guard stale teardown against active sessions and gate rewarm on mic auth Co-Authored-By: tkheyfets <timur@vellum.ai> * Move context capture to Task.detached to avoid blocking main actor Co-Authored-By: tkheyfets <timur@vellum.ai> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: tkheyfets <timur@vellum.ai> * [LUM-681] Fix audio tap format mismatch by resetting engine before installTap (#23766) After audio-route changes (Bluetooth, USB mic, AirPods mode switch), the format cached inside AVAudioInputNode diverges from the engine's actual hardware format. Both outputFormat(forBus:) and a nil format argument to installTap resolve to this stale value, causing: 'Failed to create tap due to format mismatch, <AVAudioFormat: 2 ch, 44100 Hz, Float32, deinterleaved>' Fix: call audioEngine.reset() before re-querying the format, then pass it explicitly to installTap. This forces the engine to discard its cached graph state and re-read the hardware, so the tap, node, and engine all agree. Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: tkheyfets <timur@vellum.ai> * fix: pass transport hints through HTTP message endpoint for managed-mode conversations (#23824) * fix: pass transport metadata through POST /v1/messages to enable host environment hints The HTTP message handler auto-creates conversations without transport metadata, so applyTransportMetadata() returns early and host environment hints (hostHomeDir, hostUsername) are never injected into the LLM context. This causes the assistant to hallucinate the user's home directory path from their display name instead of using the actual macOS username. Thread transport metadata from the message request body through SendMessageDeps.getOrCreateConversation() to the daemon, and send hostHomeDir/hostUsername from the macOS client in every message request. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: replace dynamic imports with static type imports Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: reset non-version-bump files to match main Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Noa Flaherty <noa@vellum.ai> Co-authored-by: Carson Shaar <carson.s.shaar@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai> Co-authored-by: tkheyfets <timur@vellum.ai> Co-authored-by: Tirman Sidhu <tirmansidhu@gmail.com> Co-authored-by: David Vargas Fuertes <vargasvellum@Davids-MacBook-Pro.local>
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
1 participant
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.
Summary
Part of plan: host-env-transport-hints.md (PR 1 of 3)