diff --git a/apps/marketing/src/pages/index.astro b/apps/marketing/src/pages/index.astro
index d3f12d854194..de4cd632da3d 100644
--- a/apps/marketing/src/pages/index.astro
+++ b/apps/marketing/src/pages/index.astro
@@ -67,6 +67,7 @@ const mobileEndorsementRows = [
           <svg class="dl-icon dl-icon--apple" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 814 1000" aria-hidden="true"><path fill="currentColor" d="M788.1 340.9c-5.8 4.5-108.2 62.2-108.2 190.5 0 148.4 130.3 200.9 134.2 202.2-.6 3.2-20.7 71.9-68.7 141.9-42.8 61.6-87.5 123.1-155.5 123.1s-85.5-39.5-164-39.5c-76.5 0-103.7 40.8-165.9 40.8s-105.6-57-155.5-127C46.7 790.7 0 663 0 541.8c0-194.4 126.4-297.5 250.8-297.5 66.1 0 121.2 43.4 162.7 43.4 39.5 0 101.1-46 176.3-46 28.5 0 130.9 2.6 198.3 99.2zm-234-181.5c31.1-36.9 53.1-88.1 53.1-139.3 0-7.1-.6-14.3-1.9-20.1-50.6 1.9-110.8 33.7-147.1 75.8-28.5 32.4-55.1 83.6-55.1 135.5 0 7.8 1.3 15.6 1.9 18.1 3.2.6 8.4 1.3 13.6 1.3 45.4 0 102.5-30.4 135.5-71.3z"/></svg>
           <svg class="dl-icon dl-icon--windows" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 88 88" aria-hidden="true"><path fill="currentColor" d="m0 12.402 35.687-4.86.016 34.423-35.67.203zm35.67 33.529.028 34.453L.028 75.48.026 45.7zm4.326-39.025L87.314 0v41.527l-47.318.376zm47.329 39.349-.011 41.34-47.318-6.678-.066-34.739z"/></svg>
           <svg class="dl-icon dl-icon--linux" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path fill="currentColor" d="M12.504 0c-.155 0-.315.008-.48.021-4.226.333-3.105 4.807-3.17 6.298-.076 1.092-.3 1.953-1.05 3.02-.885 1.051-2.127 2.75-2.716 4.521-.278.832-.41 1.684-.287 2.489a.424.424 0 00-.11.135c-.26.268-.45.6-.663.839-.199.199-.485.267-.797.4-.313.136-.658.269-.864.68-.09.189-.136.394-.132.602 0 .199.027.4.055.536.058.399.116.728.04.97-.249.68-.28 1.145-.106 1.484.174.334.535.47.94.601.81.2 1.91.135 2.774.6.926.466 1.866.67 2.616.47.526-.116.97-.464 1.208-.946.587-.003 1.23-.269 2.26-.334.699-.058 1.574.267 2.577.2.025.134.063.198.114.333l.003.003c.391.778 1.113 1.132 1.884 1.071.771-.06 1.592-.536 2.257-1.306.631-.765 1.683-1.084 2.378-1.503.348-.199.629-.469.649-.853.023-.4-.2-.811-.714-1.376v-.097l-.003-.003c-.17-.2-.25-.535-.338-.926-.085-.401-.182-.786-.492-1.046h-.003c-.059-.054-.123-.067-.188-.135a.357.357 0 00-.19-.064c.431-1.278.264-2.55-.173-3.694-.533-1.41-1.465-2.638-2.175-3.483-.796-1.005-1.576-1.957-1.56-3.368.026-2.152.236-6.133-3.544-6.139zm.529 3.405h.013c.213 0 .396.062.584.198.19.135.33.332.438.533.105.259.158.459.166.724 0-.02.006-.04.006-.06v.105a.086.086 0 01-.004-.021l-.004-.024a1.807 1.807 0 01-.15.706.953.953 0 01-.213.335.71.71 0 00-.088-.042c-.104-.045-.198-.064-.284-.133a1.312 1.312 0 00-.22-.066c.05-.06.146-.133.183-.198.053-.128.082-.264.088-.402v-.02a1.21 1.21 0 00-.061-.4c-.045-.134-.101-.2-.183-.333-.084-.066-.167-.132-.267-.132h-.016c-.093 0-.176.03-.262.132a.8.8 0 00-.205.334 1.18 1.18 0 00-.09.4v.019c.002.089.008.179.02.267-.193-.067-.438-.135-.607-.202a1.635 1.635 0 01-.018-.2v-.02a1.772 1.772 0 01.15-.768c.082-.22.232-.406.43-.533a.985.985 0 01.594-.2zm-2.962.059h.036c.142 0 .27.048.399.135.146.129.264.288.344.465.09.199.14.4.153.667v.004c.007.134.006.2-.002.266v.08c-.03.007-.056.018-.083.024-.152.055-.274.135-.393.2.012-.09.013-.18.003-.267v-.015c-.012-.133-.04-.2-.082-.333a.613.613 0 00-.166-.267.248.248 0 00-.183-.064h-.021c-.071.006-.13.04-.186.132a.552.552 0 00-.12.27.944.944 0 00-.023.33v.015c.012.135.037.2.08.334.046.134.098.2.166.268.01.009.02.018.034.024-.07.057-.117.07-.176.136a.304.304 0 01-.131.068 2.62 2.62 0 01-.275-.402 1.772 1.772 0 01-.155-.667 1.759 1.759 0 01.08-.668 1.43 1.43 0 01.283-.535c.128-.133.26-.2.418-.2zm1.37 1.706c.332 0 .733.065 1.216.399.293.2.523.269 1.052.468h.003c.255.136.405.266.478.399v-.131a.571.571 0 01.016.47c-.123.31-.516.643-1.063.842v.002c-.268.135-.501.333-.775.465-.276.135-.588.292-1.012.267a1.139 1.139 0 01-.448-.067 3.566 3.566 0 01-.322-.198c-.195-.135-.363-.332-.612-.465v-.005h-.005c-.4-.246-.616-.512-.686-.71-.07-.268-.005-.47.193-.6.224-.135.38-.271.483-.336.104-.074.143-.102.176-.131h.002v-.003c.169-.202.436-.47.839-.601.139-.036.294-.065.466-.065zm2.8 2.142c.358 1.417 1.196 3.475 1.735 4.473.286.534.855 1.659 1.102 3.024.156-.005.33.018.513.064.646-1.671-.546-3.467-1.089-3.966-.22-.2-.232-.335-.123-.335.59.534 1.365 1.572 1.646 2.757.13.535.16 1.104.021 1.67.067.028.135.06.205.067 1.032.534 1.413.938 1.23 1.537v-.043c-.06-.003-.12 0-.18 0h-.016c.151-.467-.182-.825-1.065-1.224-.915-.4-1.646-.336-1.77.465-.008.043-.013.066-.018.135-.068.023-.139.053-.209.064-.43.268-.662.669-.793 1.187-.13.533-.17 1.156-.205 1.869v.003c-.02.334-.17.838-.319 1.35-1.5 1.072-3.58 1.538-5.348.334a2.645 2.645 0 00-.402-.533 1.45 1.45 0 00-.275-.333c.182 0 .338-.03.465-.067a.615.615 0 00.314-.334c.108-.267 0-.697-.345-1.163-.345-.467-.931-.995-1.788-1.521-.63-.4-.986-.87-1.15-1.396-.165-.534-.143-1.085-.015-1.645.245-1.07.873-2.11 1.274-2.763.107-.065.037.135-.408.974-.396.751-1.14 2.497-.122 3.854a8.123 8.123 0 01.647-2.876c.564-1.278 1.743-3.504 1.836-5.268.048.036.217.135.289.202.218.133.38.333.59.465.21.201.477.335.876.335.039.003.075.006.11.006.412 0 .73-.134.997-.268.29-.134.52-.334.74-.4h.005c.467-.135.835-.402 1.044-.7zm2.185 8.958c.037.6.343 1.245.882 1.377.588.134 1.434-.333 1.791-.765l.211-.01c.315-.007.577.01.847.268l.003.003c.208.199.305.53.391.876.085.4.154.78.409 1.066.486.527.645.906.636 1.14l.003-.007v.018l-.003-.012c-.015.262-.185.396-.498.595-.63.401-1.746.712-2.457 1.57-.618.737-1.37 1.14-2.036 1.191-.664.053-1.237-.2-1.574-.898l-.005-.003c-.21-.4-.12-1.025.056-1.69.176-.668.428-1.344.463-1.897.037-.714.076-1.335.195-1.814.12-.465.308-.797.641-.984l.045-.022zm-10.814.049h.01c.053 0 .105.005.157.014.376.055.706.333 1.023.752l.91 1.664.003.003c.243.533.754 1.064 1.189 1.637.434.598.77 1.131.729 1.57v.006c-.057.744-.48 1.148-1.125 1.294-.645.135-1.52.002-2.395-.464-.968-.536-2.118-.469-2.857-.602-.369-.066-.61-.2-.723-.4-.11-.2-.113-.602.123-1.23v-.004l.002-.003c.117-.334.03-.752-.027-1.118-.055-.401-.083-.71.043-.94.16-.334.396-.4.69-.533.294-.135.64-.202.915-.47h.002v-.002c.256-.268.445-.601.668-.838.19-.201.38-.336.663-.336zm7.159-9.074c-.435.201-.945.535-1.488.535-.542 0-.97-.267-1.28-.466-.154-.134-.28-.268-.373-.335-.164-.134-.144-.333-.074-.333.109.016.129.134.199.2.096.066.215.2.36.333.292.2.68.467 1.167.467.485 0 1.053-.267 1.398-.466.195-.135.445-.334.648-.467.156-.136.149-.267.279-.267.128.016.034.134-.147.332a8.097 8.097 0 01-.69.468zm-1.082-1.583V5.64c-.006-.02.013-.042.029-.05.074-.043.18-.027.26.004.063 0 .16.067.15.135-.006.049-.085.066-.135.066-.055 0-.092-.043-.141-.068-.052-.018-.146-.008-.163-.065zm-.551 0c-.02.058-.113.049-.166.066-.047.025-.086.068-.14.068-.05 0-.13-.02-.136-.068-.01-.066.088-.133.15-.133.08-.031.184-.047.259-.005.019.009.036.03.03.05v.02h.003z"/></svg>
+          <svg class="dl-icon dl-icon--google-play" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path fill="currentColor" d="m22.018 13.298-3.919 2.218-3.515-3.493 3.543-3.521 3.891 2.202a1.49 1.49 0 0 1 0 2.594zM1.337.924a1.486 1.486 0 0 0-.112.568v21.017c0 .217.045.419.124.6l11.155-11.087L1.337.924zm12.207 10.065 3.258-3.238L3.45.195a1.466 1.466 0 0 0-.946-.179l11.04 10.973zm0 2.067-11 10.933c.298.036.612-.016.906-.183l13.324-7.54-3.23-3.21z"/></svg>
           <span id="download-label">Download for macOS</span>
         </a>
         <a class="hero-source-link" href={GITHUB_REPOSITORY_URL} target="_blank" rel="noopener noreferrer">
@@ -398,6 +399,7 @@ const mobileEndorsementRows = [
           <svg class="dl-icon dl-icon--windows" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 88 88" aria-hidden="true"><path fill="currentColor" d="m0 12.402 35.687-4.86.016 34.423-35.67.203zm35.67 33.529.028 34.453L.028 75.48.026 45.7zm4.326-39.025L87.314 0v41.527l-47.318.376zm47.329 39.349-.011 41.34-47.318-6.678-.066-34.739z"/></svg>
           <svg class="dl-icon dl-icon--linux" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path fill="currentColor" d="M12.504 0c-.155 0-.315.008-.48.021-4.226.333-3.105 4.807-3.17 6.298-.076 1.092-.3 1.953-1.05 3.02-.885 1.051-2.127 2.75-2.716 4.521-.278.832-.41 1.684-.287 2.489a.424.424 0 00-.11.135c-.26.268-.45.6-.663.839-.199.199-.485.267-.797.4-.313.136-.658.269-.864.68-.09.189-.136.394-.132.602 0 .199.027.4.055.536.058.399.116.728.04.97-.249.68-.28 1.145-.106 1.484.174.334.535.47.94.601.81.2 1.91.135 2.774.6.926.466 1.866.67 2.616.47.526-.116.97-.464 1.208-.946.587-.003 1.23-.269 2.26-.334.699-.058 1.574.267 2.577.2.025.134.063.198.114.333l.003.003c.391.778 1.113 1.132 1.884 1.071.771-.06 1.592-.536 2.257-1.306.631-.765 1.683-1.084 2.378-1.503.348-.199.629-.469.649-.853.023-.4-.2-.811-.714-1.376v-.097l-.003-.003c-.17-.2-.25-.535-.338-.926-.085-.401-.182-.786-.492-1.046h-.003c-.059-.054-.123-.067-.188-.135a.357.357 0 00-.19-.064c.431-1.278.264-2.55-.173-3.694-.533-1.41-1.465-2.638-2.175-3.483-.796-1.005-1.576-1.957-1.56-3.368.026-2.152.236-6.133-3.544-6.139zm.529 3.405h.013c.213 0 .396.062.584.198.19.135.33.332.438.533.105.259.158.459.166.724 0-.02.006-.04.006-.06v.105a.086.086 0 01-.004-.021l-.004-.024a1.807 1.807 0 01-.15.706.953.953 0 01-.213.335.71.71 0 00-.088-.042c-.104-.045-.198-.064-.284-.133a1.312 1.312 0 00-.22-.066c.05-.06.146-.133.183-.198.053-.128.082-.264.088-.402v-.02a1.21 1.21 0 00-.061-.4c-.045-.134-.101-.2-.183-.333-.084-.066-.167-.132-.267-.132h-.016c-.093 0-.176.03-.262.132a.8.8 0 00-.205.334 1.18 1.18 0 00-.09.4v.019c.002.089.008.179.02.267-.193-.067-.438-.135-.607-.202a1.635 1.635 0 01-.018-.2v-.02a1.772 1.772 0 01.15-.768c.082-.22.232-.406.43-.533a.985.985 0 01.594-.2zm-2.962.059h.036c.142 0 .27.048.399.135.146.129.264.288.344.465.09.199.14.4.153.667v.004c.007.134.006.2-.002.266v.08c-.03.007-.056.018-.083.024-.152.055-.274.135-.393.2.012-.09.013-.18.003-.267v-.015c-.012-.133-.04-.2-.082-.333a.613.613 0 00-.166-.267.248.248 0 00-.183-.064h-.021c-.071.006-.13.04-.186.132a.552.552 0 00-.12.27.944.944 0 00-.023.33v.015c.012.135.037.2.08.334.046.134.098.2.166.268.01.009.02.018.034.024-.07.057-.117.07-.176.136a.304.304 0 01-.131.068 2.62 2.62 0 01-.275-.402 1.772 1.772 0 01-.155-.667 1.759 1.759 0 01.08-.668 1.43 1.43 0 01.283-.535c.128-.133.26-.2.418-.2zm1.37 1.706c.332 0 .733.065 1.216.399.293.2.523.269 1.052.468h.003c.255.136.405.266.478.399v-.131a.571.571 0 01.016.47c-.123.31-.516.643-1.063.842v.002c-.268.135-.501.333-.775.465-.276.135-.588.292-1.012.267a1.139 1.139 0 01-.448-.067 3.566 3.566 0 01-.322-.198c-.195-.135-.363-.332-.612-.465v-.005h-.005c-.4-.246-.616-.512-.686-.71-.07-.268-.005-.47.193-.6.224-.135.38-.271.483-.336.104-.074.143-.102.176-.131h.002v-.003c.169-.202.436-.47.839-.601.139-.036.294-.065.466-.065zm2.8 2.142c.358 1.417 1.196 3.475 1.735 4.473.286.534.855 1.659 1.102 3.024.156-.005.33.018.513.064.646-1.671-.546-3.467-1.089-3.966-.22-.2-.232-.335-.123-.335.59.534 1.365 1.572 1.646 2.757.13.535.16 1.104.021 1.67.067.028.135.06.205.067 1.032.534 1.413.938 1.23 1.537v-.043c-.06-.003-.12 0-.18 0h-.016c.151-.467-.182-.825-1.065-1.224-.915-.4-1.646-.336-1.77.465-.008.043-.013.066-.018.135-.068.023-.139.053-.209.064-.43.268-.662.669-.793 1.187-.13.533-.17 1.156-.205 1.869v.003c-.02.334-.17.838-.319 1.35-1.5 1.072-3.58 1.538-5.348.334a2.645 2.645 0 00-.402-.533 1.45 1.45 0 00-.275-.333c.182 0 .338-.03.465-.067a.615.615 0 00.314-.334c.108-.267 0-.697-.345-1.163-.345-.467-.931-.995-1.788-1.521-.63-.4-.986-.87-1.15-1.396-.165-.534-.143-1.085-.015-1.645.245-1.07.873-2.11 1.274-2.763.107-.065.037.135-.408.974-.396.751-1.14 2.497-.122 3.854a8.123 8.123 0 01.647-2.876c.564-1.278 1.743-3.504 1.836-5.268.048.036.217.135.289.202.218.133.38.333.59.465.21.201.477.335.876.335.039.003.075.006.11.006.412 0 .73-.134.997-.268.29-.134.52-.334.74-.4h.005c.467-.135.835-.402 1.044-.7zm2.185 8.958c.037.6.343 1.245.882 1.377.588.134 1.434-.333 1.791-.765l.211-.01c.315-.007.577.01.847.268l.003.003c.208.199.305.53.391.876.085.4.154.78.409 1.066.486.527.645.906.636 1.14l.003-.007v.018l-.003-.012c-.015.262-.185.396-.498.595-.63.401-1.746.712-2.457 1.57-.618.737-1.37 1.14-2.036 1.191-.664.053-1.237-.2-1.574-.898l-.005-.003c-.21-.4-.12-1.025.056-1.69.176-.668.428-1.344.463-1.897.037-.714.076-1.335.195-1.814.12-.465.308-.797.641-.984l.045-.022zm-10.814.049h.01c.053 0 .105.005.157.014.376.055.706.333 1.023.752l.91 1.664.003.003c.243.533.754 1.064 1.189 1.637.434.598.77 1.131.729 1.57v.006c-.057.744-.48 1.148-1.125 1.294-.645.135-1.52.002-2.395-.464-.968-.536-2.118-.469-2.857-.602-.369-.066-.61-.2-.723-.4-.11-.2-.113-.602.123-1.23v-.004l.002-.003c.117-.334.03-.752-.027-1.118-.055-.401-.083-.71.043-.94.16-.334.396-.4.69-.533.294-.135.64-.202.915-.47h.002v-.002c.256-.268.445-.601.668-.838.19-.201.38-.336.663-.336zm7.159-9.074c-.435.201-.945.535-1.488.535-.542 0-.97-.267-1.28-.466-.154-.134-.28-.268-.373-.335-.164-.134-.144-.333-.074-.333.109.016.129.134.199.2.096.066.215.2.36.333.292.2.68.467 1.167.467.485 0 1.053-.267 1.398-.466.195-.135.445-.334.648-.467.156-.136.149-.267.279-.267.128.016.034.134-.147.332a8.097 8.097 0 01-.69.468zm-1.082-1.583V5.64c-.006-.02.013-.042.029-.05.074-.043.18-.027.26.004.063 0 .16.067.15.135-.006.049-.085.066-.135.066-.055 0-.092-.043-.141-.068-.052-.018-.146-.008-.163-.065zm-.551 0c-.02.058-.113.049-.166.066-.047.025-.086.068-.14.068-.05 0-.13-.02-.136-.068-.01-.066.088-.133.15-.133.08-.031.184-.047.259-.005.019.009.036.03.03.05v.02h.003z"/></svg>
 
+          <svg class="dl-icon dl-icon--google-play" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path fill="currentColor" d="m22.018 13.298-3.919 2.218-3.515-3.493 3.543-3.521 3.891 2.202a1.49 1.49 0 0 1 0 2.594zM1.337.924a1.486 1.486 0 0 0-.112.568v21.017c0 .217.045.419.124.6l11.155-11.087L1.337.924zm12.207 10.065 3.258-3.238L3.45.195a1.466 1.466 0 0 0-.946-.179l11.04 10.973zm0 2.067-11 10.933c.298.036.612-.016.906-.183l13.324-7.54-3.23-3.21z"/></svg>
           <span id="cta-download-label">Download for macOS</span>
         </a>
         <a class="btn btn-ghost btn-lg" href="/download">Other platforms</a>
@@ -409,11 +411,14 @@ const mobileEndorsementRows = [
 <script>
   import { fetchLatestRelease, RELEASES_URL, type ReleaseAsset } from "../lib/releases";
   import { startHomeMotion } from "../lib/homeMotion";
+  import { ANDROID_PLAY_STORE_URL } from "../lib/site";
 
-  type Platform = { os: "mac" | "win" | "linux"; label: string };
+  type Platform = { os: "mac" | "win" | "linux" | "android"; label: string };
 
   function detectPlatform(): Platform | null {
     const ua = navigator.userAgent;
+    // Match Android first because Android browsers also include Linux in their user agent.
+    if (/Android/i.test(ua)) return { os: "android", label: "Get it on Google Play" };
     if (/Win/i.test(ua)) return { os: "win", label: "Download for Windows" };
     if (/Mac/i.test(ua)) return { os: "mac", label: "Download for macOS" };
     if (/Linux/i.test(ua)) return { os: "linux", label: "Download for Linux" };
@@ -447,6 +452,15 @@ const mobileEndorsementRows = [
     if (label) label.textContent = platform.label;
     if (ctaLabel) ctaLabel.textContent = platform.label;
     if (kbd && platform.os !== "mac") kbd.textContent = "Ctrl ⏎";
+    if (platform.os === "android") {
+      for (const androidBtn of [btn, ctaBtn]) {
+        if (!androidBtn) continue;
+        androidBtn.href = ANDROID_PLAY_STORE_URL;
+        androidBtn.target = "_blank";
+        androidBtn.rel = "noopener noreferrer";
+      }
+      return;
+    }
 
     try {
       const release = await fetchLatestRelease();
@@ -645,6 +659,7 @@ const mobileEndorsementRows = [
   :global([data-platform="mac"]) .dl-icon--apple { display: block; }
   :global([data-platform="win"]) .dl-icon--windows { display: block; }
   :global([data-platform="linux"]) .dl-icon--linux { display: block; }
+  :global([data-platform="android"]) .dl-icon--google-play { display: block; }
   :global(html:not([data-platform])) .dl-icon--apple { display: block; }
 
   /* Marks enter once, then drift while visible and lean toward the pointer. */
diff --git a/apps/server/src/orchestration-v2/ContextHandoffBudget.test.ts b/apps/server/src/orchestration-v2/ContextHandoffBudget.test.ts
index c4068702e3a5..e86c3032e621 100644
--- a/apps/server/src/orchestration-v2/ContextHandoffBudget.test.ts
+++ b/apps/server/src/orchestration-v2/ContextHandoffBudget.test.ts
@@ -135,6 +135,7 @@ describe("handoff budget", () => {
     });
     assert.equal(command?.role, "assistant");
     assert.equal(command?.kind, "command_execution");
+    assert.isNull(command?.nativeItemRef);
     assert.include(command!.text, "Exit code: 1");
     assert.include(command!.text, "界".repeat(300));
     assert.isNull(
@@ -146,6 +147,17 @@ describe("handoff budget", () => {
       }),
     );
     assert.equal(historyResponseItems([command!], "Activity")[1]?.type, "message");
+    const nativeCommand = historicalMessage({
+      ...base,
+      type: "command_execution",
+      input: "vp test",
+      nativeItemRef: {
+        driver: ProviderDriverKind.make("codex"),
+        nativeId: "command-1",
+        strength: "strong",
+      },
+    });
+    assert.equal(nativeCommand?.nativeItemRef?.nativeId, "command-1");
   });
 
   it("omits oversized multilingual items whole, preserves original constraints and recent work", () => {
diff --git a/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts b/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts
index ff2ca1fbec44..928a2ef952f6 100644
--- a/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts
+++ b/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts
@@ -19,6 +19,7 @@ export const deliverContextHandoffs = Effect.fn("orchestrationV2.deliverContextH
     readonly providerThread: OrchestrationV2ProviderThread;
     readonly budget: number | Effect.Effect<number, BudgetError>;
     readonly deferInline?: boolean;
+    readonly deferIfOverBudget?: boolean;
     readonly alreadyDeliveredItemIds: ReadonlySet<string>;
     readonly inject?: (
       history: ProviderAdapter.ProviderAdapterV2HistoricalContext,
@@ -72,6 +73,9 @@ export const deliverContextHandoffs = Effect.fn("orchestrationV2.deliverContextH
     });
     if (historyCost(selected.messages, selected.context) > budget) {
       if (input.deferInline) return { context: "", delivered: Effect.void, unsent: Effect.void };
+      // Keep the handoff pending when the native transcript has too little room for recovery context.
+      if (input.deferIfOverBudget)
+        return { context: "", delivered: Effect.void, unsent: Effect.void };
       return yield* new ContextHandoffBudgetError();
     }
     const omittedItemIds = new Set(selected.omittedItemIds);
diff --git a/apps/server/src/orchestration-v2/ProjectionStore.test.ts b/apps/server/src/orchestration-v2/ProjectionStore.test.ts
index 1dc7c912e776..fa55b9c46d30 100644
--- a/apps/server/src/orchestration-v2/ProjectionStore.test.ts
+++ b/apps/server/src/orchestration-v2/ProjectionStore.test.ts
@@ -1558,6 +1558,11 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
       assert.deepEqual(yield* store.getTurnStartHistory(threadId, [runId]), history);
       assert.deepEqual(yield* store.getTurnStartHistory(threadId, []), []);
       assert.deepEqual(yield* store.getTurnStartHistory(threadId, [RunId.make("run:other")]), []);
+      const selectedItem = history[0]!;
+      assert.deepEqual(yield* store.getTurnStartHistory(threadId, undefined, [selectedItem.id]), [
+        selectedItem,
+      ]);
+      assert.deepEqual(yield* store.getTurnStartHistory(threadId, undefined, []), []);
     }),
   );
   it.effect("preserves stored provider usage when a terminal update omits it", () =>
diff --git a/apps/server/src/orchestration-v2/ProjectionStore.ts b/apps/server/src/orchestration-v2/ProjectionStore.ts
index 88a9073117dd..3cd8d0ab008d 100644
--- a/apps/server/src/orchestration-v2/ProjectionStore.ts
+++ b/apps/server/src/orchestration-v2/ProjectionStore.ts
@@ -542,6 +542,7 @@ export interface ProjectionStoreV2Shape {
   readonly getTurnStartHistory: (
     threadId: ThreadId,
     runIds?: ReadonlyArray<RunId>,
+    itemIds?: ReadonlyArray<TurnItemId>,
   ) => Effect.Effect<ReadonlyArray<OrchestrationV2TurnItem>, ProjectionStoreV2Error>;
   readonly getThreadProjection: (
     threadId: ThreadId,
@@ -4271,18 +4272,25 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
     const getTurnStartHistory: ProjectionStoreV2Shape["getTurnStartHistory"] = Effect.fn(
       "ProjectionStore.getTurnStartHistory",
     )(
-      function* (threadId, runIds) {
+      function* (threadId, runIds, itemIds) {
+        if (itemIds !== undefined && itemIds.length === 0) return [];
         const rows = yield* sql<PayloadRow>`
           SELECT payload_json FROM orchestration_v2_projection_turn_items
           WHERE thread_id = ${threadId}
             AND type IN ('user_message','assistant_message','command_execution','error',
               'run_interrupt_result','file_change','proposed_plan')
-            AND ${runIds === undefined ? sql`1` : sql`run_id IN ${sql.in(runIds)}`}
+            AND ${
+              itemIds !== undefined
+                ? sql`turn_item_id IN ${sql.in(itemIds)}`
+                : runIds === undefined
+                  ? sql`1`
+                  : sql`run_id IN ${sql.in(runIds)}`
+            }
           ORDER BY ordinal ASC, turn_item_id ASC
         `;
         return yield* decodeRows(decodeTurnItemPayload, threadId)(rows);
       },
-      (effect, threadId, _runIds) =>
+      (effect, threadId) =>
         effect.pipe(Effect.mapError((cause) => new ProjectionStoreReadError({ threadId, cause }))),
     );
 
diff --git a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
index fad06732fb48..b3bc005cc8f5 100644
--- a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
+++ b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
@@ -48,6 +48,10 @@ import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter"
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
 import * as ProjectionStore from "./ProjectionStore.ts";
 import * as ProviderSessionManager from "./ProviderSessionManager.ts";
+import {
+  itemIsInNativeThread as isItemInNativeThread,
+  latestNativeCompactionRunOrdinal,
+} from "./nativeThreadHistory.ts";
 import {
   ContextHandoffBackgroundWorkError,
   knownProviderFailureMessage,
@@ -929,6 +933,48 @@ export const layer: Layer.Layer<
             !deliveredAttemptIds.has(source.activeAttemptId),
         );
         const missedRunIds = new Set(missedRuns.map((source) => source.id));
+        const compactionMessageIds = new Set(
+          projection.messages.filter(isCompactionCommandMessage).map((candidate) => candidate.id),
+        );
+        const runOrdinals = new Map(projection.runs.map((source) => [source.id, source.ordinal]));
+        const latestCompactionOrdinal = latestNativeCompactionRunOrdinal({
+          runs: projection.runs,
+          turnItems: projection.turnItems,
+          providerThreadId: providerThread.id,
+          compactionMessageIds,
+        });
+        const itemIsInNativeThread = (item: Parameters<typeof isItemInNativeThread>[0]["item"]) =>
+          isItemInNativeThread({
+            item,
+            threadId: projection.thread.id,
+            providerThreadId: providerThread.id,
+            acceptedRunIds: nativeInputRunIds,
+            runOrdinals,
+            latestCompactionRunOrdinal: latestCompactionOrdinal,
+          });
+        const handoffIsAlreadyInNativeThread = (
+          handoff: OrchestrationV2ContextHandoff,
+          sourceItemsById: ReadonlyMap<string, OrchestrationV2TurnItem>,
+        ) => {
+          const history = handoff.history;
+          if (!handoff.fromProviderThreadIds.includes(providerThread.id) || history === undefined)
+            return false;
+          const omittedItemIds = history.omittedItemIds ?? [];
+          return (
+            (history.messages.length > 0 || omittedItemIds.length > 0) &&
+            history.omittedItems === omittedItemIds.length &&
+            history.messages.every(itemIsInNativeThread) &&
+            omittedItemIds.every((itemId) => {
+              const item = sourceItemsById.get(itemId);
+              return item !== undefined && itemIsInNativeThread(item);
+            })
+          );
+        };
+        const nativeThreadHasTurns =
+          nativeInputRunIds.size > 0 ||
+          (legacyInputRunIds.size > 0 &&
+            sameNativeThread &&
+            !acceptedAttempts.some((source) => source.nativeThreadId !== undefined));
         return {
           sameNativeThread,
           handoffUsage,
@@ -937,6 +983,8 @@ export const layer: Layer.Layer<
           acceptedAttempts,
           nativeInputRunIds,
           legacyInputRunIds,
+          nativeThreadHasTurns,
+          handoffIsAlreadyInNativeThread,
           missedRuns,
           missedRunIds,
           budget: Effect.gen(function* () {
@@ -1383,9 +1431,37 @@ export const layer: Layer.Layer<
       );
       const startWithHandoffs = Effect.fn("ProviderTurnStartService.startWithHandoffs")(
         function* (turnInput: Parameters<typeof session.startTurn>[0], compact = false) {
+          const handoffsToDeliver = [...effectiveHandoffs, ...retryHandoff];
+          const canDeferHandoff =
+            handoffContext.sameNativeThread &&
+            handoffContext.nativeThreadHasTurns &&
+            retryHandoff.length === 0 &&
+            handoffsToDeliver.length > 0;
+          const omittedItemIds = canDeferHandoff
+            ? Array.from(
+                new Set(
+                  handoffsToDeliver.flatMap((handoff) => handoff.history?.omittedItemIds ?? []),
+                ),
+              )
+            : [];
+          const sourceItemsById =
+            omittedItemIds.length === 0
+              ? new Map<string, OrchestrationV2TurnItem>()
+              : new Map(
+                  (yield* projectionStore.getTurnStartHistory(
+                    input.threadId,
+                    undefined,
+                    omittedItemIds,
+                  )).map((item) => [item.id, item] as const),
+                );
           const delivery = yield* deliverContextHandoffs({
-            handoffs: [...effectiveHandoffs, ...retryHandoff],
+            handoffs: handoffsToDeliver,
             deferInline: compact || goalCommand,
+            deferIfOverBudget:
+              canDeferHandoff &&
+              handoffsToDeliver.every((handoff) =>
+                handoffContext.handoffIsAlreadyInNativeThread(handoff, sourceItemsById),
+              ),
             providerThread: runningProviderThread,
             budget,
             alreadyDeliveredItemIds: deliveredItemIds,
diff --git a/apps/server/src/orchestration-v2/nativeThreadHistory.test.ts b/apps/server/src/orchestration-v2/nativeThreadHistory.test.ts
new file mode 100644
index 000000000000..840357dc23c4
--- /dev/null
+++ b/apps/server/src/orchestration-v2/nativeThreadHistory.test.ts
@@ -0,0 +1,180 @@
+import { expect, it } from "vite-plus/test";
+import {
+  MessageId,
+  ProviderDriverKind,
+  ProviderThreadId,
+  RunId,
+  ThreadId,
+} from "@t3tools/contracts";
+
+import { itemIsInNativeThread, latestNativeCompactionRunOrdinal } from "./nativeThreadHistory.ts";
+
+it("includes provider-generated compaction runs in the native history boundary", () => {
+  const providerThreadId = ProviderThreadId.make("provider-thread:compaction-history");
+  const otherProviderThreadId = ProviderThreadId.make("provider-thread:other-compaction");
+  const explicitCompactMessageId = MessageId.make("message:explicit-compact");
+  const runs = [
+    {
+      id: RunId.make("run:before-provider-compaction"),
+      ordinal: 2,
+      providerThreadId,
+      userMessageId: MessageId.make("message:ordinary-1"),
+    },
+    {
+      id: RunId.make("run:provider-compaction"),
+      ordinal: 4,
+      providerThreadId,
+      userMessageId: MessageId.make("message:ordinary-2"),
+    },
+    {
+      id: RunId.make("run:explicit-compaction"),
+      ordinal: 6,
+      providerThreadId,
+      userMessageId: explicitCompactMessageId,
+    },
+    {
+      id: RunId.make("run:other-compaction"),
+      ordinal: 8,
+      providerThreadId: otherProviderThreadId,
+      userMessageId: MessageId.make("message:other-thread"),
+    },
+  ];
+
+  expect(
+    latestNativeCompactionRunOrdinal({
+      runs,
+      turnItems: [
+        {
+          type: "compaction",
+          runId: runs[1]!.id,
+          providerThreadId,
+        },
+        {
+          type: "compaction",
+          runId: runs[3]!.id,
+          providerThreadId: otherProviderThreadId,
+        },
+      ],
+      providerThreadId,
+      compactionMessageIds: new Set([explicitCompactMessageId]),
+    }),
+  ).toBe(6);
+});
+
+it("only treats retained provider input as native transcript history", () => {
+  const threadId = ThreadId.make("thread:native-history");
+  const providerThreadId = ProviderThreadId.make("provider-thread:native-history");
+  const beforeCompaction = RunId.make("run:before-compaction");
+  const afterCompaction = RunId.make("run:after-compaction");
+  const shared = {
+    threadId,
+    providerThreadId,
+    acceptedRunIds: new Set([beforeCompaction, afterCompaction]),
+    runOrdinals: new Map([
+      [beforeCompaction, 1],
+      [afterCompaction, 3],
+    ]),
+    latestCompactionRunOrdinal: 2,
+  };
+
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        type: "user_message",
+        threadId,
+        providerThreadId,
+        runId: beforeCompaction,
+      },
+    }),
+  ).toBe(false);
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        type: "command_execution",
+        threadId,
+        providerThreadId,
+        runId: afterCompaction,
+        nativeItemRef: null,
+      },
+    }),
+  ).toBe(false);
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        type: "command_execution",
+        threadId,
+        providerThreadId,
+        runId: afterCompaction,
+        nativeItemRef: {
+          driver: ProviderDriverKind.make("codex"),
+          nativeId: "command-1",
+          strength: "strong",
+        },
+      },
+    }),
+  ).toBe(true);
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        type: "error",
+        threadId,
+        providerThreadId,
+        runId: afterCompaction,
+        nativeItemRef: null,
+      },
+    }),
+  ).toBe(false);
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        type: "error",
+        threadId,
+        providerThreadId,
+        runId: afterCompaction,
+        nativeItemRef: {
+          driver: ProviderDriverKind.make("codex"),
+          nativeId: "error-1",
+          strength: "strong",
+        },
+      },
+    }),
+  ).toBe(true);
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        type: "user_message",
+        threadId,
+        providerThreadId,
+        runId: afterCompaction,
+      },
+    }),
+  ).toBe(true);
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        type: "run_interrupt_result",
+        threadId,
+        providerThreadId,
+        runId: afterCompaction,
+      },
+    }),
+  ).toBe(false);
+  expect(
+    itemIsInNativeThread({
+      ...shared,
+      item: {
+        kind: "run_interrupt_result",
+        threadId,
+        providerThreadId,
+        runId: afterCompaction,
+      },
+    }),
+  ).toBe(false);
+});
diff --git a/apps/server/src/orchestration-v2/nativeThreadHistory.ts b/apps/server/src/orchestration-v2/nativeThreadHistory.ts
new file mode 100644
index 000000000000..b6f451d2877a
--- /dev/null
+++ b/apps/server/src/orchestration-v2/nativeThreadHistory.ts
@@ -0,0 +1,77 @@
+import type {
+  OrchestrationV2HistoricalMessage,
+  OrchestrationV2Run,
+  OrchestrationV2TurnItem,
+  ProviderThreadId,
+  RunId,
+  ThreadId,
+} from "@t3tools/contracts";
+
+export const latestNativeCompactionRunOrdinal = (input: {
+  readonly runs: ReadonlyArray<
+    Pick<OrchestrationV2Run, "id" | "ordinal" | "providerThreadId" | "userMessageId">
+  >;
+  readonly turnItems: ReadonlyArray<
+    Pick<OrchestrationV2TurnItem, "type" | "runId" | "providerThreadId">
+  >;
+  readonly providerThreadId: ProviderThreadId;
+  readonly compactionMessageIds: ReadonlySet<OrchestrationV2Run["userMessageId"]>;
+}) => {
+  const providerCompactionRunIds = new Set(
+    input.turnItems
+      .filter(
+        (item) => item.type === "compaction" && item.providerThreadId === input.providerThreadId,
+      )
+      .flatMap((item) => (item.runId === null ? [] : [item.runId])),
+  );
+
+  return input.runs.reduce<number | undefined>(
+    (latest, run) =>
+      run.providerThreadId === input.providerThreadId &&
+      (input.compactionMessageIds.has(run.userMessageId) || providerCompactionRunIds.has(run.id))
+        ? Math.max(latest ?? run.ordinal, run.ordinal)
+        : latest,
+    undefined,
+  );
+};
+
+type NativeHistoryItem = {
+  readonly threadId: OrchestrationV2HistoricalMessage["threadId"];
+  readonly providerThreadId?: OrchestrationV2TurnItem["providerThreadId"];
+  readonly runId?: OrchestrationV2TurnItem["runId"];
+  readonly type?: OrchestrationV2TurnItem["type"];
+  readonly kind?: OrchestrationV2HistoricalMessage["kind"];
+  readonly nativeItemRef?: OrchestrationV2TurnItem["nativeItemRef"] | undefined;
+};
+
+export const itemIsInNativeThread = (input: {
+  readonly item: NativeHistoryItem;
+  readonly threadId: ThreadId;
+  readonly providerThreadId: ProviderThreadId;
+  readonly acceptedRunIds: ReadonlySet<RunId>;
+  readonly runOrdinals: ReadonlyMap<RunId, number>;
+  readonly latestCompactionRunOrdinal: number | undefined;
+}) => {
+  const { item } = input;
+  if (
+    item.type === "run_interrupt_result" ||
+    item.kind === "run_interrupt_result" ||
+    ((item.type === "command_execution" ||
+      item.kind === "command_execution" ||
+      item.type === "error" ||
+      item.kind === "error") &&
+      item.nativeItemRef?.nativeId == null) ||
+    item.threadId !== input.threadId ||
+    item.providerThreadId !== input.providerThreadId ||
+    item.runId == null ||
+    !input.acceptedRunIds.has(item.runId)
+  )
+    return false;
+
+  const runOrdinal = input.runOrdinals.get(item.runId);
+  return (
+    runOrdinal !== undefined &&
+    (input.latestCompactionRunOrdinal === undefined ||
+      runOrdinal > input.latestCompactionRunOrdinal)
+  );
+};
diff --git a/packages/contracts/src/orchestrationV2.ts b/packages/contracts/src/orchestrationV2.ts
index d20da5780255..085f979165ca 100644
--- a/packages/contracts/src/orchestrationV2.ts
+++ b/packages/contracts/src/orchestrationV2.ts
@@ -1087,6 +1087,7 @@ export const OrchestrationV2HistoricalMessage = Schema.Struct({
   threadId: ThreadId,
   runId: Schema.NullOr(RunId),
   itemId: TurnItemId,
+  nativeItemRef: Schema.optional(Schema.NullOr(OrchestrationV2ProviderRef)),
   providerThreadId: Schema.NullOr(ProviderThreadId),
   status: Schema.String,
   kind: Schema.String,
diff --git a/packages/provider-core/src/server/handoffBudget.ts b/packages/provider-core/src/server/handoffBudget.ts
index 4658bc44fc6d..2018382d8e39 100644
--- a/packages/provider-core/src/server/handoffBudget.ts
+++ b/packages/provider-core/src/server/handoffBudget.ts
@@ -161,6 +161,7 @@ export function historicalMessage(
     threadId: item.threadId,
     runId: item.runId,
     itemId: item.id,
+    nativeItemRef: item.nativeItemRef,
     providerThreadId: item.providerThreadId,
     status: item.status,
     kind: item.type,