diff --git a/src/content/docs/changelog/2026.mdx b/src/content/docs/changelog/2026.mdx
index 9f15f57e..72c19537 100644
--- a/src/content/docs/changelog/2026.mdx
+++ b/src/content/docs/changelog/2026.mdx
@@ -6,6 +6,75 @@ description: >-
 
 Submit bugs and feature requests on our [GitHub board!](https://github.com/warpdotdev/Warp/issues/new/choose)
 
+### 2026.06.17 (v0.2026.06.17.09.49)
+
+**New features**
+
+* Adds support for git chips over remote environments. ([#12542](https://github.com/warpdotdev/warp/pull/12542))
+* Added a "Format on save" setting (Settings → Code) to disable automatic LSP formatting on save while keeping other LSP features enabled. ([#12254](https://github.com/warpdotdev/warp/pull/12254))
+* Conversations can now be renamed using the `/rename-conversation` command. ([#12323](https://github.com/warpdotdev/warp/pull/12323))
+
+**Improvements**
+
+* Added a warp://settings/warp_agent deep link that opens the Warp Agent settings page directly. ([#12720](https://github.com/warpdotdev/warp/pull/12720))
+* Added hover tooltips to all git dialog action buttons (Commit, Push, Publish, Create PR, View PR) so their purpose is clear at a glance. ([#12709](https://github.com/warpdotdev/warp/pull/12709))
+* Transient network error banners now surface the underlying error details to aid in debugging connection issues. ([#12497](https://github.com/warpdotdev/warp/pull/12497))
+* Warp now offers a one-time prompt to enable automatic local-to-cloud handoff when your computer sleeps during a local agent run, and shows a confirmation toast when an automatic handoff completes. ([#12514](https://github.com/warpdotdev/warp/pull/12514))
+* [Windows] Reduced lag when switching tabs to a WSL tab. ([#12492](https://github.com/warpdotdev/warp/pull/12492))
+* The experimental tmux-based SSH warpification flow has been removed in favor of Warp's SSH extension. Users who had opted into the tmux wrapper see a one-time notice on their next SSH session. ([#12478](https://github.com/warpdotdev/warp/pull/12478))
+* Hitting enter with an empty input and queued prompt(s) now automatically sends your top queued prompt. ([#12536](https://github.com/warpdotdev/warp/pull/12536))
+* Conversations can now be renamed by double-clicking their title in the conversation list. ([#12409](https://github.com/warpdotdev/warp/pull/12409))
+* Double-click the empty area of the vertical tabs panel to open a new tab. ([#12506](https://github.com/warpdotdev/warp/pull/12506))
+* Added an opt-in setting (`warpify.ssh.reuse_existing_control_master`) that makes Warp's SSH wrapper attach to an existing SSH ControlMaster for the destination host instead of always creating its own, preserving user-managed masters and their port forwards. ([#12465](https://github.com/warpdotdev/warp/pull/12465))
+* Mermaid diagrams in AI responses now scale to the full available width instead of being constrained to a fixed height. ([#12488](https://github.com/warpdotdev/warp/pull/12488))
+* Agent completion notifications are no longer shown when a follow-up prompt is queued to auto-send. ([#12461](https://github.com/warpdotdev/warp/pull/12461))
+* SuperGrok: connecting an xAI Grok subscription to use Grok models in the agent is now available on stable (previously dogfood only). ([#12494](https://github.com/warpdotdev/warp/pull/12494))
+* Agent questions now size to their content, allowing a single question to use more vertical room. ([#11719](https://github.com/warpdotdev/warp/pull/11719))
+* Cloud agents that pause to wait for inbound events from child agents are now correctly held in a "waiting" state instead of being prematurely treated as completed. ([#12084](https://github.com/warpdotdev/warp/pull/12084))
+
+**Bug fixes**
+
+* Added a fallback to paste the xAI authorization code when connecting a SuperGrok subscription, so sign-in can complete even when the browser can't reach the loopback redirect. ([#12599](https://github.com/warpdotdev/warp/pull/12599))
+* Fixed several tab group bugs affecting special system-managed tabs. ([#12706](https://github.com/warpdotdev/warp/pull/12706))
+* Fixed macOS native window chrome events (e.g. window close/minimize) being dropped in certain situations. ([#12557](https://github.com/warpdotdev/warp/pull/12557))
+* Project explorer now sorts numbered files in natural (numeric-aware) order — e.g. file2 before file10. ([#11991](https://github.com/warpdotdev/warp/pull/11991))
+* Cloud agent runs and local agent conversations now automatically recover from transient network failures mid-turn (showing a "Reconnecting" status) instead of failing the run. ([#12431](https://github.com/warpdotdev/warp/pull/12431))
+* Fixed an issue where pressing Ctrl-C to stop a command monitored by Warp Agent could leave the conversation stuck showing `Warping…`. ([#12623](https://github.com/warpdotdev/warp/pull/12623))
+* Warp now immediately surfaces a clear error message when a required platform plugin is not installed correctly, instead of silently failing. ([#12471](https://github.com/warpdotdev/warp/pull/12471))
+* Fixed child agent status chips lingering in the UI when agent runs fail immediately on start. ([#12649](https://github.com/warpdotdev/warp/pull/12649))
+* Fixed a crash and mis-rendering when parsing certain Markdown content with very long delimiter runs. ([#12644](https://github.com/warpdotdev/warp/pull/12644))
+* Fixed vertical tabs toolbar buttons appearing underneath macOS traffic light buttons when the tools panel is open. ([#12660](https://github.com/warpdotdev/warp/pull/12660))
+* Fixed a regression where pane layout was not saved correctly when closing the app. ([#12672](https://github.com/warpdotdev/warp/pull/12672))
+* Fixed double-slash prefix (e.g. `//home/user/...`) shown in the read_skill action header when the skill is not yet indexed by Warp. ([#12668](https://github.com/warpdotdev/warp/pull/12668))
+* [Windows] Fixed pasted CRLF line endings breaking multi-line commands in POSIX shells. ([#12446](https://github.com/warpdotdev/warp/pull/12446))
+* Fixed attaching files or context blocks via CLI rich input not working correctly. ([#11509](https://github.com/warpdotdev/warp/pull/11509))
+* Command search in the terminal (Ctrl-R) now prioritizes commands in your history. ([#12600](https://github.com/warpdotdev/warp/pull/12600))
+* Fixed a rare reversed line range when an AI file read truncated a file whose first line exceeded the remaining byte budget. ([#12642](https://github.com/warpdotdev/warp/pull/12642))
+* Fixed queued prompts in sub-agent conversations sometimes not being sent when a sibling agent block obscured the turn-end signal. ([#12573](https://github.com/warpdotdev/warp/pull/12573))
+* Fixed the code review file section header rendering opaque square corners behind its rounded background. ([#12447](https://github.com/warpdotdev/warp/pull/12447))
+* Fixed inline images emitted during shell startup (e.g. `fastfetch`) being dropped instead of rendered. ([#10478](https://github.com/warpdotdev/warp/pull/10478))
+* Fixed git diff status chips not appearing in the prompt when untracked directories (e.g. nested repos or worktrees) are present. ([#12590](https://github.com/warpdotdev/warp/pull/12590))
+* Fixed custom inference endpoint and BYO API key settings inputs becoming unreadable after switching themes. ([#12521](https://github.com/warpdotdev/warp/pull/12521))
+* Fixed the theme picker causing the top tab bar to pass underneath macOS traffic light buttons. ([#11052](https://github.com/warpdotdev/warp/pull/11052))
+* Fixed header text alignment in markdown viewer — headers now share the same left edge as paragraph text. ([#12371](https://github.com/warpdotdev/warp/pull/12371))
+* Fixed "Open skill" buttons sharing hover and click state when multiple skills are read in one agent block. ([#12429](https://github.com/warpdotdev/warp/pull/12429))
+* Fixed code review "attach as context" actions (diff hunk, selection, and diff set) sometimes targeting a different agent conversation than the one in focus when using orchestrated agents. ([#12524](https://github.com/warpdotdev/warp/pull/12524))
+* Fixed Cmd+Enter incorrectly starting new agent conversations instead of submitting the current prompt. ([#12540](https://github.com/warpdotdev/warp/pull/12540))
+* Fixed launch crashes on Macs with legacy Metal driver stacks by pinning the Metal AIR bytecode target to the app's minimum macOS deployment target. ([#12496](https://github.com/warpdotdev/warp/pull/12496))
+* Fixed CLI environment updates resetting secret selection to "All Secrets". ([#12280](https://github.com/warpdotdev/warp/pull/12280))
+* Fixed Shift+Backspace deleting a whole word instead of one character on Windows. ([#11563](https://github.com/warpdotdev/warp/pull/11563))
+* Fixed connected SuperGrok subscriptions silently failing to authenticate once the OAuth access token expired; tokens are now refreshed automatically. ([#12516](https://github.com/warpdotdev/warp/pull/12516))
+* Fixed user-installed CLIs (e.g. `gcloud`, `gh`) and language servers failing to resolve when shell startup files print output on launch. ([#12473](https://github.com/warpdotdev/warp/pull/12473))
+* Fixed commands rendering with duplicated or missing characters when using the Warp prompt with zsh themes (e.g. oh-my-zsh's robbyrussell) alongside plugins such as zsh-syntax-highlighting. ([#12438](https://github.com/warpdotdev/warp/pull/12438))
+* Fixed `/fork` with an attached image — attachments are now sent with the initial prompt in the new forked conversation. ([#12376](https://github.com/warpdotdev/warp/pull/12376))
+* [Windows] Fixed terminal response sequences getting dropped, which caused `edit.exe` to hang indefinitely and NeoVim 0.12 to start slowly. ([#11906](https://github.com/warpdotdev/warp/pull/11906))
+* Orchestrated child agents can now correctly read plans from parent agents. ([#12359](https://github.com/warpdotdev/warp/pull/12359))
+* Fixed MCP tool argument coercion not applying integer conversion recursively to nested object, array, and oneOf schemas. ([#10640](https://github.com/warpdotdev/warp/pull/10640))
+
+**Oz updates**
+
+* By default, cloud agent runs now continue without configured MCP servers that fail to start within the 20-second startup window, instead of failing the run. ([#12470](https://github.com/warpdotdev/warp/pull/12470))
+
 ### 2026.06.10 (v0.2026.06.10.09.27)
 
 **New features**
diff --git a/src/content/docs/support-and-community/community/open-source-licenses.mdx b/src/content/docs/support-and-community/community/open-source-licenses.mdx
index 9a07144a..b160500f 100644
--- a/src/content/docs/support-and-community/community/open-source-licenses.mdx
+++ b/src/content/docs/support-and-community/community/open-source-licenses.mdx
@@ -111,6 +111,7 @@ sidebar:
 | cpal 0.17.1 | Apache License 2.0 |
 | cvt 0.1.2 | Apache License 2.0 |
 | graphql-ws-client 0.11.1 | Apache License 2.0 |
+| opentelemetry-proto 0.32.0 | Apache License 2.0 |
 | rustls-platform-verifier 0.6.2 | Apache License 2.0 |
 | spinning 0.1.0 | Apache License 2.0 |
 | sys-locale 0.3.2 | Apache License 2.0 |
@@ -291,7 +292,7 @@ sidebar:
 | fastrand 2.3.0 | Apache License 2.0 |
 | filetime 0.2.25 | Apache License 2.0 |
 | fixedbitset 0.5.7 | Apache License 2.0 |
-| flate2 1.1.1 | Apache License 2.0 |
+| flate2 1.1.9 | Apache License 2.0 |
 | fnv 1.0.7 | Apache License 2.0 |
 | form_urlencoded 1.2.1 | Apache License 2.0 |
 | freetype 0.7.2 | Apache License 2.0 |
@@ -662,6 +663,10 @@ sidebar:
 | objc2-metal 0.3.2 | Apache License 2.0 |
 | objc2-quartz-core 0.3.2 | Apache License 2.0 |
 | oneshot 0.1.13 | Apache License 2.0 |
+| opentelemetry-http 0.32.0 | Apache License 2.0 |
+| opentelemetry-otlp 0.32.0 | Apache License 2.0 |
+| opentelemetry 0.32.0 | Apache License 2.0 |
+| opentelemetry_sdk 0.32.1 | Apache License 2.0 |
 | ouroboros 0.18.0 | Apache License 2.0 |
 | ouroboros_macro 0.18.0 | Apache License 2.0 |
 | owned_ttf_parser 0.25.0 | Apache License 2.0 |
@@ -854,8 +859,10 @@ sidebar:
 | http-body 0.4.6 | MIT License |
 | tracing-attributes 0.1.31 | MIT License |
 | tracing-core 0.1.36 | MIT License |
+| tracing-futures 0.2.5 | MIT License |
 | tracing-log 0.2.0 | MIT License |
-| tracing-subscriber 0.3.20 | MIT License |
+| tracing-opentelemetry 0.33.0 | MIT License |
+| tracing-subscriber 0.3.23 | MIT License |
 | tracing 0.1.44 | MIT License |
 | tower-layer 0.3.3 | MIT License |
 | tower-service 0.3.3 | MIT License |
@@ -903,6 +910,7 @@ sidebar:
 | tiff 0.10.3 | MIT License |
 | typed-arena 2.0.2 | MIT License |
 | alsa-sys 0.3.1 | MIT License |
+| alphanumeric-sort 1.5.7 | MIT License |
 | enclose 1.1.8 | MIT License |
 | dashmap 6.1.0 | MIT License |
 | comfy-table 7.2.1 | MIT License |
@@ -956,6 +964,7 @@ sidebar:
 | arborium-json 2.13.0 | MIT License |
 | arborium-kotlin 2.13.0 | MIT License |
 | arborium-lua 2.13.0 | MIT License |
+| arborium-nix 2.13.0 | MIT License |
 | arborium-objc 2.13.0 | MIT License |
 | arborium-php 2.13.0 | MIT License |
 | arborium-powershell 2.13.0 | MIT License |
@@ -1031,6 +1040,7 @@ sidebar:
 | tokio 1.50.0 | MIT License |
 | simd-adler32 0.3.7 | MIT License |
 | getset 0.1.2 | MIT License |
+| deltae 0.3.2 | MIT License |
 | imagesize 0.14.0 | MIT License |
 | serde-wasm-bindgen 0.6.5 | MIT License |
 | crossterm 0.29.0 | MIT License |
@@ -1038,7 +1048,6 @@ sidebar:
 | line-span 0.1.5 | MIT License |
 | fluent-uri 0.1.4 | MIT License |
 | downcast 0.11.0 | MIT License |
-| deltae 0.3.2 | MIT License |
 | endi 1.1.0 | MIT License |
 | is-terminal 0.4.17 | MIT License |
 | unsafe-libyaml 0.2.11 | MIT License |
@@ -5414,6 +5423,7 @@ Apache License 2.0
   - cpal 0.17.1
   - cvt 0.1.2
   - graphql-ws-client 0.11.1
+  - opentelemetry-proto 0.32.0
   - rustls-platform-verifier 0.6.2
   - spinning 0.1.0
   - sys-locale 0.3.2
@@ -12533,7 +12543,7 @@ Apache License 2.0
   - fastrand 2.3.0
   - filetime 0.2.25
   - fixedbitset 0.5.7
-  - flate2 1.1.1
+  - flate2 1.1.9
   - fnv 1.0.7
   - form_urlencoded 1.2.1
   - freetype 0.7.2
@@ -17748,6 +17758,10 @@ Apache License 2.0
   - objc2-metal 0.3.2
   - objc2-quartz-core 0.3.2
   - oneshot 0.1.13
+  - opentelemetry-http 0.32.0
+  - opentelemetry-otlp 0.32.0
+  - opentelemetry 0.32.0
+  - opentelemetry_sdk 0.32.1
   - ouroboros 0.18.0
   - ouroboros_macro 0.18.0
   - owned_ttf_parser 0.25.0
@@ -19912,8 +19926,10 @@ DEALINGS IN THE SOFTWARE.
 MIT License
   - tracing-attributes 0.1.31
   - tracing-core 0.1.36
+  - tracing-futures 0.2.5
   - tracing-log 0.2.0
-  - tracing-subscriber 0.3.20
+  - tracing-opentelemetry 0.33.0
+  - tracing-subscriber 0.3.23
   - tracing 0.1.44
 --------------------------------------------------------------------------------
 Copyright (c) 2019 Tokio Contributors
@@ -20696,6 +20712,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+MIT License
+  - alphanumeric-sort 1.5.7
+--------------------------------------------------------------------------------
+MIT License
+
+Copyright (c) 2018 magiclen.org (Ron Li)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 MIT License
   - enclose 1.1.8
 --------------------------------------------------------------------------------
@@ -21549,6 +21591,7 @@ MIT License
   - arborium-json 2.13.0
   - arborium-kotlin 2.13.0
   - arborium-lua 2.13.0
+  - arborium-nix 2.13.0
   - arborium-objc 2.13.0
   - arborium-php 2.13.0
   - arborium-powershell 2.13.0
@@ -21745,6 +21788,31 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+MIT License
+  - deltae 0.3.2
+--------------------------------------------------------------------------------
+MIT License
+
+Copyright 2019 Ryan O'Beirne
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 MIT License
   - imagesize 0.14.0
 --------------------------------------------------------------------------------
@@ -21890,7 +21958,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 
 MIT License
-  - deltae 0.3.2
   - endi 1.1.0
   - is-terminal 0.4.17
   - unsafe-libyaml 0.2.11
diff --git a/src/content/docs/support-and-community/privacy-and-security/privacy.mdx b/src/content/docs/support-and-community/privacy-and-security/privacy.mdx
index 64bec45b..bdbc5ddc 100644
--- a/src/content/docs/support-and-community/privacy-and-security/privacy.mdx
+++ b/src/content/docs/support-and-community/privacy-and-security/privacy.mdx
@@ -717,7 +717,6 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `AIAutonomy.ToggledAutoexecuteReadonlyCommandsSetting` | Toggled setting to autoexecute readonly Agent Mode requested commands |
 | `Active Indexed Repos Changed` | Active indexed repositories changed, affecting codebase context. |
 | `Add Added Subshell Command` | Added a command to be automatically Warpified via Warp's subshell wrapper |
-| `Add Denylisted SSH Tmux Wrapper Host` | Added a SSH host to the denylist for prompting for Tmux Wrapper |
 | `Add Denylisted Subshell Command` | Explicitly prevent a command from being Warpified via Warp's subshell wrapper |
 | `Add Tab With Shell` | Added a tab with specific shell |
 | `Added Workflow Alias` | Added an alias to a Warp Drive workflow |
@@ -828,6 +827,9 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `AmbientAgent.EnvironmentSettings.Opened` | User opened the environment management pane |
 | `AmbientAgent.EnvironmentSettings.UpdatedEnvironment` | User updated an existing environment |
 | `AmbientAgent.Handoff.Initiated` | User initiated a local-to-cloud handoff |
+| `AmbientAgent.Handoff.SleepPrompt.Dismissed` | User dismissed the auto-handoff sleep discoverability prompt |
+| `AmbientAgent.Handoff.SleepPrompt.Enabled` | User enabled auto-handoff on sleep from the discoverability prompt |
+| `AmbientAgent.Handoff.SleepPrompt.Shown` | The auto-handoff sleep discoverability prompt was shown on wake |
 | `AmbientAgent.Handoff.SnapshotPrepared` | Handoff snapshot upload settled; reports whether it carried content |
 | `AmbientAgents.ThirdPartyHarness.RuntimeError.Detected` | Runtime output scanner detected a known failure substring in a third-party harness block. |
 | `Anonymous User Attempted Login-Gated Feature` | Anonymous user attempted to access a login-gated feature |
@@ -1021,6 +1023,9 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `FileTree.ItemCreated` | Created a new file from the file tree |
 | `Find Option Toggled` | Changed settings in Find Toggle |
 | `Focused Config in Settings Import` | Selected a terminal in the settings import onboarding block |
+| `FreeAiRemovalModal.CtaClicked` | The user clicked a CTA in the free AI removal notice modal |
+| `FreeAiRemovalModal.Dismissed` | The user dismissed the free AI removal notice modal |
+| `FreeAiRemovalModal.Shown` | The free AI removal notice modal was shown to the user |
 | `FreeTierLimitHitInterstitial.Closed` | User closed the free tier limit hit interstitial |
 | `FreeTierLimitHitInterstitial.Displayed` | The free tier limit hit interstitial was displayed |
 | `FreeTierLimitHitInterstitial.UpgradeButtonClicked` | User clicked the 'Upgrade' button in the free tier limit hit interstitial |
@@ -1136,6 +1141,7 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `QueuedPrompt.Edited` | User committed a non-empty edit to a queued prompt row |
 | `QueuedPrompt.PanelCollapseToggled` | User toggled the queued prompts panel collapse state |
 | `QueuedPrompt.Reordered` | User reordered a queued prompt row via drag-and-drop |
+| `QueuedPrompt.SentNow` | User sent a queued prompt row immediately (send-now button or Enter on empty input) |
 | `Quit Modal Cancel Pressed` | `Cancel` button on the alert modal was pressed |
 | `Quit Modal Disabled` | The quit modal dialog has been disabled and will not popup when a user closes Warp while a session is running |
 | `Quit Modal Shown` | Showed an alert modal to warn the user about closing the app/window with a running process |
@@ -1147,7 +1153,7 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `RemoteServer.ClientRequestError` | A client request to the remote server failed |
 | `RemoteServer.DaemonStartup` | Remote server daemon startup completed and socket bound |
 | `RemoteServer.Disconnection` | An established remote server connection was dropped |
-| `RemoteServer.HostUnsupported` | Preinstall check classified the remote host as unsupported, falling back to the legacy SSH flow |
+| `RemoteServer.HostUnsupported` | Preinstall check classified the remote host as unsupported, falling back to the wrapper-only SSH flow |
 | `RemoteServer.Initialization` | Remote server connection and initialization completed (success or failure) |
 | `RemoteServer.Installation` | Remote server binary installation completed (success or failure) |
 | `RemoteServer.MessageDecodingError` | A server message could not be decoded (no parseable request_id) |
@@ -1155,7 +1161,6 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `RemoteServer.Reconnection` | A reconnection attempt succeeded after a spontaneous disconnect |
 | `RemoteServer.SetupDuration` | End-to-end duration of the remote server setup flow |
 | `Remove Added Subshell Command` | Removed a command from the list of commands to automatically Warpify via Warp's subshell wrapper |
-| `Remove Denylisted SSH Tmux Wrapper Host` | Removed an SSH host from the denylist from prompting for Tmux Wrapper |
 | `Remove Denylisted Subshell Command` | Removed a command from the list of commands to IGNORE when trying to Warpify via Warp's subshell wrapper |
 | `Removed Workflow Alias` | Removed an alias from a Warp Drive workflow |
 | `Removed user from team` | Remove user from Warp Drive team |
@@ -1166,15 +1171,7 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `Resource Center Tips Skipped` | Skipped welcome tips for new users |
 | `SSH Bootstrap Attempt` | Attempted bootstrapping for an SSH session |
 | `SSH ControlMaster Error` | Encountered a ControlMaster error during an SSH session |
-| `SSH Install Tmux Block Accepted` | User accepted an ssh install tmux block |
-| `SSH Install Tmux Block Dismissed` | User dismissed an ssh install tmux block |
-| `SSH Install Tmux Block Displayed` | Displayed an ssh install tmux block |
-| `SSH Interactive Session Detected` | An interactive SSH session was detected |
 | `SSH Remote Server Choice Do Not Ask Again Toggled` | Toggled the 'Don't ask me this again' checkbox on the SSH remote-server choice block |
-| `SSH Tmux Warpification Error Block` | Ssh tmux warpification errored out |
-| `SSH Tmux Warpification Succeeded` | Ssh tmux warpification succeeded |
-| `SSH Tmux Warpify Block Accepted` | User accepted an ssh tmux warpify block |
-| `SSH Tmux Warpify Block Dismissed` | User dismissed an ssh tmux warpify block |
 | `Save Launch Config` | Saved current launch configuration of windows, tabs, and panes |
 | `Select App Icon` | Selected app icon |
 | `Select Command Palette Option` | Selected option from command palette (i.e. CMD-P) |
@@ -1195,7 +1192,6 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `Shell Terminated Prematurely` | The shell process terminated prematurely |
 | `Show Alias Expansion Banner` | Displayed the banner asking whether Warp should automatically expand aliases within the Input Editor |
 | `Show Subshell Banner` | Displayed the banner asking whether Warp should Warpify the current session via Warp's subshell wrapper |
-| `Show Warpify SSH Banner` | Displayed the banner asking whether Warp should Warpify the current SSH session via Warp's SSH Wrapper |
 | `ShowNotificationsDiscoveryBanner` | Showed notifications discovery banner in the block list |
 | `ShowNotificationsErrorBanner` | Showed error banner for notifications feature |
 | `Showed File in File Explorer` | Opened a file in Finder by using "Show in Finder" |
@@ -1250,7 +1246,6 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `Toggle Obfuscate Secret` | Revealed or hid a secret |
 | `Toggle Preserve Active Tab Color` | Enabled or disabled preserving the active tab color |
 | `Toggle Restore Session` | Toggled session restoration ("Restore windows, tabs, panes, on startup") |
-| `Toggle SSH Tmux Wrapper` | Changed the setting for SSH sessions to prompt for Tmux Wrapper |
 | `Toggle SSH Warpification` | Changed the setting for SSH sessions to be warified |
 | `Toggle Same Line Prompt` | Toggled on/off same line prompt |
 | `Toggle Secret Redaction` | Toggled on/off the setting for Secret Redaction - attempts to redact secrets and sensitive information |
@@ -1308,8 +1303,10 @@ If you're a [Team](/knowledge-and-collaboration/teams/) admin, the deletion flow
 | `onboarding_callout_next` | User clicked next on a callout |
 | `onboarding_folder_selected` | User selected a folder |
 | `onboarding_folder_selection_started` | User started folder selection |
-| `onboarding_free_user_no_ai_upgrade_clicked` | User clicked the upgrade button on the free-user no-AI experiment slide |
 | `onboarding_get_started_clicked` | User clicked the Get Started button |
+| `onboarding_no_ai_confirmation_cancelled` | User chose to keep AI in the confirmation modal |
+| `onboarding_no_ai_confirmation_shown` | User was shown the no-AI confirmation modal |
+| `onboarding_no_ai_confirmed` | User confirmed they don't want AI in the confirmation modal |
 | `onboarding_setting_changed` | User changed a setting during onboarding |
 | `onboarding_slide_navigated_back` | User navigated to the previous slide |
 | `onboarding_slide_navigated_next` | User navigated to the next slide |